tagfu 1.0.1 → 1.0.2

data/lib/tagfu/tagger.rb

@@ -54,32 +54,44 @@ module Tagfu
 		end
 
 		def delete_all(lines)
-			lines_to_delete = []
+			lines_to_delete = lines_to_delete(lines, "@")
+			delete_lines(lines, lines_to_delete)
+		end
+
+		def lines_to_delete(lines, regex)
+			tmp = []
 			lines.each_with_index do |line, index|
-				if line.match(/@/)
-					lines_to_delete << index
+				if line.match(/#{regex}/)
+					tmp << index
 				end
 			end
-			running_index = 0
+			tmp
+		end
+
+		def delete_lines(lines, lines_to_delete)
+			lines_to_delete = lines_to_delete.sort
+			index_adjustment = 0
 			lines_to_delete.each do |line_index|
-				lines.delete_at(line_index - running_index)
-				running_index += 1
+				lines.delete_at(line_index - index_adjustment)
+				index_adjustment += 1
 			end
 		end
 
 		def delete_tags(lines)
+			lines_to_delete = []
 			@delete_tags.each do |tag|
-				lines.each_with_index do |line, index|
+				lines.each_with_index do |line, line_index|
 					if only_tag?(line, tag)
-						lines.delete_at(index)
+						lines_to_delete << line_index
 					else	
-						indent = lines[index][/^\s+/].to_s
+						indent = lines[line_index][/^\s+/].to_s
 						line = line.strip
 						next if line.empty?
-						lines[index] = indent + line.chomp.split(' ').delete_if {|word| word.match(/#{tag}/)}.join(' ') + "\n" if line.match(/^@/)
+						lines[line_index] = indent + line.chomp.split(' ').delete_if {|word| word.match(/#{tag}/)}.join(' ') + "\n" if line.match(/^@/)
 					end
 				end
 			end
+			delete_lines(lines, lines_to_delete.flatten)
 		end
 
 		def only_tag?(line, tag)

data/lib/tagfu/version.rb

@@ -1,3 +1,3 @@
 module Tagfu
-	VERSION = "1.0.1"
+	VERSION = "1.0.2"
 end

data/spec/tagger_spec.rb

@@ -54,6 +54,33 @@ RSpec.configure do |config|
 					When I run it through the tagger
 					Then I see that the tag has been updated
 			""",
+			:two_tags_to_delete =>
+			"""
+				@smoke
+				@smoke
+				Feature: Two tags to delete in feature file		
+				
+				@wip
+				@wip
+				@wip
+				Scenario: sample story
+					Given I have a feature file with one tag
+					When I run it through the tagger
+					Then I see that the tag has been updated
+			""",
+			:two_tags_to_update =>
+			"""
+				@wip
+				@wip
+				Feature: Two tags to delete in feature file		
+				
+				@wip
+				@wip
+				Scenario: sample story
+					Given I have a feature file with one tag
+					When I run it through the tagger
+					Then I see that the tag has been updated
+			""",
 			:three_tags_delete_update =>
 			"""
 				Feature: Three tags to update in feature file		
@@ -98,7 +125,6 @@ RSpec.configure do |config|
 	end
 
 	config.after(:all) do
-		#FileUtils.remove_entry_secure @dir
 		files = Dir.glob("*.feature")
 		files.each {|file| File.unlink(file)}
 	end
@@ -155,6 +181,20 @@ RSpec.configure do |config|
 			File.readlines(file).any? {|line| line =~ /@story3/}.should be_true
 		end
 
+		it "should delete duplicate tags in consecutive lines" do
+			file = "two_tags_to_delete.feature"
+			Tagfu::Tagger.new({:path => file, :delete_tags => ['@wip', '@smoke']}).get_files
+			File.readlines(file).any? {|line| line =~ /@smoke/}.should be_false
+			File.readlines(file).any? {|line| line =~ /@wip/}.should be_false
+		end
+
+		it "should update duplicate tags in consecutive lines" do
+			file = "two_tags_to_update.feature"
+			Tagfu::Tagger.new({:path => file, :update_tags => ['@wip', '@smoke']}).get_files
+			File.readlines(file).any? {|line| line =~ /@wip/}.should be_false
+			File.readlines(file).any? {|line| line =~ /@smoke/}.should be_true
+		end
+
 		it "should delete all tags in feature file" do
 			file = "all_tags_delete.feature"
 			Tagfu::Tagger.new({:path => file, :delete_all => true}).get_files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagfu
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors: