spinach 0.3.1 → 0.3.2

data/.travis.yml

@@ -3,6 +3,5 @@ env:
 rvm:
   - 1.9.2
   - 1.9.3
-  - ruby-head
-  # - rbx-2.0
+  # - rbx
   # - jruby

data/Gemfile

@@ -9,6 +9,7 @@ group :test do
   gem 'guard'
   gem 'guard-minitest'
   gem 'guard-spinach'
+  gem 'capybara'
 end
 
 group :darwin do

data/README.markdown

@@ -1,4 +1,4 @@
-# Spinach - BDD framework on top of Gherkin [![Build Status](https://secure.travis-ci.org/codegram/spinach.png)](http://travis-ci.org/codegram/spinach)
+# Spinach - BDD framework on top of Gherkin [![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)
 
 Spinach is a high-level BDD framework that leverages the expressive
 [Gherkin language][gherkin] (used by [Cucumber][cucumber]) to help you define

data/features/rspec_compatibility.feature

@@ -3,6 +3,11 @@ Feature: RSpec compatibility
   As a RSpec developer
   I want spinach to detect my rspec failures as failures instead of errors
 
+  Scenario: Everything works as expected
+    Given I have a feature that should completely pass
+    When I run "spinach" with rspec
+    Then there should be no error
+
   Scenario: An expectation fails
     Given I have a feature with some failed expectations
     When I run "spinach" with rspec

data/features/steps/rspec_compatibility.rb

@@ -5,6 +5,24 @@ class RSpecCompatibility < Spinach::FeatureSteps
   include Integration::SpinachRunner
   include Integration::ErrorReporting
 
+  Given 'I have a feature that should completely pass' do
+    write_file('features/feature_without_failures.feature', """
+Feature: Feature without failures
+
+  Scenario: This scenario will pass
+    Then RSpec expectations and matchers are available
+""")
+
+    write_file('features/steps/rspec_feature.rb',
+               'class FeatureWithoutFailures < Spinach::FeatureSteps
+                  feature "Feature without failures"
+                  Then "RSpec expectations and matchers are available" do
+                    42.0.should be_within(0.2).of(42.1)
+                  end
+                end')
+    @feature = 'feature_without_failures'
+  end
+
   Given "I have a feature with some failed expectations" do
     write_file('features/feature_with_failures.feature', """
 Feature: Feature with failures

data/features/support/error_reporting.rb

@@ -5,11 +5,11 @@ module Integration
     include Filesystem
 
     def check_error_messages(n = 1)
-      @stderr.must_match /Failures \(1\)/
+      @stderr.must_match /Failures \(#{n}\)/
     end
 
     def check_backtrace(n = 1)
-      @stderr.must_match /Failures \(1\)/
+      @stderr.must_match /Failures \(#{n}\)/
       @stderr.must_match /gems.*(minitest|rspec).*assert_equal/
     end
   end

data/lib/spinach/feature_steps.rb

@@ -4,14 +4,27 @@ module Spinach
   class FeatureSteps
     include DSL
 
-    # Registers the feature class for later use.
-    #
-    # @param [Class] base
-    #   The host class.
-    #
-    # @api public
-    def self.inherited(base)
-      Spinach.feature_steps << base
+    class << self
+      # Registers the feature class for later use.
+      #
+      # @param [Class] base
+      #   The host class.
+      #
+      # @api public
+      def inherited(base)
+        Spinach.feature_steps << base
+      end
+
+      alias_method :include_private, :include
+
+      # Exposes the include method publicly so you can add more modules to it
+      # due its plastic nature.
+      #
+      # @example
+      #   Spinach::FeatureSteps.include Capybara::DSL
+      def include(*args)
+        include_private(*args)
+      end
     end
   end
 end

data/lib/spinach/frameworks/minitest.rb

@@ -1,4 +1,4 @@
 require 'minitest/spec'
 MiniTest::Spec.new nil if defined?(MiniTest::Spec)
 Spinach.config[:failure_exceptions] << MiniTest::Assertion
-Spinach::FeatureSteps.send(:include, MiniTest::Assertions)
+Spinach::FeatureSteps.include MiniTest::Assertions

data/lib/spinach/frameworks/rspec.rb

@@ -1 +1,2 @@
 Spinach.config[:failure_exceptions] << RSpec::Expectations::ExpectationNotMetError
+Spinach::FeatureSteps.include RSpec::Matchers

data/lib/spinach/generators/feature_generator.rb

@@ -33,7 +33,6 @@ module Spinach
       def generate
         result = StringIO.new
         result.puts "class #{Spinach::Support.camelize name} < Spinach::FeatureSteps"
-        result.puts "  feature \'#{Spinach::Support.escape_single_commas name}\'\n"
         generated_steps = steps.map do |step|
           step_generator = Generators::StepGenerator.new(step)
           step_generator.generate.split("\n").map do |line|

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spinach.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'fakefs'
-  gem.add_development_dependency 'minitest', '~> 2.8.0'
+  gem.add_development_dependency 'minitest', '~> 2.0'
   gem.add_development_dependency 'turn'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/test/spinach/capybara_test.rb

@@ -1,10 +1,14 @@
 require 'test_helper'
+require 'capybara'
+require 'rack/test'
 require 'spinach'
 require 'spinach/capybara'
 require 'sinatra'
 
 describe Spinach::FeatureSteps::Capybara do
   before do
+    Capybara.current_driver = :rack_test
+
     @sinatra_app = Sinatra::Application.new do
       get '/' do
         'Hello world!'

data/test/test_helper.rb

@@ -19,7 +19,6 @@ require 'fakefs/safe'
 require 'turn'
 
 require 'spinach'
-require 'spinach/capybara'
 
 module Kernel
   def capture_stdout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin-ruby
-  requirement: &2164870640 !ruby/object:Gem::Requirement
+  requirement: &70349778016000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164870640
+  version_requirements: *70349778016000
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &2164885300 !ruby/object:Gem::Requirement
+  requirement: &70349778019280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164885300
+  version_requirements: *70349778019280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164884680 !ruby/object:Gem::Requirement
+  requirement: &70349777935200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164884680
+  version_requirements: *70349777935200
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2164884200 !ruby/object:Gem::Requirement
+  requirement: &70349777559000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164884200
+  version_requirements: *70349777559000
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2164883660 !ruby/object:Gem::Requirement
+  requirement: &70349777661240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164883660
+  version_requirements: *70349777661240
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2164883000 !ruby/object:Gem::Requirement
+  requirement: &70349773533380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164883000
+  version_requirements: *70349773533380
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &2164882540 !ruby/object:Gem::Requirement
+  requirement: &70349773504080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164882540
+  version_requirements: *70349773504080
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2164881940 !ruby/object:Gem::Requirement
+  requirement: &70349773438720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164881940
+  version_requirements: *70349773438720
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2164881340 !ruby/object:Gem::Requirement
+  requirement: &70349773411420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164881340
+  version_requirements: *70349773411420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164880800 !ruby/object:Gem::Requirement
+  requirement: &70349773406720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164880800
+  version_requirements: *70349773406720
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2164880100 !ruby/object:Gem::Requirement
+  requirement: &70349773405900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,21 +134,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164880100
+  version_requirements: *70349773405900
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2164878420 !ruby/object:Gem::Requirement
+  requirement: &70349773405100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2164878420
+  version_requirements: *70349773405100
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2164933560 !ruby/object:Gem::Requirement
+  requirement: &70349773404240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,7 +156,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164933560
+  version_requirements: *70349773404240
 description: Spinach is a BDD framework on top of gherkin
 email:
 - info@codegram.com
@@ -268,21 +268,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2060161195994026194
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2060161195994026194
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Spinach is a BDD framework on top of gherkin