cucumber 1.2.1 → 1.2.2

data/lib/cucumber/step_definitions.rb

@@ -1,4 +1,3 @@
-require 'json'
 module Cucumber
   class StepDefinitions
     def initialize(configuration = Configuration.default)
@@ -6,9 +5,9 @@ module Cucumber
       @support_code = Runtime::SupportCode.new(nil, false)
       @support_code.load_files_from_paths(configuration.autoload_code_paths)
     end
-    
+
     def to_json
       @support_code.step_definitions.map{|stepdef| stepdef.to_hash}.to_json
     end
   end
-end
+end

data/lib/cucumber/step_match.rb

@@ -2,9 +2,9 @@ module Cucumber
   class StepMatch #:nodoc:
     attr_reader :step_definition, :step_arguments
 
-    # Creates a new StepMatch. The +name_to_report+ argument is what's reported, unless it's is,
-    # in which case +name_to_report+ is used instead.
-    # 
+    # Creates a new StepMatch. The +name_to_report+ argument is what's
+    # reported, unless it's is, in which case +name_to_report+ is used instead.
+    #
     def initialize(step_definition, name_to_match, name_to_report, step_arguments)
       raise "name_to_match can't be nil" if name_to_match.nil?
       raise "step_arguments can't be nil (but it can be an empty array)" if step_arguments.nil?
@@ -61,7 +61,7 @@ module Cucumber
       offset = past_offset = 0
       step_arguments.each do |step_argument|
         next if step_argument.offset.nil? || step_argument.offset < past_offset
-        
+
         replacement = if block_given?
           proc.call(step_argument.val)
         elsif Proc === format
@@ -81,7 +81,7 @@ module Cucumber
       sprintf("#<%s:0x%x>", self.class, self.object_id)
     end
   end
-  
+
   class NoStepMatch #:nodoc:
     attr_reader :step_definition, :name
 
@@ -89,7 +89,7 @@ module Cucumber
       @step = step
       @name = name
     end
-    
+
     def format_args(format)
       @name
     end

data/lib/cucumber/step_mother.rb

@@ -7,4 +7,4 @@ module Cucumber
       super
     end
   end
-end
+end

data/lib/cucumber/term/ansicolor.rb

@@ -5,34 +5,34 @@ module Cucumber
     module ANSIColor
       # :stopdoc:
       ATTRIBUTES = [
-        [ :clear        ,   0 ], 
+        [ :clear        ,   0 ],
         [ :reset        ,   0 ],     # synonym for :clear
-        [ :bold         ,   1 ], 
-        [ :dark         ,   2 ], 
+        [ :bold         ,   1 ],
+        [ :dark         ,   2 ],
         [ :italic       ,   3 ],     # not widely implemented
-        [ :underline    ,   4 ], 
+        [ :underline    ,   4 ],
         [ :underscore   ,   4 ],     # synonym for :underline
-        [ :blink        ,   5 ], 
+        [ :blink        ,   5 ],
         [ :rapid_blink  ,   6 ],     # not widely implemented
         [ :negative     ,   7 ],     # no reverse because of String#reverse
-        [ :concealed    ,   8 ], 
+        [ :concealed    ,   8 ],
         [ :strikethrough,   9 ],     # not widely implemented
-        [ :black        ,  30 ], 
-        [ :red          ,  31 ], 
-        [ :green        ,  32 ], 
-        [ :yellow       ,  33 ], 
-        [ :blue         ,  34 ], 
-        [ :magenta      ,  35 ], 
-        [ :cyan         ,  36 ], 
-        [ :white        ,  37 ], 
-        [ :on_black     ,  40 ], 
-        [ :on_red       ,  41 ], 
-        [ :on_green     ,  42 ], 
-        [ :on_yellow    ,  43 ], 
-        [ :on_blue      ,  44 ], 
-        [ :on_magenta   ,  45 ], 
-        [ :on_cyan      ,  46 ], 
-        [ :on_white     ,  47 ], 
+        [ :black        ,  30 ],
+        [ :red          ,  31 ],
+        [ :green        ,  32 ],
+        [ :yellow       ,  33 ],
+        [ :blue         ,  34 ],
+        [ :magenta      ,  35 ],
+        [ :cyan         ,  36 ],
+        [ :white        ,  37 ],
+        [ :on_black     ,  40 ],
+        [ :on_red       ,  41 ],
+        [ :on_green     ,  42 ],
+        [ :on_yellow    ,  43 ],
+        [ :on_blue      ,  44 ],
+        [ :on_magenta   ,  45 ],
+        [ :on_cyan      ,  46 ],
+        [ :on_white     ,  47 ],
       ]
 
       ATTRIBUTE_NAMES = ATTRIBUTES.transpose.first

data/lib/cucumber/wire_support/configuration.rb

@@ -5,27 +5,24 @@ module Cucumber
   module WireSupport
     class Configuration
       attr_reader :host, :port
-      
+
       def initialize(wire_file)
         params = YAML.load(ERB.new(File.read(wire_file)).result)
         @host = params['host']
         @port = params['port']
-        @timeouts = default_timeouts.merge(params['timeout'] || {})
+        @timeouts = DEFAULT_TIMEOUTS.merge(params['timeout'] || {})
       end
-      
+
       def timeout(message = nil)
         return @timeouts[message.to_s] || 3
       end
-      
-      private
-      
-      def default_timeouts
-        {
-          'invoke' => 120,
-          'begin_scenario' => 120,
-          'end_scenario' => 120
-        }
-      end
+
+      DEFAULT_TIMEOUTS = {
+        'connect' => 11,
+        'invoke' => 120,
+        'begin_scenario' => 120,
+        'end_scenario' => 120
+      }
     end
   end
-end
+end

data/lib/cucumber/wire_support/connection.rb

@@ -5,13 +5,13 @@ module Cucumber
   module WireSupport
     class Connection
       class ConnectionError < StandardError; end
-        
+
       include WireProtocol
-      
+
       def initialize(config)
         @config = config
       end
-      
+
       def call_remote(request_handler, message, params)
         packet = WirePacket.new(message, params)
 
@@ -24,27 +24,28 @@ module Cucumber
           raise Timeout::Error, "Timed out calling wire server with message '#{message}'", backtrace
         end
       end
-      
+
       def exception(params)
         WireException.new(params, @config.host, @config.port)
       end
 
       private
-      
+
       def send_data_to_socket(data)
-        Timeout.timeout(@config.timeout) { socket.puts(data) }
+        Timeout.timeout(@config.timeout('connect')) { socket.puts(data) }
       end
 
       def fetch_data_from_socket(timeout)
-        raw_response = 
+        raw_response =
           if timeout == :never
             socket.gets
           else
             Timeout.timeout(timeout) { socket.gets }
           end
+        raise exception({'message' => "Remote Socket with #{@config.host}:#{@config.port} closed."}) if raw_response.nil?
         WirePacket.parse(raw_response)
       end
-      
+
       def socket
         @socket ||= TCPSocket.new(@config.host, @config.port)
       rescue Errno::ECONNREFUSED => exception
@@ -52,4 +53,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/wire_support/request_handler.rb

@@ -13,12 +13,12 @@ module Cucumber
       def handle_fail(params)
         raise @connection.exception(params)
       end
-      
+
       def handle_success(params)
       end
-      
+
       private
-      
+
       # Props to Rails
       def underscore(camel_cased_word)
         camel_cased_word.to_s.gsub(/::/, '/').

data/lib/cucumber/wire_support/wire_exception.rb

@@ -8,7 +8,7 @@ module Cucumber
           @exception_name
         end
       end
-      
+
       def initialize(args, host, port)
         super args['message']
         if args['exception']
@@ -23,10 +23,10 @@ module Cucumber
             end
         end
       end
-      
+
       def backtrace
         @backtrace || super
       end
     end
   end
-end
+end

data/lib/cucumber/wire_support/wire_language.rb

@@ -1,5 +1,5 @@
+require 'multi_json'
 require 'socket'
-require 'json'
 require 'cucumber/wire_support/connection'
 require 'cucumber/wire_support/configuration'
 require 'cucumber/wire_support/wire_packet'
@@ -8,16 +8,16 @@ require 'cucumber/wire_support/wire_step_definition'
 
 module Cucumber
   module WireSupport
-    
-    # The wire-protocol (lanugage independent) implementation of the programming 
+
+    # The wire-protocol (lanugage independent) implementation of the programming
     # language API.
     class WireLanguage
       include LanguageSupport::LanguageMethods
 
-      def initialize(step_mother)
+      def initialize(runtime)
         @connections = []
       end
-      
+
       def alias_adverbs(adverbs)
       end
 
@@ -25,25 +25,25 @@ module Cucumber
         config = Configuration.new(wire_file)
         @connections << Connection.new(config)
       end
-      
+
       def snippet_text(code_keyword, step_name, multiline_arg_class)
-        snippets = @connections.map do |remote| 
+        snippets = @connections.map do |remote|
           remote.snippet_text(code_keyword, step_name, multiline_arg_class.to_s)
         end
         snippets.flatten.join("\n")
       end
-      
+
       def step_matches(step_name, formatted_step_name)
         @connections.map{ |c| c.step_matches(step_name, formatted_step_name)}.flatten
       end
-      
+
       protected
-      
+
       def begin_scenario(scenario)
         @connections.each { |c| c.begin_scenario(scenario) }
         @current_scenario = scenario
       end
-      
+
       def end_scenario
         scenario = @current_scenario
         @connections.each { |c| c.end_scenario(scenario) }

data/lib/cucumber/wire_support/wire_packet.rb

@@ -1,3 +1,5 @@
+require 'multi_json'
+
 module Cucumber
   module WireSupport
     # Represents the packet of data sent over the wire as JSON data, containing
@@ -5,25 +7,25 @@ module Cucumber
     class WirePacket
       class << self
         def parse(raw)
-          attributes = JSON.parse(raw.strip)
+          attributes = MultiJson.load(raw.strip)
           message = attributes[0]
           params  = attributes[1]
           new(message, params)
         end
       end
-      
+
       attr_reader :message, :params
-      
+
       def initialize(message, params = nil)
         @message, @params = message, params
       end
-      
+
       def to_json
         packet = [@message]
         packet << @params if @params
         packet.to_json
       end
-      
+
       def handle_with(handler)
         handler.send("handle_#{@message}", @params)
       end

data/lib/cucumber/wire_support/wire_protocol.rb

@@ -12,22 +12,22 @@ module Cucumber
         handler = Requests::SnippetText.new(self)
         handler.execute(step_keyword, step_name, multiline_arg_class_name)
       end
-      
+
       def invoke(step_definition_id, args)
         handler = Requests::Invoke.new(self)
         handler.execute(step_definition_id, args)
       end
-      
+
       def diff_failed
         handler = Requests::DiffFailed.new(self)
         handler.execute
       end
-      
+
       def diff_ok
         handler = Requests::DiffOk.new(self)
         handler.execute
       end
-      
+
       def begin_scenario(scenario)
         handler = Requests::BeginScenario.new(self)
         handler.execute(scenario)
@@ -37,7 +37,7 @@ module Cucumber
         handler = Requests::EndScenario.new(self)
         handler.execute(scenario)
       end
-      
+
     end
   end
-end
+end

data/lib/cucumber/wire_support/wire_protocol/requests.rb

@@ -19,11 +19,11 @@ module Cucumber
               create_step_match(raw_step_match)
             end
           end
-          
+
           alias :handle_step_matches :handle_success
-        
+
           private
-          
+
           def create_step_match(raw_step_match)
             step_definition = WireStepDefinition.new(@connection, raw_step_match)
             step_args = raw_step_match['args'].map do |raw_arg|
@@ -31,7 +31,7 @@ module Cucumber
             end
             step_match(step_definition, step_args)
           end
-        
+
           def step_match(step_definition, step_args)
             StepMatch.new(step_definition, @name_to_match, @name_to_report, step_args)
           end
@@ -39,25 +39,25 @@ module Cucumber
 
         class SnippetText < RequestHandler
           def execute(step_keyword, step_name, multiline_arg_class_name)
-            request_params = { 
-              :step_keyword => step_keyword, 
-              :step_name => step_name, 
-              :multiline_arg_class => multiline_arg_class_name 
+            request_params = {
+              :step_keyword => step_keyword,
+              :step_name => step_name,
+              :multiline_arg_class => multiline_arg_class_name
             }
             super(request_params)
           end
-          
+
           def handle_success(snippet_text)
             snippet_text
           end
-          
+
           alias :handle_snippet_text :handle_success
         end
 
         class Invoke < RequestHandler
           def execute(step_definition_id, args)
-            request_params = { 
-              :id => step_definition_id, 
+            request_params = {
+              :id => step_definition_id,
               :args => args
             }
             super(request_params)
@@ -66,13 +66,13 @@ module Cucumber
           def handle_pending(message)
             raise Pending, message || "TODO"
           end
-          
+
           def handle_diff!(tables)
             table1 = Ast::Table.new(tables[0])
             table2 = Ast::Table.new(tables[1])
             table1.diff!(table2)
           end
-        
+
           def handle_diff(tables)
             begin
               handle_diff!(tables)
@@ -81,29 +81,29 @@ module Cucumber
             end
             @connection.diff_ok
           end
-          
+
           alias :handle_step_failed :handle_fail
         end
 
         class DiffFailed < RequestHandler
           alias :handle_step_failed :handle_fail
         end
-      
+
         class DiffOk < RequestHandler
           alias :handle_step_failed :handle_fail
         end
-      
+
         module Tags
           def clean_tag_names(scenario)
             scenario.source_tags.map { |tag| tag.name.gsub(/^@/, '') }.sort
           end
-          
+
           def request_params(scenario)
             return nil unless scenario.source_tags.any?
             { "tags" => clean_tag_names(scenario) }
           end
         end
-      
+
         class BeginScenario < RequestHandler
           include Tags
 
@@ -122,4 +122,4 @@ module Cucumber
       end
     end
   end
-end
+end