spinach 0.8.10 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b29833b6efaa67b23b899ac116da0ed43893b03
-  data.tar.gz: 47d838646bd2e30584f00bcf0a8366d0771175f3
+  metadata.gz: 7c9af04ac6ce809e1d3f867afe57d007b58ddc20
+  data.tar.gz: a663f71bcb7c7e2cd1ba9345e28f82be82019e58
 SHA512:
-  metadata.gz: 1ec7dd33eb6f1ee1013f9d99002586b002edfa8191b2f2494d73a22183325b8bf350dd8ef8639022d45a01c902d1f4ffa2ca3a40d52eac573c7a20c095404c9a
-  data.tar.gz: dbac7af642bff3cfb2899b7713de5f6d1974b9ab7e375b219eb30422e5f2ff508954b2c0a50308eb7425e53f5c014467aa12668d67029e7a5ae9fc6069460b6d
+  metadata.gz: 7e0bda8c1296cce5b934ababdb573ef6a46577aef3a4b821d56f9bcf9b3b2e2fc647d24f23056d838531c44dd489bcc51b0eb02c75d0e9885ca4f3cad09260de
+  data.tar.gz: e135c2368013b2bfab39c613ba5a6d075c5eee3ee803bddce30e12b857fd6d2486ddbf184f7e2f561ebba83932e316a8758d1ae5319d5e1b49c48a6a59253cb3

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.3.1

data/.travis.yml

@@ -1,9 +1,8 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-  - rbx-2.2.7
-  - jruby-19mode
+  - 2.1.9
+  - 2.2.4
+  - 2.3.1
+  - jruby-9.1.2.0
 
 cache: bundler
 script: "bundle exec rake"

data/Gemfile

@@ -5,19 +5,6 @@ gemspec
 
 gem 'coveralls', require: false
 
-group :test do
-  gem 'guard'
-  gem 'guard-minitest'
-  gem 'guard-spinach'
-end
-
-group :darwin do
-  gem 'rb-fsevent'
-  gem 'growl'
-end
-
 group :docs do
   gem 'yard'
 end
-
-gem 'rubysl', :platforms => :rbx

data/README.markdown

@@ -4,8 +4,6 @@
 [![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)
 
-**Join a live discussion on Gitter**: [![Gitter chat](https://badges.gitter.im/codegram/spinach.png)](https://gitter.im/codegram/spinach)
-
 Spinach is a high-level BDD framework that leverages the expressive
 [Gherkin language][gherkin] (used by [Cucumber][cucumber]) to help you define
 executable specifications of your application or library's acceptance criteria.
@@ -18,11 +16,7 @@ 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, 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 :)
+Spinach is tested against **2.0, 2.1, 2.2 and 2.3** as well as **JRuby 9000**.
 
 ## Getting started
 
@@ -271,7 +265,7 @@ end
 
 Full hook documentation is here:
 
-[Spinach's hook documentation on rubydoc](http://rubydoc.info/github/codegram/spinach/master/Spinach/Hooks)
+[Spinach's hook documentation](https://github.com/codegram/spinach/blob/master/lib/spinach/hooks.rb)
 
 ## Local Before and After Hooks
 
@@ -302,9 +296,10 @@ You can specify them when calling the `spinach` binary:
 
 When no reporter is specified, `stdout` will be used by default.
 
-For a console reporter with no colors, try:
+Other reporters:
 
-* [spinach-console-reporter](https://github.com/ywen/spinach-console-reporter) (to be used with Jenkins)
+* For a console reporter with no colors, try [spinach-console-reporter][spinach-console-reporter] (to be used with Jenkins)
+* For a rerun reporter, try [spinach-rerun-reporter][spinach-rerun-reporter] (writes failed scenarios in a file)
 
 ## Wanna use it with Rails 3?
 
@@ -326,7 +321,8 @@ Check out our [spinach-sinatra demo](https://github.com/codegram/spinach-sinatra
 
 * [guard-spinach](http://github.com/codegram/guard-spinach)
 * [spinach-rails](http://github.com/codegram/spinach-rails)
-* [spinach-console-reporter](https://github.com/ywen/spinach-console-reporter) (to be used with Jenkins)
+* [spinach-console-reporter][spinach-console-reporter] (to be used with Jenkins)
+* [spinach-rerun-reporter][spinach-rerun-reporter] (writes failed scenarios in a file)
 * [spring-commands-spinach](https://github.com/jvanbaarsen/spring-commands-spinach) (to be used with spring)
 
 ### Demos
@@ -351,13 +347,13 @@ You can easily contribute to Spinach. Its codebase is simple and
   in a commit by itself I can ignore when I pull.
 * Send me a pull request. Bonus points for topic branches.
 
-[gherkin]: http://github.com/codegram/gherkin-ruby
-[cucumber]: http://github.com/cucumber/cucumber
-[documentation]: http://rubydoc.info/github/codegram/spinach/master/frames
-
 ## License
 
-MIT (Expat) License. Copyright 2011-2013 [Codegram Technologies](http://codegram.com)
+MIT (Expat) License. Copyright 2011-2016 [Codegram Technologies](http://codegram.com)
 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/codegram/spinach/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
+[gherkin]: http://github.com/codegram/gherkin-ruby
+[cucumber]: http://github.com/cucumber/cucumber
+[documentation]: http://rubydoc.info/github/codegram/spinach/master/frames
+[spinach-console-reporter]: https://github.com/ywen/spinach-console-reporter
+[spinach-rerun-reporter]: https://github.com/javierav/spinach-rerun-reporter

data/lib/spinach/capybara.rb

@@ -24,30 +24,6 @@ module Spinach
         require 'capybara/rspec'
         include ::Capybara::RSpecMatchers
       end
-
-      alias_method :capybara_visit, :visit
-
-      def visit(*args)
-        stream = STDOUT
-        old_stream = stream.dup
-        stream.reopen(null_device)
-        stream.sync = true
-        capybara_visit *args
-      ensure
-        stream.reopen(old_stream)
-      end
-
-      def null_device
-        return @null_device if defined?(@null_device)
-
-        if RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
-          @null_device = "NUL"
-        else
-          @null_device = "/dev/null"
-        end
-
-        @null_device
-      end
     end
   end
 end

data/lib/spinach/cli.rb

@@ -22,9 +22,11 @@ module Spinach
     def run
       options
 
-      return true if Spinach.config.generate
-
-      Spinach::Runner.new(feature_files).run
+      if Spinach.config.generate
+        Spinach::Generators.run(feature_files)
+      else
+        Spinach::Runner.new(feature_files).run
+      end
     end
 
     # @return [Hash]
@@ -109,7 +111,6 @@ module Spinach
           opts.on('-g', '--generate',
                   'Auto-generate the feature steps files') do
             config[:generate] = true
-            Spinach::Generators.run(feature_files)
           end
 
           opts.on_tail('--version', 'Show version') do

data/lib/spinach/feature.rb

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

data/lib/spinach/frameworks/minitest.rb

@@ -1,4 +1,13 @@
 require 'minitest/spec'
 MiniTest::Spec.new nil if defined?(MiniTest::Spec)
 Spinach.config[:failure_exceptions] << MiniTest::Assertion
-Spinach::FeatureSteps.include MiniTest::Assertions
+
+class Spinach::FeatureSteps
+  include MiniTest::Assertions
+  attr_accessor :assertions
+
+  def initialize(*args)
+    super *args
+    self.assertions = 0
+  end
+end

data/lib/spinach/generators.rb

@@ -7,15 +7,18 @@ module Spinach
     # @files [Array]
     #   filenames to evaluate for step generation
     def self.run(files)
+      successful = true
       files.each do |file|
         feature = Parser.open_file(file).parse
 
         begin
           FeatureGenerator.new(feature).store
         rescue FeatureGeneratorException => e
+          successful = false
           $stderr.puts e
         end
       end
+      successful
     end
   end
 end

data/lib/spinach/generators/feature_generator.rb

@@ -69,8 +69,8 @@ module Spinach
       # Stores the example feature steps definition into an expected path
       #
       def store
-        if File.exists?(filename_with_path)
-          raise FeatureGeneratorException.new("File #{filename_with_path} already exists.")
+        if file_exists?(filename)
+          raise FeatureGeneratorException.new("File #{filename} already exists at #{file_path(filename)}.")
         else
           FileUtils.mkdir_p path
           File.open(filename_with_path, 'w') do |file|
@@ -80,6 +80,15 @@ module Spinach
         end
       end
 
+      private
+      
+      def file_exists?(filename)
+        !!file_path(filename)
+      end
+
+      def file_path(filename)
+        Dir.glob("#{path}/**/#{filename}").first
+      end
     end
 
     class FeatureGeneratorException < Exception; end;

data/lib/spinach/runner.rb

@@ -69,15 +69,25 @@ module Spinach
 
       successful = true
 
-      filenames.map do |filename|
-        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
+      filenames.map! do |filename|
+        file, *lines = filename.split(":")
+        [file, lines]
+      end
+
+      catch :fail do
+        filenames.each do |filename, lines|
+          lines = [nil] if lines.empty?
+
+          feature = Parser.open_file(filename).parse
+          feature.filename = filename
+          feature.lines = lines
+
+          lines.each do |line|
+            success = FeatureRunner.new(feature, line).run
+            successful = false unless success
+            throw :fail if fail_fast? && !successful
+          end
+        end
       end
 
       Spinach.hooks.run_after_run(successful)

data/lib/spinach/version.rb

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

data/test/spinach/cli_test.rb

@@ -148,17 +148,28 @@ tags:
     end
 
     describe 'generate' do
-      %w{-g --generate}.each do |opt|
-        it 'inits the generator if #{opt}' do
+      %w{-g --generate}.each do |generate_opt|
+        it 'inits the generator if #{generate_opt}' do
           config = Spinach::Config.new
           Spinach.stubs(:config).returns(config)
 
           Spinach::Generators.expects(:run)
 
-          Spinach::Cli.new([opt]).run
+          Spinach::Cli.new([generate_opt]).run
 
           config.generate.must_equal true
         end
+
+        %w{-f --features_path}.each do |feature_path_opt|
+          it "honors the #{feature_path_opt} option" do
+            config = Spinach::Config.new
+            Spinach.stubs(:config).returns(config)
+            cli = Spinach::Cli.new([feature_path_opt,"custom_path", generate_opt])
+            cli.options
+            config.features_path.must_equal 'custom_path'
+          end
+        end
+
       end
     end
 
@@ -246,6 +257,15 @@ tags:
       end
     end
 
+    describe "when a particular feature list is passed with multiple lines" do
+      it "returns the feature with the line numbers" do
+        cli = Spinach::Cli.new(['features/some_feature.feature:10:20'])
+        File.stubs(:exists?).returns(true)
+
+        cli.feature_files.must_equal ["features/some_feature.feature:10:20"]
+      end
+    end
+
     describe 'when no feature is passed' do
       it 'returns all the features' do
         cli = Spinach::Cli.new([])

data/test/spinach/frameworks/minitest_test.rb

@@ -12,4 +12,12 @@ describe "minitest framework" do
   it "extends the FeatureSteps class with MiniTest DSL" do
     Spinach::FeatureSteps.ancestors.must_include MiniTest::Assertions
   end
+
+  it "makes FeatureSteps respond to 'assertions'" do
+    Spinach::FeatureSteps.new.must_respond_to :assertions
+  end
+
+  it "initializes FeatureSteps' assertions with zero" do
+    Spinach::FeatureSteps.new.assertions.must_equal 0
+  end
 end

data/test/spinach/runner_test.rb

@@ -119,7 +119,50 @@ describe Spinach::Runner do
 
         runner.run.must_equal true
         feature.filename.must_equal filename
-        feature.line.must_equal line
+        feature.lines.must_equal [line]
+      end
+    end
+
+    describe "when lines set" do
+      let(:filename) { "features/cool_feature.feature" }
+      let(:line) { "12:24" }
+      let(:filenames) { ["#{filename}:#{line}"] }
+      let(:runner) { Spinach::Runner.new(filenames) }
+
+      before(:each) 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: [])
+      end
+
+      it "sets filename and lines on the feature" do
+        @feature_runner.stubs(:run).returns(true)
+        runner.run.must_equal true
+        @feature.filename.must_equal filename
+        @feature.lines.must_equal line.split(":").map(&:to_i)
+      end
+
+      it "returns false if it fails" do
+        @feature_runner.stubs(:run).returns(false)
+        runner.run.must_equal false
+      end
+
+      it "breaks with a failure when fail fast set" do
+        Spinach.config.stubs(:fail_fast).returns true
+        @feature_runner.stubs(:run).returns(false)
+        @feature_runner.expects(:run).never
+        runner.run.must_equal false
+      end
+
+      it "does not break when success when fail fast set" do
+        Spinach.config.stubs(:fail_fast).returns true
+        @feature_runner.stubs(:run).returns(true)
+        @feature_runner.expects(:run).returns true
+        runner.run.must_equal true
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.9.0
 platform: ruby
 authors:
 - Josep Jaume Rey
@@ -11,174 +11,174 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         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.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
 description: Spinach is a BDD framework on top of gherkin
@@ -193,11 +193,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .document
+- .gitignore
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -312,17 +312,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Spinach is a BDD framework on top of gherkin