spinach 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c1f5d14fd17c664d04af5c26331b5ebdffd68d6
-  data.tar.gz: 516f1ca8cd7a2e5e63c9cdbfe805668c196e2e37
+  metadata.gz: 2b29833b6efaa67b23b899ac116da0ed43893b03
+  data.tar.gz: 47d838646bd2e30584f00bcf0a8366d0771175f3
 SHA512:
-  metadata.gz: 217336b4e2db284a25387fb5fb6fc4906913992879d8fd25f51ff5f2abf35b060b9789e9450e664751d187fb274f4decf1a21814cb328491e1c3ffc61b2e88e5
-  data.tar.gz: 9d21d91f3894fedda12acbec8761a39dfa02d59a52fec3d5e28d58b6d845b30684c0ab1a6cbe8f997d9a4f09ee27c8356a52315a390221e7d004b8934fc072e1
+  metadata.gz: 1ec7dd33eb6f1ee1013f9d99002586b002edfa8191b2f2494d73a22183325b8bf350dd8ef8639022d45a01c902d1f4ffa2ca3a40d52eac573c7a20c095404c9a
+  data.tar.gz: dbac7af642bff3cfb2899b7713de5f6d1974b9ab7e375b219eb30422e5f2ff508954b2c0a50308eb7425e53f5c014467aa12668d67029e7a5ae9fc6069460b6d

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.2

data/.travis.yml

@@ -1,7 +1,9 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - rbx
+  - 2.1.2
+  - rbx-2.2.7
+  - jruby-19mode
 
 cache: bundler
+script: "bundle exec rake"

data/Gemfile

@@ -3,16 +3,12 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in spinach.gemspec
 gemspec
 
-gem 'rake'
 gem 'coveralls', require: false
 
 group :test do
   gem 'guard'
   gem 'guard-minitest'
   gem 'guard-spinach'
-  gem 'capybara'
-  gem "rspec"
-  gem 'fakefs'
 end
 
 group :darwin do

data/README.markdown

@@ -1,6 +1,6 @@
-# Spinach - BDD framework on top of Gherkin 
+# Spinach - BDD framework on top of Gherkin
 [![Gem Version](https://badge.fury.io/rb/spinach.png)](http://badge.fury.io/rb/spinach)
-[![Build Status](https://secure.travis-ci.org/codegram/spinach.png)](http://travis-ci.org/codegram/spinach) 
+[![Build Status](https://secure.travis-ci.org/codegram/spinach.png)](http://travis-ci.org/codegram/spinach)
 [![Dependency Status](https://gemnasium.com/codegram/spinach.png)](http://gemnasium.com/codegram/spinach)
 [![Coverage Status](https://coveralls.io/repos/codegram/spinach/badge.png?branch=master)](https://coveralls.io/r/codegram/spinach)
 
@@ -18,7 +18,8 @@ Conceived as an alternative to Cucumber, here are some of its design goals:
 * Step reusability: In case you want to reuse steps across features, you can
   always wrap those in plain ol' Ruby modules.
 
-Spinach is tested against **MRI 1.9.3 and 2.0.0**.
+Spinach is tested against **MRI 1.9.3, 2.0 and 2.1** as well as **JRuby 1.7+**
+and **Rubinius 2.2+**.
 
 We are not planning to make it compatible with MRI 1.8.7 since, you know, this
 would be irresponsible :)
@@ -168,7 +169,7 @@ This is one way to make that reusable:
 module CommonSteps
   module Login
     include Spinach::DSL
-    
+
     step 'I am logged in' do
       # log in stuff...
     end
@@ -287,7 +288,7 @@ class Spinach::Features::SessionTimeout < Spinach::FeatureSteps
   after do
     change_session_timeout_to original_timeout_value
   end
-  
+
   # remaining steps
 end
 ```

data/features/steps/exit_status.rb

@@ -17,10 +17,10 @@ class ExitStatus < Spinach::FeatureSteps
   end
 
   Then "the exit status should be 0" do
-    @last_exit_status.must_equal 0
+    @last_exit_status.success?.must_equal true
   end
 
   Then "the exit status should be 1" do
-    @last_exit_status.must_equal 1
+    @last_exit_status.success?.must_equal false
   end
 end

data/features/support/env.rb

@@ -1,3 +1,4 @@
+require 'minitest/autorun'
 require 'minitest/spec'
 require_relative 'filesystem'
 

data/features/support/feature_generator.rb

@@ -80,7 +80,7 @@ module Integration
       def failure_step
         %Q|class AFailureFeature < Spinach::FeatureSteps
       feature "A failure feature"
-      %{failure_step_definition}
+      #{failure_step_definition}
       |
       end
 

data/features/support/filesystem.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'open3'
 
 # The Filesystem module runs commands, captures their output and exit status
 # and lets the host know about it.
@@ -49,26 +50,12 @@ module Filesystem
   # @api public
   def run(command)
     in_current_dir do
-      # stdout, stderr pipes
-      rout, wout = IO.pipe
-      rerr, werr = IO.pipe
-
-      pid = Process.spawn(command, :out => wout, :err => werr)
-      _, status = Process.wait2(pid)
-
-      # close write ends so we could read them
-      wout.close
-      werr.close
-
-      @stdout = rout.readlines.join("\n").force_encoding('utf-8')
-      @stderr = rerr.readlines.join("\n").force_encoding('utf-8')
-
-      # dispose the read ends of the pipes
-      rout.close
-      rerr.close
-
-      @last_exit_status = status.exitstatus
+      args = command.strip.split(" ")
+      @stdout, @stderr, @last_exit_status = Open3.capture3(*args)
     end
+
+    @stdout = strip_colors(@stdout)
+    @stderr = strip_colors(@stderr)
   end
 
   private
@@ -89,4 +76,7 @@ module Filesystem
     ['tmp/fs']
   end
 
+  def strip_colors(string)
+    string.gsub(/\e\[((\d;?)+)m/, "")
+  end
 end

data/features/support/spinach_runner.rb

@@ -15,11 +15,12 @@ module Integration
       end
     end
 
-    def run_feature(command, options={})
+    def run_feature(feature, options={})
       options[:framework] ||= :minitest
       use_minitest if options[:framework] == :minitest
       use_rspec if options[:framework] == :rspec
-      run "#{ruby} ../../bin/spinach #{command} #{options[:append]}"
+      spinach = File.expand_path("bin/spinach")
+      run "#{ruby} #{spinach} #{feature} #{options[:append]}"
     end
 
     def ruby

data/lib/spinach/cli.rb

@@ -59,7 +59,7 @@ module Spinach
           end
         elsif File.directory?(arg)
           files_to_run << Dir.glob(File.join(arg, '**', '*.feature'))
-        else
+        elsif arg != "{}"
           fail! "invalid argument - #{arg}"
         end
       end

data/lib/spinach/feature.rb

@@ -1,6 +1,6 @@
 module Spinach
   class Feature
-    attr_accessor :line
+    attr_accessor :filename, :line
     attr_accessor :name, :scenarios, :tags
     attr_accessor :background
     attr_accessor :description
@@ -14,5 +14,8 @@ module Spinach
       @background.nil? ? [] : @background.steps
     end
 
+    def line=(value)
+      @line = value.to_i if value
+    end
   end
 end

data/lib/spinach/runner.rb

@@ -73,6 +73,8 @@ module Spinach
         filename.split(':')
       end.each do |filename, line|
         feature = Parser.open_file(filename).parse
+        feature.filename = filename
+        feature.line = line
         success = FeatureRunner.new(feature, line).run
         successful = false unless success
         break if fail_fast? && !successful

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

data/spinach.gemspec

@@ -10,17 +10,18 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://github.com/codegram/spinach"
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'gherkin-ruby', '>= 0.3.1'
-  gem.add_runtime_dependency 'colorize', '0.5.8'
+  gem.add_runtime_dependency 'gherkin-ruby', '>= 0.3.2'
+  gem.add_runtime_dependency 'colorize'
   gem.add_runtime_dependency 'json'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'mocha'
+  gem.add_development_dependency 'mocha', '~> 1.0'
   gem.add_development_dependency 'sinatra'
   gem.add_development_dependency 'capybara'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'minitest', '< 5.0'
+  gem.add_development_dependency 'fakefs', ">= 0.5.2"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

data/test/spinach/cli_test.rb

@@ -228,7 +228,7 @@ tags:
         end
       end
 
-      describe 'it fails if the feature does not exist' do
+      it 'it fails if the feature does not exist' do
         cli = Spinach::Cli.new(['features/some_feature.feature'])
         File.stubs(:exists?).returns(false)
         cli.expects(:fail!).with('features/some_feature.feature could not be found')

data/test/spinach/runner_test.rb

@@ -76,7 +76,7 @@ describe Spinach::Runner do
       @feature_runner = stub
       filenames.each do |filename|
         Spinach::Parser.stubs(:open_file).with(filename).returns parser = stub
-        parser.stubs(:parse).returns feature = stub
+        parser.stubs(:parse).returns feature = Spinach::Feature.new
         Spinach::Runner::FeatureRunner.stubs(:new).
           with(feature, anything).
           returns(@feature_runner)
@@ -101,13 +101,35 @@ describe Spinach::Runner do
       runner.run.must_equal false
     end
 
+    describe 'when line set' do
+      let(:filename) { 'features/cool_feature.feature' }
+      let(:line) { 12 }
+      let(:filenames) { ["#{filename}:#{line}"] }
+      let(:runner) { Spinach::Runner.new(filenames) }
+
+      it 'sets filename and line on the feature' do
+        @feature_runner = stub
+        Spinach::Parser.stubs(:open_file).with(filename).returns parser = stub
+        parser.stubs(:parse).returns feature = Spinach::Feature.new
+        Spinach::Runner::FeatureRunner.stubs(:new).
+          with(feature, anything).
+          returns(@feature_runner)
+        runner.stubs(required_files: [])
+        @feature_runner.stubs(:run).returns(true)
+
+        runner.run.must_equal true
+        feature.filename.must_equal filename
+        feature.line.must_equal line
+      end
+    end
+
     describe "when fail_fast set" do
       let(:feature_runners) { [ stub, stub ] }
 
       before(:each) do
         filenames.each_with_index do |filename, i|
           Spinach::Parser.stubs(:open_file).with(filename).returns parser = stub
-          parser.stubs(:parse).returns feature = stub
+          parser.stubs(:parse).returns feature = Spinach::Feature.new
           Spinach::Runner::FeatureRunner.stubs(:new).
             with(feature, anything).
             returns(feature_runners[i])

data/test/test_helper.rb

@@ -13,7 +13,7 @@ end
 
 require 'minitest/autorun'
 require 'minitest/spec'
-require 'mocha/setup'
+require 'mocha/mini_test'
 require 'ostruct'
 require 'stringio'
 require 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Josep Jaume Rey
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin-ruby
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -73,16 +73,16 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -155,18 +155,32 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.2
 description: Spinach is a BDD framework on top of gherkin
 email:
 - info@codegram.com
@@ -308,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Spinach is a BDD framework on top of gherkin