rspec 1.1.12 → 1.2.0

data/.autotest

@@ -1,4 +1,5 @@
 Autotest.add_hook :initialize do |at|
   at.add_exception("spec/interop/test/unit/resources")
   at.add_exception("spec/spec/runner/drb_command_line_spec.rb")
-end
+end
+

data/.document

@@ -0,0 +1,7 @@
+features/**/*.feature
+lib/**/*.rb
+History.txt
+License.txt
+README.txt
+Ruby1.9.markdown
+Upgrade.markdown

data/History.txt

@@ -1,3 +1,61 @@
+=== Version 1.2.0
+
+WARNINGS:
+
+  * If you use the ruby command to run specs instead of the spec command, you'll
+    need to require 'spec/autorun' or they won't run. This won't affect you if
+    you use the spec command or the Spec::Rake::SpecTask that ships with RSpec.
+
+  * require 'spec/test/unit' to invoke test/unit interop if you're using
+    RSpec's core (this is handled implicitly with spec-rails)
+
+  * setup and teardown are gone - use before and after instead
+
+    * you can still use setup and teardown if you're using
+      Test::Unit::TestCase as the base ExampleGroup class (which is implicit
+      in rspec-rails)
+      
+  * The matcher protocol has been improved. The old protocol is still
+    supported, so as long as you're not monkey patching rspec's built-in
+    matchers, or using extension libraries that do, this should not affect
+    you. If you run into trouble, you'll just need to change:
+    
+    * failure_message          => failure_message_for_should
+    * negative_failure_message => failure_message_for_should_not
+      
+  * All references to rubygems have been removed from within rspec's code.
+  
+    * See http://gist.github.com/54177 for rationale and suggestions on
+      alternative approaches to loading rubygems
+
+* deprecations
+
+  * BaseTextFormatter#colourize - use colorize_failure instead.
+  * BaseTextFormatter#magenta - use red instead.
+
+* enhancements
+
+  * cleaner integration with with heckle-1.4.2
+  * allow registering example groups with a path-like key (Pat Maddox)
+  * start DRb service at "druby://localhost:0" (Hongli Lai) - See http://redmine.ruby-lang.org/issues/show/496 
+  * consistent reporting of errors as failures
+  * added spec/test/unit as more intuitive path to loading test/unit interop lib
+  * added explicit autorun feature for running specs with ruby command
+  * added handling for does_not_match? for matchers that want to know the context in which they were called
+  * lots of ruby 1.9.1 compatibility fixes from Chad Humprhies
+  * improved feedback from be_kind_of/be_a_kind_of/be_instance_of/be_an_instance_of (Jakub Šťastný)
+  * added --format silent (l) option, which is now the default when running --heckle (Bob Aman)
+  * sexy new custom matcher creation (Corey Haines & David Chelimsky - initial concept by Yehuda Katz)
+  * improved matcher protocol - old one is still supported, but new one is cleaner and prefered
+  
+* bug fixes
+
+  * support delegating operator matchers to subject with should_not
+  * all arguments are included if --drb is specified in spec.opts (Neil Buckley). Closes #671.
+  * added --autospec option hack (used internally) to get --color to work when using --drb and autospec.
+  * Fixed mock framework failure message bug in which similar calls were excluded from the output
+  * cryptic error message on change.rb when the from value is wrong (Michael Murray). Closes #706.
+
 === Version 1.1.12 / 2009-01-11
 
 WARNING: there was a stub/mock bug in 1.1.11 that allowed a structure that was

data/License.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2005-2008 The RSpec Development Team
+Copyright (c) 2005-2009 The RSpec Development Team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -1,15 +1,19 @@
 .autotest
+.document
 History.txt
 License.txt
 Manifest.txt
 README.txt
 Rakefile
+Ruby1.9.markdown
 TODO.txt
+Upgrade.markdown
 bin/autospec
 bin/spec
+cucumber.yml
 examples/failing/README.txt
 examples/failing/diffing_spec.rb
-examples/failing/failing_autogenerated_docstrings_example.rb
+examples/failing/failing_implicit_docstrings_example.rb
 examples/failing/failure_in_after.rb
 examples/failing/failure_in_before.rb
 examples/failing/mocking_example.rb
@@ -17,32 +21,31 @@ examples/failing/mocking_with_flexmock.rb
 examples/failing/mocking_with_mocha.rb
 examples/failing/mocking_with_rr.rb
 examples/failing/partial_mock_example.rb
+examples/failing/pending_example.rb
 examples/failing/predicate_example.rb
 examples/failing/raising_example.rb
 examples/failing/spec_helper.rb
 examples/failing/syntax_error_example.rb
 examples/failing/team_spec.rb
 examples/failing/timeout_behaviour.rb
-examples/passing/autogenerated_docstrings_example.rb
-examples/passing/before_and_after_example.rb
-examples/passing/behave_as_example.rb
-examples/passing/custom_expectation_matchers.rb
 examples/passing/custom_formatter.rb
+examples/passing/custom_matchers.rb
 examples/passing/dynamic_spec.rb
 examples/passing/file_accessor.rb
 examples/passing/file_accessor_spec.rb
+examples/passing/filtered_formatter.rb
+examples/passing/filtered_formatter_example.rb
 examples/passing/greeter_spec.rb
 examples/passing/helper_method_example.rb
+examples/passing/implicit_docstrings_example.rb
 examples/passing/io_processor.rb
 examples/passing/io_processor_spec.rb
-examples/passing/legacy_spec.rb
 examples/passing/mocking_example.rb
 examples/passing/multi_threaded_example_group_runner.rb
 examples/passing/nested_classes_example.rb
 examples/passing/partial_mock_example.rb
 examples/passing/pending_example.rb
 examples/passing/predicate_example.rb
-examples/passing/priority.txt
 examples/passing/shared_example_group_example.rb
 examples/passing/shared_stack_examples.rb
 examples/passing/simple_matcher_example.rb
@@ -54,46 +57,55 @@ examples/passing/stubbing_example.rb
 examples/passing/yielding_example.rb
 examples/ruby1.9.compatibility/access_to_constants_spec.rb
 features/before_and_after_blocks/before_and_after_blocks.feature
-features/example_groups/autogenerated_docstrings.feature
 features/example_groups/example_group_with_should_methods.feature
+features/example_groups/implicit_docstrings.feature
 features/example_groups/nested_groups.feature
 features/example_groups/output.feature
+features/heckle/heckle.feature
 features/interop/examples_and_tests_together.feature
 features/interop/test_but_not_test_unit.feature
 features/interop/test_case_with_should_methods.feature
+features/matchers/create_matcher.feature
 features/mock_framework_integration/use_flexmock.feature
+features/mock_framework_integration/use_mocha.feature
+features/mock_framework_integration/use_rr.feature
+features/mocks/mix_stubs_and_mocks.feature
+features/pending/pending_examples.feature
 features/step_definitions/running_rspec.rb
 features/support/env.rb
-features/support/helpers/cmdline.rb
-features/support/helpers/story_helper.rb
 features/support/matchers/smart_match.rb
 init.rb
-lib/adapters/mock_frameworks/flexmock.rb
-lib/adapters/mock_frameworks/mocha.rb
-lib/adapters/mock_frameworks/rr.rb
-lib/adapters/mock_frameworks/rspec.rb
 lib/autotest/discover.rb
 lib/autotest/rspec.rb
 lib/spec.rb
+lib/spec/adapters/mock_frameworks/flexmock.rb
+lib/spec/adapters/mock_frameworks/mocha.rb
+lib/spec/adapters/mock_frameworks/rr.rb
+lib/spec/adapters/mock_frameworks/rspec.rb
+lib/spec/autorun.rb
 lib/spec/dsl.rb
 lib/spec/dsl/main.rb
+lib/spec/dsl/matchers.rb
 lib/spec/example.rb
 lib/spec/example/before_and_after_hooks.rb
 lib/spec/example/errors.rb
+lib/spec/example/example_description.rb
 lib/spec/example/example_group.rb
 lib/spec/example/example_group_factory.rb
+lib/spec/example/example_group_hierarchy.rb
 lib/spec/example/example_group_methods.rb
 lib/spec/example/example_matcher.rb
 lib/spec/example/example_methods.rb
 lib/spec/example/module_reopening_fix.rb
 lib/spec/example/pending.rb
+lib/spec/example/predicate_matchers.rb
 lib/spec/example/shared_example_group.rb
+lib/spec/example/subject.rb
 lib/spec/expectations.rb
 lib/spec/expectations/differs/default.rb
 lib/spec/expectations/errors.rb
 lib/spec/expectations/extensions.rb
 lib/spec/expectations/extensions/object.rb
-lib/spec/expectations/extensions/string_and_symbol.rb
 lib/spec/expectations/handler.rb
 lib/spec/interop/test.rb
 lib/spec/interop/test/unit/autorunner.rb
@@ -104,17 +116,22 @@ lib/spec/interop/test/unit/ui/console/testrunner.rb
 lib/spec/matchers.rb
 lib/spec/matchers/be.rb
 lib/spec/matchers/be_close.rb
+lib/spec/matchers/be_instance_of.rb
+lib/spec/matchers/be_kind_of.rb
 lib/spec/matchers/change.rb
+lib/spec/matchers/compatibility.rb
 lib/spec/matchers/eql.rb
 lib/spec/matchers/equal.rb
 lib/spec/matchers/errors.rb
 lib/spec/matchers/exist.rb
+lib/spec/matchers/extensions/instance_exec.rb
 lib/spec/matchers/generated_descriptions.rb
 lib/spec/matchers/has.rb
 lib/spec/matchers/have.rb
 lib/spec/matchers/include.rb
 lib/spec/matchers/match.rb
 lib/spec/matchers/match_array.rb
+lib/spec/matchers/matcher.rb
 lib/spec/matchers/method_missing.rb
 lib/spec/matchers/operator_matcher.rb
 lib/spec/matchers/raise_error.rb
@@ -124,8 +141,8 @@ lib/spec/matchers/simple_matcher.rb
 lib/spec/matchers/throw_symbol.rb
 lib/spec/matchers/wrap_expectation.rb
 lib/spec/mocks.rb
-lib/spec/mocks/argument_constraints.rb
 lib/spec/mocks/argument_expectation.rb
+lib/spec/mocks/argument_matchers.rb
 lib/spec/mocks/error_generator.rb
 lib/spec/mocks/errors.rb
 lib/spec/mocks/extensions.rb
@@ -158,9 +175,6 @@ lib/spec/runner/formatter/profile_formatter.rb
 lib/spec/runner/formatter/progress_bar_formatter.rb
 lib/spec/runner/formatter/snippet_extractor.rb
 lib/spec/runner/formatter/specdoc_formatter.rb
-lib/spec/runner/formatter/story/html_formatter.rb
-lib/spec/runner/formatter/story/plain_text_formatter.rb
-lib/spec/runner/formatter/story/progress_bar_formatter.rb
 lib/spec/runner/formatter/text_mate_formatter.rb
 lib/spec/runner/heckle_runner.rb
 lib/spec/runner/heckle_runner_unsupported.rb
@@ -168,37 +182,18 @@ lib/spec/runner/option_parser.rb
 lib/spec/runner/options.rb
 lib/spec/runner/reporter.rb
 lib/spec/runner/spec_parser.rb
-lib/spec/story.rb
-lib/spec/story/extensions.rb
-lib/spec/story/extensions/main.rb
-lib/spec/story/extensions/regexp.rb
-lib/spec/story/extensions/string.rb
-lib/spec/story/given_scenario.rb
-lib/spec/story/runner.rb
-lib/spec/story/runner/plain_text_story_runner.rb
-lib/spec/story/runner/scenario_collector.rb
-lib/spec/story/runner/scenario_runner.rb
-lib/spec/story/runner/story_mediator.rb
-lib/spec/story/runner/story_parser.rb
-lib/spec/story/runner/story_runner.rb
-lib/spec/story/scenario.rb
-lib/spec/story/step.rb
-lib/spec/story/step_group.rb
-lib/spec/story/step_mother.rb
-lib/spec/story/story.rb
-lib/spec/story/world.rb
+lib/spec/test/unit.rb
 lib/spec/version.rb
+resources/helpers/cmdline.rb
 resources/rake/examples.rake
 resources/rake/examples_with_rcov.rake
 resources/rake/failing_examples_with_html.rake
 resources/rake/verify_rcov.rake
 resources/spec/example_group_with_should_methods.rb
 resources/spec/simple_spec.rb
-resources/spec/spec_with_flexmock.rb
 resources/test/spec_and_test_together.rb
 resources/test/spec_including_test_but_not_unit.rb
 resources/test/test_case_with_should_methods.rb
-rspec.gemspec
 spec/README.jruby
 spec/autotest/autotest_helper.rb
 spec/autotest/autotest_matchers.rb
@@ -209,6 +204,7 @@ spec/rspec_suite.rb
 spec/ruby_forker.rb
 spec/spec.opts
 spec/spec/dsl/main_spec.rb
+spec/spec/dsl/matchers_spec.rb
 spec/spec/example/example_group_class_definition_spec.rb
 spec/spec/example/example_group_factory_spec.rb
 spec/spec/example/example_group_methods_spec.rb
@@ -224,6 +220,7 @@ spec/spec/example/subclassing_example_group_spec.rb
 spec/spec/expectations/differs/default_spec.rb
 spec/spec/expectations/extensions/object_spec.rb
 spec/spec/expectations/fail_with_spec.rb
+spec/spec/expectations/handler_spec.rb
 spec/spec/expectations/wrap_expectation_spec.rb
 spec/spec/interop/test/unit/resources/spec_that_fails.rb
 spec/spec/interop/test/unit/resources/spec_that_passes.rb
@@ -238,20 +235,22 @@ spec/spec/interop/test/unit/test_unit_spec_helper.rb
 spec/spec/interop/test/unit/testcase_spec.rb
 spec/spec/interop/test/unit/testsuite_adapter_spec.rb
 spec/spec/matchers/be_close_spec.rb
+spec/spec/matchers/be_instance_of_spec.rb
+spec/spec/matchers/be_kind_of_spec.rb
 spec/spec/matchers/be_spec.rb
 spec/spec/matchers/change_spec.rb
+spec/spec/matchers/compatibility_spec.rb
 spec/spec/matchers/description_generation_spec.rb
 spec/spec/matchers/eql_spec.rb
 spec/spec/matchers/equal_spec.rb
 spec/spec/matchers/exist_spec.rb
-spec/spec/matchers/handler_spec.rb
 spec/spec/matchers/has_spec.rb
 spec/spec/matchers/have_spec.rb
 spec/spec/matchers/include_spec.rb
 spec/spec/matchers/match_array_spec.rb
 spec/spec/matchers/match_spec.rb
 spec/spec/matchers/matcher_methods_spec.rb
-spec/spec/matchers/mock_constraint_matchers_spec.rb
+spec/spec/matchers/matcher_spec.rb
 spec/spec/matchers/operator_matcher_spec.rb
 spec/spec/matchers/raise_error_spec.rb
 spec/spec/matchers/respond_to_spec.rb
@@ -266,13 +265,13 @@ spec/spec/mocks/bug_report_10260_spec.rb
 spec/spec/mocks/bug_report_10263_spec.rb
 spec/spec/mocks/bug_report_11545_spec.rb
 spec/spec/mocks/bug_report_15719_spec.rb
-spec/spec/mocks/bug_report_496.rb
+spec/spec/mocks/bug_report_496_spec.rb
 spec/spec/mocks/bug_report_600_spec.rb
 spec/spec/mocks/bug_report_7611_spec.rb
 spec/spec/mocks/bug_report_7805_spec.rb
 spec/spec/mocks/bug_report_8165_spec.rb
 spec/spec/mocks/bug_report_8302_spec.rb
-spec/spec/mocks/failing_mock_argument_constraints_spec.rb
+spec/spec/mocks/failing_argument_matchers_spec.rb
 spec/spec/mocks/hash_including_matcher_spec.rb
 spec/spec/mocks/hash_not_including_matcher_spec.rb
 spec/spec/mocks/mock_ordering_spec.rb
@@ -285,7 +284,7 @@ spec/spec/mocks/once_counts_spec.rb
 spec/spec/mocks/options_hash_spec.rb
 spec/spec/mocks/partial_mock_spec.rb
 spec/spec/mocks/partial_mock_using_mocks_directly_spec.rb
-spec/spec/mocks/passing_mock_argument_constraints_spec.rb
+spec/spec/mocks/passing_argument_matchers_spec.rb
 spec/spec/mocks/precise_counts_spec.rb
 spec/spec/mocks/record_messages_spec.rb
 spec/spec/mocks/stub_spec.rb
@@ -316,15 +315,12 @@ spec/spec/runner/formatter/nested_text_formatter_spec.rb
 spec/spec/runner/formatter/profile_formatter_spec.rb
 spec/spec/runner/formatter/progress_bar_formatter_spec.rb
 spec/spec/runner/formatter/snippet_extractor_spec.rb
-spec/spec/runner/formatter/spec_mate_formatter_spec.rb
 spec/spec/runner/formatter/specdoc_formatter_spec.rb
-spec/spec/runner/formatter/story/html_formatter_spec.rb
-spec/spec/runner/formatter/story/plain_text_formatter_spec.rb
-spec/spec/runner/formatter/story/progress_bar_formatter_spec.rb
 spec/spec/runner/formatter/text_mate_formatted-1.8.4.html
 spec/spec/runner/formatter/text_mate_formatted-1.8.6.html
 spec/spec/runner/formatter/text_mate_formatted-1.8.7.html
 spec/spec/runner/formatter/text_mate_formatted-1.9.1.html
+spec/spec/runner/formatter/text_mate_formatter_spec.rb
 spec/spec/runner/heckle_runner_spec.rb
 spec/spec/runner/heckler_spec.rb
 spec/spec/runner/noisy_backtrace_tweaker_spec.rb
@@ -347,37 +343,4 @@ spec/spec/runner/spec_parser_spec.rb
 spec/spec/runner/spec_spaced.opts
 spec/spec/runner_spec.rb
 spec/spec/spec_classes.rb
-spec/spec/spec_spec.rb
-spec/spec/story/builders.rb
-spec/spec/story/extensions/main_spec.rb
-spec/spec/story/extensions_spec.rb
-spec/spec/story/given_scenario_spec.rb
-spec/spec/story/runner/plain_text_story_runner_spec.rb
-spec/spec/story/runner/scenario_collector_spec.rb
-spec/spec/story/runner/scenario_runner_spec.rb
-spec/spec/story/runner/story_mediator_spec.rb
-spec/spec/story/runner/story_parser_spec.rb
-spec/spec/story/runner/story_runner_spec.rb
-spec/spec/story/runner_spec.rb
-spec/spec/story/scenario_spec.rb
-spec/spec/story/step_group_spec.rb
-spec/spec/story/step_mother_spec.rb
-spec/spec/story/step_spec.rb
-spec/spec/story/story_helper.rb
-spec/spec/story/story_spec.rb
-spec/spec/story/world_spec.rb
 spec/spec_helper.rb
-story_server/prototype/javascripts/builder.js
-story_server/prototype/javascripts/controls.js
-story_server/prototype/javascripts/dragdrop.js
-story_server/prototype/javascripts/effects.js
-story_server/prototype/javascripts/prototype.js
-story_server/prototype/javascripts/rspec.js
-story_server/prototype/javascripts/scriptaculous.js
-story_server/prototype/javascripts/slider.js
-story_server/prototype/javascripts/sound.js
-story_server/prototype/javascripts/unittest.js
-story_server/prototype/lib/server.rb
-story_server/prototype/stories.html
-story_server/prototype/stylesheets/rspec.css
-story_server/prototype/stylesheets/test.css

data/README.txt

@@ -12,10 +12,10 @@ examples.
 
 == FEATURES:
 
-* Spec::Example provides a framework for expressing executable code examples
+* Spec::Example provides a framework for organizing executable code examples
 * Spec::Expectations adds #should and #should_not to every object
 * Spec::Matchers provides Expression Matchers for use with #should and #should_not
-* Spec::Mocks is a full featured mocking/stubbing library
+* Spec::Mocks is a full featured mock object/stubbing library
 
 == SYNOPSIS:
 
@@ -51,7 +51,4 @@ examples.
 
  or
 
-  git clone git://github.com/dchelimsky/rspec.git
-  cd rspec
-  rake gem
-  rake install_gem
+ clone, build, install - See http://wiki.github.com/dchelimsky/rspec

data/Rakefile

@@ -1,7 +1,6 @@
 # -*- ruby -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
-require 'rubygems'
 require 'hoe'
 require 'spec/version'
 require 'spec/rake/spectask'
@@ -22,34 +21,40 @@ Hoe.new('rspec', Spec::VERSION::STRING) do |p|
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}"
+  p.rspec_options = ['--options', 'spec/spec.opts']
 end
 
 ['audit','test','test_deps','default','post_blog'].each do |task|
   Rake.application.instance_variable_get('@tasks').delete(task)
 end
 
-task :verify_rcov => [:spec, :features]
-task :default => :verify_rcov
-
-# # Some of the tasks are in separate files since they are also part of the website documentation
+# Some of the tasks are in separate files since they are also part of the website documentation
 load File.dirname(__FILE__) + '/resources/rake/examples.rake'
 load File.dirname(__FILE__) + '/resources/rake/examples_with_rcov.rake'
 load File.dirname(__FILE__) + '/resources/rake/failing_examples_with_html.rake'
 load File.dirname(__FILE__) + '/resources/rake/verify_rcov.rake'
 
-desc "Run all specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['--options', 'spec/spec.opts']
-  unless ENV['NO_RCOV']
+if RUBY_VERSION =~ /^1.8/
+  task :default => [:verify_rcov, :features]
+else
+  task :default => [:spec, :features]
+end
+
+namespace :spec do
+  desc "Run all specs with rcov"
+  Spec::Rake::SpecTask.new('rcov') do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--options', 'spec/spec.opts']
     t.rcov = true
     t.rcov_dir = 'coverage'
-    t.rcov_opts = ['--text-report', '--exclude', "lib/spec.rb,lib/spec/runner.rb,spec\/spec,bin\/spec,examples,\/gems,\/Library\/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
+    t.rcov_opts = ['--exclude', "instance_exec\.rb,lib/spec.rb,lib/spec/runner.rb,spec/spec,bin/spec,examples,/gems,/Library/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
   end
 end
 
 desc "Run Cucumber features"
-Cucumber::Rake::Task.new do; end
+task :features do
+  sh(RUBY_VERSION =~ /^1.8/ ? "cucumber" : "cucumber --profile no_heckle")
+end
 
 desc "Run failing examples (see failure output)"
 Spec::Rake::SpecTask.new('failing_examples') do |t|
@@ -86,4 +91,19 @@ task :verify_committed do
       raise "\n!!! Do a git commit first !!!\n\n" if line =~ /^#\s*modified:/
     end
   end
-end
+end
+
+namespace :update do
+  desc "update the manfest"
+  task :manifest do
+    system %q[touch Manifest.txt; rake check_manifest | grep -v "(in " | patch]
+  end
+end
+
+task :clobber => :clobber_tmp
+
+task :clobber_tmp do
+  cmd = %q[rm -r tmp]
+  puts cmd
+  system cmd if test ?d, 'tmp'
+end