spinach 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e27f69c95b6fab263c314db8cb58a6bc3ff3f673
-  data.tar.gz: 75ec627bf23c84e1c13fe6ef364d8af40618cf42
+  metadata.gz: 5b707d1189dcf7e14b981a5c71720a2c5e15535c
+  data.tar.gz: c446d9797269a2a2ac125a6a38f13b4afa8573c8
 SHA512:
-  metadata.gz: af2d21ba883aaec463b738b5acd4a0d809981e94d722d65b0794285ea9b30eba4768ba9da98cdd1b2e5a3d0e2dfe53b8f2707e1cb4d95bcfca30b7421c1d99d5
-  data.tar.gz: 3dc41bafa156c3936e656bf60c3dce68f5d6322a8cf6da2fcf8332af32e9817bf527e343f5994b8562136bf34964f7bdceb44a9b66a7f08520af7bfd4bbe5363
+  metadata.gz: 3cb1779c57669967a3996b12e99359af58029e0447614bc6b08e4d97b2ce9a38fa1b301cba09a27d6e71a51f6da8c45d742c91de1f3c3edc2782a1720afb0020
+  data.tar.gz: 56d2b4fa3ebf70c65e9d5b19306171cd0c6be991a62c234053b824f261287212aeaef3705c97a1e705602e3d2e7c4e6972cb1013a4404798bc2ed29eb3f37895

data/.ruby-gemset

@@ -0,0 +1 @@
+spinach

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+== 0.8.2
+* upgrade to gherkin-ruby 0.3 in order to avoid naming conflicts when using at
+the same time spinach & cucumber (transitioning)
+
 == 0.8.1
 * bug fix
   * Requiring `spinach/capybara` now auto-includes Capybara's DSL

data/Rakefile

@@ -11,7 +11,7 @@ end
 
 desc 'Run spinach features'
 task :spinach do
-  exec "bundle exec spinach"
+  exec "bin/spinach"
 end
 
 task :default => [:test, :spinach]

data/lib/spinach/parser/visitor.rb

@@ -1,11 +1,11 @@
 module Spinach
   class Parser
-    # The Spinach Visitor traverses the output AST from the Gherkin parser and
+    # The Spinach Visitor traverses the output AST from the GherkinRuby parser and
     # populates its Feature with all the scenarios, tags, steps, etc.
     #
     # @example
     #
-    #   ast     = Gherkin.parse(File.read('some.feature')
+    #   ast     = GherkinRuby.parse(File.read('some.feature')
     #   visitor = Spinach::Parser::Visitor.new
     #   feature = visitor.visit(ast)
     #
@@ -20,7 +20,7 @@ module Spinach
         @feature = Feature.new
       end
 
-      # @param [Gherkin::AST::Feature] ast
+      # @param [GherkinRuby::AST::Feature] ast
       #   The AST root node to visit.
       #
       # @api public
@@ -31,7 +31,7 @@ module Spinach
 
       # Sets the feature name and iterates over the feature scenarios.
       #
-      # @param [Gherkin::AST::Feature] feature
+      # @param [GherkinRuby::AST::Feature] feature
       #   The feature to visit.
       #
       # @api public
@@ -48,7 +48,7 @@ module Spinach
 
       # Iterates over the steps.
       #
-      # @param [Gherkin::AST::Scenario] node
+      # @param [GherkinRuby::AST::Scenario] node
       #   The scenario to visit.
       #
       # @api public
@@ -65,7 +65,7 @@ module Spinach
 
       # Sets the scenario name and iterates over the steps.
       #
-      # @param [Gherkin::AST::Scenario] node
+      # @param [GherkinRuby::AST::Scenario] node
       #   The scenario to visit.
       #
       # @api public
@@ -87,7 +87,7 @@ module Spinach
 
       # Adds the tag to the current scenario.
       #
-      # @param [Gherkin::AST::Tag] node
+      # @param [GherkinRuby::AST::Tag] node
       #   The tag to add.
       #
       # @api public
@@ -97,7 +97,7 @@ module Spinach
 
       # Adds the step to the current scenario.
       #
-      # @param [Gherkin::AST::Step] step
+      # @param [GherkinRuby::AST::Step] step
       #   The step to add.
       #
       # @api public

data/lib/spinach/parser.rb

@@ -1,8 +1,8 @@
-require 'gherkin'
+require 'gherkin_ruby'
 require_relative 'parser/visitor'
 
 module Spinach
-  # Parser leverages Gherkin to parse the feature definition.
+  # Parser leverages GherkinRuby to parse the feature definition.
   #
   class Parser
     # @param [String] content
@@ -36,7 +36,7 @@ module Spinach
     #
     # @api public
     def parse
-      ast = Gherkin.parse(@content + "\n")
+      ast = GherkinRuby.parse(@content + "\n")
       Visitor.new.visit(ast)
     end
   end

data/lib/spinach/reporter/progress.rb

@@ -37,7 +37,7 @@ module Spinach
       # Adds a failing step to the output buffer.
       #
       # @param [Hash] step
-      #   The step in a JSON Gherkin format
+      #   The step in a JSON GherkinRuby format
       #
       # @param [Exception] failure
       #   The exception that caused the failure
@@ -51,7 +51,7 @@ module Spinach
       # Adds a step that has raised an error to the output buffer.
       #
       # @param [Hash] step
-      #   The step in a JSON Gherkin format
+      #   The step in a JSON GherkinRuby format
       #
       # @param [Exception] failure
       #   The exception that caused the failure
@@ -65,7 +65,7 @@ module Spinach
       # Adds an undefined step to the output buffer.
       #
       # @param [Hash] step
-      #   The step in a JSON Gherkin format
+      #   The step in a JSON GherkinRuby format
       #
       def on_undefined_step(step, failure, step_definitions = nil)
         output_step('U', :yellow)
@@ -76,7 +76,7 @@ module Spinach
       # Adds an undefined step to the output buffer.
       #
       # @param [Hash] step
-      #   The step in a JSON Gherkin format
+      #   The step in a JSON GherkinRuby format
       #
       def on_pending_step(step, failure)
         output_step('P', :yellow)
@@ -87,7 +87,7 @@ module Spinach
       # Adds a step that has been skipped to the output buffer.
       #
       # @param [Hash] step
-      #   The step that Gherkin extracts
+      #   The step that GherkinRuby extracts
       #
       def on_skipped_step(step, step_definitions = nil)
         output_step('~', :cyan)

data/lib/spinach/reporter/stdout.rb

@@ -24,7 +24,7 @@ module Spinach
       # Prints the feature name to the standard output
       #
       # @param [Hash] data
-      #   The feature in a JSON Gherkin format
+      #   The feature in a JSON GherkinRubyRuby format
       #
       def before_feature_run(feature)
         name = feature.name
@@ -34,7 +34,7 @@ module Spinach
       # Prints the scenario name to the standard ouput
       #
       # @param [Hash] data
-      #   The feature in a JSON Gherkin format
+      #   The feature in a JSON GherkinRubyRuby format
       #
       def before_scenario_run(scenario, step_definitions = nil)
         @max_step_name_length = scenario.steps.map(&:name).map(&:length).max if scenario.steps.any?
@@ -45,7 +45,7 @@ module Spinach
       # Adds an error report and re
       #
       # @param [Hash] data
-      #   The feature in a JSON Gherkin format
+      #   The feature in a JSON GherkinRubyRuby format
       #
       def after_scenario_run(scenario, step_definitions = nil)
         if scenario_error
@@ -71,7 +71,7 @@ module Spinach
       # Adds a failing step to the output buffer.
       #
       # @param [Hash] step
-      #   The step in a JSON Gherkin format
+      #   The step in a JSON GherkinRubyRuby format
       #
       # @param [Exception] failure
       #   The exception that caused the failure
@@ -85,7 +85,7 @@ module Spinach
       # Adds a step that has raised an error to the output buffer.
       #
       # @param [Hash] step
-      #   The step in a JSON Gherkin format
+      #   The step in a JSON GherkinRubyRuby format
       #
       # @param [Exception] failure
       #   The exception that caused the failure
@@ -99,7 +99,7 @@ module Spinach
       # Adds an undefined step to the output buffer.
       #
       # @param [Hash] step
-      #   The step in a JSON Gherkin format
+      #   The step in a JSON GherkinRubyRuby format
       #
       def on_undefined_step(step, failure, step_definitions = nil)
         output_step('?', step, :yellow)
@@ -110,7 +110,7 @@ module Spinach
       # Adds an undefined step to the output buffer.
       #
       # @param [Hash] step
-      #   The step in a JSON Gherkin format
+      #   The step in a JSON GherkinRubyRuby format
       #
       def on_pending_step(step, failure)
         output_step('P', step, :yellow)
@@ -144,7 +144,7 @@ module Spinach
       # Adds a step that has been skipped to the output buffer.
       #
       # @param [Hash] step
-      #   The step that Gherkin extracts
+      #   The step that GherkinRubyRuby extracts
       #
       def on_skipped_step(step, step_definitions = nil)
         output_step('~', step, :cyan)
@@ -157,7 +157,7 @@ module Spinach
       #   indicate if everything went ok or not).
       #
       # @param [Hash] step
-      #   The step in a JSON Gherkin format
+      #   The step in a JSON GherkinRubyRuby format
       #
       # @param [Symbol] color
       #   The color code to use with Colorize to colorize the output.

data/lib/spinach/runner/feature_runner.rb

@@ -7,7 +7,7 @@ module Spinach
     class FeatureRunner
       attr_reader :feature
 
-      # @param [Gherkin::AST::Feature] feature
+      # @param [GherkinRuby::AST::Feature] feature
       #   The feature to run.
       #
       # @param [#to_i] line
@@ -28,7 +28,7 @@ module Spinach
         @feature.name
       end
 
-      # @return [Array<Gherkin::AST::Scenario>]
+      # @return [Array<GherkinRuby::AST::Scenario>]
       #   The parsed scenarios for this runner's feature.
       #
       # @api public

data/lib/spinach/runner/scenario_runner.rb

@@ -3,7 +3,7 @@ module Spinach
     # A Scenario Runner handles a particular scenario run.
     #
     class ScenarioRunner
-      # @param [Gherkin::AST::Scenario] scenario
+      # @param [GherkinRuby::AST::Scenario] scenario
       #   The scenario.
       #
       # @api public
@@ -11,7 +11,7 @@ module Spinach
         @scenario = scenario
       end
 
-      # @return [Gherkin::AST::Feature>]
+      # @return [GherkinRuby::AST::Feature>]
       #   The feature containing the scenario.
       #
       # @api public
@@ -19,7 +19,7 @@ module Spinach
         @scenario.feature
       end
 
-      # @return [Array<Gherkin::AST::Step>]
+      # @return [Array<GherkinRuby::AST::Step>]
       #   An array of steps.
       #
       # @api public
@@ -68,7 +68,7 @@ module Spinach
 
       # Runs a particular step.
       #
-      # @param [Gherkin::AST::Step] step
+      # @param [GherkinRuby::AST::Step] step
       #   The step to be run.
       #
       # @api semipublic

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/spinach.rb

@@ -18,7 +18,7 @@ require_relative 'spinach/features'
 require_relative 'spinach/scenario'
 require_relative 'spinach/step'
 
-# Spinach is a BDD framework leveraging the great Gherkin language. This
+# Spinach is a BDD framework leveraging the great GherkinRuby language. This
 # language is the one used defining features in Cucumber, the BDD framework
 # Spinach is inspired upon.
 #

data/spinach.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Spinach is a BDD framework on top of gherkin}
   gem.homepage      = "http://github.com/codegram/spinach"
 
-  gem.add_runtime_dependency 'gherkin-ruby', '~> 0.2.1'
+  gem.add_runtime_dependency 'gherkin-ruby', '~> 0.3.0'
   gem.add_runtime_dependency 'colorize', '0.5.8'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'mocha'

data/test/spinach/capybara_test.rb

@@ -3,19 +3,18 @@ require 'capybara'
 require 'rack/test'
 require 'spinach'
 require 'spinach/capybara'
-require 'sinatra'
+require 'sinatra/base'
+
+class SinatraStubApp < Sinatra::Base
+  get '/' do
+    'Hello world!'
+  end
+end
 
 describe Spinach::FeatureSteps::Capybara do
   before do
     Capybara.current_driver = :rack_test
-
-    @sinatra_app = Sinatra::Application.new do
-      get '/' do
-        'Hello world!'
-      end
-    end
-
-    Capybara.app = @sinatra_app
+    Capybara.app = SinatraStubApp
 
     class TestFeature < Spinach::FeatureSteps
       include Spinach::FeatureSteps::Capybara

data/test/spinach/parser_test.rb

@@ -17,7 +17,7 @@ Feature: User authentication
 
   describe '#parse' do
     it 'parses the file' do
-      Gherkin.expects(:parse).returns ast = stub
+      GherkinRuby.expects(:parse).returns ast = stub
       Spinach::Parser::Visitor.stubs(:new).returns visitor = stub
       visitor.expects(:visit).with ast
       @parser.parse

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Josep Jaume Rey
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin-ruby
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +181,8 @@ extra_rdoc_files: []
 files:
 - .document
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -300,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Spinach is a BDD framework on top of gherkin

data/.rvmrc

@@ -1 +0,0 @@
-rvm --create use 2.0.0@spinach