jarib-cuketagger 0.7.1 → 0.7.2

data/Rakefile

@@ -21,7 +21,7 @@ spec = Gem::Specification.new do |s|
   s.files            = %w[Rakefile README.markdown] + Dir['lib/**/*']
   s.bindir           = 'bin'
   s.executables      = Dir['bin/*'].map { |f| File.basename(f) }
-  s.add_runtime_dependency 'cucumber', '>= 0.3.96'
+  s.add_runtime_dependency 'cucumber', '>= 0.3.103'
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/cuketagger.rb

@@ -6,7 +6,5 @@ require "cucumber/formatter/pretty"
 require "set"
 
 require "cuketagger/version"
-require "cuketagger/tag_visitor"
+require "cuketagger/tag_formatter"
 require "cuketagger/tagger"
-
-

data/lib/cuketagger/tag_formatter.rb

@@ -0,0 +1,35 @@
+module CukeTagger
+  module TagFormatter
+    attr_accessor :tagger
+
+    def before_feature(feature)
+      @__current_feature = feature
+      super
+    end
+
+    def before_feature_element(element)
+      @__current_element = element
+      super
+    end
+    
+    def after_feature_element(element)
+      @__current_element = nil
+      super
+    end
+
+    def before_tags(tags)
+      @tagger.process(@__current_feature, @__current_element, tags.instance_variable_get("@tag_names"))
+    end
+
+    private
+
+    def record_tag_occurrences(*args)
+      # override to avoid error if options[:include_tags] is nil
+    end
+    
+    def print_summary(*args)
+      # override
+    end
+    
+  end
+end

data/lib/cuketagger/tagger.rb

@@ -30,10 +30,11 @@ module CukeTagger
       end
 
       formatter = Cucumber::Formatter::Pretty.new(step_mother, $stdout, opts)
-      formatter.extend(TagVisitor)
+      formatter.extend(TagFormatter)
       formatter.tagger = self
 
-      features.accept formatter
+      walker = Cucumber::Ast::TreeWalker.new(step_mother, [formatter], opts)
+      walker.visit_features features
     end
 
     def process(feature, element, tag_names)
@@ -42,22 +43,23 @@ module CukeTagger
       alterations.each do |op, tag_name|
         case op
         when :add
-          tag_names.push tag_name
+          tag_names.push "@#{tag_name}"
         when :remove
-          tag_names.delete tag_name
+          tag_names.delete "@#{tag_name}"
         when :replace
-          idx = tag_names.index tag_name.first
+          idx = tag_names.index "@#{tag_name.first}"
           if idx.nil?
             $stderr.puts "expected #{tag_name.first.inspect} at #{file_and_line_for(feature, element).join(":")}, skipping"
           else
-            tag_names[idx] = tag_name.last
+            tag_names[idx] = "@#{tag_name.last}"
           end
         end
       end
     end
 
     def should_alter?(feature, element)
-      features_to_change.include? file_and_line_for(feature, element)
+      fl = file_and_line_for(feature, element)
+      features_to_change.include? fl
     end
 
     private

data/lib/cuketagger/version.rb

@@ -1,3 +1,3 @@
 module CukeTagger
-  Version = "0.7.1"
+  Version = "0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarib-cuketagger
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Jari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -07:00
+date: 2009-09-24 00:00:00 -07:00
 default_executable: cuketagger
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.96
+        version: 0.3.103
     version: 
 description: batch tagging of cucumber features and scenarios
 email: jari.bakken@gmail.com
@@ -35,7 +35,7 @@ files:
 - Rakefile
 - README.markdown
 - lib/cuketagger
-- lib/cuketagger/tag_visitor.rb
+- lib/cuketagger/tag_formatter.rb
 - lib/cuketagger/tagger.rb
 - lib/cuketagger/version.rb
 - lib/cuketagger.rb

data/lib/cuketagger/tag_visitor.rb

@@ -1,28 +0,0 @@
-module CukeTagger
-  module TagVisitor
-    attr_accessor :tagger
-
-    def visit_feature(feature)
-      @current_feature = feature
-      super
-    end
-
-    def visit_feature_element(element)
-      @current_element = element
-      super
-      @current_element = nil
-    end
-
-    def visit_tags(tags)
-      @tagger.process(@current_feature, @current_element, tags.instance_variable_get("@tag_names"))
-      super
-    end
-
-    private
-
-    def record_tag_occurrences(*args)
-      # override to avoid error if options[:include_tags] is nil
-    end
-
-  end
-end