aslakhellesoy-cucumber 0.2.0.1 → 0.2.0.2

data/History.txt

@@ -1,8 +1,15 @@
 == 0.2.1 (In Git)
 
 == Bugfixes
+* After blocks are run in reverse order of registration. (#113 Aslak Hellesøy)
 * Snippets are showing 'Ands' (#249 Aslak Hellesøy)
 
+=== New features
+* New usage formatter. This is the foundation for editor autocompletion and navigation between steps and step definitions.
+
+=== Removed features
+* -S/--step-definitions option introduced in 0.2.0 is removed. Use --format usage [--dry-run] [--no-color].
+
 == 0.2.0 2009-03-18
 
 This release sports a bunch of new and exciting features, as well a major rewrite of Cucumber's internals. 

data/Manifest.txt

@@ -199,6 +199,7 @@ features/report_called_undefined_steps.feature
 features/step_definitions/cucumber_steps.rb
 features/step_definitions/extra_steps.rb
 features/support/env.rb
+features/usage.feature
 gem_tasks/deployment.rake
 gem_tasks/environment.rake
 gem_tasks/features.rake
@@ -252,6 +253,7 @@ lib/cucumber/formatter/profile.rb
 lib/cucumber/formatter/progress.rb
 lib/cucumber/formatter/rerun.rb
 lib/cucumber/formatter/unicode.rb
+lib/cucumber/formatter/usage.rb
 lib/cucumber/formatters/unicode.rb
 lib/cucumber/jbehave.rb
 lib/cucumber/languages.yml

data/examples/sinatra/features/support/env.rb

@@ -1,7 +1,11 @@
+# See http://wiki.github.com/aslakhellesoy/cucumber/sinatra
+# for more details about Sinatra with Cucumber
+
 # Sinatra
-require File.join(File.dirname(__FILE__), *%w[.. .. app])
+app_file = File.join(File.dirname(__FILE__), *%w[.. .. app.rb])
+require app_file
 # Force the application name because polyglot breaks the auto-detection logic.
-Sinatra::Application.app_file = File.join(File.dirname(__FILE__), *%w[.. .. app.rb])
+Sinatra::Application.app_file = app_file
 
 # RSpec
 require 'spec/expectations'

data/examples/tickets/features/248.feature

@@ -0,0 +1,11 @@
+Feature: pending method causes failure in Scenario Outlines 
+
+  Scenario Outline: blah
+    Given this is pending until we fix it
+    Given context with <Stuff>
+    When action
+    Then outcome with <Blah>
+
+  Examples:
+    | Stuff  | Blah        |
+    | Cheese | Pepper Jack |

data/examples/tickets/features/step_definitons/248_steps.rb

@@ -0,0 +1,15 @@
+Given /^this is pending until we fix it$/ do
+  pending
+end
+
+Given /^context with Cheese$/ do
+  pending
+end
+
+When /^action$/ do
+  pending
+end
+
+Then /^outcome with Pepper Jack$/ do
+  pending
+end

data/features/usage.feature

@@ -0,0 +1,59 @@
+Feature: Cucumber command line
+  In order to be able to write an editor plugin that can jump between
+  steps and step definitions, Cucumber must provide a way to
+  display how they are related.
+
+  Scenario: List usage of step definitions
+    When I run cucumber features --format usage --dry-run
+    Then it should pass with
+      """
+      /^passing without a table$/          # features/step_definitions/sample_steps.rb:12
+       Given passing without a table       # features/background/failing_background_after_success.feature:4
+       Given <state> without a table       # features/outline_sample.feature:6
+       Given <other_state> without a table # features/outline_sample.feature:7
+      /^failing without a table$/    # features/step_definitions/sample_steps.rb:15
+       Given failing without a table # features/background/failing_background.feature:4
+       Given failing without a table # features/background/scenario_outline_failing_background.feature:4
+      /^a step definition that calls an undefined step$/    # features/step_definitions/sample_steps.rb:19
+       Given a step definition that calls an undefined step # features/call_undefined_step_from_step_def.feature:4
+      /^call step "(.*)"$/                                              # features/step_definitions/sample_steps.rb:23
+       Given call step "a step definition that calls an undefined step" # features/call_undefined_step_from_step_def.feature:7
+      /^'(.+)' cukes$/   # features/step_definitions/sample_steps.rb:27
+       And '10' cukes    # features/background/failing_background.feature:5
+       Given '10' cukes  # features/background/passing_background.feature:4
+       Given '10' cukes  # features/background/scenario_outline_passing_background.feature:4
+      /^I should have '(.+)' cukes$/      # features/step_definitions/sample_steps.rb:31
+       Then I should have '10' cukes      # features/background/failing_background.feature:8
+       Then I should have '10' cukes      # features/background/failing_background.feature:11
+       Then I should have '10' cukes      # features/background/passing_background.feature:7
+       Then I should have '10' cukes      # features/background/passing_background.feature:10
+       Then I should have '10' cukes      # features/background/pending_background.feature:7
+       Then I should have '10' cukes      # features/background/pending_background.feature:10
+       Then I should have '<count>' cukes # features/background/scenario_outline_failing_background.feature:7
+       Then I should have '<count>' cukes # features/background/scenario_outline_failing_background.feature:13
+       Then I should have '<count>' cukes # features/background/scenario_outline_passing_background.feature:7
+       Then I should have '<count>' cukes # features/background/scenario_outline_passing_background.feature:13
+      /^'(.+)' global cukes$/   # features/step_definitions/sample_steps.rb:35
+       And '10' global cukes    # features/background/failing_background_after_success.feature:5
+      /^I should have '(.+)' global cukes$/   # features/step_definitions/sample_steps.rb:42
+       Then I should have '10' global cukes   # features/background/failing_background_after_success.feature:8
+       Then I should have '10' global cukes   # features/background/failing_background_after_success.feature:11
+      /^table$/    # features/step_definitions/sample_steps.rb:46
+       Given table # features/background/multiline_args_background.feature:4
+      /^multiline string$/   # features/step_definitions/sample_steps.rb:50
+       And multiline string  # features/background/multiline_args_background.feature:7
+      /^the table should be$/   # features/step_definitions/sample_steps.rb:54
+       Then the table should be # features/background/multiline_args_background.feature:14
+       Then the table should be # features/background/multiline_args_background.feature:24
+      /^the multiline string should be$/   # features/step_definitions/sample_steps.rb:58
+       Then the multiline string should be # features/background/multiline_args_background.feature:17
+       Then the multiline string should be # features/background/multiline_args_background.feature:27
+      /^passing$/    # features/step_definitions/sample_steps.rb:5
+       Given passing # features/sample.feature:10
+      /^failing expectation$/    # features/step_definitions/sample_steps.rb:62
+       Given failing expectation # features/failing_expectation.feature:4
+      /^failing$/    # features/step_definitions/sample_steps.rb:8
+       Given failing # features/sample.feature:16
+
+      """
+

data/lib/cucumber/ast/step_invocation.rb

@@ -82,7 +82,7 @@ module Cucumber
         if [Cucumber.keyword_hash['and'], Cucumber.keyword_hash['but']].index(@step.keyword) && previous
           previous.actual_keyword
         else
-          @step.keyword
+          keyword
         end
       end
 
@@ -94,6 +94,10 @@ module Cucumber
         @step.text_length
       end
 
+      def keyword
+        @step.keyword
+      end
+
       def file_colon_line
         @step.file_colon_line
       end

data/lib/cucumber/cli/configuration.rb

@@ -137,9 +137,6 @@ module Cucumber
           opts.on("--no-diff", "Disable diff output on failing expectations.") do
             @options[:diff_enabled] = false
           end
-          opts.on("-S", "--step-definitions", "Print the regexp and line of all step definitions, then exit.") do
-            @options[:print_step_definitions] = true
-          end
           opts.on_tail("--version", "Show version.") do
             @out_stream.puts VERSION::STRING
             Kernel.exit
@@ -175,10 +172,6 @@ module Cucumber
         @options[:diff_enabled]
       end
 
-      def print_step_definitions?
-        @options[:print_step_definitions]
-      end
-
       def load_language
         if Cucumber.language_incomplete?(@options[:lang])
           list_keywords_and_exit(@options[:lang])
@@ -224,11 +217,12 @@ module Cucumber
     
       def formatter_class(format)
         case format
+          when 'html'     then Formatter::Html
           when 'pretty'   then Formatter::Pretty
-          when 'progress' then Formatter::Progress
           when 'profile'  then Formatter::Profile
+          when 'progress' then Formatter::Progress
           when 'rerun'    then Formatter::Rerun
-          when 'html'     then Formatter::Html
+          when 'usage'    then Formatter::Usage
         else
           constantize(format)
         end

data/lib/cucumber/cli/main.rb

@@ -32,13 +32,6 @@ module Cucumber
         step_mother.options = configuration.options
 
         require_files
-
-        if(configuration.print_step_definitions?)
-          step_mother.print_step_definitions(@out_stream)
-          Kernel.exit(0)
-          return # In specs, exit is stubbed
-        end
-        
         enable_diffing
       
         features = load_plain_text_features

data/lib/cucumber/formatter.rb

@@ -1 +1 @@
-%w{color_io pretty progress profile rerun html}.each{|n| require "cucumber/formatter/#{n}"}
+%w{color_io pretty progress profile rerun html usage}.each{|n| require "cucumber/formatter/#{n}"}

data/lib/cucumber/formatter/rerun.rb

@@ -1,5 +1,13 @@
 module Cucumber
   module Formatter
+    # This formatter keeps track of all failing features and print out their location.
+    # Example:
+    #
+    #   features/foo.feature:34 features/bar.feature:11:76:81
+    #
+    # This formatter is used by AutoTest - it will use the output to decide what
+    # to run the next time, simply passing the output string on the command line.
+    #
     class Rerun < Ast::Visitor
       def initialize(step_mother, io, options)
         super(step_mother)

data/lib/cucumber/formatter/usage.rb

@@ -0,0 +1,69 @@
+require 'cucumber/formatter/progress'
+
+module Cucumber
+  module Formatter
+    class Usage < Ast::Visitor
+      include Console
+
+      def initialize(step_mother, io, options)
+        super(step_mother)
+        @io = io
+        @options = options
+        @step_definitions = Hash.new { |h,step_definition| h[step_definition] = [] }
+        @locations = []
+      end
+
+      def visit_features(features)
+        super
+        print_summary
+      end
+
+      def visit_step(step)
+        @step = step
+        super
+      end
+
+      def visit_step_name(keyword, step_match, status, source_indent, background)
+        if step_match.step_definition
+          location = @step.file_colon_line
+          return if @locations.index(location)
+          @locations << location
+          
+          description = format_step(keyword, step_match, status, nil)
+          length = (keyword + step_match.format_args).jlength
+          @step_definitions[step_match.step_definition] << [step_match, description, length, location]
+        end
+      end
+
+      def print_summary
+        sorted_defs = @step_definitions.keys.sort_by{|step_definition| step_definition.backtrace_line}
+        
+        sorted_defs.each do |step_definition|          
+          step_matches_and_descriptions = @step_definitions[step_definition].sort_by do |step_match_and_description|
+            step_match = step_match_and_description[0]
+            step_match.step_definition.regexp.inspect
+          end
+
+          step_matches = step_matches_and_descriptions.map{|step_match_and_description| step_match_and_description[0]}
+
+          lengths = step_matches_and_descriptions.map do |step_match_and_description| 
+            step_match_and_description[2]
+          end
+          lengths << step_definition.text_length
+          max_length = lengths.max
+
+          @io.print step_definition.regexp.inspect
+          @io.puts format_string("   # #{step_definition.file_colon_line}".indent(max_length - step_definition.text_length), :comment)
+          step_matches_and_descriptions.each do |step_match_and_description|
+            step_match      = step_match_and_description[0]
+            description     = step_match_and_description[1]
+            length          = step_match_and_description[2]
+            file_colon_line = step_match_and_description[3]
+            @io.print " #{description}"
+            @io.puts format_string(" # #{file_colon_line}".indent(max_length - length), :comment)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/jbehave.rb

@@ -27,6 +27,7 @@ if defined?(JRUBY_VERSION)
         end
 
         def step_match(name_to_match, name_to_report)
+          raise "FIXME"
           if(match = name_to_match.match(@regexp))
             StepMatch.new(self, name_to_match, name_to_report, match.captures)
           else

data/lib/cucumber/rails/world.rb

@@ -24,7 +24,7 @@ end
 # So that Test::Unit doesn't launch at the end - makes it think it has already been run.
 Test::Unit.run = true if Test::Unit.respond_to?(:run=)
 
-$cucumber_toplevel = self
+$__cucumber_toplevel = self
 
 module Cucumber #:nodoc:
   module Rails
@@ -44,20 +44,21 @@ module Cucumber #:nodoc:
     def self.use_transactional_fixtures
       World.use_transactional_fixtures = true
       if defined?(ActiveRecord::Base)
-        $cucumber_toplevel.Before do
-          if ActiveRecord::Base.connection.respond_to?(:increment_open_transactions)
-            ActiveRecord::Base.connection.increment_open_transactions
+        $__cucumber_toplevel.Before do
+          @__cucumber_ar_connection = ActiveRecord::Base.connection
+          if @__cucumber_ar_connection.respond_to?(:increment_open_transactions)
+            @__cucumber_ar_connection.increment_open_transactions
           else
             ActiveRecord::Base.__send__(:increment_open_transactions)
           end
-          ActiveRecord::Base.connection.begin_db_transaction
+          @__cucumber_ar_connection.begin_db_transaction
           ActionMailer::Base.deliveries = [] if defined?(ActionMailer::Base)
         end
         
-        $cucumber_toplevel.After do
-          ActiveRecord::Base.connection.rollback_db_transaction
-          if ActiveRecord::Base.connection.respond_to?(:decrement_open_transactions)
-            ActiveRecord::Base.connection.decrement_open_transactions
+        $__cucumber_toplevel.After do
+          @__cucumber_ar_connection.rollback_db_transaction
+          if @__cucumber_ar_connection.respond_to?(:decrement_open_transactions)
+            @__cucumber_ar_connection.decrement_open_transactions
           else
             ActiveRecord::Base.__send__(:decrement_open_transactions)
           end

data/lib/cucumber/step_definition.rb

@@ -95,9 +95,5 @@ module Cucumber
     def text_length
       @regexp.inspect.jlength
     end
-
-    def to_s(indent = 0)
-      @regexp.inspect + (' # ').indent(indent) + file_colon_line
-    end
   end
 end

data/lib/cucumber/step_match.rb

@@ -13,7 +13,7 @@ module Cucumber
       @step_definition.invoke(world, all_args, @step_name)
     end
 
-    def format_args(format)
+    def format_args(format = lambda{|a| a})
       @formatted_step_name || @step_definition.format_args(@step_name, format)
     end
     
@@ -24,6 +24,10 @@ module Cucumber
     def backtrace_line
       @step_definition.backtrace_line
     end
+
+    def text_length
+      @step_definition.text_length
+    end
   end
   
   class NoStepMatch
@@ -45,5 +49,9 @@ module Cucumber
     def backtrace_line
       @step.backtrace_line
     end
+
+    def text_length
+      @step.text_length
+    end
   end
 end

data/lib/cucumber/step_mother.rb

@@ -101,7 +101,7 @@ module Cucumber
     end
 
     def After(&proc)
-      (@after_procs ||= []) << proc
+      (@after_procs ||= []).unshift(proc)
     end
 
     # Registers a World proc. You can call this method as many times as you
@@ -141,13 +141,6 @@ module Cucumber
     def snippet_text(step_keyword, step_name)
       @snippet_generator.snippet_text(step_keyword, step_name)
     end
-    
-    def print_step_definitions(out)
-      step_definitions.each do |step_definition|
-        indent = max_step_definition_length - step_definition.text_length
-        out.puts(step_definition.to_s(indent))
-      end
-    end
 
     def before_and_after(scenario, skip=false)
       unless current_world || skip

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 2
     TINY  = 0
-    PATCH = 1 # Set to nil for official release
+    PATCH = 2 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/spec/cucumber/cli/main_spec.rb

@@ -10,18 +10,6 @@ module Cli
       Kernel.stub!(:exit).and_return(nil)
     end
 
-    it "should print step definitions" do
-      step_mother = Object.new.extend(StepMother)
-      step_mother.Given(/Bonjour/) {}
-      step_mother.Given(/Monde/) {}
-      @cli = Main.new(%w{-S}, @out)
-      @cli.execute!(step_mother)
-      @out.string.should == %{
-/Bonjour/ # spec/cucumber/cli/main_spec.rb:15
-/Monde/   # spec/cucumber/cli/main_spec.rb:16
-}.lstrip
-    end
-
     describe "verbose mode" do
       
       before(:each) do
@@ -54,7 +42,7 @@ module Cli
     describe "diffing" do
 
       before :each do
-        @configuration = mock('Configuration', :null_object => true, :print_step_definitions? => nil)
+        @configuration = mock('Configuration', :null_object => true)
         Configuration.should_receive(:new).and_return(@configuration)
         
         @step_mother = mock('StepMother', :null_object => true)

data/spec/cucumber/step_definition_spec.rb

@@ -58,15 +58,7 @@ module Cucumber
         step_match("Outside").invoke(@world, nil)
       end.should raise_error(Pending, "Do me!")
     end
-    
-    it "should have a #to_s suitable for automcompletion" do
-      stepdef = Given /Hello (.*)/ do
-      end
-      
-      stepdef.to_s.should    == '/Hello (.*)/ # spec/cucumber/step_definition_spec.rb:63'
-      stepdef.to_s(2).should == '/Hello (.*)/   # spec/cucumber/step_definition_spec.rb:63'
-    end
-    
+
     it "should allow announce" do
       v = mock('visitor')
       v.should_receive(:announce).with('wasup')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.2.0.1
+  version: 0.2.0.2
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-20 00:00:00 -07:00
+date: 2009-03-21 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -264,9 +264,11 @@ files:
 - examples/tickets/features/180.feature
 - examples/tickets/features/236.feature
 - examples/tickets/features/241.feature
+- examples/tickets/features/248.feature
 - examples/tickets/features/lib/eatting_machine.rb
 - examples/tickets/features/lib/pantry.rb
 - examples/tickets/features/scenario_outline.feature
+- examples/tickets/features/step_definitons/248_steps.rb
 - examples/tickets/features/step_definitons/scenario_outline_steps.rb
 - examples/tickets/features/step_definitons/tickets_steps.rb
 - examples/tickets/features/tickets.feature
@@ -284,6 +286,7 @@ files:
 - features/step_definitions/cucumber_steps.rb
 - features/step_definitions/extra_steps.rb
 - features/support/env.rb
+- features/usage.feature
 - gem_tasks/deployment.rake
 - gem_tasks/environment.rake
 - gem_tasks/features.rake
@@ -337,6 +340,7 @@ files:
 - lib/cucumber/formatter/progress.rb
 - lib/cucumber/formatter/rerun.rb
 - lib/cucumber/formatter/unicode.rb
+- lib/cucumber/formatter/usage.rb
 - lib/cucumber/formatters/unicode.rb
 - lib/cucumber/jbehave.rb
 - lib/cucumber/languages.yml