aslakhellesoy-cucumber 0.3.9.4 → 0.3.9.5

data/features/step_definitions/cucumber_steps.rb

@@ -31,6 +31,15 @@ Given /^the following profiles? (?:are|is) defined:$/ do |profiles|
   create_file('cucumber.yml', profiles)
 end
 
+Given /^I am running "([^\"]*)" in the background$/ do |command|
+  run_in_background command
+end
+
+Given /^I am not running (?:.*) in the background$/ do
+  # no-op
+end
+
+
 When /^I run cucumber (.*)$/ do |cucumber_opts|
   run "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} --no-color #{cucumber_opts}"
 end

data/features/support/env.rb

@@ -3,6 +3,11 @@ require 'tempfile'
 require 'spec/expectations'
 require 'fileutils'
 require 'forwardable'
+begin
+  require 'spork'
+rescue Gem::LoadError => ex
+  warn "WARNING: #{ex.message} You need to have the spork gem installed to run the DRb feature properly!"
+end
 
 class CucumberWorld
   extend Forwardable
@@ -52,6 +57,10 @@ class CucumberWorld
     end
   end
 
+  def background_jobs
+    @background_jobs ||= []
+  end
+
   def in_current_dir(&block)
     Dir.chdir(@current_dir, &block)
   end
@@ -66,6 +75,27 @@ class CucumberWorld
     @last_stderr = IO.read(stderr_file.path)
   end
 
+  def run_in_background(command)
+    pid = fork
+    in_current_dir do
+      if pid
+        background_jobs << pid
+      else
+        #STDOUT.close
+        #STDERR.close
+        exec command
+      end
+    end
+  end
+
+  def terminate_background_jobs
+    if @background_jobs
+      @background_jobs.each do |pid|
+        Process.kill(Signal.list['TERM'], pid)
+      end
+    end
+  end
+
 end
 
 World do
@@ -77,7 +107,11 @@ Before do
   FileUtils.mkdir CucumberWorld.working_dir
 end
 
+After do
+  terminate_background_jobs
+end
+
 Before('@diffxml') do
   `diffxml --version`
   raise "Please install diffxml from http://diffxml.sourceforge.net/" if $? != 0
-end
+end

data/lib/cucumber/cli/configuration.rb

@@ -13,6 +13,9 @@ module Cucumber
         'junit'    => 'Cucumber::Formatter::Junit'
       }
       DEFAULT_FORMAT = 'pretty'
+      DRB_FLAG = '--drb'
+      PROFILE_SHORT_FLAG = '-p'
+      PROFILE_LONG_FLAG = '--profile'
 
       attr_reader :paths
       attr_reader :options
@@ -28,8 +31,10 @@ module Cucumber
       end
 
       def parse!(args)
-        @args = args
-        return parse_args_from_profile('default') if @args.empty?
+        @args = args.empty? ? args_from_profile('default') : args
+        expand_profiles_into_args
+        return if parse_drb
+
         @args.extend(::OptionParser::Arguable)
 
         @args.options do |opts|
@@ -100,8 +105,8 @@ module Cucumber
           opts.on("-e", "--exclude PATTERN", "Don't run feature files or require ruby files matching PATTERN") do |v|
             @options[:excludes] << Regexp.new(v)
           end
-          opts.on("-p", "--profile PROFILE", "Pull commandline arguments from cucumber.yml.") do |v|
-            parse_args_from_profile(v)
+          opts.on(PROFILE_SHORT_FLAG, "#{PROFILE_LONG_FLAG} PROFILE", "Pull commandline arguments from cucumber.yml.") do |v|
+            # Processing of this is done previsouly so that the DRb flag can be detected within profiles.
           end
           opts.on("-c", "--[no-]color",
             "Whether or not to use ANSI color in the output. Cucumber decides",
@@ -158,6 +163,9 @@ module Cucumber
           opts.on("--no-diff", "Disable diff output on failing expectations.") do
             @options[:diff_enabled] = false
           end
+          opts.on(DRB_FLAG, "Run features against a DRb server. (i.e. with the spork gem)") do
+            # Processing of this is done previsouly in order to short circuit args from being lost.
+          end
           opts.on_tail("--version", "Show version.") do
             @out_stream.puts VERSION::STRING
             Kernel.exit
@@ -176,7 +184,7 @@ module Cucumber
         raise("You can't use both --strict and --wip") if @options[:strict] && @options[:wip]
 
         # Whatever is left after option parsing is the FILE arguments
-        @paths += args
+        @paths += @args
       end
 
       def verbose?
@@ -199,6 +207,10 @@ module Cucumber
         @options[:diff_enabled]
       end
 
+      def drb?
+        @drb
+      end
+
       def load_language
         if Cucumber.language_incomplete?(@options[:lang])
           list_keywords_and_exit(@options[:lang])
@@ -313,7 +325,15 @@ module Cucumber
           downcase
       end
 
-      def parse_args_from_profile(profile)
+      def expand_profiles_into_args
+        while (profile_index = @args.index(PROFILE_SHORT_FLAG) || @args.index(PROFILE_LONG_FLAG)) do
+          @args.delete_at(profile_index)
+          @args[profile_index] = args_from_profile(@args[profile_index])
+          @args.flatten!
+        end
+      end
+
+      def args_from_profile(profile)
         unless cucumber_yml.has_key?(profile)
           raise(<<-END_OF_ERROR)
 Could not find profile: '#{profile}'
@@ -334,7 +354,7 @@ Defined profiles in cucumber.yml:
           else
             raise "The '#{profile}' profile in cucumber.yml was a #{args_from_yml.class}. It must be a String or Array"
         end
-        parse!(args_from_yml)
+        args_from_yml
       end
 
       def cucumber_yml
@@ -346,7 +366,7 @@ Defined profiles in cucumber.yml:
         require 'yaml'
         begin
           @cucumber_yml = YAML::load(IO.read('cucumber.yml'))
-        rescue Exception => e
+        rescue StandardError => e
           raise(YmlLoadError,"cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentation on correct profile usage.\n")
         end
 
@@ -370,6 +390,10 @@ Defined profiles in cucumber.yml:
         Kernel.exit
       end
 
+      def parse_drb
+        @drb = @args.delete(DRB_FLAG) ? true : false
+      end
+
       def default_options
         {
           :strict       => false,

data/lib/cucumber/cli/drb_client.rb

@@ -0,0 +1,21 @@
+require "drb/drb"
+# This code was taken from the RSpec project and slightly modified.
+
+module Cucumber
+  module Cli
+    # Runs features on a DRB server, originally created with Spork compatibility in mind.
+    class DRbClient
+      def self.run(args, error_stream, out_stream)
+        begin
+          # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
+          DRb.start_service("druby://localhost:0")
+          feature_server = DRbObject.new_with_uri("druby://127.0.0.1:8990")
+          feature_server.run(args, error_stream, out_stream)
+          true
+        rescue DRb::DRbConnError
+          false
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/cli/main.rb

@@ -5,6 +5,7 @@ require 'cucumber/parser'
 require 'cucumber/formatter/color_io'
 require 'cucumber/cli/language_help_formatter'
 require 'cucumber/cli/configuration'
+require 'cucumber/cli/drb_client'
 
 module Cucumber
   module Cli
@@ -27,11 +28,19 @@ module Cucumber
 
       def initialize(args, out_stream = STDOUT, error_stream = STDERR)
         @args         = args
-        @out_stream   = out_stream == STDOUT ? Formatter::ColorIO.new : out_stream
+        @out_stream   = out_stream #== STDOUT ? Formatter::ColorIO.new : out_stream
         @error_stream = error_stream
       end
       
       def execute!(step_mother)
+        if configuration.drb?
+          if DRbClient.run(@args, @error_stream, @out_stream)
+            return false
+          else
+            @out_stream.puts "No DRb server is running. Running features locally:"
+            configuration.parse!(@args)
+          end
+        end
         configuration.load_language
         step_mother.options = configuration.options
 

data/lib/cucumber/formatter/html.rb

@@ -16,7 +16,11 @@ module Cucumber
       def initialize(step_mother, io, options)
         super(step_mother)
         @options = options
-        @builder = Builder::XmlMarkup.new(:target => io, :indent => 2)
+        @builder = create_builder(io)
+      end
+      
+      def create_builder(io)
+        Builder::XmlMarkup.new(:target => io, :indent => 2)
       end
       
       def visit_features(features)
@@ -89,6 +93,7 @@ module Cucumber
         @listing_background = true
         @builder.h3 do |h3|
           @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
           @builder.span(name, :class => 'val')
         end
       end
@@ -108,6 +113,7 @@ module Cucumber
         @listing_background = false
         @builder.h3 do
           @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
           @builder.span(name, :class => 'val')
         end
       end
@@ -127,7 +133,11 @@ module Cucumber
       end
 
       def visit_examples_name(keyword, name)
-        @builder.h4("#{keyword} #{name}")
+        @builder.h4 do
+          @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
+          @builder.span(name, :class => 'val')
+        end
       end
 
       def visit_steps(steps)
@@ -181,7 +191,7 @@ module Cucumber
 
       def visit_py_string(string)
         @builder.pre(:class => 'val') do |pre|
-          pre << string
+          @builder.text!(string)
         end
       end
 
@@ -221,6 +231,7 @@ module Cucumber
         step_name = step_match.format_args(lambda{|param| %{<span class="param">#{param}</span>}})
         @builder.div do |div|
           @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
           @builder.span(:class => 'step val') do |name|
             name << h(step_name).gsub(/&lt;span class=&quot;(.*?)&quot;&gt;/, '<span class="\1">').gsub(/&lt;\/span&gt;/, '</span>')
           end

data/lib/cucumber/rake/task.rb

@@ -90,7 +90,7 @@ module Cucumber
         class_eval <<-EOF, __FILE__, __LINE__ + 1
           def #{attribute}=(value)
             @#{attribute} = value
-            warn("Cucumber::Rake::Task##{attribute} is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles")
+            warn("\nWARNING: Cucumber::Rake::Task##{attribute} is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles\n")
           end
         EOF
       end

data/lib/cucumber/version.rb

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

data/rails_generators/cucumber/cucumber_generator.rb

@@ -19,11 +19,17 @@ class CucumberGenerator < Rails::Generator::Base
       m.gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *TEST"
 
       m.directory 'features/support'
-      m.template  'env.rb',           'features/support/env.rb'
+
+      if options[:spork]
+        m.template  'spork_env.rb',     'features/support/env.rb'
+      else
+        m.template  'env.rb',           'features/support/env.rb'
+      end
+
       m.file      'paths.rb',         'features/support/paths.rb'
 
       m.directory 'lib/tasks'
-      m.file      'cucumber.rake',    'lib/tasks/cucumber.rake'
+      m.template  'cucumber.rake',    'lib/tasks/cucumber.rake'
 
       m.file      'cucumber',         'script/cucumber', {
         :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang]
@@ -51,6 +57,10 @@ protected
     opt.on('--testunit', 'Setup cucumber for use with test/unit') do |value|
       options[:framework] = :testunit
     end
+
+    opt.on('--spork', 'Setup cucumber for use with Spork') do |value|
+      options[:spork] = true
+    end
   end
 
 end

data/rails_generators/cucumber/templates/cucumber.rake

@@ -5,7 +5,7 @@ begin
 
   Cucumber::Rake::Task.new(:features) do |t|
     t.fork = true
-    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+    t.cucumber_opts = [<%= options[:spork] ? "'--drb', " : "" %>'--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
   end
   task :features => 'db:test:prepare'
 rescue LoadError

data/rails_generators/cucumber/templates/env.rb

@@ -2,10 +2,17 @@
 ENV["RAILS_ENV"] ||= "cucumber"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails/world'
-require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
+
+# Comment out the next line if you don't want Cucumber Unicode support
+require 'cucumber/formatter/unicode'
+
+# Comment out the next line if you don't want transactions to
+# open/roll back around each scenario
 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)
+
+# Comment out the next line if you want Rails' own error handling
+# (e.g. rescue_action_in_public / rescue_responses / rescue_from)
+Cucumber::Rails.bypass_rescue
 
 require 'webrat'
 

data/rails_generators/cucumber/templates/spork_env.rb

@@ -0,0 +1,36 @@
+require 'rubygems'
+require 'spork'
+ 
+Spork.prefork do
+  # Sets up the Rails environment for Cucumber
+  ENV["RAILS_ENV"] ||= "cucumber"
+  require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+ 
+  require 'webrat'
+ 
+  Webrat.configure do |config|
+    config.mode = :rails
+  end
+ 
+  require 'webrat/core/matchers'
+  require 'cucumber'
+
+  # Comment out the next line if you don't want Cucumber Unicode support
+  require 'cucumber/formatter/unicode'
+
+  require 'spec/rails'
+  require 'cucumber/rails/rspec'
+end
+ 
+Spork.each_run do
+  # This code will be run each time you run your specs.
+  require 'cucumber/rails/world'
+
+  # Comment out the next line if you don't want transactions to
+  # open/roll back around each scenario
+  Cucumber::Rails.use_transactional_fixtures
+
+  # Comment out the next line if you want Rails' own error handling
+  # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
+  Cucumber::Rails.bypass_rescue
+end

data/spec/cucumber/cli/configuration_spec.rb

@@ -83,6 +83,61 @@ module Cli
       end
     end
 
+    describe '#drb?' do
+      it "indicates whether the --drb flag was passed in or not" do
+        config = Configuration.new(StringIO.new)
+
+        config.parse!(%w{features})
+        config.drb?.should == false
+
+
+        config.parse!(%w{features --drb})
+        config.drb?.should == true
+      end
+    end
+
+    context '--drb' do
+      it "removes the --drb flag from the args" do
+        config = Configuration.new(StringIO.new)
+
+        args = %w{features --drb}
+        config.parse!(args)
+        args.should == %w{features}
+      end
+
+      it "keeps all other flags intact" do
+        config = Configuration.new(StringIO.new)
+
+        args = %w{features --drb --format profile}
+        config.parse!(args)
+        args.should == %w{features --format profile}
+      end
+
+    end
+
+    context '--drb in a profile' do
+      it "removes the --drb flag from the args" do
+        given_cucumber_yml_defined_as({'server' => '--drb features'})
+        config = Configuration.new(StringIO.new)
+
+        args = %w{--profile server}
+        config.parse!(args)
+        args.should == %w{features}
+      end
+
+      it "keeps all other flags intact from all profiles involved" do
+        given_cucumber_yml_defined_as({'server' => '--drb features --profile nested',
+                                       'nested' => '--verbose'})
+
+        config = Configuration.new(StringIO.new)
+
+        args = %w{--profile server --format profile}
+        config.parse!(args)
+        args.should == %w{features --verbose --format profile}
+      end
+
+    end
+
     it "should expand args from YAML file" do
       given_cucumber_yml_defined_as({'bongo' => '--require from/yml'})
 
@@ -156,7 +211,7 @@ END_OF_MESSAGE
       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
+      YAML.should_receive(:load).and_raise ArgumentError
 
       config = Configuration.new(StringIO.new, error = StringIO.new)
       lambda{config.parse!([])}.should raise_error(expected_error_message)