turnip 1.3.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f374c37f9f2fcb45274efc7e2cebfb164a2afbca
-  data.tar.gz: b99dc0745a12e0cf34dd7883ddd162bfbac073cd
+  metadata.gz: e13764190ae64991bef56ee17f874dd70b34a43c
+  data.tar.gz: 0194234d5c5560fcae6ed4ec1f98c4127e273473
 SHA512:
-  metadata.gz: af3a06dd948d386dde7c022297c7f60fcff8a137548bc64edb2a521576b2b7a8fb294d99f81c4ac734116112c3cd4b35692836d782df477bb918bc4cea49c255
-  data.tar.gz: 024480e1a6fbe196f41f55f76b70bab698219f30d336f374c7b0e2224f14005f1c3d2ce13c6f8eb568bbad2af59440d7b669b23205e9d6899e7d6a0b3d0a2180
+  metadata.gz: 17511f911bcba948491f6cb3f8db9b64492c41c85d497f9f4dc442ba52895a86e34b581e01dfec77a55b2104ba34d8b42ada890af8a3a44066e7083daf10495c
+  data.tar.gz: 087b15c4ceddaab438898380f5c20f8cec905a253858275c697d3c634dc291c9adb9a8a85b66f1131b9e4859043894e0413bedc6a68eb5c7390ebf1f0fc2c873

data/.travis.yml

@@ -6,22 +6,23 @@ cache: bundler
 branches:
   only:
     - master
+    - 2_0_0_rc1
 
 matrix:
   allow_failures:
     - gemfile: Gemfile
+    - gemfile: gemfiles/Gemfile-rspec-3.2.x
     - rvm: ruby-head
+
 rvm:
- - 2.0.0
- - 2.1
- - 2.2
- - ruby-head
- - jruby-19mode
+  - 2.0.0
+  - 2.1
+  - 2.2
+  - ruby-head
+  - jruby-19mode
+
 gemfile:
-- Gemfile
-- gemfiles/Gemfile-rspec-2.14.x
-- gemfiles/Gemfile-rspec-2.99.x
-- gemfiles/Gemfile-rspec-3.0.x
-- gemfiles/Gemfile-rspec-3.1.x
-- gemfiles/Gemfile-rspec-3.2.x
-- gemfiles/Gemfile-rspec-3.3.x
+  - Gemfile
+  - gemfiles/Gemfile-rspec-3.2.x
+  - gemfiles/Gemfile-rspec-3.3.x
+  - gemfiles/Gemfile-rspec-3.4.x

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in turnip.gemspec
 gemspec

data/README.md

@@ -44,10 +44,30 @@ exist), and add the following line:
 Pull requests are very welcome (and even better than bug reports)!
 Please create a topic branch for every separate change you make.
 
-## Compatibility and support
+## Compatibility and support policy
+
+### 1. Ruby
+
+- Support Ruby 2.x
+- Does not support Ruby 1.9.X
+- Does not work on Ruby 1.8.X
+
+### 2. RSpec
+
+In accordance with the RSpec support policy https://github.com/jnicklas/turnip/issues/158#issuecomment-119049054
+
+- Support RSpec 3.x **the latest or one version before**
+- Does not support **two version before the latest or earlier**
+- Does not work on **RSpec 2 or earlier**
+
+Example `If the latest version is 3.4.x`:
+
+- Support `3.4.x`
+- Support `3.3.x`
+- Does not support `3.2.x`
+- Does not support `3.1.x`
+- Does not support `2.x.y`
 
-- Does not work on Ruby 1.8.X.
-- Does not support Ruby 1.9.X.
 
 ## Usage
 

data/gemfiles/Gemfile-rspec-3.2.x

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in turnip.gemspec
 gemspec :path => '..'

data/gemfiles/Gemfile-rspec-3.3.x

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in turnip.gemspec
 gemspec :path => '..'

data/gemfiles/{Gemfile-rspec-2.14.x → Gemfile-rspec-3.4.x}

@@ -1,6 +1,6 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in turnip.gemspec
 gemspec :path => '..'
 
-gem 'rspec', '~> 2.14.0'
+gem 'rspec', '~> 3.4.0'

data/lib/turnip/capybara.rb

@@ -2,8 +2,7 @@ require 'capybara/rspec'
 
 RSpec.configure do |config|
   config.before do
-    current_example = RSpec.current_example if RSpec.respond_to?(:current_example)
-    current_example ||= example
+    current_example = RSpec.current_example
 
     if self.class.include?(Capybara::DSL) and current_example.metadata[:turnip]
       Capybara.current_driver = Capybara.javascript_driver if current_example.metadata.has_key?(:javascript)

data/lib/turnip/rspec.rb

@@ -45,8 +45,7 @@ module Turnip
             step(step)
           EOS
         rescue Turnip::Pending => e
-          # This is kind of a hack, but it will make RSpec throw way nicer exceptions
-          example = Turnip::RSpec.fetch_current_example(self)
+          example = ::RSpec.current_example
           example.metadata[:line_number] = step.line
           example.metadata[:location] = "#{example.metadata[:file_path]}:#{step.line}"
 
@@ -55,11 +54,7 @@ module Turnip
             raise
           end
 
-          if ::RSpec::Version::STRING >= '2.99.0'
-            skip("No such step: '#{e}'")
-          else
-            pending("No such step: '#{e}'")
-          end
+          skip("No such step: '#{e}'")
         rescue StandardError, ::RSpec::Expectations::ExpectationNotMetError => e
           e.backtrace.push "#{feature_file}:#{step.line}:in `#{step.description}'"
           raise e
@@ -68,14 +63,6 @@ module Turnip
     end
 
     class << self
-      def fetch_current_example(context)
-        if ::RSpec.respond_to?(:current_example)
-          ::RSpec.current_example
-        else
-          context.example
-        end
-      end
-
       def run(feature_file)
         Turnip::Builder.build(feature_file).features.each do |feature|
           instance_eval <<-EOS, feature_file, feature.line

data/lib/turnip/version.rb

@@ -1,3 +1,3 @@
 module Turnip
-  VERSION = '1.3.1'
+  VERSION = '2.0.0'
 end

data/turnip.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "rspec", [">=2.14.0", "<4.0"]
+  s.add_runtime_dependency "rspec", [">=3.0", "<4.0"]
   s.add_runtime_dependency "gherkin", ">= 2.5"
   s.add_development_dependency "rake"
   s.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turnip
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -113,12 +113,9 @@ files:
 - examples/tags.feature
 - examples/with_backticks.feature
 - examples/with_comments.feature
-- gemfiles/Gemfile-rspec-2.14.x
-- gemfiles/Gemfile-rspec-2.99.x
-- gemfiles/Gemfile-rspec-3.0.x
-- gemfiles/Gemfile-rspec-3.1.x
 - gemfiles/Gemfile-rspec-3.2.x
 - gemfiles/Gemfile-rspec-3.3.x
+- gemfiles/Gemfile-rspec-3.4.x
 - lib/turnip.rb
 - lib/turnip/builder.rb
 - lib/turnip/capybara.rb

data/gemfiles/Gemfile-rspec-2.99.x

@@ -1,6 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in turnip.gemspec
-gemspec :path => '..'
-
-gem 'rspec', '~> 2.99.0'

data/gemfiles/Gemfile-rspec-3.0.x

@@ -1,6 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in turnip.gemspec
-gemspec :path => '..'
-
-gem 'rspec', '~> 3.0.0'

data/gemfiles/Gemfile-rspec-3.1.x

@@ -1,6 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in turnip.gemspec
-gemspec :path => '..'
-
-gem 'rspec', '~> 3.1.0'