cuketagger 1.4 → 1.5

data/lib/cuketagger/tag_formatter.rb

@@ -2,34 +2,20 @@ module CukeTagger
   module TagFormatter
     attr_accessor :tagger
 
-    def before_feature(feature)
-      @__current_feature = feature
+    def feature(feature)
+      @tagger.process @uri, feature
       super
     end
 
-    def before_feature_element(element)
-      @__current_element = element
-      super
-    end
-    
-    def after_feature_element(element)
-      @__current_element = nil
+    def scenario_outline(scenario_outline)
+      @tagger.process @uri, scenario_outline
       super
     end
 
-    def before_tags(tags)
-      @tagger.process(@__current_feature, @__current_element, tags.instance_variable_get("@tag_names"))
+    def scenario(scenario)
+      @tagger.process @uri, scenario
+      super
     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

@@ -1,5 +1,3 @@
-require "cucumber/cli/options"
-
 module CukeTagger
   class Tagger
     USAGE = "#{File.basename $0} [-v|--version] [-f|--force] [add|remove|replace]:TAG[:REPLACEMENT] [FILE[:LINE]]+"
@@ -12,22 +10,20 @@ module CukeTagger
       abort(USAGE) if args.empty? || args.first =~ /^(-h|--help)$/
       CukeTagger.log :args, args
 
-      cuke_args = %w[--dry-run]
+      force = false
 
       args.each do |arg|
         case arg
         when /^-v|--version$/
           puts CukeTagger::Version
         when /^(.+?\.feature)((:\d+)*)$/
-          add_feature($1, $2.to_s)
+         add_feature $1, $2.to_s
         when /^(add|remove):(.+?)$/
           alterations << [$1.to_sym, $2]
         when /^(replace):(.+?):(.+)$/
           alterations << [$1.to_sym, [$2, $3]]
         when /^(-f|--force)$/
-          cuke_args << "--autoformat" << "."
-          cuke_args << "--no-source"
-          Term::ANSIColor.coloring = false
+          force = true
         else
           abort(USAGE)
         end
@@ -37,83 +33,89 @@ module CukeTagger
 
       CukeTagger.log :alterations, alterations
 
-      configuration = Cucumber::Cli::Configuration.new
-      configuration.parse!(cuke_args)
-
-      formatter = Cucumber::Formatter::Pretty.new(runtime, $stdout, configuration.instance_variable_get("@options"))
-      formatter.extend(TagFormatter)
-      formatter.tagger = self
+      files = features_to_change.map { |file, line| file }.uniq
+      files.each { |file| parse file, force }
+    end
 
-      walker = Cucumber::Ast::TreeWalker.new(runtime, [formatter], configuration)
-      walker.visit_features features
+    def parse(file, write)
+      content = File.read(file)
+
+      io = write ? File.open(file, "w") : $stdout
+      begin
+        pretty_formatter = Gherkin::Formatter::PrettyFormatter.new(io,
+                                                                  !(io == $stdout && $stdout.tty?), # monochrome
+                                                                  false) # executing
+        pretty_formatter.extend TagFormatter
+        pretty_formatter.tagger = self
+
+        parser = Gherkin::Parser::Parser.new(pretty_formatter, true)
+        parser.parse content, file, 0
+      ensure
+        io.close unless io == $stdout
+      end
     end
 
-    def process(feature, element, tag_names)
+    def process(uri, element)
       CukeTagger.log :process, :element => element.class
-      return unless should_alter?(feature, element)
+      return unless should_alter?(uri, element)
+
+      @uri = uri
 
       alterations.each do |op, tag_name|
         case op
         when :add
-          tag_names.push "@#{tag_name}"
+          push_tag element, "@#{tag_name}"
         when :remove
-          tag_names.delete "@#{tag_name}"
+          remove_tag element, "@#{tag_name}"
         when :replace
-          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}"
-          end
+          replace_tag element, tag_name
         end
       end
     end
 
-    def should_alter?(feature, element)
-      fl = file_and_line_for(feature, element)
-
-      CukeTagger.log(:file_and_line => fl, :features_to_change => features_to_change)
+    def push_tag(element, tag_name)
+      element.tags << Gherkin::Formatter::Model::Tag.new(tag_name, element.line)
+    end
 
-      features_to_change.include? fl
+    def remove_tag(element, tag_name)
+      element.tags.delete_if { |tag| tag.name == tag_name }
     end
 
-    private
+    def replace_tag(element, tag_name)
+      to_replace, replacement = tag_name
+      to_replace  = "@#{to_replace}"
+      replacement = "@#{replacement}"
 
-    def file_and_line_for(feature, element)
-      line = if element.respond_to?(:line)
-               element.line
-             elsif element.kind_of?(Cucumber::Ast::ScenarioOutline)
-               element.instance_variable_get("@line")
-             else
-               0
-             end
+      idx = element.tags.find_index { |tag| tag.name == to_replace }
 
-      [feature.file, line]
+      if idx.nil?
+        $stderr.puts "expected #{to_replace.inspect} at #{@uri}:#{element.line}, skipping"
+      else
+        element.tags[idx] = Gherkin::Formatter::Model::Tag.new(replacement, element.line)
+      end
     end
 
-    def add_feature(path, lines)
-      ff = Cucumber::FeatureFile.new(path).parse({}, {})
+    def should_alter?(uri, element)
+      CukeTagger.log(:file_and_line => [uri, element.line], :features_to_change => features_to_change)
 
+      features_to_change.any? do |file, line|
+        file == uri && (element.line == line || (line.nil? && element.kind_of?(Gherkin::Formatter::Model::Feature)))
+      end
+    end
+
+    private
+
+    def add_feature(path, lines)
       lines = lines.split(":")
-      lines.delete("")
+      lines.delete ""
 
       if lines.empty?
-        features_to_change << [path, 0]
+        features_to_change << [path, nil]
       else
         lines.each do |line|
           features_to_change << [path, Integer(line)]
         end
       end
-
-      features.add_feature ff
-    end
-
-    def runtime
-      @runtime ||= Cucumber::Runtime.new
-    end
-
-    def features
-      @features ||= Cucumber::Ast::Features.new
     end
 
     def alterations

data/lib/cuketagger/version.rb

@@ -1,3 +1,3 @@
 module CukeTagger
-  Version = "1.4"
+  Version = "1.5"
 end

data/lib/cuketagger.rb

@@ -1,10 +1,11 @@
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require "cucumber"
-require "cucumber/feature_file"
-require "cucumber/formatter/pretty"
 require "set"
 
+require "gherkin"
+require "gherkin/formatter/pretty_formatter"
+require "stringio"
+
 require "cuketagger/version"
 require "cuketagger/tag_formatter"
 require "cuketagger/tagger"

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cuketagger
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: "1.4"
+  hash: 5
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  version: "1.5"
 platform: ruby
 authors: 
 - Jari
@@ -11,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +01:00
+date: 2011-04-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
   type: :runtime
   version_requirements: *id001
@@ -42,7 +51,7 @@ files:
 - lib/cuketagger/version.rb
 - lib/cuketagger.rb
 - bin/cuketagger
-has_rdoc: true
+has_rdoc: false
 homepage: http://cukes.info
 licenses: []
 
@@ -56,17 +65,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: batch tagging of cucumber features and scenarios