spinach 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66296e07e2af7b9daa268623eb0e59ac1e90ee16855a3baf9eb63801be1338d2
-  data.tar.gz: b2239f90a08a88a7b9c0ca93d16103b816249122c60176ea094405f8d1f8ebf8
+  metadata.gz: 13ae199ec9413a41d2f1ea007433f4ca9acf8750811468e320927c55cc6ae80d
+  data.tar.gz: 37383a9a6e243a01d113cbe64139ce7119af7c571dcb12589846b8737115ac9e
 SHA512:
-  metadata.gz: 909a2ec0656f8991d9ab05a3a26864544da914475de5d8205ada4a20b3041c8cddb81d33319329252a440ec53e32852ff2daf0a0364fe9d87b2c1bff815725c4
-  data.tar.gz: b08372a0eb16eb49f0ca4972f8a412307ea9cd0eba8eab48c848ff849700bad2dc79444f6eb73d3830ed67941c0ce3efa44803658aa71da453a10fa00fa114c1
+  metadata.gz: 16007d35b6d52765c78a9e82e7f08e484d6d8f6ddc8ff4de765472ec11c7e236d6dd92de7cb5e89f8d8bda7ddc042fddbc2480ba92b00793784ca5d2d22c0e12
+  data.tar.gz: ff6aad6deac02d61cf3f932afacf62bedb0f16aaa07e415ea1a675c7ac79e815d030ebb86f039e4d726bd5481226f12326c9d9060d0c4f999c820e5226a1a118

data/.github/workflows/ci.yml

@@ -17,15 +17,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.4, 2.5, 2.6, 2.7, jruby]
+        ruby: [2.4, 2.5, 2.6, 2.7, "3.0", 3.1, 3.2, jruby]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1
-      - uses: ruby/setup-ruby@master
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: bundle install --jobs 4 --retry 3
-        name: Install Ruby deps
+          bundler-cache: true
       - run: bundle exec rake

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+3.2.0

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.1

data/Gemfile

@@ -3,7 +3,6 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in spinach.gemspec
 gemspec
 
-gem 'coveralls', require: false
 gem 'pry-byebug', platforms: [:ruby]
 
 group :docs do

data/README.markdown

@@ -2,8 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/spinach.svg)](https://badge.fury.io/rb/spinach)
 ![Tests](https://github.com/codegram/spinach/workflows/Tests/badge.svg)
-[![Coverage Status](https://coveralls.io/repos/codegram/spinach/badge.png?branch=master)](https://coveralls.io/r/codegram/spinach)
-![](https://ruby-gem-downloads-badge.herokuapp.com/rails)
 
 Spinach is a high-level BDD framework that leverages the expressive
 [Gherkin language][gherkin] (used by [Cucumber][cucumber]) to help you define
@@ -17,7 +15,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 Ruby MRI **2.4, 2.5, 2.6 and 2.7** as well as **latest JRuby 9000**.
+Spinach is tested against Ruby MRI **2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2** as well as **JRuby **.
 
 ## Getting started
 
@@ -238,19 +236,19 @@ Feature: So something great
   Scenario: Ensure no regression on this
 ```
 
-Then you can run all Scenarios in your suite related to `@feat-1` using:
+Then you can run all Scenarios in your suite tagged `@feat-1` using:
 
 ```shell
 $ spinach --tags @feat-1
 ```
 
-Or only Scenarios related to `@feat-1` and `@bug-12` using:
+Or only Scenarios tagged either `@feat-1` or `@bug-12` using:
 
 ```shell
 $ spinach --tags @feat-1,@bug-12
 ```
 
-Or only Scenarios related to `@feat-1` excluding `@bug-12` using:
+Or only Scenarios tagged `@feat-1` that aren't tagged `@bug-12` using:
 
 ```shell
 $ spinach --tags @feat-1,~@bug-12
@@ -380,7 +378,7 @@ You can easily contribute to Spinach. Its codebase is simple and
 
 ## License
 
-MIT (Expat) License. Copyright 2011-2016 [Codegram Technologies](http://codegram.com)
+MIT (Expat) License. Copyright 2011-2023 [Codegram Technologies](http://codegram.com)
 
 [gherkin]: http://github.com/codegram/gherkin-ruby
 [cucumber]: http://github.com/cucumber/cucumber

data/bin/spinach

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 begin
-  require "bundler/setup" 
+  require "bundler/setup"
 rescue LoadError
 end
 

data/features/feature_hooks_and_tags.feature

@@ -0,0 +1,22 @@
+Feature: Feature Hooks and Tags
+  In order to run only the appropriate setup and teardown code
+  As a developer
+  I want spinach to only run feature hooks if those features would be run under the tags I provided
+
+  Scenario: No tags specified
+    Given I have a tagged feature with an untagged scenario
+    And I have an untagged feature with a tagged scenario
+    When I don't specify tags
+    Then all the feature hooks should have run
+
+  Scenario: Tags specified
+    Given I have a tagged feature with an untagged scenario
+    And I have an untagged feature with a tagged scenario
+    When I specify a tag the features and scenarios are tagged with
+    Then all the feature hooks should have run
+
+  Scenario: Tags excluded
+    Given I have a tagged feature with an untagged scenario
+    And I have an untagged feature with a tagged scenario
+    When I exclude a tag the features and scenarios are tagged with
+    Then no feature hooks should have run

data/features/steps/automatic_feature_generation.rb

@@ -20,7 +20,7 @@ Feature: Cheezburger can I has
   Then 'I a feature should exist named "features/steps/cheezburger_can_i_has.rb"' do
     in_current_dir do
       @file = 'features/steps/cheezburger_can_i_has.rb'
-      File.exists?(@file).must_equal true
+      File.exist?(@file).must_equal true
     end
   end
 

data/features/steps/feature_hooks_and_tags.rb

@@ -0,0 +1,55 @@
+class Spinach::Features::FeatureHooksAndTags < Spinach::FeatureSteps
+  include Integration::SpinachRunner
+
+  step 'I have a tagged feature with an untagged scenario' do
+    write_file 'features/a.feature', <<-FEATURE
+@tag
+Feature: A
+  Scenario: A1
+    Then a1
+    FEATURE
+
+    write_file 'features/steps/a.rb', <<-STEPS
+class Spinach::Features::A < Spinach::FeatureSteps
+  step 'a1' do; end
+end
+    STEPS
+  end
+
+  step 'I have an untagged feature with a tagged scenario' do
+    write_file 'features/b.feature', <<-FEATURE
+Feature: B
+  @tag
+  Scenario: B1
+    Then b1
+    FEATURE
+
+    write_file 'features/steps/b.rb', <<-STEPS
+class Spinach::Features::B < Spinach::FeatureSteps
+  step 'b1' do; end
+end
+    STEPS
+  end
+
+  step "I don't specify tags" do
+    run_spinach
+  end
+
+  step 'I specify a tag the features and scenarios are tagged with' do
+    run_spinach({append: "--tags @tag"})
+  end
+
+  step 'I exclude a tag the features and scenarios are tagged with' do
+    run_spinach({append: "--tags ~@tag"})
+  end
+
+  step 'all the feature hooks should have run' do
+    @stdout.must_match("Feature: A")
+    @stdout.must_match("Feature: B")
+  end
+
+  step 'no feature hooks should have run' do
+    @stdout.wont_match("Feature: A")
+    @stdout.wont_match("Feature: B")
+  end
+end

data/features/support/env.rb

@@ -1,19 +1,6 @@
 require 'minitest/autorun'
 require 'minitest/spec'
 require_relative 'filesystem'
-require 'simplecov'
-
-if ENV['CI'] && !defined?(Rubinius)
-  require 'coveralls'
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-  require 'simplecov'
-
-  SimpleCov.start do
-    add_filter '/test/'
-    add_filter '/features/'
-  end
-end
-
 
 Spinach.hooks.after_scenario do |scenario|
   FileUtils.rm_rf(Filesystem.dirs)

data/lib/spinach/cli.rb

@@ -56,7 +56,7 @@ module Spinach
 
       @args.each do |arg|
         if arg.match(/\.feature/)
-          if File.exists? arg.gsub(/:\d*/, '')
+          if File.exist? arg.gsub(/:\d*/, '')
             files_to_run << arg
           else
             fail! "#{arg} could not be found"

data/lib/spinach/runner.rb

@@ -151,7 +151,7 @@ module Spinach
     end
 
     def features_to_run
-      unordered_features = filenames.map do |filename|
+      unordered_features = filenames.reduce([]) do |features, filename|
         file, *lines = filename.split(":") # little more complex than just a "filename"
 
         # FIXME Feature should be instantiated directly, not through an unrelated class method
@@ -160,7 +160,9 @@ module Spinach
 
         feature.lines_to_run = lines if lines.any?
 
-        feature
+        features << feature if TagsMatcher.match_feature(feature)
+
+        features
       end
 
       orderer.order(unordered_features)

data/lib/spinach/tags_matcher.rb

@@ -6,9 +6,9 @@ module Spinach
     class << self
 
       # Matches an array of tags (e.g. of a scenario) against the tags present
-      # in Spinach' runtime options.
+      # in Spinach's runtime options.
       #
-      # Spinach' tag option is an array which consists of (possibly) multiple
+      # Spinach's tag option is an array which consists of (possibly) multiple
       # arrays containing tags provided by the user running the features and
       # scenarios. Each of these arrays is considered a tag group.
       #
@@ -23,6 +23,15 @@ module Spinach
         }
       end
 
+      # Matches the tags of a feature (and its scenarios) against the tags present
+      # in Spinach's runtime options.
+      #
+      # A feature matches when, for any of its scenarios, the combination of the
+      # feature's tags and that scenario's tags match the configured tags.
+      def match_feature(feature)
+        feature.scenarios.any? { |scenario| match(feature.tags + scenario.tags) }
+      end
+
       private
 
       def tag_groups

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/spinach.gemspec

@@ -3,8 +3,7 @@ require File.expand_path('../lib/spinach/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Josep Jaume Rey", "Josep M. Bach", "Oriol Gual", "Marc Divins Castellvi"]
-  gem.email         = ["info@codegram.com", "josep.m.bach@gmail.com",
-    "oriolgual@gmail.com", "josepjaume@gmail.com", "marcdivc@gmail.com"]
+  gem.email         = ["josep.m.bach@gmail.com", "oriolgual@gmail.com", "josepjaume@gmail.com", "marcdivc@gmail.com"]
   gem.description   = %q{Spinach is a BDD framework on top of gherkin}
   gem.summary       = %q{Spinach is a BDD framework on top of gherkin}
   gem.homepage      = "http://github.com/codegram/spinach"
@@ -12,13 +11,11 @@ Gem::Specification.new do |gem|
 
   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', "~> 1.5.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', '< 5.0'
   gem.add_development_dependency 'fakefs', ">= 0.5.2"

data/test/spinach/cli_test.rb

@@ -276,14 +276,14 @@ tags:
       describe 'the feature really exists' do
         it 'runs the feature' do
           cli = Spinach::Cli.new(['features/some_feature.feature'])
-          File.stubs(:exists?).returns(true)
+          File.stubs(:exist?).returns(true)
           cli.feature_files.must_equal ['features/some_feature.feature']
         end
       end
 
       it 'it fails if the feature does not exist' do
         cli = Spinach::Cli.new(['features/some_feature.feature'])
-        File.stubs(:exists?).returns(false)
+        File.stubs(:exist?).returns(false)
         cli.expects(:fail!).with('features/some_feature.feature could not be found')
 
         cli.feature_files
@@ -293,7 +293,7 @@ tags:
     describe 'when a particular feature list is passed with line' do
       it 'returns the feature with the line number' do
         cli = Spinach::Cli.new(['features/some_feature.feature:10'])
-        File.stubs(:exists?).returns(true)
+        File.stubs(:exist?).returns(true)
 
         cli.feature_files.must_equal ['features/some_feature.feature:10']
       end
@@ -302,7 +302,7 @@ tags:
     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)
+        File.stubs(:exist?).returns(true)
 
         cli.feature_files.must_equal ["features/some_feature.feature:10:20"]
       end
@@ -337,7 +337,7 @@ tags:
           Dir.expects(:glob).with('path/to/features/**/*.feature')
           .returns(['several features'])
 
-          File.stubs(:exists?).returns(true)
+          File.stubs(:exist?).returns(true)
 
           cli.feature_files.must_equal ['several features', 'some_feature.feature']
         end

data/test/spinach/dsl_test.rb

@@ -157,7 +157,7 @@ describe Spinach::DSL do
         end
 
         @feature.new.step_location_for('I say goodbye').first.must_include '/dsl_test.rb'
-        @feature.new.step_location_for('I say goodbye').last.must_be_kind_of Fixnum
+        @feature.new.step_location_for('I say goodbye').last.must_be_kind_of Integer
       end
     end
   end

data/test/spinach/generators/feature_generator_test.rb

@@ -71,7 +71,7 @@ Feature: Cheezburger can I has
         in_current_dir do
           subject.store
           File.directory?("features/steps/").must_equal true
-          File.exists?("features/steps/cheezburger_can_i_has.rb").must_equal true
+          File.exist?("features/steps/cheezburger_can_i_has.rb").must_equal true
           File.read("features/steps/cheezburger_can_i_has.rb").strip.must_equal(
             subject.generate.strip
           )

data/test/spinach/reporter_test.rb

@@ -89,8 +89,8 @@ module Spinach
 
         it "binds a callback around every scenario" do
           @reporter.expects(:around_scenario_run)
-          Spinach.hooks.run_around_scenario(anything) do
-            yield
+          Spinach.hooks.run_around_scenario(anything) do |&block|
+            block.call
           end
         end
 

data/test/spinach/runner_test.rb

@@ -77,15 +77,21 @@ describe Spinach::Runner do
   describe '#run' do
     before(:each) do
       @feature_runner = stub
+      @feature_runner.stubs(:run).returns(true)
+
       filenames.each do |filename|
-        Spinach::Parser.stubs(:open_file).with(filename).returns parser = stub
-        parser.stubs(:parse).returns feature = Spinach::Feature.new
+        parser = stub
+        Spinach::Parser.stubs(:open_file).with(filename).returns(parser)
+
+        feature = Spinach::Feature.new
+        feature.scenarios << Spinach::Scenario.new(feature)
+        parser.stubs(:parse).returns(feature)
+
         Spinach::Runner::FeatureRunner.stubs(:new).
           with(feature, anything).
           returns(@feature_runner)
       end
 
-      @feature_runner.stubs(:run).returns(true)
       runner.stubs(required_files: [])
     end
 
@@ -133,12 +139,18 @@ describe Spinach::Runner do
       let(:runner) { Spinach::Runner.new(filenames) }
 
       before(:each) do
+        parser = stub
+        Spinach::Parser.stubs(:open_file).with(filename).returns(parser)
+
+        @feature = Spinach::Feature.new
+        @feature.scenarios << Spinach::Scenario.new(@feature)
+        parser.stubs(:parse).returns(@feature)
+
         @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
 
@@ -174,8 +186,13 @@ describe Spinach::Runner do
 
       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 = Spinach::Feature.new
+          parser = stub
+          Spinach::Parser.stubs(:open_file).with(filename).returns(parser)
+
+          feature = Spinach::Feature.new
+          feature.scenarios << Spinach::Scenario.new(feature)
+          parser.stubs(:parse).returns(feature)
+
           Spinach::Runner::FeatureRunner.stubs(:new).
             with(feature, anything).
             returns(feature_runners[i])

data/test/test_helper.rb

@@ -1,16 +1,3 @@
-require 'simplecov'
-require 'coveralls'
-
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-if ENV['CI'] && !defined?(Rubinius)
-  require 'simplecov'
-
-  SimpleCov.start do
-    add_filter '/test/'
-    add_filter '/features/'
-  end
-end
-
 require 'minitest/autorun'
 require 'minitest/spec'
 require 'mocha/minitest'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Josep Jaume Rey
 - Josep M. Bach
 - Oriol Gual
 - Marc Divins Castellvi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin-ruby
@@ -41,20 +41,6 @@ dependencies:
     - - ">="
       - !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
@@ -125,20 +111,6 @@ dependencies:
     - - ">="
       - !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
@@ -183,7 +155,6 @@ dependencies:
         version: 0.5.2
 description: Spinach is a BDD framework on top of gherkin
 email:
-- info@codegram.com
 - josep.m.bach@gmail.com
 - oriolgual@gmail.com
 - josepjaume@gmail.com
@@ -198,6 +169,7 @@ files:
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".tool-versions"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -211,6 +183,7 @@ files:
 - features/before_and_after_hooks_inheritance.feature
 - features/exit_status.feature
 - features/fail_fast.feature
+- features/feature_hooks_and_tags.feature
 - features/feature_name_guessing.feature
 - features/pending_steps.feature
 - features/randomization.feature
@@ -229,6 +202,7 @@ files:
 - features/steps/before_and_after_hooks_inheritance.rb
 - features/steps/exit_status.rb
 - features/steps/fail_fast_option.rb
+- features/steps/feature_hooks_and_tags.rb
 - features/steps/feature_name_guessing.rb
 - features/steps/pending_steps.rb
 - features/steps/randomizing_features_scenarios.rb
@@ -321,7 +295,7 @@ homepage: http://github.com/codegram/spinach
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -336,8 +310,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: Spinach is a BDD framework on top of gherkin
 test_files:
@@ -347,6 +321,7 @@ test_files:
 - features/before_and_after_hooks_inheritance.feature
 - features/exit_status.feature
 - features/fail_fast.feature
+- features/feature_hooks_and_tags.feature
 - features/feature_name_guessing.feature
 - features/pending_steps.feature
 - features/randomization.feature
@@ -365,6 +340,7 @@ test_files:
 - features/steps/before_and_after_hooks_inheritance.rb
 - features/steps/exit_status.rb
 - features/steps/fail_fast_option.rb
+- features/steps/feature_hooks_and_tags.rb
 - features/steps/feature_name_guessing.rb
 - features/steps/pending_steps.rb
 - features/steps/randomizing_features_scenarios.rb