rspec 1.1.9 → 1.1.10

data/History.txt

@@ -1,3 +1,14 @@
+=== Version 1.1.10 / 2008-10-24
+
+* 1 minor enhancement
+
+  * hash.should include(:key => 'value') #when you don't care about the whole hash
+
+* 2 bug fixes
+
+  * fix --help output (had inaccurate info about 'nested' formatter)
+  * eliminate spicycode-rcov dev dependency for rubygems < 1.3
+
 === Version 1.1.9 / 2008-10-20
 
 WARNING: This release removes implicit inclusion of modules in example groups.
@@ -6,15 +17,15 @@ included in the group.
 
 * 2 major enhancements
 
-	* Add extend to configuration (thanks to advice from Chad Fowler)
-	* Modules are no longer implicitly included in example groups
+  * Add extend to configuration (thanks to advice from Chad Fowler)
+  * Modules are no longer implicitly included in example groups
 
 * 4 minor enhancements
 
   * mingw indicates windows too (thanks to Luis Lavena for the tip)
-	* improved output for partial mock expecation failures
-	* it_should_behave_like now accepts n names of shared groups
-	* eliminated redundant inclusion/extension of ExampleGroupMethods
+  * improved output for partial mock expecation failures
+  * it_should_behave_like now accepts n names of shared groups
+  * eliminated redundant inclusion/extension of ExampleGroupMethods
 
 * 6 bug fixes
 
@@ -22,8 +33,8 @@ included in the group.
   * fixed typo in help. Fixes #73.
   * fixed bug where should_receive..and_yield after similar stub added the args_to_yield to the stub's original args_to_yield (Pat Maddox)
   * fixed bug where rspec-autotest (autospec) was loading non-spec files in spec directory. Fixes #559.
-	* fixed bug where should_not_receive was reporting twice
-	* fixed bug where rspec tries to run examples just because it is required (even if there are no examples loaded). Fixes #575.
+  * fixed bug where should_not_receive was reporting twice
+  * fixed bug where rspec tries to run examples just because it is required (even if there are no examples loaded). Fixes #575.
 
 === Version 1.1.8 / 2008-10-03
 

data/Rakefile

@@ -18,7 +18,7 @@ Hoe.new('rspec', Spec::VERSION::STRING) do |p|
   p.url = 'http://rspec.info/'
   p.description = "Behaviour Driven Development for Ruby."
   p.rubyforge_name = 'rspec'
-  p.extra_dev_deps = ['diff-lcs',['spicycode-rcov','>= 0.8.1.3'],'syntax']
+  p.extra_dev_deps = ['diff-lcs','syntax']
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
   p.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}"
 end

data/lib/spec/matchers/include.rb

@@ -10,7 +10,14 @@ module Spec
       def matches?(given)
         @given = given
         @expecteds.each do |expected|
-          return false unless given.include?(expected)
+          case given
+          when Hash
+            expected.each_pair do |k,v|
+              return false unless given[k] == v
+            end
+          else
+            return false unless given.include?(expected)
+          end
         end
         true
       end

data/lib/spec/runner/option_parser.rb

@@ -42,19 +42,19 @@ module Spec
                                                     "not specified. The --format option may be specified several times",
                                                     "if you want several outputs",
                                                     " ",
-                                                    "Builtin formats for examples: ",
-                                                    "progress|p               : Text progress",
-                                                    "profile|o                : Text progress with profiling of 10 slowest examples",
-                                                    "specdoc|s                : Example doc as text",
-                                                    "indented|i               : Example doc as indented text",
+                                                    "Builtin formats for code examples:",
+                                                    "progress|p               : Text-based progress bar",
+                                                    "profile|o                : Text-based progress bar with profiling of 10 slowest examples",
+                                                    "specdoc|s                : Code example doc strings",
+                                                    "nested|n                 : Code example doc strings with nested groups intented",
                                                     "html|h                   : A nice HTML report",
                                                     "failing_examples|e       : Write all failing examples - input for --example",
                                                     "failing_example_groups|g : Write all failing example groups - input for --example",
                                                     " ",
-                                                    "Builtin formats for stories: ",
-                                                    "plain|p              : Plain Text",
-                                                    "html|h               : A nice HTML report",
-                                                    "progress|r           : Text progress",
+                                                    "Builtin formats for stories:",
+                                                    "plain|p                  : Plain Text",
+                                                    "html|h                   : A nice HTML report",
+                                                    "progress|r               : Text progress",
                                                     " ",
                                                     "FORMAT can also be the name of a custom formatter class",
                                                     "(in which case you should also specify --require to load it)"],

data/lib/spec/runner/options.rb

@@ -8,7 +8,7 @@ module Spec
       EXAMPLE_FORMATTERS = { # Load these lazily for better speed
                'specdoc' => ['spec/runner/formatter/specdoc_formatter',                'Formatter::SpecdocFormatter'],
                      's' => ['spec/runner/formatter/specdoc_formatter',                'Formatter::SpecdocFormatter'],
-                'nested' => ['spec/runner/formatter/nested_text_formatter',          'Formatter::NestedTextFormatter'],
+                'nested' => ['spec/runner/formatter/nested_text_formatter',            'Formatter::NestedTextFormatter'],
                      'n' => ['spec/runner/formatter/nested_text_formatter',            'Formatter::NestedTextFormatter'],
                   'html' => ['spec/runner/formatter/html_formatter',                   'Formatter::HtmlFormatter'],
                      'h' => ['spec/runner/formatter/html_formatter',                   'Formatter::HtmlFormatter'],

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 1
-      TINY   = 9
+      TINY   = 10
 
       STRING = [MAJOR, MINOR, TINY].join('.')
 

data/rspec.gemspec

@@ -1,12 +1,13 @@
+(in /Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec)
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rspec}
-  s.version = "1.1.9"
+  s.version = "1.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2008-10-20}
+  s.date = %q{2008-10-24}
   s.description = %q{Behaviour Driven Development for Ruby.}
   s.email = ["rspec-devel@rubyforge.org"]
   s.executables = ["autospec", "spec"]
@@ -18,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.0}
-  s.summary = %q{rspec 1.1.9}
+  s.summary = %q{rspec 1.1.10}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -26,19 +27,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_development_dependency(%q<spicycode-rcov>, [">= 0.8.1.3"])
       s.add_development_dependency(%q<syntax>, [">= 0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_development_dependency(%q<spicycode-rcov>, [">= 0.8.1.3"])
+      s.add_development_dependency(%q<hoe>, [">= 1.8.1"])
     else
       s.add_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_dependency(%q<spicycode-rcov>, [">= 0.8.1.3"])
       s.add_dependency(%q<syntax>, [">= 0"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_dependency(%q<hoe>, [">= 1.8.1"])
     end
   else
     s.add_dependency(%q<diff-lcs>, [">= 0"])
-    s.add_dependency(%q<spicycode-rcov>, [">= 0.8.1.3"])
     s.add_dependency(%q<syntax>, [">= 0"])
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
+    s.add_dependency(%q<hoe>, [">= 1.8.1"])
   end
 end

data/spec/spec/matchers/include_spec.rb

@@ -43,3 +43,22 @@ describe "should_not include(expected)" do
     }.should fail_with("expected \"abc\" not to include \"c\"")
   end
 end
+
+describe "should include(:key => value)" do
+  it "should pass if target is a Hash and includes the key/value pair" do
+    {:key => 'value'}.should include(:key => 'value')
+  end
+  it "should pass if target is a Hash and includes the key/value pair among others" do
+    {:key => 'value', :other => 'different'}.should include(:key => 'value')
+  end
+  it "should fail if target is a Hash and has a different value for key" do
+    lambda {
+      {:key => 'different'}.should include(:key => 'value')
+    }.should fail_with(%Q|expected {:key=>"different"} to include {:key=>"value"}|)
+  end
+  it "should fail if target is a Hash and has a different key" do
+    lambda {
+      {:other => 'value'}.should include(:key => 'value')
+    }.should fail_with(%Q|expected {:other=>"value"} to include {:key=>"value"}|)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-20 00:00:00 -05:00
+date: 2008-10-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: spicycode-rcov
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.1.3
-    version: 
 - !ruby/object:Gem::Dependency 
   name: syntax
   type: :development
@@ -50,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 1.8.1
     version: 
 description: Behaviour Driven Development for Ruby.
 email: 
@@ -503,6 +493,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
-summary: rspec 1.1.9
+summary: rspec 1.1.10
 test_files: []