cucumber 0.9.0 → 0.9.1

data/Gemfile

@@ -1,5 +1,10 @@
 source "http://rubygems.org"
 gemspec
 
-@dependencies.reject!{|dep| dep.name == 'gherkin'}
-gem 'gherkin', :path => '../gherkin'
+# Use source from sibling folders (if available) instead of gems
+%w[gherkin].each do |g|
+  if File.directory?(File.dirname(__FILE__) + "/../#{g}")
+    @dependencies.reject!{|dep| dep.name == g}
+    gem g, :path => "../#{g}"
+  end
+end

data/History.txt

@@ -1,3 +1,8 @@
+== 0.9.1 (2010-10-02)
+
+=== Bugfixes
+* Just a minor internal change to make Cuke4Duke happy. (Aslak Hellesøy)
+
 == 0.9.0 (2010-09-21)
 
 Maintenance release for the new release of Gherkin 2.2.3.

data/Rakefile

@@ -9,4 +9,4 @@ Dir['gem_tasks/**/*.rake'].each { |rake| load rake }
 task :default => [:spec, :cucumber]
 
 require 'rake/clean'
-CLEAN.include %w(**/*.{log,pyc})
+CLEAN.include %w(**/*.{log,pyc,rbc})

data/cucumber.gemspec

@@ -24,7 +24,7 @@ for important information about this release. Happy cuking!
 
 }
 
-  s.add_dependency 'gherkin', '~> 2.2.2'
+  s.add_dependency 'gherkin', '~> 2.2.5'
   s.add_dependency 'term-ansicolor', '~> 1.0.5'
   s.add_dependency 'builder', '~> 2.1.2'
   s.add_dependency 'diff-lcs', '~> 1.1.2'
@@ -37,7 +37,7 @@ for important information about this release. Happy cuking!
   s.add_development_dependency 'prawn-layout', '= 0.8.4'
   s.add_development_dependency 'syntax', '~> 1.0.0'
   s.add_development_dependency 'spork', '~> 0.8.4'
-  s.add_development_dependency 'rcov', '~> 0.9.9'
+#  s.add_development_dependency 'rcov', '~> 0.9.9'
 
   s.rubygems_version   = "1.3.7"
   s.files            = `git ls-files`.split("\n")

data/features/api/list_step_defs_as_json.feature

@@ -0,0 +1,45 @@
+Feature: List step defs as json
+  In order to build tools on top of Cucumber
+  As a tool developer
+  I want to be able to query a features directory for all the step definitions it contains
+  
+  Background: 
+    Given a standard Cucumber project directory structure
+  
+  Scenario: Two Ruby step definitions, in the same file
+    Given a file named "features/step_definitions/foo_steps.rb" with:
+      """
+      Given(/foo/) {}
+      Given(/b.r/) {}
+      """
+    When I run the following Ruby code:
+      """
+      require 'cucumber'
+      puts Cucumber::StepDefinitions.new.to_json
+      
+      """
+    Then it should pass
+    And the output should contain the following JSON:
+      """
+      [ "/foo/", "/b.r/" ]
+      
+      """
+
+  Scenario: Non-default directory structure
+    Given a file named "my_weird/place/foo_steps.rb" with:
+      """
+      Given(/foo/) {}
+      Given(/b.r/) {}
+      """
+    When I run the following Ruby code:
+      """
+      require 'cucumber'
+      puts Cucumber::StepDefinitions.new(:autoload_code_paths => ['my_weird']).to_json
+      
+      """
+    Then it should pass
+    And the output should contain the following JSON:
+      """
+      [ "/foo/", "/b.r/" ]
+      
+      """

data/features/step_definitions/cucumber_steps.rb

@@ -50,10 +50,6 @@ Given /^I have environment variable (\w+) set to "([^"]*)"$/ do |variable, value
 end
 
 When /^I run cucumber (.*)$/ do |cucumber_opts|
-  # Don't use Cucumber::BINARY (which is the binary used to start the "outer" cucumber)
-  # Instead we force the use of this codebase's cucumber bin script.
-  # This allows us to run cucumber's cukes with an older, stable cucumber.
-  cucumber_bin = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   run "#{Cucumber::RUBY_BINARY} -I rubygems #{cucumber_bin} --no-color #{cucumber_opts} CUCUMBER_OUTPUT_ENCODING=UTF-8"
 end
 
@@ -61,6 +57,11 @@ When /^I run rake (.*)$/ do |rake_opts|
   run "rake #{rake_opts} --trace"
 end
 
+When /^I run the following Ruby code:$/ do |code|
+  run %{#{Cucumber::RUBY_BINARY} -r rubygems -I #{cucumber_lib_dir} -e "#{code}"}
+end
+
+
 Then /^it should (fail|pass)$/ do |success|
   if success == 'fail'
     last_exit_status.should_not == 0
@@ -161,4 +162,6 @@ Then /^print output$/ do
   puts last_stdout
 end
 
-
+Then /^the output should contain the following JSON:$/ do |json_string|
+  JSON.parse(last_stdout).should == JSON.parse(json_string)
+end

data/features/support/env.rb

@@ -26,6 +26,13 @@ class CucumberWorld
   def cucumber_lib_dir
     @cucumber_lib_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
   end
+  
+  # Don't use Cucumber::BINARY (which is the binary used to start the "outer" cucumber)
+  # Instead we force the use of this codebase's cucumber bin script.
+  # This allows us to run cucumber's cukes with an older, stable cucumber.
+  def cucumber_bin
+    File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
+  end
 
   def initialize
     @current_dir = self_test_dir

data/lib/cucumber.rb

@@ -7,13 +7,17 @@ require 'cucumber/parser'
 require 'cucumber/step_mother'
 require 'cucumber/cli/main'
 require 'cucumber/broadcaster'
+require 'cucumber/step_definitions'
 
 module Cucumber
   class << self
     attr_accessor :wants_to_quit
     
     def logger
-      @log ||= Logger.new(STDOUT)
+      return @log if @log
+      @log = Logger.new(STDOUT)
+      @log.level = Logger::INFO
+      @log
     end
     
     def logger=(logger)

data/lib/cucumber/configuration.rb

@@ -10,8 +10,8 @@ module Cucumber
       argument
     end
     
-    def initialize(options = {})
-      @options = options
+    def initialize(user_options = {})
+      @options = default_options.merge(user_options)
     end
     
     def dry_run?
@@ -33,5 +33,17 @@ module Cucumber
     def paths
       @options[:paths]
     end
+    
+    def autoload_code_paths
+      @options[:autoload_code_paths]
+    end
+  
+  private
+  
+    def default_options
+      {
+        :autoload_code_paths => ['features/support', 'features/step_definitions']
+      }
+    end
   end
 end

data/lib/cucumber/platform.rb

@@ -1,18 +1,19 @@
 # Detect the platform we're running on so we can tweak behaviour
 # in various places.
+require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '0.9.0'
+  VERSION       = '0.9.1'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)
   IRONRUBY      = defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby"
-  WINDOWS       = Config::CONFIG['host_os'] =~ /mswin|mingw/
-  OS_X          = Config::CONFIG['host_os'] =~ /darwin/
+  WINDOWS       = RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+  OS_X          = RbConfig::CONFIG['host_os'] =~ /darwin/
   WINDOWS_MRI   = WINDOWS && !JRUBY && !IRONRUBY
   RAILS         = defined?(Rails)
-  RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+  RUBY_BINARY   = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
   RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
   RUBY_1_8_7    = RUBY_VERSION =~ /^1\.8\.7/
 

data/lib/cucumber/rb_support/rb_language.rb

@@ -30,7 +30,8 @@ module Cucumber
     # The Ruby implementation of the programming language API.
     class RbLanguage
       include LanguageSupport::LanguageMethods
-      attr_reader :current_world
+      attr_reader :current_world,
+                  :step_definitions
 
       Gherkin::I18n.code_keywords.each do |adverb|
         RbDsl.alias_adverb(adverb)
@@ -66,7 +67,7 @@ module Cucumber
 
       # Gets called for each file under features (or whatever is overridden
       # with --require).
-      def step_definitions_for(rb_file)
+      def step_definitions_for(rb_file) # Looks Unused - Delete?
         begin
           require rb_file # This will cause self.add_step_definition and self.add_hook to be called from RbDsl
           step_definitions
@@ -77,7 +78,7 @@ module Cucumber
           @step_definitions = nil
         end
       end
-
+      
       def step_matches(name_to_match, name_to_format)
         @step_definitions.map do |step_definition|
           if(arguments = step_definition.arguments_from(name_to_match))
@@ -139,9 +140,9 @@ module Cucumber
       end
 
       def load_code_file(code_file)
-        require File.expand_path(code_file) # This will cause self.add_step_definition, self.add_hook, and self.add_transform to be called from RbDsl
+        load File.expand_path(code_file) # This will cause self.add_step_definition, self.add_hook, and self.add_transform to be called from RbDsl
       end
-
+      
       protected
 
       def begin_scenario(scenario)

data/lib/cucumber/runtime.rb

@@ -56,7 +56,8 @@ module Cucumber
       @support_code.load_programming_language!(ext)
     end
 
-    def invoke(step_name, multiline_argument)
+    def invoke(step_name, multiline_argument=nil)
+      # It is very important to leave multiline_argument=nil as a vararg. Cuke4Duke needs it that way. 
       @support_code.invoke(step_name, multiline_argument)
     end
 

data/lib/cucumber/runtime/support_code.rb

@@ -62,6 +62,11 @@ module Cucumber
         end
         log.debug("\n")
       end
+      
+      def load_files_from_paths(paths)
+        files = paths.map { |path| Dir["#{path}/**/*"] }.flatten
+        load_files! files
+      end
     
       def unmatched_step_definitions
         @programming_languages.map do |programming_language| 
@@ -95,6 +100,12 @@ module Cucumber
           end
         end.call
       end
+      
+      def step_definitions
+        @programming_languages.map do |programming_language|
+          programming_language.step_definitions
+        end.flatten
+      end
     
       def step_match(step_name, name_to_report=nil) #:nodoc:
         matches = matches(step_name, name_to_report)

data/lib/cucumber/step_definitions.rb

@@ -0,0 +1,16 @@
+require 'json'
+module Cucumber
+  class StepDefinitions
+    def initialize(configuration = Configuration.default)
+      configuration = Configuration.parse(configuration)
+      @support_code = Runtime::SupportCode.new(nil, false)
+      @support_code.load_files_from_paths(configuration.autoload_code_paths)
+    end
+    
+    def to_json
+      @support_code.step_definitions.map do |step_definition|
+        step_definition.regexp_source
+      end.to_json
+    end
+  end
+end

data/spec/cucumber/configuration_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module Cucumber
+  describe Configuration do
+    describe ".default" do
+      subject { Configuration.default }
+      
+      it "has an autoload_code_paths containing the standard support and step_definitions folders" do
+        subject.autoload_code_paths.should include('features/support')
+        subject.autoload_code_paths.should include('features/step_definitions')
+      end
+    end
+    
+    describe "with custom user options" do
+      let(:user_options) { { :autoload_code_paths => ['foo/bar/baz'] } }
+      subject { Configuration.new(user_options) }
+      
+      it "allows you to override the defaults" do
+        subject.autoload_code_paths.should == ['foo/bar/baz']
+      end
+    end
+  end
+end

data/spec/cucumber/rb_support/rb_language_spec.rb

@@ -64,6 +64,34 @@ module Cucumber
           end
         })
       end
+      
+      describe "#load_code_file" do
+        after do
+          FileUtils.rm_rf('tmp.rb')
+        end
+        
+        def a_file_called(name)
+          File.open('tmp.rb', 'w') do |f|
+            f.puts yield
+          end
+        end
+        
+        it "re-loads the file when called multiple times" do
+          a_file_called('tmp.rb') do
+            "$foo = 1"
+          end
+          
+          @rb.load_code_file('tmp.rb')
+          $foo.should == 1
+          
+          a_file_called('tmp.rb') do
+            "$foo = 2"
+          end
+          
+          @rb.load_code_file('tmp.rb')
+          $foo.should == 2
+        end
+      end
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  hash: 59
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -15,112 +14,106 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +02:00
+date: 2010-10-02 00:00:00 +02:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: gherkin
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 2
-        - 2
-        version: 2.2.2
-  requirement: *id001
+        - 5
+        version: 2.2.5
   type: :runtime
-  name: gherkin
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: term-ansicolor
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 1
         - 0
         - 5
         version: 1.0.5
-  requirement: *id002
   type: :runtime
-  name: term-ansicolor
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: builder
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 1
         - 2
         version: 2.1.2
-  requirement: *id003
   type: :runtime
-  name: builder
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: diff-lcs
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 1
         - 2
         version: 1.1.2
-  requirement: *id004
   type: :runtime
-  name: diff-lcs
   prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: json
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 4
         - 6
         version: 1.4.6
-  requirement: *id005
   type: :runtime
-  name: json
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: rake
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
         - 7
         version: 0.8.7
-  requirement: *id006
   type: :development
-  name: rake
   prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: rspec
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196427
         segments: 
         - 2
         - 0
@@ -128,106 +121,84 @@ dependencies:
         - beta
         - 20
         version: 2.0.0.beta.20
-  requirement: *id007
   type: :development
-  name: rspec
   prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: nokogiri
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 4
         - 3
         version: 1.4.3
-  requirement: *id008
   type: :development
-  name: nokogiri
   prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: prawn
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 55
         segments: 
         - 0
         - 8
         - 4
         version: 0.8.4
-  requirement: *id009
   type: :development
-  name: prawn
   prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: prawn-layout
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 55
         segments: 
         - 0
         - 8
         - 4
         version: 0.8.4
-  requirement: *id010
   type: :development
-  name: prawn-layout
   prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  name: syntax
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  requirement: *id011
   type: :development
-  name: syntax
   prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  name: spork
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
         segments: 
         - 0
         - 8
         - 4
         version: 0.8.4
-  requirement: *id012
-  type: :development
-  name: spork
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
-  requirement: *id013
   type: :development
-  name: rcov
   prerelease: false
+  version_requirements: *id012
 description: Behaviour Driven Development with elegance and joy
 email: cukes@googlegroups.com
 executables: 
@@ -499,6 +470,7 @@ files:
 - examples/watir/features/support/env.rb
 - examples/watir/features/support/screenshots.rb
 - features/announce.feature
+- features/api/list_step_defs_as_json.feature
 - features/around_hooks.feature
 - features/background.feature
 - features/bug_371.feature
@@ -729,6 +701,7 @@ files:
 - lib/cucumber/runtime/user_interface.rb
 - lib/cucumber/step_argument.rb
 - lib/cucumber/step_definition_light.rb
+- lib/cucumber/step_definitions.rb
 - lib/cucumber/step_match.rb
 - lib/cucumber/step_mother.rb
 - lib/cucumber/wire_support/configuration.rb
@@ -756,6 +729,7 @@ files:
 - spec/cucumber/cli/main_spec.rb
 - spec/cucumber/cli/options_spec.rb
 - spec/cucumber/cli/profile_loader_spec.rb
+- spec/cucumber/configuration_spec.rb
 - spec/cucumber/core_ext/proc_spec.rb
 - spec/cucumber/formatter/ansicolor_spec.rb
 - spec/cucumber/formatter/color_io_spec.rb
@@ -782,16 +756,12 @@ has_rdoc: true
 homepage: http://cukes.info
 licenses: []
 
-post_install_message: |+
-  
-  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
-  
-  Thank you for installing cucumber-0.9.0.
-  Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
-  for important information about this release. Happy cuking!
-  
-  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
-  
+post_install_message: "\n\
+  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n\
+  Thank you for installing cucumber-0.9.1.\n\
+  Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading\n\
+  for important information about this release. Happy cuking!\n\n\
+  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n"
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -801,7 +771,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -2926991703887616495
       segments: 
       - 0
       version: "0"
@@ -810,7 +780,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -2926991703887616495
       segments: 
       - 0
       version: "0"
@@ -820,9 +790,10 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: cucumber-0.9.0
+summary: cucumber-0.9.1
 test_files: 
 - features/announce.feature
+- features/api/list_step_defs_as_json.feature
 - features/around_hooks.feature
 - features/background.feature
 - features/bug_371.feature
@@ -893,6 +864,7 @@ test_files:
 - spec/cucumber/cli/main_spec.rb
 - spec/cucumber/cli/options_spec.rb
 - spec/cucumber/cli/profile_loader_spec.rb
+- spec/cucumber/configuration_spec.rb
 - spec/cucumber/core_ext/proc_spec.rb
 - spec/cucumber/formatter/ansicolor_spec.rb
 - spec/cucumber/formatter/color_io_spec.rb