spinach 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d4dfd21f14ba8e46aea298e002a3d894e272f83
-  data.tar.gz: e8ee42c24af4fe2cf4306a3dda1ef8d8cdd92384
+  metadata.gz: a4a7688b9f7af807e9ffa56dc81fbfcd284b5b15
+  data.tar.gz: 0b0da6bb8d6ea72ab5e51c9090c2d09f4fc0067d
 SHA512:
-  metadata.gz: edfb2aa8d0d3a27a0a99a8a8611d44b4a9c83d25faa81eecfad6b1e7d7f427afd4bc299b2cf589f5f418a08aa788c832aa798503e2bb2dc3c3cf3f3f01d1a8ae
-  data.tar.gz: 1294e78404e827d9326387ee4a7eb10653eb1cf899eab7375be413b0a330238c0c58be92c197a3792a46dbb9568b9fe57289216a5d762b6a6fdf618919b7aaed
+  metadata.gz: 4aab211a57a9c500aa89b02d277a75fa14801f60c869ab03d9f9bd723e9f2100778876f02cdeac6cacdf072de9fa28541ee77ad06dcec181b5c0c69d43122127
+  data.tar.gz: d5acad37f9c42283f34b73f631db893145bd2bcc9428f8f38c8f357f3c5adebd4f36eeef57894e516e4957949ba4191309b5337e8cdd1078069da3a4ecc2a724

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.1.0

data/.travis.yml

@@ -1,3 +1,7 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - rbx
+
+cache: bundler

data/Gemfile

@@ -10,7 +10,7 @@ group :test do
   gem 'guard'
   gem 'guard-minitest'
   gem 'guard-spinach'
-  gem 'capybara', '~> 2.0.0'
+  gem 'capybara'
   gem "rspec"
   gem 'fakefs'
 end
@@ -23,3 +23,5 @@ end
 group :docs do
   gem 'yard'
 end
+
+gem 'rubysl', :platforms => :rbx

data/README.markdown

@@ -4,6 +4,8 @@
 [![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.
@@ -324,6 +326,7 @@ 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)
+* [spring-commands-spinach](https://github.com/jvanbaarsen/spring-commands-spinach) (to be used with spring)
 
 ### Demos
 

data/features/support/env.rb

@@ -2,10 +2,10 @@ require 'minitest/spec'
 require_relative 'filesystem'
 
 require 'simplecov'
-require 'coveralls'
 
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-if ENV['CI']
+if ENV['CI'] && !defined?(Rubinius)
+  require 'coveralls'
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
   require 'simplecov'
 
   SimpleCov.start do

data/lib/spinach/capybara.rb

@@ -17,43 +17,43 @@ module Spinach
     #   end
     #
     module Capybara
-      # Enhances a FeatureSteps with Capybara goodness.
-      #
-      # @param [Class] base
-      #   The host class.
-      #
-      # @api public
-      def self.included(base)
-        base.class_eval do
-          include ::Capybara::DSL
-          if defined?(RSpec)
-            require 'rspec/matchers'
-            require 'capybara/rspec'
-            include ::Capybara::RSpecMatchers
-          end
+      class CapybaraDslDelegator
+        include ::Capybara::DSL
+        if defined?(RSpec)
+          require 'rspec/matchers'
+          require 'capybara/rspec'
+          include ::Capybara::RSpecMatchers
+        end
+      end
 
-          def visit(*args)
-            stream = STDOUT
-            old_stream = stream.dup
-            stream.reopen(null_device)
-            stream.sync = true
-            super
-          ensure
-            stream.reopen(old_stream)
-          end
+      def visit(*args)
+        stream = STDOUT
+        old_stream = stream.dup
+        stream.reopen(null_device)
+        stream.sync = true
+        instance.visit *args
+      ensure
+        stream.reopen(old_stream)
+      end
 
-          def null_device
-            return @null_device if defined?(@null_device)
+      def instance
+        @instance ||= CapybaraDslDelegator.new
+      end
 
-            if RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
-              @null_device = "NUL"
-            else
-              @null_device = "/dev/null"
-            end
+      def method_missing(m, *args)
+        instance.send m, *args
+      end
+
+      def null_device
+        return @null_device if defined?(@null_device)
 
-            @null_device
-          end
+        if RbConfig::CONFIG["host_os"] =~ /mingw|mswin/
+          @null_device = "NUL"
+        else
+          @null_device = "/dev/null"
         end
+
+        @null_device
       end
     end
   end

data/lib/spinach/feature.rb

@@ -3,6 +3,7 @@ module Spinach
     attr_accessor :line
     attr_accessor :name, :scenarios, :tags
     attr_accessor :background
+    attr_accessor :description
 
     def initialize
       @scenarios = []

data/lib/spinach/parser/visitor.rb

@@ -37,6 +37,7 @@ module Spinach
       # @api public
       def visit_Feature(node)
         @feature.name = node.name
+        @feature.description = node.description
         node.background.accept(self) if node.background
 
         @current_tag_set = @feature

data/lib/spinach/reporter/reporting.rb

@@ -34,7 +34,7 @@ module Spinach
       def report_undefined_steps
         if undefined_steps.any?
           error.puts "\nUndefined steps summary:\n"
-          report_errors('Undefined steps', undefined_steps, :yellow)
+          report_errors('Undefined steps', undefined_steps, :red)
         end
       end
 
@@ -47,9 +47,9 @@ module Spinach
 
       def report_undefined_features
         if undefined_features.any?
-          error.puts "  Undefined features (#{undefined_features.length})".light_yellow
+          error.puts "  Undefined features (#{undefined_features.length})".red
           undefined_features.each do |feature|
-            error.puts "    #{feature.name}".yellow
+            error.puts "    #{feature.name}".red
           end
         end
       end
@@ -108,7 +108,7 @@ module Spinach
         feature, scenario, step, exception = error
         summary = "    #{feature.name} :: #{scenario.name} :: #{full_step step}"
         if exception.kind_of?(Spinach::StepNotDefinedException)
-          summary.yellow
+          summary.red
         elsif exception.kind_of?(Spinach::StepPendingException)
           summary += "\n      Reason: '#{exception.reason}'\n"
           summary.yellow
@@ -133,10 +133,10 @@ module Spinach
 
         if exception.kind_of?(Spinach::StepNotDefinedException)
           output << "\n"
-          output << "        You can define it with: \n\n".yellow
+          output << "        You can define it with: \n\n".red
           suggestion = Generators::StepGenerator.new(step).generate
           suggestion.split("\n").each do |line|
-            output << "          #{line}\n".yellow
+            output << "          #{line}\n".red
           end
           output << "\n"
         elsif exception.kind_of?(Spinach::StepPendingException)
@@ -169,7 +169,7 @@ module Spinach
         }.join("\n")
 
         if exception.kind_of?(Spinach::StepNotDefinedException)
-          output.yellow
+          output.red
         elsif exception.kind_of?(Spinach::StepPendingException)
           output.yellow
         else
@@ -215,12 +215,12 @@ module Spinach
       #
       def run_summary
         successful_summary = format_summary(:green,  successful_steps, 'Successful')
-        undefined_summary  = format_summary(:yellow, undefined_steps,  'Undefined')
+        undefined_summary  = format_summary(:red,    undefined_steps,  'Undefined')
         pending_summary    = format_summary(:yellow, pending_steps,    'Pending')
         failed_summary     = format_summary(:red,    failed_steps,     'Failed')
         error_summary      = format_summary(:red,    error_steps,      'Error')
 
-        out.puts "Steps Summary: #{successful_summary}, #{undefined_summary}, #{pending_summary}, #{failed_summary}, #{error_summary}\n\n"
+        out.puts "Steps Summary: #{successful_summary}, #{pending_summary}, #{undefined_summary}, #{failed_summary}, #{error_summary}\n\n"
         out.puts "Finished in #{Time.now - @start_time} seconds" if @start_time
       end
     end

data/lib/spinach/reporter/stdout.rb

@@ -102,7 +102,7 @@ module Spinach
       #   The step in a JSON GherkinRubyRuby format
       #
       def on_undefined_step(step, failure, step_definitions = nil)
-        output_step('?', step, :yellow)
+        output_step('?', step, :red)
         self.scenario_error = [current_feature, current_scenario, step, failure]
         undefined_steps << scenario_error
       end
@@ -134,7 +134,7 @@ module Spinach
         lines << generator.generate
 
         lines.split("\n").each do |line|
-          out.puts "    #{line}".yellow
+          out.puts "    #{line}".red
         end
         out.puts "\n\n"
 

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

data/spinach.gemspec

@@ -12,10 +12,11 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'gherkin-ruby', '>= 0.3.1'
   gem.add_runtime_dependency 'colorize', '0.5.8'
+  gem.add_runtime_dependency 'json'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'sinatra'
-  gem.add_development_dependency 'capybara', '~> 2.0.0'
+  gem.add_development_dependency 'capybara'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rspec'

data/test/spinach/capybara_test.rb

@@ -5,16 +5,18 @@ require 'spinach'
 require 'spinach/capybara'
 require 'sinatra/base'
 
-class SinatraStubApp < Sinatra::Base
-  get '/' do
-    'Hello world!'
+describe Spinach::FeatureSteps::Capybara do
+  let(:sinatra_class) do
+    Class.new(Sinatra::Base) do
+      get '/' do
+        'Hello world!'
+      end
+    end
   end
-end
 
-describe Spinach::FeatureSteps::Capybara do
   before do
     Capybara.current_driver = :rack_test
-    Capybara.app = SinatraStubApp
+    Capybara.app = sinatra_class
 
     class TestFeature < Spinach::FeatureSteps
       include Spinach::FeatureSteps::Capybara
@@ -46,18 +48,26 @@ Feature: A test feature
   Scenario: Another test scenario
     Given Hello
     Then Goodbye
-""").parse
+                                             """).parse
   }
 
   let(:failing_feature) { Spinach::Parser.new("""
 Feature: A test feature
   Scenario: A test scenario
     Given Fail
-""").parse
+                                              """).parse
   }
 
-  it 'includes capybara into all features' do
-    @feature.kind_of?(Capybara::DSL).must_equal true
+  it 'responds to Capybara::DSL methods' do
+    @feature.respond_to?(:page).must_equal false
+  end
+
+  it 'does not respond to non Capybara::DSL methods' do
+    @feature.respond_to?(:strange).must_equal false
+  end
+
+  it 'raises NoMethodError when calling a non Capybara::DSL methods' do
+    proc { @feature.strange }.must_raise(NoMethodError)
   end
 
   it 'goes to a capybara page and returns its result' do

data/test/spinach/parser/visitor_test.rb

@@ -29,6 +29,7 @@ module Spinach
           @node  = stub(
             scenarios: @scenarios,
             name: 'Go shopping',
+            description: ['some non-interpreted info','from the description'],
             background: @background,
             tags: @tags
           )
@@ -39,6 +40,11 @@ module Spinach
           visitor.feature.name.must_equal 'Go shopping'
         end
 
+        it 'sets the description' do
+          visitor.visit_Feature(@node)
+          visitor.feature.description.must_equal ['some non-interpreted info','from the description']
+        end
+
         it 'sets the tags' do
           @tags.each do |step|
             step.expects(:accept).with visitor

data/test/spinach/parser_test.rb

@@ -4,6 +4,9 @@ describe Spinach::Parser do
   before do
     @contents = """
 Feature: User authentication
+  As a developer
+  I expect some stuff
+  So that I have it
 
   Scenario: User logs in
     Given I am on the front page
@@ -22,6 +25,11 @@ Feature: User authentication
       visitor.expects(:visit).with ast
       @parser.parse
     end
+
+    it 'includes description text in the feature' do
+      feature = @parser.parse
+      feature.description.must_equal ['As a developer', 'I expect some stuff', 'So that I have it']
+    end
   end
 
   describe '.open_file' do
@@ -31,4 +39,5 @@ Feature: User authentication
         'feature_definition.feature')
     end
   end
+
 end

data/test/spinach/reporter/stdout/error_reporting_test.rb

@@ -3,7 +3,11 @@
 require_relative '../../../test_helper'
 
 describe Spinach::Reporter::Stdout do
-  let(:exception) { StandardError.new('Something went wrong') }
+  let(:exception) do
+    mock "exception" do
+      stubs(:message).returns "Something went wrong"
+    end
+  end
 
   let(:error) do
     [stub(name: 'My feature'),
@@ -93,7 +97,7 @@ describe Spinach::Reporter::Stdout do
       it 'outputs the failing steps' do
         steps = [anything]
         @reporter.stubs(:undefined_steps).returns(steps)
-        @reporter.expects(:report_errors).with('Undefined steps', steps, :yellow)
+        @reporter.expects(:report_errors).with('Undefined steps', steps, :red)
 
         @reporter.report_undefined_steps
       end
@@ -216,11 +220,11 @@ describe Spinach::Reporter::Stdout do
     end
 
     describe 'when given an undefined step exception' do
-      it 'prints the error in yellow' do
+      it 'prints the error in red' do
         undefined_error = error
         undefined_error.insert(3, Spinach::StepNotDefinedException.new(anything))
 
-        String.any_instance.expects(:yellow)
+        String.any_instance.expects(:red)
 
         @reporter.summarized_error(error)
       end
@@ -288,10 +292,10 @@ describe Spinach::Reporter::Stdout do
     end
 
     describe 'when given an undefined step exception' do
-      it 'prints the error in yellow' do
+      it 'prints the error in red' do
         undefined_exception = Spinach::StepNotDefinedException.new(stub(name: 'some step'))
 
-        String.any_instance.expects(:yellow)
+        String.any_instance.expects(:red)
 
         @reporter.report_exception(undefined_exception)
       end

data/test/spinach/reporter/stdout_test.rb

@@ -48,8 +48,6 @@ describe Spinach::Reporter::Stdout do
 
   describe '#after_scenario_run' do
     describe 'in case of error' do
-      let(:exception) { anything }
-
       before do
         @reporter.scenario_error = exception
       end

data/test/spinach/runner_test.rb

@@ -151,7 +151,7 @@ describe Spinach::Runner do
         ['features/steps/a.rb', 'features/steps/a/a.rb', 'features/steps/z.rb', 'features/steps/z/z.rb'].each do |f|
           FileUtils.touch(f)
         end
-        runner.required_files.must_equal(['features/steps/a/a.rb', 'features/steps/z/z.rb', 'features/steps/a.rb', 'features/steps/z.rb'])
+        runner.required_files.must_equal(['/features/steps/a/a.rb', '/features/steps/z/z.rb', '/features/steps/a.rb', '/features/steps/z.rb'])
       end
     end
 

data/test/test_helper.rb

@@ -2,7 +2,7 @@ require 'simplecov'
 require 'coveralls'
 
 SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-if ENV['CI']
+if ENV['CI'] && !defined?(Rubinius)
   require 'simplecov'
 
   SimpleCov.start do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Josep Jaume Rey
@@ -11,20 +11,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2014-04-04 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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
@@ -41,116 +41,130 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.8
+- !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: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '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: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        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: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Spinach is a BDD framework on top of gherkin
@@ -165,11 +179,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
@@ -284,17 +298,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.1.9
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Spinach is a BDD framework on top of gherkin