rspec-expectations 2.0.0.beta.16 → 2.0.0.beta.17

data/Gemfile

@@ -1,7 +1,9 @@
+source "http://rubygems.org"
+
 gem "rake"
 gem "jeweler"
 gem "cucumber"
-gem "aruba"
+gem "aruba", ">= 0.2.0"
 gem "autotest"
 gem "diff-lcs"
 gem "rspec-expectations", :path => "."

data/README.markdown

@@ -3,7 +3,7 @@
 rspec-expectations adds `should` and `should_not` to every object and includes
 RSpec::Matchers, a library of standard matchers.
 
-# Matchers
+## Matchers
 
 Matchers are objects used to compose expectations:
 
@@ -12,9 +12,12 @@ Matchers are objects used to compose expectations:
 In that example, `eq("this value")` returns a `Matcher` object that
 compares the actual `result` to the expected `"this value"`.
 
-#### Also see
+## Contribute
+
+See [http://github.com/rspec/rspec-dev](http://github.com/rspec/rspec-dev)
+
+## Also see
 
 * [http://github.com/rspec/rspec](http://github.com/rspec/rspec)
 * [http://github.com/rspec/rspec-core](http://github.com/rspec/rspec-core)
 * [http://github.com/rspec/rspec-mocks](http://github.com/rspec/rspec-mocks)
-* [http://github.com/rspec/rspec-dev](http://github.com/rspec/rspec-dev)

data/Rakefile

@@ -3,7 +3,10 @@ Bundler.setup
 
 $LOAD_PATH << File.expand_path("../lib", __FILE__)
 require 'rake'
+require 'rake/rdoctask'
 require 'rspec/expectations/version'
+require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
 
 begin
   require 'jeweler'
@@ -40,25 +43,22 @@ namespace :gem do
   end
 end
 
-begin
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
-  puts "RSpec core or one of its dependencies is not installed. Install it with: gem install rspec-core"
-end
+RSpec::Core::RakeTask.new(:spec)
 
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new do |t|
-    t.cucumber_opts = %w{--format progress}
+class Cucumber::Rake::Task::ForkedCucumberRunner
+  # When cucumber shells out, we still need it to run in the context of our
+  # bundle.
+  def run
+    sh "bundle exec #{RUBY} " + args.join(" ")
   end
-rescue LoadError
-  puts "Cucumber or one of its dependencies is not installed. Install it with: gem install cucumber"
+end
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--format progress}
 end
 
 task :default => [:check_dependencies, :spec, :cucumber]
 
-require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION.yml')
     config = YAML.load(File.read('VERSION.yml'))

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.16
+2.0.0.beta.17

data/features/expectations/attribute_of_subject.feature

@@ -15,5 +15,5 @@ Feature: attribute of subject
     """
 
     When I run "rspec example_spec.rb -fdoc"
-    Then I should see "Failure/Error: its(:size) { should eq(1) }"
-    And  I should see "expected 1"
+    Then the output should contain "Failure/Error: its(:size) { should eq(1) }"
+    And  the output should contain "expected 1"

data/features/expectations/customized_message.feature

@@ -46,9 +46,9 @@ Feature: customized message
 
       """
     When I run "rspec ./node_spec.rb --format documentation"
-    Then I should see "3 examples, 3 failures"
-    And  I should not see "to return true, got false"
-    And  I should not see "to return false, got true"
-    And  I should see "node.state: started (first example)"
-    And  I should see "node.state: started (second example)"
-    And  I should see "expected a change"
+    Then the output should contain "3 examples, 3 failures"
+    And  the output should not contain "to return true, got false"
+    And  the output should not contain "to return false, got true"
+    And  the output should contain "node.state: started (first example)"
+    And  the output should contain "node.state: started (second example)"
+    And  the output should contain "expected a change"

data/features/expectations/implicit_docstrings.feature

@@ -20,9 +20,9 @@ Feature: implicit docstrings
 
     When I run "rspec ./implicit_docstrings_spec.rb -fdoc"
 
-    Then I should see "should be < 5"
-    And I should see "should include 2"
-    And I should see "should respond to #size"
+    Then the output should contain "should be < 5"
+    And the output should contain "should include 2"
+    And the output should contain "should respond to #size"
 
   Scenario Outline: run failing examples
     Given a file named "failing_implicit_docstrings_spec.rb" with:
@@ -46,7 +46,7 @@ Feature: implicit docstrings
 
     When I run "rspec ./failing_implicit_docstrings_spec.rb -fdoc"
 
-    Then I should see "should equal 2"
-    And I should see "should be > 5"
-    And I should see "should include "b""
-    And I should see "should not respond to #size"
+    Then the output should contain "should equal 2"
+    And the output should contain "should be > 5"
+    And the output should contain "should include "b""
+    And the output should contain "should not respond to #size"

data/features/matchers/access_running_example.feature

@@ -29,7 +29,7 @@ Feature: access running example
       end
       """
     When I run "rspec ./example_spec.rb"
-    Then I should see "1 example, 0 failures"
+    Then the output should contain "1 example, 0 failures"
 
   Scenario: call method _not_ defined on example from matcher
     Given a file named "example_spec.rb" with:
@@ -47,7 +47,7 @@ Feature: access running example
       end
       """
     When I run "rspec ./example_spec.rb"
-    Then I should see "1 example, 1 failure"
-    And I should see "undefined local variable"
-    And I should see "RSpec::Matchers::Matcher"
-    And I should not see "ExampleGroup"
+    Then the output should contain "1 example, 1 failure"
+    And the output should contain "undefined local variable"
+    And the output should contain "RSpec::Matchers::Matcher"
+    And the output should not contain "ExampleGroup"

data/features/matchers/define_diffable_matcher.feature

@@ -23,5 +23,5 @@ Feature: define diffable matcher
     When I run "rspec ./diffable_matcher_spec.rb --diff"
     Then the exit status should not be 0
 
-    And I should see "should be just like that"
-    And I should see "Diff:\n@@ -1,2 +1,2 @@\n-that\n+this"
+    And the output should contain "should be just like that"
+    And the output should contain "Diff:\n@@ -1,2 +1,2 @@\n-that\n+this"

data/features/matchers/define_matcher.feature

@@ -37,14 +37,14 @@ Feature: define matcher
     When I run "rspec ./matcher_with_default_message_spec.rb --format documentation"
     Then the exit status should not be 0
 
-    And I should see "should be a multiple of 3"
-    And I should see "should not be a multiple of 4"
-    And I should see "Failure/Error: it {should be_a_multiple_of(4)}"
-    And I should see "Failure/Error: it {should_not be_a_multiple_of(3)}"
-
-    And I should see "4 examples, 2 failures"
-    And I should see "expected 9 to be a multiple of 4"
-    And I should see "expected 9 not to be a multiple of 3"
+    And the output should contain "should be a multiple of 3"
+    And the output should contain "should not be a multiple of 4"
+    And the output should contain "Failure/Error: it {should be_a_multiple_of(4)}"
+    And the output should contain "Failure/Error: it {should_not be_a_multiple_of(3)}"
+
+    And the output should contain "4 examples, 2 failures"
+    And the output should contain "expected 9 to be a multiple of 4"
+    And the output should contain "expected 9 not to be a multiple of 3"
 
   Scenario: overriding the failure_message_for_should
     Given a file named "matcher_with_failure_message_spec.rb" with:

data/features/matchers/define_matcher_outside_rspec.feature

@@ -34,5 +34,5 @@ Feature: define matcher outside rspec
       """
     When I run "ruby test_multiples.rb"
     Then the exit status should not be 0 
-    And I should see "expected 9 to be a multiple of 4"
-    And I should see "2 tests, 0 assertions, 0 failures, 1 errors"
+    And the output should contain "expected 9 to be a multiple of 4"
+    And the output should contain "2 tests, 0 assertions, 0 failures, 1 errors"

data/features/matchers/define_matcher_with_fluent_interface.feature

@@ -23,5 +23,5 @@ Feature: define matcher
       end
       """
     When I run "rspec ./between_spec.rb --format documentation"
-    Then I should see "1 example, 0 failures"
-    And  I should see "should be bigger than 4"
+    Then the output should contain "1 example, 0 failures"
+    And  the output should contain "should be bigger than 4"

data/features/matchers/expect_change.feature

@@ -30,8 +30,8 @@ Feature: expect change
       end
       """
     When I run "rspec ./expect_change_spec.rb"
-    Then I should see "2 examples, 1 failure"
-    Then I should see "should have been changed by 2, but was changed by 1"
+    Then the output should contain "2 examples, 1 failure"
+    Then the output should contain "should have been changed by 2, but was changed by 1"
 
   Scenario: expecting no change
     Given a file named "expect_no_change_spec.rb" with:
@@ -61,5 +61,5 @@ Feature: expect change
       end
       """
     When I run "rspec ./expect_no_change_spec.rb"
-    Then I should see "2 examples, 1 failure"
-    Then I should see "should not have changed, but did change from 1 to 2"
+    Then the output should contain "2 examples, 1 failure"
+    Then the output should contain "should not have changed, but did change from 1 to 2"

data/features/matchers/expect_error.feature

@@ -19,8 +19,8 @@ Feature: expect error
       end
       """
     When I run "rspec ./expect_error_spec.rb"
-    Then I should see "2 examples, 1 failure"
-    Then I should see "expected NameError but nothing was raised"
+    Then the output should contain "2 examples, 1 failure"
+    Then the output should contain "expected NameError but nothing was raised"
 
   Scenario: expect no error
     Given a file named "expect_no_error_spec.rb" with:
@@ -39,6 +39,6 @@ Feature: expect error
       end
       """
     When I run "rspec ./expect_no_error_spec.rb"
-    Then I should see "2 examples, 1 failure"
-    Then I should see "undefined method `non_existent_message'"
+    Then the output should contain "2 examples, 1 failure"
+    Then the output should contain "undefined method `non_existent_message'"
 

data/features/support/env.rb

@@ -1,20 +1 @@
-require 'bundler'
-Bundler.setup
-
 require 'aruba'
-require 'rspec/expectations'
-
-module ArubaOverrides
-  def detect_ruby_script(cmd)
-    if cmd =~ /^rspec /
-      "bundle exec ../../../rspec-core/bin/#{cmd}"
-    elsif cmd =~ /^ruby /
-      "bundle exec #{cmd}"
-    else
-      super(cmd)
-    end
-  end
-end
-
-World(ArubaOverrides)
-

data/rspec-expectations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-expectations}
-  s.version = "2.0.0.beta.16"
+  s.version = "2.0.0.beta.17"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-07-06}
+  s.date = %q{2010-07-11}
   s.description = %q{rspec expectations (should[_not] and matchers)}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -113,7 +113,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/expectations}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-expectations-2.0.0.beta.16
+  Thank you for installing rspec-expectations-2.0.0.beta.17
 
 **************************************************
 }
@@ -121,7 +121,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-expectations-2.0.0.beta.16}
+  s.summary = %q{rspec-expectations-2.0.0.beta.17}
   s.test_files = [
     "spec/rspec/expectations/differ_spec.rb",
      "spec/rspec/expectations/extensions/kernel_spec.rb",
@@ -164,21 +164,21 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<diff-lcs>, [">= 1.1.2"])
       s.add_development_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_development_dependency(%q<aruba>, [">= 0.1.1"])
-      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.16"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.16"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.17"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.17"])
     else
       s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
       s.add_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_dependency(%q<aruba>, [">= 0.1.1"])
-      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.16"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.16"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.17"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.17"])
     end
   else
     s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
     s.add_dependency(%q<cucumber>, [">= 0.6.2"])
     s.add_dependency(%q<aruba>, [">= 0.1.1"])
-    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.16"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.16"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.17"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.17"])
   end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-expectations
 version: !ruby/object:Gem::Version 
-  hash: 62196419
+  hash: 62196417
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 16
-  version: 2.0.0.beta.16
+  - 17
+  version: 2.0.0.beta.17
 platform: ruby
 authors: 
 - David Chelimsky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 -05:00
+date: 2010-07-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,14 +78,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196419
+        hash: 62196417
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 16
-        version: 2.0.0.beta.16
+        - 17
+        version: 2.0.0.beta.17
   requirement: *id004
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -96,14 +96,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196419
+        hash: 62196417
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 16
-        version: 2.0.0.beta.16
+        - 17
+        version: 2.0.0.beta.17
   requirement: *id005
 description: rspec expectations (should[_not] and matchers)
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
@@ -214,7 +214,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-expectations-2.0.0.beta.16
+    Thank you for installing rspec-expectations-2.0.0.beta.17
   
   **************************************************
 
@@ -248,7 +248,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.0.0.beta.16
+summary: rspec-expectations-2.0.0.beta.17
 test_files: 
 - spec/rspec/expectations/differ_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb