scenario 0.3.1 → 0.3.2

data/README.markdown

@@ -187,6 +187,7 @@ to be read once.
 Version History
 ===============
 
+* 0.3.2 - Explicitly require RSpec.
 * 0.3.1 - Add "setup" syntax.
 * 0.3.0 - Remove support for module-based scenarios, allow calling RSpec hooks
   in scenarios.

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/scenario.rb

@@ -1,5 +1,11 @@
 $: << File.expand_path( File.dirname( __FILE__ ) )
 
+begin
+  require "rspec"
+rescue LoadError
+  require "spec"
+end
+
 require 'scenario/fixtures'
 require 'scenario/scenario'
 require 'scenario/rspec'

data/scenario.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scenario}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyson Tate"]
-  s.date = %q{2011-05-23}
+  s.date = %q{2011-05-24}
   s.description = %q{Basic spec scenarios for RSpec. Also includes basic fixtures support.}
   s.email = %q{tyson@tysontate.com}
   s.extra_rdoc_files = [

data/spec/scenario_spec.rb

@@ -115,13 +115,15 @@ describe "Shared example groups" do
     it_should_behave_like "without scenario in the shared group"
   end
   
-  context "with scenario in shared group" do
-    it_should_behave_like "with scenario in the shared group"
-    
-    it "shouldn't leak" do
-      @scenario_all.should be_nil
-      @scenario_each.should be_nil
-      lambda { scenario_method }.should raise_error
+  if $rspec2
+    context "with scenario in shared group" do
+      it_should_behave_like "with scenario in the shared group"
+      
+      it "shouldn't leak" do
+        @scenario_all.should be_nil
+        @scenario_each.should be_nil
+        lambda { scenario_method }.should raise_error
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,8 +3,12 @@ $LOAD_PATH.unshift( File.join( File.dirname( __FILE__ ), '..', 'lib' ) )
 begin
   # 2.x
   require 'rspec'
+  $rspec1 = false
+  $rspec2 = true
 rescue LoadError
   # 1.x
   require 'spec'
+  $rspec1 = true
+  $rspec2 = false
 end
 require 'scenario'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scenario
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Tyson Tate
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -07:00
+date: 2011-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency