cucumber 0.2.0 → 0.2.1

data/lib/cucumber/step_match.rb

@@ -10,10 +10,10 @@ module Cucumber
     def invoke(world, multiline_arg)
       all_args = @args.dup
       all_args << multiline_arg if multiline_arg
-      @step_definition.invoke(world, all_args, @step_name)
+      @step_definition.invoke(world, all_args)
     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

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

data/rails_generators/cucumber/templates/env.rb

@@ -4,6 +4,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails/world'
 require 'cucumber/formatters/unicode' # Comment out this line if you don't want Cucumber Unicode support
 Cucumber::Rails.use_transactional_fixtures
+Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling 
+                              # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
 
 require 'webrat'
 

data/rails_generators/feature/templates/steps.erb

@@ -10,7 +10,7 @@ When /^I delete the (\d+)(?:st|nd|rd|th) <%= singular_name %>$/ do |pos|
 end
 
 Then /^I should see the following <%= plural_name %>:$/ do |<%= plural_name %>|
-  <%= plural_name %>.raw[1..-1].each_with_index do |row, i|
+  <%= plural_name %>.rows.each_with_index do |row, i|
     row.each_with_index do |cell, j|
       response.should have_selector("table > tr:nth-child(#{i+2}) > td:nth-child(#{j+1})") { |td|
         td.inner_text.should == cell

data/spec/cucumber/ast/feature_spec.rb

@@ -9,7 +9,8 @@ module Cucumber
       it "should convert to sexp" do
         feature = create_feature(Object.new)
         feature.to_sexp.should == 
-        [:feature, 
+        [:feature,
+          "features/pretty_printing.feature",
           "Pretty printing", 
           [:comment, "# My feature comment\n"], 
           [:tag, "one"], 

data/spec/cucumber/ast/step_collection_spec.rb

@@ -3,6 +3,14 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 module Cucumber
   module Ast
     describe StepCollection do
+      it "should convert And to Given in snippets" do
+        c = StepCollection.new([
+          Step.new(1, 'Given', 'cukes'),
+          Step.new(2, 'And', 'turnips')
+        ])
+        actual_keywords = c.step_invocations.map{|i| i.actual_keyword}
+        actual_keywords.should == %w{Given Given}
+      end
     end
   end
 end

data/spec/cucumber/cli/configuration_spec.rb

@@ -18,7 +18,7 @@ module Cli
     it "should require files in support paths first" do
       File.stub!(:directory?).and_return(true)
       Dir.stub!(:[]).and_return(["/features/step_definitions/foo.rb","/features/support/bar.rb"])
-      
+
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--require /features})
 
@@ -31,7 +31,7 @@ module Cli
     it "should require env.rb files first" do
       File.stub!(:directory?).and_return(true)
       Dir.stub!(:[]).and_return(["/features/support/a_file.rb","/features/support/env.rb"])
-      
+
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--require /features})
 
@@ -40,7 +40,19 @@ module Cli
         "/features/support/a_file.rb"
       ]
     end
-    
+
+    it "should not require env.rb files when --dry-run" do
+      File.stub!(:directory?).and_return(true)
+      Dir.stub!(:[]).and_return(["/features/support/a_file.rb","/features/support/env.rb"])
+
+      config = Configuration.new(StringIO.new)
+      config.parse!(%w{--require /features --dry-run})
+
+      config.files_to_require.should == [
+        "/features/support/a_file.rb"
+      ]
+    end
+
     it "should expand args from YAML file" do
       given_cucumber_yml_defined_as({'bongo' => '--require from/yml'})
 
@@ -101,11 +113,11 @@ END_OF_MESSAGE
       config = Configuration.new(StringIO.new, error = StringIO.new)
       config.parse!(%w{--profile i_do_not_exist})
 
-      error.string.should match(/cucumber.yml was not found.  Please refer to cucumber's documentaion on defining profiles in cucumber.yml./)
+      error.string.should match(/cucumber.yml was not found.  Please refer to cucumber's documentation on defining profiles in cucumber.yml./)
     end
 
     it "should provide a helpful error message when cucumber.yml is blank or malformed" do
-        expected_error_message = /cucumber.yml was found, but was blank or malformed. Please refer to cucumber's documentaion on correct profile usage./
+        expected_error_message = /cucumber.yml was found, but was blank or malformed. Please refer to cucumber's documentation on correct profile usage./
 
       ['', 'sfsadfs', "--- \n- an\n- array\n", "---dddfd"].each do |bad_input|
         given_cucumber_yml_defined_as(bad_input)
@@ -118,7 +130,7 @@ END_OF_MESSAGE
     end
 
     it "should procide a helpful error message when the YAML can not be parsed" do
-      expected_error_message = /cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentaion on correct profile usage./
+      expected_error_message = /cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentation on correct profile usage./
 
       given_cucumber_yml_defined_as("input that causes an exception in YAML loading")
       YAML.should_receive(:load).and_raise Exception

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/parser/feature_parser_spec.rb

@@ -33,7 +33,7 @@ with blurb
           parse(%{# My comment
 Feature: hi
 }).to_sexp.should ==
-          [:feature, "Feature: hi\n",
+          [:feature, nil, "Feature: hi\n",
             [:comment, "# My comment\n"]]
         end
         
@@ -45,7 +45,7 @@ Feature: hi
     # When bar
     Then baz
 }).to_sexp.should == 
-          [:feature, "Feature: Hi", 
+          [:feature, nil, "Feature: Hi", 
             [:scenario, 2, "Scenario:", "Hello", 
               [:step, 3, "Given", "foo"],
               [:comment, "# When bar\n"], 
@@ -59,18 +59,18 @@ Feature: hi
 # World
 Feature: hi
 }).to_sexp.should ==
-          [:feature, "Feature: hi\n",
+          [:feature, nil, "Feature: hi\n",
             [:comment, "# Hello\n# World\n"]]
         end
 
         it "should parse a file with no comments" do
           parse("Feature: hi\n").to_sexp.should ==
-          [:feature, "Feature: hi\n"]
+          [:feature, nil, "Feature: hi\n"]
         end
 
         it "should parse a file with only a multiline comment with newlines" do
           parse("# Hello\n\n# World\n").to_sexp.should == 
-          [:feature, "", 
+          [:feature, nil, "", 
             [:comment, "# Hello\n\n# World\n"]]
         end
       end
@@ -78,7 +78,7 @@ Feature: hi
       describe "Tags" do
         it "should parse a file with tags on a feature" do
           parse("# My comment\n@hello @world Feature: hi\n").to_sexp.should ==
-          [:feature, "Feature: hi\n",
+          [:feature, nil, "Feature: hi\n",
             [:comment, "# My comment\n"],
             [:tag, "hello"],
             [:tag, "world"]]
@@ -96,7 +96,7 @@ Feature: hi
 @st3 
    @st4    @ST5  @#^%&ST6**!
   Scenario: Second}).to_sexp.should ==
-          [:feature, "Feature: hi",
+          [:feature, nil, "Feature: hi",
             [:comment, "# FC\n  "],
             [:tag, "ft"],
             [:scenario, 6, 'Scenario:', 'First',
@@ -111,7 +111,7 @@ Feature: hi
       describe "Background" do
         it "should have steps" do
           parse("Feature: Hi\nBackground:\nGiven I am a step\n").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:background, 2, "Background:",
               [:step, 3, "Given", "I am a step"]]]
         end
@@ -120,7 +120,7 @@ Feature: hi
       describe "Scenarios" do
         it "can be empty" do
           parse("Feature: Hi\n\nScenario: Hello\n").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 3, "Scenario:", "Hello"]]
         end
 
@@ -134,7 +134,7 @@ Scenario: bar
             
         it "should have steps" do
           parse("Feature: Hi\nScenario: Hello\nGiven I am a step\n").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
               [:step_invocation, 3, "Given", "I am a step"]]]
         end
@@ -145,7 +145,7 @@ Scenario: Hello
 Given I have a table
 |a|b|
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
               [:step_invocation, 3, "Given", "I have a table",
                 [:table,
@@ -166,7 +166,7 @@ Given I have a string
   """
 
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
               [:step_invocation, 3, "Given", "I have a string",
                 [:py_string, "hello\nworld"]]]]
@@ -182,7 +182,7 @@ Examples:
 |what|
 |green|
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario_outline, "Scenario Outline:", "Hello",
               [:step, 3, "Given", "a <what> cucumber"],
               [:examples, "Examples:", "",
@@ -203,7 +203,7 @@ Examples:
 |a|b|
 |c|d|
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario_outline, "Scenario Outline:", "Hello",
               [:step, 4, "Given", "I have a table",
                 [:table, 
@@ -233,7 +233,7 @@ Examples:
 |5|6|
 
 ").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario_outline, "Scenario Outline:", "Hello",
               [:step, 5, "Given", "I have a table",
                 [:table,

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')
@@ -77,5 +69,25 @@ module Cucumber
       end
       step_match("Loud").invoke(world, nil)
     end
+    
+    def unindented(s)
+      s.split("\n")[1..-2].join("\n").indent(-8)
+    end
+    
+    it "should recognise quotes in name and make according regexp" do
+      StepDefinition.snippet_text('Given', 'A "first" arg').should == unindented(%{
+        Given /^A "([^\\"]*)" arg$/ do |arg1|
+          pending
+        end
+      })
+    end
+
+    it "should not use quote group when there are no quotes" do
+      StepDefinition.snippet_text('Given', 'A first arg').should == unindented(%{
+        Given /^A first arg$/ do
+          pending
+        end
+      })
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 -04:00
+date: 2009-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -245,6 +245,7 @@ files:
 - examples/self_test/features/step_definitions/sample_steps.rb
 - examples/self_test/features/support/env.rb
 - examples/self_test/features/support/tag_count_formatter.rb
+- examples/self_test/features/tons_of_cukes.feature
 - examples/sinatra/Rakefile
 - examples/sinatra/app.rb
 - examples/sinatra/features/add.feature
@@ -264,9 +265,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,13 +287,13 @@ 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
 - gem_tasks/fix_cr_lf.rake
 - gem_tasks/flog.rake
 - gem_tasks/gemspec.rake
-- gem_tasks/jar.rake
 - gem_tasks/rspec.rake
 - gem_tasks/yard.rake
 - lib/autotest/cucumber.rb
@@ -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

data/gem_tasks/jar.rake

@@ -1,67 +0,0 @@
-# http://blog.nicksieger.com/articles/2009/01/10/jruby-1-1-6-gems-in-a-jar
-
-USE_JRUBY_VERSION    = '1.1.6'
-USE_JBEHAVE_VERSION  = '2.1'
-USE_JUNIT_VERSION    = '4.5'
-USE_HAMCREST_VERSION = '1.1'
-CUCUMBER_VERSIONED   = "cucumber-#{Cucumber::VERSION::STRING}"
-
-task :jar => [
-  :clean,
-  'jar:download_jruby',
-  'jar:install_gems',
-  'jar:bundle_gems',
-  'jar:download_jars_deps',
-  'jar:unpack_jar_deps',
-  'jar:bundle_jars',
-  'jar:fix_gem_binaries',
-  'jar:test_jar'
-]
-
-namespace :jar do
-  task :download_jruby do
-    sh "wget http://dist.codehaus.org/jruby/#{USE_JRUBY_VERSION}/jruby-complete-#{USE_JRUBY_VERSION}.jar -O #{CUCUMBER_VERSIONED}.jar"
-  end
-
-  task :install_gems => :gem do
-    mkdir 'pkg/jar_gems'
-    sh "java -jar #{CUCUMBER_VERSIONED}.jar -S gem install -i ./pkg/jar_gems pkg/#{CUCUMBER_VERSIONED}.gem --no-ri --no-rdoc"
-  end
-
-  task :bundle_gems do
-    sh "jar uf #{CUCUMBER_VERSIONED}.jar -C pkg/jar_gems ."
-  end
-
-  task :download_jars_deps do
-    mkdir 'pkg/jar_deps'
-    sh "wget http://repository.codehaus.org/org/jbehave/jbehave-core/#{USE_JBEHAVE_VERSION}/jbehave-core-#{USE_JBEHAVE_VERSION}.jar -O pkg/jar_deps/jbehave-core-#{USE_JBEHAVE_VERSION}.jar"
-    sh "wget http://mirrors.ibiblio.org/pub/mirrors/maven2/junit/junit/#{USE_JUNIT_VERSION}/junit-#{USE_JUNIT_VERSION}.jar -O pkg/jar_deps/junit-#{USE_JUNIT_VERSION}.jar"
-    sh "wget http://hamcrest.googlecode.com/files/hamcrest-all-#{USE_HAMCREST_VERSION}.jar -O pkg/jar_deps/hamcrest-all-#{USE_HAMCREST_VERSION}.jar"
-  end
-
-  task :unpack_jar_deps do
-    Dir.chdir 'pkg/jar_deps' do
-      Dir['*.jar'].each do |jar|
-        sh "jar xvf #{jar}"
-        rm_rf jar
-        rm_rf 'META-INF'
-      end
-    end
-  end
-
-  task :bundle_jars do
-    sh "jar uf #{CUCUMBER_VERSIONED}.jar -C pkg/jar_deps ."
-  end
-  
-  task :fix_gem_binaries do
-    mkdir_p 'pkg/gem_binaries/META-INF/jruby.home'
-    Dir.chdir 'pkg/gem_binaries/META-INF/jruby.home' do
-      sh "jar xvf ../../../../#{CUCUMBER_VERSIONED}.jar bin"
-    end
-    sh "jar uf #{CUCUMBER_VERSIONED}.jar -C pkg/gem_binaries ."
-  end
-
-  task :test_jar do
-    sh "java -cp examples/jbehave/target/classes -jar #{CUCUMBER_VERSIONED}.jar -S cucumber examples/jbehave/features"
-  end
-end