aslakhellesoy-cucumber 0.1.10 → 0.1.11

data/History.txt

@@ -1,13 +1,18 @@
 == 0.1.11 (In Git)
 
 == New features
+* Capture output from cucumber in Autotest (Alan Larkin)
+* Update cucumber generator to work with latest Webrat (Bryan Helkamp)
 * CUCUMBR LIKEZ 2 SPEEK WIF KATS. KTHXBAI (Aimee Daniells)
 * Support for dynamically pluggable formatters (#99 Joseph Wilk)
 * --verbose mode to see ruby files and feature files loaded by Cucumber (#106 Joseph Wilk)
 
 == Bugfixes
+* The jcode library is not loaded on JRuby/Rails. Workaround for http://tinyurl.com/55uu3u. (Aslak Hellesøy)
+* Support including modules for class passed to --format (#109 Joseph Wilk)
 
 == Removed features
+* The cucumber gem no longer depends on the rspec gem. It must be downloaded manually if RSpec is used.
 
 == 0.1.10 2008-11-25
 

data/Manifest.txt

@@ -166,6 +166,7 @@ lib/cucumber/treetop_parser/feature_ar.rb
 lib/cucumber/treetop_parser/feature_cy.rb
 lib/cucumber/treetop_parser/feature_da.rb
 lib/cucumber/treetop_parser/feature_de.rb
+lib/cucumber/treetop_parser/feature_en-lol.rb
 lib/cucumber/treetop_parser/feature_en-tx.rb
 lib/cucumber/treetop_parser/feature_en.rb
 lib/cucumber/treetop_parser/feature_es.rb

data/Rakefile

@@ -5,5 +5,4 @@ require 'config/hoe' # setup Hoe + all gem configuration
 Dir['gem_tasks/**/*.rake'].each { |rake| load rake }
 
 # Hoe gives us :default => :test, but we don't have Test::Unit tests.
-Rake::Task[:default].clear_prerequisites
-task :default => [:spec, :features]
+Rake::Task[:default].clear_prerequisites

data/config/hoe.rb

@@ -58,7 +58,6 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   p.extra_deps = [ ['term-ansicolor', '>= 1.0.3'], ['treetop', '>= 1.2.4'], ['diff-lcs', '>= 1.1.2'] ]
-  p.extra_dev_deps = [ ['rspec', '>= 1.1.11'] ]
 
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   

data/gem_tasks/rspec.rake

@@ -1,21 +1,35 @@
-begin
+def unable_to_load
+  STDERR.puts <<-EOS
+To use rspec for testing you must install rspec gem:
+    gem install rspec
+    
+EOS
+  nil
+end
+
+def require_spec
   require 'spec'
 rescue LoadError
+  require_spec_with_rubygems
+end
+
+def require_spec_with_rubygems
   require 'rubygems'
   require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
 rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
+  unable_to_load
 end
 
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
+if require_spec
+  begin
+    require 'spec/rake/spectask'
+  rescue LoadError
+    unable_to_load
+  end
+
+  desc "Run the Cucumber specs"
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_opts = ['--options', "spec/spec.opts"]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
+end

data/lib/autotest/cucumber_mixin.rb

@@ -70,7 +70,29 @@ module Autotest::CucumberMixin
       cmd = self.make_cucumber_cmd self.scenarios_to_run, dirty_scenarios_file.path
       return if cmd.empty?
       puts cmd unless $q
-      system cmd
+      old_sync = $stdout.sync
+      $stdout.sync = true
+      self.results = []
+      line = []
+      begin
+        open("| #{cmd}", "r") do |f|
+          until f.eof? do
+            c = f.getc
+            putc c
+            line << c
+            if c == ?\n then
+              self.results << if RUBY_VERSION >= "1.9" then
+                                line.join
+                              else
+                                line.pack "c*"
+                              end
+              line.clear
+            end
+          end
+        end
+      ensure
+        $stdout.sync = old_sync
+      end
       self.scenarios_to_run = dirty_scenarios_file.readlines.map { |l| l.chomp }
       self.tainted = true unless self.scenarios_to_run == []
     end

data/lib/cucumber.rb

@@ -1,7 +1,6 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'jcode'
 require 'cucumber/platform'
 require 'rubygems'
 require 'treetop/runtime'

data/lib/cucumber/cli.rb

@@ -256,13 +256,13 @@ Defined profiles in cucumber.yml:
           formatter_broadcaster.register(Formatters::AutotestFormatter.new(output_broadcaster))
         else
           begin
-            formatter_class = Kernel.const_get(format)
+            formatter_class = constantize(format)
             formatter_broadcaster.register(formatter_class.new(output_broadcaster, step_mother, @options))
           rescue NameError => e
             @error_stream.puts "Invalid format: #{format}\n"
             exit_with_help
           rescue Exception => e
-            exit_with_error("Error creating formatter: #{format}\n#{e}")
+            exit_with_error("Error creating formatter: #{format}\n#{e}\n")
           end
         end
       end
@@ -279,6 +279,17 @@ Defined profiles in cucumber.yml:
     
   private
 
+    def constantize(camel_cased_word)
+        names = camel_cased_word.split('::')
+        names.shift if names.empty? || names.first.empty?
+ 
+        constant = Object
+        names.each do |name|
+          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+        end
+        constant
+    end
+    
     def verbose_log(string)
       @out_stream.puts(string) if @options[:verbose]
     end

data/lib/cucumber/core_ext/string.rb

@@ -19,4 +19,11 @@ class String
     end
     s
   end
+
+  if $CUCUMBER_JRUBY && $CUCUMBER_RAILS
+    # Workaround for http://tinyurl.com/55uu3u 
+    alias jlength length
+  else
+    require 'jcode'
+  end
 end

data/lib/cucumber/executor.rb

@@ -1,5 +1,3 @@
-require 'cucumber/core_ext/proc'
-
 module Cucumber
   class Executor
     attr_reader :failed

data/lib/cucumber/platform.rb

@@ -6,6 +6,7 @@ $CUCUMBER_JRUBY       = defined?(JRUBY_VERSION)
 $CUCUMBER_IRONRUBY    = Config::CONFIG['sitedir'] =~ /IronRuby/
 $CUCUMBER_WINDOWS     = Config::CONFIG['host_os'] =~ /mswin|mingw/
 $CUCUMBER_WINDOWS_MRI = $CUCUMBER_WINDOWS && !$CUCUMBER_JRUBY && !$CUCUMBER_IRONRUBY
+$CUCUMBER_RAILS       = defined?(Rails)
 
 if $CUCUMBER_IRONRUBY
   ENV['GEM_PATH'] ||= "C:/ruby/lib/ruby/gems/1.8"

data/lib/cucumber/step_mother.rb

@@ -1,5 +1,4 @@
 require 'cucumber/tree/top_down_visitor'
-require 'cucumber/core_ext/proc'
 
 module Cucumber
   class Pending < StandardError
@@ -21,6 +20,7 @@ module Cucumber
     PENDING = lambda do |*_| 
       raise Pending
     end
+    require 'cucumber/core_ext/proc'
     PENDING.extend(CoreExt::CallIn)
     PENDING.name = "PENDING"
 

data/lib/cucumber/tree.rb

@@ -1,6 +1,4 @@
 %w{features feature scenario step given_scenario table top_down_visitor}.each{|f| require "cucumber/tree/#{f}"}
-require 'cucumber/core_ext/proc'
-require 'cucumber/core_ext/string'
 
 module Cucumber
   module Tree

data/lib/cucumber/tree/scenario.rb

@@ -43,6 +43,7 @@ module Cucumber
       attr_reader :name, :line
 
       def initialize(feature, name, line, &proc)
+        require 'cucumber/core_ext/string'
         @feature, @name, @line = feature, name, line
         @steps_and_given_scenarios = []
         instance_eval(&proc) if block_given?

data/lib/cucumber/version.rb

@@ -2,7 +2,7 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 10
+    TINY  = 11
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rails_generators/cucumber/templates/env.rb

@@ -4,5 +4,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails/world'
 Cucumber::Rails.use_transactional_fixtures
 
-# Comment out the next line if you're not using RSpec's matchers (should / should_not) in your steps.
+require 'webrat/rails'
+
+# Comment out the next two lines if you're not using RSpec's matchers (should / should_not) in your steps.
 require 'cucumber/rails/rspec'
+require 'webrat/rspec-rails'

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -1,28 +1,26 @@
 # Commonly used webrat steps
 # http://github.com/brynary/webrat
 
-require 'webrat' if !defined?(Webrat) # Because some people have it installed as a Gem
-
 When /^I press "(.*)"$/ do |button|
-  clicks_button(button)
+  click_button(button)
 end
 
 When /^I follow "(.*)"$/ do |link|
-  clicks_link(link)
+  click_link(link)
 end
 
 When /^I fill in "(.*)" with "(.*)"$/ do |field, value|
-  fills_in(field, :with => value) 
+  fill_in(field, :with => value) 
 end
 
 When /^I select "(.*)" from "(.*)"$/ do |value, field|
-  selects(value, :from => field) 
+  select(value, :from => field) 
 end
 
 # Use this step in conjunction with Rail's datetime_select helper. For example:
 # When I select "December 25, 2008 10:00" as the date and time 
 When /^I select "(.*)" as the date and time$/ do |time|
-  selects_datetime(time)
+  select_datetime(time)
 end
 
 # Use this step when using multiple datetime_select helpers on a page or 
@@ -35,7 +33,7 @@ end
 # When I select "November 23, 2004 11:20" as the "Preferred" data and time
 # And I select "November 25, 2004 10:30" as the "Alternative" data and time
 When /^I select "(.*)" as the "(.*)" date and time$/ do |datetime, datetime_label|
-  selects_datetime(datetime, :from => datetime_label)
+  select_datetime(datetime, :from => datetime_label)
 end
 
 # Use this step in conjuction with Rail's time_select helper. For example:
@@ -43,43 +41,43 @@ end
 # Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
 # will convert the 2:20PM to 14:20 and then select it. 
 When /^I select "(.*)" as the time$/ do |time|
-  selects_time(time)
+  select_time(time)
 end
 
 # Use this step when using multiple time_select helpers on a page or you want to
 # specify the name of the time on the form.  For example:
 # When I select "7:30AM" as the "Gym" time
 When /^I select "(.*)" as the "(.*)" time$/ do |time, time_label|
-  selects_time(time, :from => time_label)
+  select_time(time, :from => time_label)
 end
 
 # Use this step in conjuction with Rail's date_select helper.  For example:
 # When I select "February 20, 1981" as the date
 When /^I select "(.*)" as the date$/ do |date|
-  selects_date(date)
+  select_date(date)
 end
 
 # Use this step when using multiple date_select helpers on one page or
 # you want to specify the name of the date on the form. For example:
 # When I select "April 26, 1982" as the "Date of Birth" date
 When /^I select "(.*)" as the "(.*)" date$/ do |date, date_label|
-  selects_date(date, :from => date_label)
+  select_date(date, :from => date_label)
 end
 
 When /^I check "(.*)"$/ do |field|
-  checks(field) 
+  check(field) 
 end
 
 When /^I uncheck "(.*)"$/ do |field|
-  unchecks(field) 
+  uncheck(field) 
 end
 
 When /^I choose "(.*)"$/ do |field|
-  chooses(field)
+  choose(field)
 end
 
 When /^I attach the file at "(.*)" to "(.*)" $/ do |path, field|
-  attaches_file(field, path)
+  attach_file(field, path)
 end
 
 Then /^I should see "(.*)"$/ do |text|

data/spec/cucumber/cli_spec.rb

@@ -217,14 +217,32 @@ Defined profiles in cucumber.yml:
 
       cli.execute!(stub('step mother'), mock_executor, stub('features'))
     end
+    
+    describe "--format with class" do
+     
+     describe "in module" do
+
+        it "should resolve each module until it gets Formatter class" do
+          cli = CLI.new
+          mock_module = mock('module')
+          cli.parse_options!(%w{--format ZooModule::MonkeyFormatterClass})
+          Object.stub!(:const_defined?).and_return(true)
+          mock_module.stub!(:const_defined?).and_return(true)
 
-    describe "external formatter" do
+          Object.should_receive(:const_get).with('ZooModule').and_return(mock_module)
+          mock_module.should_receive(:const_get).with('MonkeyFormatterClass').and_return(mock('formatter class', :new => nil))
+
+          cli.execute!(stub('step mother'), mock_executor, stub('features'))
+        end
 
+      end
+     
       describe "exists and valid constructor" do
-        
+     
         before(:each) do
           @mock_formatter_class = mock('formatter class')
-          Kernel.stub!(:const_get).and_return(@mock_formatter_class)
+          Object.stub!(:const_get).and_return(@mock_formatter_class)
+          Object.stub!(:const_defined?).with('magical').and_return(true)
         end
         
         it "should create the formatter" do
@@ -236,7 +254,7 @@ Defined profiles in cucumber.yml:
 
           cli.execute!(stub('step mother'), mock_executor, stub('features'))
         end
-
+                
         it "should register the formatter with broadcaster" do
           cli = CLI.new
           broadcaster = Broadcaster.new
@@ -261,7 +279,8 @@ Defined profiles in cucumber.yml:
           
           mock_formatter_class = stub('formatter class')
           mock_formatter_class.stub!(:new).and_raise("No such method")
-          Kernel.stub!(:const_get).and_return(mock_formatter_class)
+          Object.stub!(:const_get).and_return(mock_formatter_class)
+          Object.stub!(:const_defined?).with('exists_but_evil').and_return(true)
           
           @cli.parse_options!(%w{--format exists_but_evil}) 
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-25 00:00:00 -08:00
+date: 2008-12-02 00:00:00 -08:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,15 +39,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.11
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: