cucumber 0.4.5.rc2 → 0.5.0

data/lib/cucumber/wire_support/wire_step_definition.rb

@@ -1,20 +1,25 @@
 module Cucumber
   module WireSupport
     class WireStepDefinition
-      def initialize(id, connection)
-        @id, @connection = id, connection
+      attr_reader :regexp_source, :file_colon_line
+      
+      def initialize(connection, data)
+        @connection = connection
+        @id              = data['id']
+        @regexp_source   = data['regexp'] || "Unknown"
+        @file_colon_line = data['source'] || "Unknown"
       end
       
       def invoke(args)
-        @connection.invoke(@id, args)
-      end
-
-      def regexp_source
-        "/FIXME/"
+        prepared_args = args.map{ |arg| prepare(arg) }
+        @connection.invoke(@id, prepared_args)
       end
 
-      def file_colon_line
-        "FIXME:0"
+      private
+      
+      def prepare(arg)
+        return arg unless arg.is_a?(Cucumber::Ast::Table)
+        arg.raw
       end
     end
   end

data/spec/cucumber/cli/options_spec.rb

@@ -52,15 +52,16 @@ module Cli
         end
       end
 
-      context '-l LANG or --language LANG' do
+      context '--i18n' do
         context "with LANG specified as 'help'" do
           it "lists all known langues" do
-            when_parsing '-l help' do
+            when_parsing '--i18n help' do
+              require 'cucumber/cli/language_help_formatter'
               LanguageHelpFormatter.should_receive(:list_languages).with(output_stream)
             end
           end
           it "exits the program" do
-            when_parsing('--language help') { Kernel.should_receive(:exit) }
+            when_parsing('--i18n help') { Kernel.should_receive(:exit) }
           end
         end
       end
@@ -218,11 +219,6 @@ module Cli
           options[:snippets].should be_false
           options[:source].should be_false
         end
-
-        it "uses the language from profile when none is specified on the command line" do
-          given_cucumber_yml_defined_as({'foo' => '--language fr'})
-          after_parsing('-p foo') {options[:lang].should == 'fr'}
-        end
       end
 
       context '-P or --no-profile' do

data/spec/cucumber/formatter/color_io_spec.rb

@@ -6,18 +6,20 @@ module Cucumber
     describe ColorIO do
       describe "<<" do
         it "should convert to a print using kernel" do
-          color_io = ColorIO.new
+          kernel = mock('Kernel')
+          color_io = ColorIO.new(kernel, nil)
           
-          Kernel.should_receive(:print).with("monkeys")
+          kernel.should_receive(:print).with("monkeys")
           
           color_io << "monkeys"
         end
         
         it "should allow chained <<" do
-          color_io = ColorIO.new
+          kernel = mock('Kernel')
+          color_io = ColorIO.new(kernel, nil)
 
-          Kernel.should_receive(:print).with("monkeys")
-          Kernel.should_receive(:print).with(" are tasty")
+          kernel.should_receive(:print).with("monkeys")
+          kernel.should_receive(:print).with(" are tasty")
           
           color_io << "monkeys" <<  " are tasty"
         end

data/spec/cucumber/rb_support/regexp_argument_matcher_spec.rb

@@ -6,12 +6,12 @@ module Cucumber
     describe RegexpArgumentMatcher do
       it "should create 2 arguments" do
         arguments = RegexpArgumentMatcher.arguments_from(/I (\w+) (\w+)/, "I like fish")
-        arguments.map{|argument| [argument.val, argument.pos]}.should == [["like", 2], ["fish", 7]]
+        arguments.map{|argument| [argument.val, argument.byte_offset]}.should == [["like", 2], ["fish", 7]]
       end
 
       it "should create 2 arguments when first group is optional" do
         arguments = RegexpArgumentMatcher.arguments_from(/should( not)? be flashed '([^']*?)'$/, "I should be flashed 'Login failed.'")
-        arguments.map{|argument| [argument.val, argument.pos]}.should == [[nil, nil], ["Login failed.", 21]]
+        arguments.map{|argument| [argument.val, argument.byte_offset]}.should == [[nil, nil], ["Login failed.", 21]]
       end
     end
   end

data/spec/cucumber/step_match_spec.rb

@@ -18,7 +18,7 @@ module Cucumber
       StepMatch.new(stepdef, name, nil, stepdef.arguments_from(name))
     end
 
-    it "should format one groups when we use Unicode" do
+    it "should format one group when we use Unicode" do
       m = step_match(/I (\w+) ok/, "I æøåÆØÅæøåÆØÅæøåÆØÅæøåÆØÅ ok")
       m.format_args("<span>%s</span>").should == "I <span>æøåÆØÅæøåÆØÅæøåÆØÅæøåÆØÅ</span> ok"
     end
@@ -28,6 +28,11 @@ module Cucumber
       m.format_args("<span>%s</span>").should == "I <span>ate</span> <span>æøåÆØÅæøåÆØÅæøåÆØÅæøåÆØÅ</span> <span>egg</span> this <span>morning</span>"
     end
 
+    it "should deal with Unicode both inside and outside arguments" do
+      m = step_match(/Jæ (\w+) ålsker (\w+) løndet/, "Jæ vø ålsker døtte løndet")
+      m.format_args("<span>%s</span>").should == "Jæ <span>vø</span> ålsker <span>døtte</span> løndet"
+    end
+
     it "should format groups with format string" do
       m = step_match(/I (\w+) (\d+) (\w+) this (\w+)/, "I ate 1 egg this morning")
       m.format_args("<span>%s</span>").should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"

data/spec/cucumber/wire_support/wire_exception_spec.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/wire_support/wire_language'
+
+module Cucumber
+  module WireSupport
+    describe WireException do
+      before(:each) do
+        @host, @port = 'localhost', '54321'
+      end
+      def exception
+        WireException.new(@data, @host, @port)
+      end
+      describe "with just a message" do
+        before(:each) do
+          @data = {'message' => 'foo'}
+        end
+        it "should #to_s as expected" do
+          exception.to_s.should == "foo"
+        end
+      end
+      
+      describe "with a message and an exception" do
+        before(:each) do
+          @data = {'message' => 'foo', 'exception' => 'Bar'}
+        end
+        it "should #to_s as expected" do
+          exception.to_s.should == "foo"
+        end
+        it "#class.to_s should return the name of the exception" do
+          exception.class.to_s.should == 'Bar from localhost:54321'
+        end
+      end
+      
+      describe "with a custom backtrace" do
+        before(:each) do
+          @data = {'message' => 'foo', 'backtrace' => ['foo', 'bar', 'baz']}
+        end
+        it "#backrace should return the custom backtrace" do
+          exception.backtrace.should == ['foo', 'bar', 'baz']
+        end
+      end
+    end
+  end
+end

data/spec/cucumber/wire_support/wire_step_definition_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/wire_support/wire_language'
+
+module Cucumber
+  module WireSupport
+    describe WireStepDefinition, "#invoke" do
+      describe "if one of the arguments is a table" do
+        it "should pass the raw table to the connection" do
+          connection = mock('connection')
+          step_definition = WireStepDefinition.new(connection, 'id' => 'the-id')
+          expected_args = ["a","b", [["1","2"],["3","4"]]]
+          connection.should_receive(:invoke).with('the-id', expected_args)
+          args = ["a","b"]
+          args << Cucumber::Ast::Table.new([["1","2"],["3","4"]])
+          step_definition.invoke(args)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.4.5.rc2
+  version: 0.5.0
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 +01:00
+date: 2009-12-15 00:00:00 +01:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,7 +18,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.0.4
     version: 
@@ -28,7 +28,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.4.2
     version: 
@@ -38,7 +38,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.2.9
     version: 
@@ -48,7 +48,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 2.1.2
     version: 
@@ -58,17 +58,27 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.1.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.4.0
     version: 
@@ -78,7 +88,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.5.1
     version: 
@@ -88,7 +98,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.2.9
     version: 
@@ -98,9 +108,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.3
+        version: 0.7.4
     version: 
 description: A BDD tool written in Ruby
 email: cukes@googlegroups.com
@@ -459,6 +469,7 @@ files:
 - features/unicode_table.feature
 - features/usage_and_stepdefs_formatter.feature
 - features/wire_protocol.feature
+- features/wire_protocol_table_diffing.feature
 - features/work_in_progress.feature
 - gem_tasks/contributors.rake
 - gem_tasks/environment.rake
@@ -617,8 +628,10 @@ files:
 - spec/cucumber/treetop_parser/test_dos.feature
 - spec/cucumber/treetop_parser/with_comments.feature
 - spec/cucumber/treetop_parser/with_tags.feature
+- spec/cucumber/wire_support/wire_exception_spec.rb
 - spec/cucumber/wire_support/wire_language_spec.rb
 - spec/cucumber/wire_support/wire_packet_spec.rb
+- spec/cucumber/wire_support/wire_step_definition_spec.rb
 - spec/cucumber/world/pending_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -632,7 +645,7 @@ post_install_message: |+
   
                        (::)   U P G R A D I N G    (::)
   
-  Thank you for installing cucumber-0.4.5.rc2.
+  Thank you for installing cucumber-0.5.0.
   Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
   for important information about this release. Happy cuking!
   
@@ -650,9 +663,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
   version: 
 requirements: []
 
@@ -696,8 +709,10 @@ test_files:
 - spec/cucumber/rb_support/regexp_argument_matcher_spec.rb
 - spec/cucumber/step_match_spec.rb
 - spec/cucumber/step_mother_spec.rb
+- spec/cucumber/wire_support/wire_exception_spec.rb
 - spec/cucumber/wire_support/wire_language_spec.rb
 - spec/cucumber/wire_support/wire_packet_spec.rb
+- spec/cucumber/wire_support/wire_step_definition_spec.rb
 - spec/cucumber/world/pending_spec.rb
 - spec/spec_helper.rb
 - examples/i18n/ar/features/step_definitons/calculator_steps.rb