cucumber 0.4.2 → 0.4.3

data/lib/cucumber/wire_support/connection.rb

@@ -0,0 +1,42 @@
+require 'timeout'
+require 'cucumber/wire_support/wire_protocol'
+
+module Cucumber
+  module WireSupport
+    class Connection
+      include WireProtocol
+      
+      def initialize(config)
+        @host, @port = config['host'], config['port']
+      end
+      
+      def call_remote(response_handler, message, params)
+        timeout = 3
+        packet = WirePacket.new(message, params)
+
+        begin
+          send_data_to_socket(packet.to_json, timeout)
+          response = fetch_data_from_socket(timeout)
+          response.handle_with(response_handler)
+        rescue Timeout::Error
+          raise "Timed out calling server with message #{message}"
+        end
+      end
+
+      private
+      
+      def send_data_to_socket(data, timeout)
+        Timeout.timeout(timeout) { socket.puts(data) }
+      end
+
+      def fetch_data_from_socket(timeout)
+        raw_response = Timeout.timeout(timeout) { socket.gets }
+        WirePacket.parse(raw_response)
+      end
+
+      def socket
+        @socket ||= TCPSocket.new(@host, @port)
+      end
+    end
+  end
+end

data/lib/cucumber/wire_support/request_handler.rb

@@ -0,0 +1,19 @@
+module Cucumber
+  module WireSupport
+    class RequestHandler
+      def initialize(connection, message, &block)
+        @connection = connection
+        @message = message
+        instance_eval(&block) if block
+      end
+
+      def execute(request_params)
+        @connection.call_remote(self, @message, request_params)
+      end
+
+      def handle_fail(params)
+        raise WireException.new(params)
+      end
+    end
+  end
+end

data/lib/cucumber/wire_support/wire_exception.rb

@@ -0,0 +1,10 @@
+module Cucumber
+  module WireSupport
+    # Proxy for an exception that occured at the remote end of the wire
+    class WireException < StandardError
+      def initialize(args)
+        super args['message']
+      end
+    end
+  end
+end

data/lib/cucumber/wire_support/wire_language.rb

@@ -0,0 +1,52 @@
+require 'socket'
+require 'json'
+require 'cucumber/wire_support/connection'
+require 'cucumber/wire_support/wire_packet'
+require 'cucumber/wire_support/wire_exception'
+require 'cucumber/wire_support/wire_step_definition'
+
+module Cucumber
+  module WireSupport
+    
+    # The wire-protocol (lanugage independent) implementation of the programming language API.
+    class WireLanguage
+      include LanguageSupport::LanguageMethods
+      
+      def load_code_file(wire_file)
+        config = YAML.load_file(wire_file)
+        @connections << Connection.new(config)
+      end
+      
+      def step_matches(step_name, formatted_step_name)
+        @connections.map{ |remote| remote.step_matches(step_name, formatted_step_name)}.flatten
+      end
+      
+      def initialize(step_mother)
+        @connections = []
+      end
+      
+      def alias_adverbs(adverbs)
+      end
+
+      def snippet_text(step_keyword, step_name, multiline_arg_class)
+        "Snippets are not implemented for the wire yet"
+      end
+      
+      protected
+      
+      def begin_scenario
+        @connections.each { |remote| remote.begin_scenario }
+      end
+      
+      def end_scenario
+        @connections.each { |remote| remote.end_scenario }
+      end
+      
+      private
+      
+      def step_definitions
+        @step_definitions ||= {}
+      end
+    end
+  end
+end

data/lib/cucumber/wire_support/wire_packet.rb

@@ -0,0 +1,34 @@
+module Cucumber
+  module WireSupport
+    # Represents the packet of data sent over the wire as JSON data, containing
+    # a message and a hash of arguments
+    class WirePacket
+      class << self
+        def parse(raw)
+          attributes = JSON.parse(raw.strip)
+          message = attributes[0]
+          params  = attributes[1]
+          new(message, params)
+        end
+      end
+      
+      attr_reader :message, :params
+      
+      def initialize(message, params)
+        @message, @params = message, params
+      end
+      
+      def to_json
+        [@message, @params].to_json
+      end
+      
+      def raise_if_bad
+        raise WireException.new(@params) if @message == 'fail' || @message == 'step_failed'
+      end
+      
+      def handle_with(handler)
+        handler.send("handle_#{@message}", @params)
+      end
+    end
+  end
+end

data/lib/cucumber/wire_support/wire_protocol.rb

@@ -0,0 +1,64 @@
+require 'cucumber/step_argument'
+require 'cucumber/wire_support/request_handler'
+
+module Cucumber
+  module WireSupport
+    module WireProtocol
+      def step_matches(name_to_match, name_to_report)
+        @name_to_match, @name_to_report = name_to_match, name_to_report
+        make_request(:step_matches, :name_to_match => name_to_match) do
+          def handle_step_matches(params)
+            params.map do |raw_step_match|
+              step_definition = WireStepDefinition.new(raw_step_match['id'], @connection)
+              step_args = raw_step_match['args'].map do |raw_arg|
+                StepArgument.new(raw_arg['val'], raw_arg['pos'])
+              end
+              @connection.step_match(step_definition, step_args) # convoluted!
+            end
+          end
+        end
+      end
+
+      def step_match(step_definition, step_args)
+        StepMatch.new(step_definition, @name_to_match, @name_to_report, step_args)
+      end
+      
+      def invoke(step_definition_id, args)
+        request_params = { :id => step_definition_id, :args => args }
+        
+        make_request(:invoke, request_params) do
+          def handle_success(params)
+          end
+        
+          def handle_step_failed(params)
+            handle_fail(params)
+          end
+        end
+      end
+      
+      def begin_scenario
+        make_request(:begin_scenario) do
+          def handle_success(params)
+          end
+        end
+      end
+
+      def end_scenario
+        make_request(:end_scenario) do
+          def handle_success(params)
+          end
+        end
+      end
+      
+      private
+      
+      def handler(request_message, &block)
+        RequestHandler.new(self, request_message, &block)
+      end
+      
+      def make_request(request_message, params = nil, &block)
+        handler(request_message, &block).execute(params)
+      end
+    end
+  end
+end

data/lib/cucumber/wire_support/wire_step_definition.rb

@@ -0,0 +1,21 @@
+module Cucumber
+  module WireSupport
+    class WireStepDefinition
+      def initialize(id, connection)
+        @id, @connection = id, connection
+      end
+      
+      def invoke(args)
+        @connection.invoke(@id, args)
+      end
+
+      def regexp_source
+        "/FIXME/"
+      end
+
+      def file_colon_line
+        "FIXME:0"
+      end
+    end
+  end
+end

data/rails_generators/cucumber/cucumber_generator.rb

@@ -76,18 +76,21 @@ protected
   end
 
   def after_generate
+    require 'cucumber/formatter/ansicolor'
+    extend Cucumber::Formatter::ANSIColor
+
     if @default_framework
       puts <<-WARNING
 
-(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) 
+#{yellow_cukes(15)} 
 
-          (::)   T E S T   F R A M E W O R K   A L E R T    (::)
+          #{yellow_cukes(1)}   T E S T   F R A M E W O R K   A L E R T    #{yellow_cukes(1)}
 
 You didn't explicitly generate with --rspec or --testunit, so I looked at
-your gems and saw that you had #{@default_framework} installed, so I went with that. 
+your gems and saw that you had #{green(@default_framework.to_s)} installed, so I went with that. 
 If you want something else, be specific about it. Otherwise, relax.
 
-(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) 
+#{yellow_cukes(15)} 
 
 WARNING
     end

data/rails_generators/cucumber/templates/cucumber_environment.rb

@@ -20,11 +20,11 @@ config.action_controller.allow_forgery_protection    = false
 config.action_mailer.delivery_method = :test
 
 config.gem 'cucumber',    :lib => false,        :version => '>=<%= cucumber_version %>' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
-config.gem 'webrat',      :lib => false,        :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
+config.gem 'webrat',      :lib => false,        :version => '>=0.5.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
 <% if framework == :rspec -%>
-config.gem 'rspec',       :lib => false,        :version => '>=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
-config.gem 'rspec-rails', :lib => false,        :version => '>=1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
+config.gem 'rspec',       :lib => false,        :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
+config.gem 'rspec-rails', :lib => false,        :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
 <% end %>
 <% if spork? -%>
-config.gem 'spork',       :lib => false,        :version => '>=0.7.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/spork'))
+config.gem 'spork',       :lib => false,        :version => '>=0.7.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/spork'))
 <% end %>

data/rails_generators/cucumber/templates/version_check.rb

@@ -1,8 +1,10 @@
+require 'cucumber/formatter/ansicolor'
+extend Cucumber::Formatter::ANSIColor
 if Cucumber::VERSION != '<%= Cucumber::VERSION %>'
 warning = <<-WARNING
-(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) 
+#{red_cukes(15)} 
 
-         (::)   R O T T E N   C U C U M B E R   A L E R T    (::)
+         #{red_cukes(1)}   R O T T E N   C U C U M B E R   A L E R T    #{red_cukes(1)}
 
 Your #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} file was generated with Cucumber <%= Cucumber::VERSION %>,
 but you seem to be running Cucumber #{Cucumber::VERSION}. If you're running an older 
@@ -18,11 +20,11 @@ version than #{Cucumber::VERSION} you should:
 If you get prompted to replace a file, hit 'd' to see the difference.
 When you're sure you have captured any personal edits, confirm that you
 want to overwrite #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} by pressing 'y'. Then reapply any
-personal changes that may have been overwritten. 
+personal changes that may have been overwritten, preferably in separate files.
 
 This message will then self destruct.
 
-(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) 
+#{red_cukes(15)}
 WARNING
 warn(warning)
 at_exit {warn(warning)}

data/spec/cucumber/ast/table_spec.rb

@@ -393,7 +393,17 @@ module Cucumber
           @table_parser.parse_or_fail(text.strip, file, line_offset)
         end
       end
-      
+
+      describe "#new" do
+        it "should allow Array of Hash" do
+          t1 = Table.new([{'name' => 'aslak', 'male' => 'true'}])
+          t1.to_s(:indent => 12, :color => false).should == %{
+            |     name  |     male |
+            |     aslak |     true |
+          }
+        end
+      end
+
       it "should convert to sexp" do
         @table.to_sexp.should == 
           [:table, 

data/spec/cucumber/ast/tags_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/ast/tags'
+
+module Cucumber
+  module Ast
+    describe Tags do
+      describe "#matches" do
+        it "should AND tags which are are in a list" do
+          Tags.matches?(['@one','@two','@three'], [['@one','@two']]).should == true
+          Tags.matches?(['@one','@three'], [['@one','@two']]).should == false
+        end
+
+        it "should OR tags in different lists" do
+          Tags.matches?(['@one'], [['@one'], ['@two']]).should == true
+        end
+
+        it "should AND and OR tags" do
+          Tags.matches?(['@one','@two'], [['@one'],['@two','@four']]).should == true
+        end
+
+        it "should NOT tags" do
+          Tags.matches?(['@one','@three'], [['@one', '~@two']]).should == true
+          Tags.matches?(['@one','@three'], [['~@one']]).should == false
+        end
+
+      end
+    end
+  end
+end

data/spec/cucumber/cli/options_spec.rb

@@ -85,7 +85,7 @@ module Cli
           after_parsing('-o file.txt') { options[:formats].should == [['pretty', 'file.txt']] }
         end
         it "sets the output for the formatter defined immediatly before it" do
-          after_parsing('-f profile --out file.txt -f pretty -o file2.txt') do 
+          after_parsing('-f profile --out file.txt -f pretty -o file2.txt') do
             options[:formats].should == [['profile', 'file.txt'], ['pretty', 'file2.txt']]
           end
         end
@@ -93,7 +93,11 @@ module Cli
 
       context '-t TAGS --tags TAGS' do
         it "designates tags prefixed with ~ as tags to be excluded" do
-          after_parsing('--tags ~@foo,@bar') { options[:tag_names].should == {'~@foo' => nil, '@bar' => nil} }
+          after_parsing('--tags ~@foo,@bar') { options[:tag_names].should == [{'~@foo' => nil, '@bar' => nil}] }
+        end
+
+        it "stores tags passed with different --tags seperately" do
+          after_parsing('--tags @foo --tags @bar') { options[:tag_names].should == [{'@foo' => nil}, {'@bar' => nil}] }
         end
       end
 
@@ -160,7 +164,7 @@ module Cli
         it "combines the tag names of both" do
           given_cucumber_yml_defined_as('baz' => %w[-t @bar])
           options.parse!(%w[--tags @foo -p baz])
-          options[:tag_names].should == {'@foo' => nil, '@bar' => nil}
+          options[:tag_names].should == [{'@foo' => nil}, {'@bar' => nil}]
         end
 
         it "only takes the paths from the original options, and disgregards the profiles" do
@@ -286,7 +290,7 @@ module Cli
 
     describe '#expanded_args_without_drb' do
       it "returns the orginal args in additon to the args from any profiles" do
-        given_cucumber_yml_defined_as('foo' => '-v', 
+        given_cucumber_yml_defined_as('foo' => '-v',
                                       'bar' => '--wip -p baz',
                                       'baz' => '-r some_file.rb')
         options.parse!(%w[features -p foo --profile bar])

data/spec/cucumber/formatter/junit_spec.rb

@@ -22,6 +22,17 @@ module Cucumber::Formatter
       File.stub!(:directory?).and_return(true)
       @formatter = TestDoubleJunitFormatter.new(step_mother, '', {})
     end
+    
+    describe "a feature with no name" do
+      define_feature <<-FEATURE
+          Scenario: Passing
+            Given a passing scenario
+      FEATURE
+      
+      it "should raise an exception" do
+        lambda { run_defined_feature }.should raise_error(Junit::UnNamedFeatureError)
+      end
+    end
 
     describe "given a single feature" do
       before(:each) do

data/spec/cucumber/step_match_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'cucumber/rb_support/rb_step_definition'
 require 'cucumber/rb_support/rb_language'
@@ -17,6 +18,16 @@ module Cucumber
       StepMatch.new(stepdef, name, nil, stepdef.arguments_from(name))
     end
 
+    it "should format one groups 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
+
+    it "should format several groups when we use Unicode" do
+      m = step_match(/I (\w+) (\w+) (\w+) this (\w+)/, "I ate æøåÆØÅæøåÆØÅæøåÆØÅæøåÆØÅ egg this morning")
+      m.format_args("<span>%s</span>").should == "I <span>ate</span> <span>æøåÆØÅæøåÆØÅæøåÆØÅæøåÆØÅ</span> <span>egg</span> this <span>morning</span>"
+    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>"