cucumber 1.2.2 → 1.2.3

data/README.md

@@ -15,8 +15,8 @@ Where to get more info:
   * Support forum: https://groups.google.com/forum/?fromgroups#!forum/cukes
   * IRC channel: irc://irc.freenode.net/cucumber
 
-See [DEVELOPERS.md](DEVELOPERS.md) for info on contributing to Cucumber.
+See [CONTRIBUTING.md](CONTRIBUTING.md) for info on contributing to Cucumber.
 
 ## Copyright
 
-Copyright (c) 2008,2009,2010,2011,2012 Aslak Hellesøy and Contributors. See LICENSE for details.
+Copyright (c) 2008,2009,2010,2011,2012,2013 Aslak Hellesøy and Contributors. See LICENSE for details.

data/lib/cucumber/ast/background.rb

@@ -1,10 +1,10 @@
-require 'cucumber/ast/feature_element'
+require 'cucumber/ast/has_steps'
 require 'cucumber/ast/names'
 
 module Cucumber
   module Ast
     class Background #:nodoc:
-      include FeatureElement
+      include HasSteps
       include Names
       attr_reader :feature_elements
 

data/lib/cucumber/ast/{feature_element.rb → has_steps.rb}

@@ -3,7 +3,7 @@ require 'gherkin/tag_expression'
 
 module Cucumber
   module Ast
-    module FeatureElement #:nodoc:
+    module HasSteps #:nodoc:
       attr_accessor :feature
 
       attr_reader :gherkin_statement, :raw_steps, :title, :description

data/lib/cucumber/ast/scenario.rb

@@ -1,10 +1,10 @@
-require 'cucumber/ast/feature_element'
+require 'cucumber/ast/has_steps'
 require 'cucumber/ast/names'
 
 module Cucumber
   module Ast
     class Scenario #:nodoc:
-      include FeatureElement
+      include HasSteps
       include Names
 
       attr_reader :line
@@ -86,9 +86,6 @@ module Cucumber
 
       def skip_invoke!
         @steps.each{|step_invocation| step_invocation.skip_invoke!}
-        @feature.next_feature_element(self) do |next_one|
-          next_one.skip_invoke!
-        end
       end
 
       def to_sexp

data/lib/cucumber/ast/scenario_outline.rb

@@ -1,10 +1,10 @@
-require 'cucumber/ast/feature_element'
+require 'cucumber/ast/has_steps'
 require 'cucumber/ast/names'
 
 module Cucumber
   module Ast
     class ScenarioOutline #:nodoc:
-      include FeatureElement
+      include HasSteps
       include Names
 
       module ExamplesArray #:nodoc:

data/lib/cucumber/formatter/gherkin_formatter_adapter.rb

@@ -67,7 +67,7 @@ module Cucumber
       def before_examples(examples)
         @gf.examples(examples.gherkin_statement)
       end
-      
+
       #used for capturing duration
       def after_step(step)
         step_finish = (Time.now - @step_time)
@@ -83,7 +83,7 @@ module Cucumber
       end
 
       def embed(file, mime_type, label)
-        data = File.read(file)
+        data = File.open(file, 'rb') { |f| f.read }
         if defined?(JRUBY_VERSION)
           data = data.to_java_bytes
         end

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '1.2.2'
+  VERSION       = '1.2.3'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

data/lib/cucumber/rake/task.rb

@@ -92,8 +92,7 @@ module Cucumber
 
         def cmd
           if use_bundler
-            bundle_cmd = Gem.default_exec_format % 'bundle'
-            [ Cucumber::RUBY_BINARY, '-S', bundle_cmd, 'exec', 'cucumber', @cucumber_opts,
+            [ Cucumber::RUBY_BINARY, '-S', 'bundle', 'exec', 'cucumber', @cucumber_opts,
             @feature_files ].flatten
           else
             [ Cucumber::RUBY_BINARY, '-I', load_path(@libs), quoted_binary(@cucumber_bin),

data/lib/cucumber/runtime.rb

@@ -157,6 +157,12 @@ module Cucumber
       end
     end
 
+    # Returns Ast::DocString for +string_without_triple_quotes+.
+    #
+    def doc_string(string_without_triple_quotes, content_type='', line_offset=0)
+      Ast::DocString.new(string_without_triple_quotes,content_type)
+    end
+
   private
 
     def fire_after_configuration_hook #:nodoc

data/lib/cucumber/wire_support/configuration.rb

@@ -4,19 +4,29 @@ require 'erb'
 module Cucumber
   module WireSupport
     class Configuration
-      attr_reader :host, :port
+      attr_reader :host, :port, :unix
 
-      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'] || {})
+      def self.from_file(wire_file)
+        settings = YAML.load(ERB.new(File.read(wire_file)).result)
+        new(settings)
+      end
+
+      def initialize(args)
+        @host = args['host']
+        @port = args['port']
+        @unix = args['unix'] if RUBY_PLATFORM !~ /mingw|mswin/
+        @timeouts = DEFAULT_TIMEOUTS.merge(args['timeout'] || {})
       end
 
       def timeout(message = nil)
         return @timeouts[message.to_s] || 3
       end
 
+      def to_s
+        return @unix if @unix
+        "#{@host}:#{@port}"
+      end
+
       DEFAULT_TIMEOUTS = {
         'connect' => 11,
         'invoke' => 120,

data/lib/cucumber/wire_support/connection.rb

@@ -26,7 +26,7 @@ module Cucumber
       end
 
       def exception(params)
-        WireException.new(params, @config.host, @config.port)
+        WireException.new(params, @config)
       end
 
       private
@@ -47,9 +47,14 @@ module Cucumber
       end
 
       def socket
-        @socket ||= TCPSocket.new(@config.host, @config.port)
+        return @socket if @socket
+        if @config.unix
+          @socket = UNIXSocket.new(@config.unix)
+        else
+          @socket = TCPSocket.new(@config.host, @config.port)
+        end
       rescue Errno::ECONNREFUSED => exception
-        raise(ConnectionError, "Unable to contact the wire server at #{@config.host}:#{@config.port}. Is it up?")
+        raise(ConnectionError, "Unable to contact the wire server at #{@config}. Is it up?")
       end
     end
   end

data/lib/cucumber/wire_support/wire_exception.rb

@@ -9,11 +9,11 @@ module Cucumber
         end
       end
 
-      def initialize(args, host, port)
+      def initialize(args, config)
         super args['message']
         if args['exception']
           self.class.extend(CanSetName)
-          self.class.exception_name = "#{args['exception']} from #{host}:#{port}"
+          self.class.exception_name = "#{args['exception']} from #{config}"
         end
         if args['backtrace']
           @backtrace = if args['backtrace'].is_a?(String)

data/lib/cucumber/wire_support/wire_language.rb

@@ -22,7 +22,7 @@ module Cucumber
       end
 
       def load_code_file(wire_file)
-        config = Configuration.new(wire_file)
+        config = Configuration.from_file(wire_file)
         @connections << Connection.new(config)
       end
 

data/spec/cucumber/rake/forked_spec.rb

@@ -24,22 +24,9 @@ module Cucumber
         end
 
         it "uses bundle exec to find cucumber and libraries" do
-          bundle_cmd = Gem.default_exec_format % 'bundle'
-
-          subject.cmd.should == [Cucumber::RUBY_BINARY,
-                                 '-S',
-                                 bundle_cmd,
-                                 'exec',
-                                 'cucumber',
-                                 '--cuke-option'] + feature_files
-        end
-
-        it "obeys program suffix for bundler" do
-          Gem::ConfigMap.stub(:[]).with(:ruby_install_name).and_return('XrubyY')
-
           subject.cmd.should == [Cucumber::RUBY_BINARY,
                                  '-S',
-                                 'XbundleY',
+                                 'bundle',
                                  'exec',
                                  'cucumber',
                                  '--cuke-option'] + feature_files

data/spec/cucumber/runtime_spec.rb

@@ -35,6 +35,10 @@ describe Runtime do
       subject.configure(new_configuration)
       subject.features_paths.should == some_new_paths
     end
+
+    it '#doc_string' do
+      subject.doc_string('Text').should == 'Text'
+    end
   end
 
 end

data/spec/cucumber/wire_support/configuration_spec.rb

@@ -6,7 +6,7 @@ module Cucumber
   module WireSupport
     describe Configuration do
       let(:wire_file) { Tempfile.new('wire') }
-      let(:config) { Configuration.new(wire_file.path) }
+      let(:config) { Configuration.from_file(wire_file.path) }
 
       def write_wire_file(contents)
         wire_file << contents

data/spec/cucumber/wire_support/wire_exception_spec.rb

@@ -5,10 +5,10 @@ module Cucumber
   module WireSupport
     describe WireException do
       before(:each) do
-        @host, @port = 'localhost', '54321'
+        @config = Configuration.new('host' => 'localhost', 'port' => 54321)
       end
       def exception
-        WireException.new(@data, @host, @port)
+        WireException.new(@data, @config)
       end
       describe "with just a message" do
         before(:each) do

data/spec/cucumber/wire_support/wire_language_spec.rb

@@ -5,7 +5,7 @@ module Cucumber
   module WireSupport
     describe WireLanguage do
       def stub_wire_file!(filename, config)
-        Configuration.stub!(:new).with(filename).and_return config
+        Configuration.stub!(:from_file).with(filename).and_return config
       end
 
       describe "#load_code_file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -342,7 +342,7 @@ files:
 - .rspec
 - .rvmrc
 - .travis.yml
-- DEVELOPERS.md
+- CONTRIBUTING.md
 - Gemfile
 - History.md
 - LICENSE
@@ -771,8 +771,8 @@ files:
 - lib/cucumber/ast/doc_string.rb
 - lib/cucumber/ast/examples.rb
 - lib/cucumber/ast/feature.rb
-- lib/cucumber/ast/feature_element.rb
 - lib/cucumber/ast/features.rb
+- lib/cucumber/ast/has_steps.rb
 - lib/cucumber/ast/multiline_argument.rb
 - lib/cucumber/ast/names.rb
 - lib/cucumber/ast/outline_table.rb
@@ -924,7 +924,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4532349198793312029
+      hash: 4201914282574794420
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -933,12 +933,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4532349198793312029
+      hash: 4201914282574794420
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: cucumber-1.2.2
+summary: cucumber-1.2.3
 test_files: []
 has_rdoc: