kosmas58-cucumber 0.3.11.3 → 0.3.11.6

data/lib/cucumber/platform.rb

@@ -4,9 +4,11 @@ require 'rbconfig'
 require 'yaml'
 
 module Cucumber
+  # TODO: Move these constants and the file to Language. Update wiki
   LANGUAGE_FILE = File.expand_path(File.dirname(__FILE__) + '/languages.yml')
   LANGUAGES     = YAML.load_file(LANGUAGE_FILE)
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
+  LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)
   IRONRUBY      = Config::CONFIG['sitedir'] =~ /IronRuby/
   WINDOWS       = Config::CONFIG['host_os'] =~ /mswin|mingw/
@@ -14,4 +16,8 @@ module Cucumber
   RAILS         = defined?(Rails)
   RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
   RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
+  
+  def self.file_mode(m)
+    RUBY_1_9 ? "#{m}:UTF-8" : m
+  end
 end

data/lib/cucumber/step_definition.rb

@@ -86,6 +86,8 @@ module Cucumber
 
     include StepDefinitionMethods
 
+    attr_reader :regexp, :proc
+
     def initialize(pattern, &proc)
       raise MissingProc if proc.nil?
       if String === pattern
@@ -112,5 +114,9 @@ module Cucumber
     def file_colon_line
       @proc.file_colon_line
     end
+    
+    def file
+      @file ||= file_colon_line.split(':')[0]
+    end
   end
 end

data/lib/cucumber/step_mother.rb

@@ -254,12 +254,12 @@ module Cucumber
       @snippet_generator.snippet_text(step_keyword, step_name, multiline_arg_class)
     end
 
-    def before_and_after(scenario, skip=false)
-      before(scenario) unless skip
+    def before_and_after(scenario, skip_hooks=false)
+      before(scenario) unless skip_hooks
       @current_scenario = scenario
       yield scenario
       @current_scenario = nil
-      after(scenario) unless skip
+      after(scenario) unless skip_hooks
       scenario_visited(scenario)
     end
     

data/lib/cucumber/version.rb

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

data/lib/cucumber.rb

@@ -9,60 +9,3 @@ require 'cucumber/step_mother'
 require 'cucumber/cli/main'
 require 'cucumber/broadcaster'
 require 'cucumber/core_ext/exception'
-
-module Cucumber
-  KEYWORD_KEYS = %w{name native encoding feature background scenario scenario_outline examples given when then but}
-  
-  class << self
-    # The currently active language
-    attr_reader :lang
-    
-    def load_language(lang) #:nodoc:
-      return if @lang
-      @lang = lang
-      alias_step_definitions(lang)
-      Parser.load_parser(keyword_hash)
-    end
-
-    def language_incomplete?(lang=@lang)
-      KEYWORD_KEYS.detect{|key| keyword_hash(lang)[key].nil?}
-    end
-
-    # File mode that accounts for Ruby platform and current language
-    def file_mode(m)
-      Cucumber::RUBY_1_9 ? "#{m}:#{keyword_hash['encoding']}" : m
-    end
-
-    # Returns a Hash of the currently active
-    # language, or for a specific language if +lang+ is
-    # specified.
-    def keyword_hash(lang=@lang)
-      LANGUAGES[lang]
-    end
-
-    def scenario_keyword
-      keyword_hash['scenario'].split('|')[0] + ':'
-    end
-    
-    def alias_step_definitions(lang) #:nodoc:
-      keywords = %w{given when then and but}.map{|keyword| keyword_hash(lang)[keyword].split('|')}
-      alias_steps(keywords.flatten)
-    end
-    
-    # Sets up additional method aliases for Given, When and Then.
-    # This does *not* affect how feature files are parsed. If you
-    # want to create aliases in the parser, you have to do this in
-    # languages.yml. For example:
-    #
-    # and: And|With
-    def alias_steps(keywords)
-      keywords.each do |adverb|
-        StepMother.alias_adverb(adverb)
-        World.alias_adverb(adverb)
-      end
-    end
-  end  
-
-  # Make sure we always have English aliases
-  alias_step_definitions('en')
-end

data/rails_generators/cucumber/templates/cucumber.rake

@@ -1,5 +1,7 @@
 $LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
 
+unless ARGV.any? {|a| a =~ /^gems/}
+
 begin
   require 'cucumber/rake/task'
 
@@ -18,3 +20,5 @@ rescue LoadError
     abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
   end
 end
+
+end

data/spec/cucumber/ast/step_collection_spec.rb

@@ -4,10 +4,11 @@ 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')
-        ])
+        s1 = Step.new(1, 'Given', 'cukes')
+        s2 = Step.new(2, 'And', 'turnips')
+        s1.stub!(:language).and_return(Parser::I18n::Language['en'])
+        s2.stub!(:language).and_return(Parser::I18n::Language['en'])
+        c = StepCollection.new([s1, s2])
         actual_keywords = c.step_invocations.map{|i| i.actual_keyword}
         actual_keywords.should == %w{Given Given}
       end

data/spec/cucumber/cli/configuration_spec.rb

@@ -138,12 +138,22 @@ module Cli
 
     end
 
+    context '--drb in the default profile and no arguments specified' do
+      it "expands the profile's arguments into the args excpet for --drb" do
+        given_cucumber_yml_defined_as({'default' => '--drb features --format pretty'})
+        config = Configuration.new(StringIO.new)
+        args = []
+        config.parse!(args)
+        args.should == %w{features --format pretty}
+      end
+    end
+
     it "should expand args from YAML file" do
       given_cucumber_yml_defined_as({'bongo' => '--require from/yml'})
 
       config = Configuration.new
       config.parse!(%w{--format progress --profile bongo})
-      config.options[:formats].should == {'progress' => STDOUT}
+      config.options[:formats].should == [['progress', STDOUT]]
       config.options[:require].should == ['from/yml']
     end
 
@@ -255,26 +265,34 @@ END_OF_MESSAGE
     it "should accept --out option" do
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--out jalla.txt})
-      config.options[:formats]['pretty'].should == 'jalla.txt'
+      config.options[:formats].should == [['pretty', 'jalla.txt']]
     end
 
     it "should accept multiple --out options" do
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--format progress --out file1 --out file2})
-      config.options[:formats].should == {'progress' => 'file2'}
+      config.options[:formats].should == [['progress', 'file2']]
     end
 
-    it "should accept multiple --format options" do
-      config = Configuration.new(StringIO.new)
-      config.parse!(%w{--format pretty --format progress})
-      config.options[:formats].should have_key('pretty')
-      config.options[:formats].should have_key('progress')
+    it "should accept multiple --format options and put the STDOUT one first so progress is seen" do
+      io = StringIO.new
+      config = Configuration.new(io)
+      config.parse!(%w{--format pretty --out pretty.txt --format progress})
+      config.options[:formats].should == [['progress', io], ['pretty', 'pretty.txt']]
+    end
+
+    it "should not accept multiple --format options when both use implicit STDOUT" do
+      io = StringIO.new
+      config = Configuration.new(io)
+      lambda do
+        config.parse!(%w{--format pretty --format progress})
+      end.should raise_error("All but one formatter must use --out, only one can print to STDOUT")
     end
 
     it "should associate --out to previous --format" do
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--format progress --out file1 --format profile --out file2})
-      config.options[:formats].should == {"profile"=>"file2", "progress"=>"file1"}
+      config.options[:formats].should == [["progress", "file1"], ["profile" ,"file2"]]
     end
 
     it "should accept --color option" do
@@ -358,6 +376,21 @@ END_OF_MESSAGE
       config.feature_files.should == ["cucumber.feature"]
     end
 
+    it "should allow specifying environment variables on the command line" do
+      config = Configuration.new
+      config.parse!(["foo=bar"])
+      ENV["foo"].should == "bar"
+      config.feature_files.should == []
+    end
+    
+    it "should allow specifying environment variables in profiles" do
+      given_cucumber_yml_defined_as({'selenium' => 'RAILS_ENV=selenium'})
+      config = Configuration.new
+      config.parse!(["--profile", "selenium"])
+      ENV["RAILS_ENV"].should == "selenium"
+      config.feature_files.should == []
+    end
+
   end
 end
 end

data/spec/cucumber/cli/main_spec.rb

@@ -35,7 +35,7 @@ module Cucumber
           @cli = Main.new(%w{--verbose example.feature}, @out)
           @cli.stub!(:require)
 
-          Parser::FeatureParser.stub!(:new).and_return(mock("feature parser", :parse_file => @empty_feature))
+          FeatureFile.stub!(:new).and_return(mock("feature file", :parse => @empty_feature))
 
           @cli.execute!(Object.new.extend(StepMother))
 
@@ -115,10 +115,9 @@ module Cucumber
           @cli.execute!(@step_mother).should == 'foo'
         end
 
-
         it "ceases execution if the DrbClient is able to perform the execution" do
           DRbClient.stub!(:run).and_return(true)
-          @configuration.should_not_receive(:load_language)
+          @configuration.should_not_receive(:build_formatter_broadcaster)
           @cli.execute!(@step_mother)
         end
 
@@ -134,15 +133,8 @@ module Cucumber
             @configuration.should_receive(:parse!).exactly(:twice)
             @cli.execute!(@step_mother)
           end
-
-          it "proceeds with the execution locally" do
-            @configuration.should_receive(:load_language)
-            @cli.execute!(@step_mother)
-          end
         end
-
       end
-
     end
   end
 end

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require 'cucumber/parser'
+require 'cucumber/parser/i18n/language'
 
 module Cucumber
   module Parser
     describe Feature do
       before do
-        @parser = FeatureParser.new
+        @parser = I18n::Language['en'].parser
       end
 
       def parse(text)
@@ -13,11 +13,11 @@ module Cucumber
       end
 
       def parse_file(file)
-        @parser.parse_file(File.dirname(__FILE__) + "/../treetop_parser/" + file, {})
+        FeatureFile.new(File.dirname(__FILE__) + "/../treetop_parser/" + file).parse
       end
 
       def parse_example_file(file)
-        @parser.parse_file(File.dirname(__FILE__) + "/../../../examples/" + file, {})
+        FeatureFile.new(File.dirname(__FILE__) + "/../../../examples/" + file).parse
       end
 
       describe "Comments" do
@@ -25,7 +25,7 @@ module Cucumber
           parse(%{# My comment
 Feature: hi
 }).to_sexp.should ==
-          [:feature, nil, "Feature: hi\n",
+          [:feature, nil, "Feature: hi",
             [:comment, "# My comment\n"]]
         end
 
@@ -34,13 +34,13 @@ Feature: hi
 # World
 Feature: hi
 }).to_sexp.should ==
-          [:feature, nil, "Feature: hi\n",
+          [:feature, nil, "Feature: hi",
             [:comment, "# Hello\n# World\n"]]
         end
 
         it "should parse a file with no comments" do
           parse("Feature: hi\n").to_sexp.should ==
-          [:feature, nil, "Feature: hi\n"]
+          [:feature, nil, "Feature: hi"]
         end
 
         it "should parse a file with only a multiline comment with newlines" do
@@ -61,7 +61,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, nil, "Feature: hi\n",
+          [:feature, nil, "Feature: hi",
             [:comment, "# My comment\n"],
             [:tag, "hello"],
             [:tag, "world"]]
@@ -352,7 +352,9 @@ Given I am a step
 
       describe "Filtering" do
         it "should filter outline tables" do
-          f = parse_example_file('self_test/features/outline_sample.feature:12')
+          ff = FeatureFile.new(
+            File.dirname(__FILE__) + '/../../../examples/self_test/features/outline_sample.feature:12')
+          f = ff.parse({:lang => 'en'})
           f.to_sexp.should ==
           [:feature,
            "./spec/cucumber/parser/../../../examples/self_test/features/outline_sample.feature",

data/spec/cucumber/parser/table_parser_spec.rb

@@ -6,7 +6,7 @@ module Cucumber
   module Parser
     describe 'Tables' do
       before do
-        @parser = FeatureParser.new
+        @parser = I18n::EnglishParser.new
       end
       
       def parse(text)

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ require 'spec/autorun'
 ENV['CUCUMBER_COLORS']=nil
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'cucumber'
-Cucumber.load_language('en')
 $:.unshift(File.dirname(__FILE__))
 
 ::Term::ANSIColor.coloring = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kosmas58-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.11.3
+  version: 0.3.11.6
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-07 00:00:00 -07:00
+date: 2009-06-16 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,17 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: polyglot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.5
+        version: 1.2.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs