From 6fdcc0c61d23bb3cc1cf200f5de365d613bd5181 Mon Sep 17 00:00:00 2001
From: Petr Korolev <sky4winder@gmail.com>
Date: Wed, 10 Jun 2015 13:23:46 +0300
Subject: [PATCH] fix #245

---
 .../generator/generator_tags.rb                        | 10 +++++-----
 spec/unit/generator/generator_tags_spec.rb             | 10 ++++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/github_changelog_generator/generator/generator_tags.rb b/lib/github_changelog_generator/generator/generator_tags.rb
index 4032a3d..6873c10 100644
--- a/lib/github_changelog_generator/generator/generator_tags.rb
+++ b/lib/github_changelog_generator/generator/generator_tags.rb
@@ -45,8 +45,8 @@ module GitHubChangelogGenerator
       filtered_tags = all_tags
       if @options[:between_tags]
         @options[:between_tags].each do |tag|
-          unless all_tags.include? tag
-            puts "Warning: can't find tag #{tag}, specified with --between-tags option.".yellow
+          unless all_tags.map(&:name).include? tag
+            Helper.log.warn "Warning: can't find tag #{tag}, specified with --between-tags option."
           end
         end
         filtered_tags = all_tags.select { |tag| @options[:between_tags].include? tag.name }
@@ -58,11 +58,11 @@ module GitHubChangelogGenerator
       filtered_tags = all_tags
       if @options[:exclude_tags]
         @options[:exclude_tags].each do |tag|
-          unless all_tags.include? tag
-            puts "Warning: can't find tag #{tag}, specified with --between-tags option.".yellow
+          unless all_tags.map(&:name).include? tag
+            Helper.log.warn "Warning: can't find tag #{tag}, specified with --exclude-tags option."
           end
         end
-        filtered_tags = all_tags.reject { |tag| @options[:exclude_tags].include? tag }
+        filtered_tags = all_tags.reject { |tag| @options[:exclude_tags].include? tag.name }
       end
       filtered_tags
     end
diff --git a/spec/unit/generator/generator_tags_spec.rb b/spec/unit/generator/generator_tags_spec.rb
index 6c4d40e..bc28290 100644
--- a/spec/unit/generator/generator_tags_spec.rb
+++ b/spec/unit/generator/generator_tags_spec.rb
@@ -58,25 +58,23 @@ describe GitHubChangelogGenerator::Generator do
 
   describe "#get_filtered_tags" do
     subject do
-      tags_mash = tags_mash_from_strings(%w(1 2 3 4 5))
-      generator.get_filtered_tags(tags_mash)
+      generator.get_filtered_tags(tags_mash_from_strings(%w(1 2 3 4 5)))
     end
-    # before { generator.get_filtered_tags(%w(1 2 3 4 5)) }
 
     context "with excluded and between tags" do
       let(:generator) { GitHubChangelogGenerator::Generator.new(between_tags: %w(1 2 3), exclude_tags: %w(2)) }
       it { is_expected.to be_a Array }
-      it { is_expected.to match_array(%w(1 3)) }
+      it { is_expected.to match_array(tags_mash_from_strings(%w(1 3))) }
     end
   end
 
   describe "#filter_excluded_tags" do
-    subject { generator.filter_excluded_tags(%w(1 2 3)) }
+    subject { generator.filter_excluded_tags(tags_mash_from_strings(%w(1 2 3))) }
 
     context "with valid excluded tags" do
       let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: %w(3)) }
       it { is_expected.to be_a Array }
-      it { is_expected.to match_array(%w(1 2)) }
+      it { is_expected.to match_array(tags_mash_from_strings(%w(1 2))) }
     end
   end
 end