Permalink
Browse files

Merge branch 'master' of git://github.com/rspec/rspec-core

  • Loading branch information...
2 parents a89fb4d + 454f3b4 commit db5a740c017068b224969bf0cf9b0e325b7012b9 Ivan Neverov committed Jan 16, 2012
Showing with 1,589 additions and 1,013 deletions.
  1. +3 −3 .document
  2. +2 −0 .gitignore
  3. +0 −1 .rspec
  4. +2 −1 .travis.yml
  5. +0 −4 .yardopts
  6. +24 −2 Changelog.md
  7. +28 −0 DEV-README.md
  8. +4 −46 Gemfile
  9. +36 −0 Gemfile-custom.sample
  10. +116 −85 README.md
  11. +5 −1 Rakefile
  12. +3 −3 features/command_line/format_option.feature
  13. +1 −1 features/example_groups/shared_examples.feature
  14. +4 −4 features/hooks/around_hooks.feature
  15. +5 −5 features/pending/pending_examples.feature
  16. +8 −1 features/support/env.rb
  17. +6 −6 lib/autotest/rspec2.rb
  18. +10 −8 lib/rspec/core.rb
  19. +2 −0 lib/rspec/core/backward_compatibility.rb
  20. +4 −0 lib/rspec/core/command_line.rb
  21. +235 −115 lib/rspec/core/configuration.rb
  22. +5 −1 lib/rspec/core/configuration_options.rb
  23. +2 −3 lib/rspec/core/deprecation.rb
  24. +71 −58 lib/rspec/core/drb_options.rb
  25. +13 −0 lib/rspec/core/dsl.rb
  26. +0 −13 lib/rspec/core/errors.rb
  27. +23 −17 lib/rspec/core/example.rb
  28. +82 −27 lib/rspec/core/example_group.rb
  29. +5 −0 lib/rspec/core/extensions/instance_eval_with_args.rb
  30. +1 −1 lib/rspec/core/extensions/kernel.rb
  31. +4 −0 lib/rspec/core/extensions/module_eval_with_args.rb
  32. +7 −2 lib/rspec/core/extensions/ordered.rb
  33. +68 −34 lib/rspec/core/filter_manager.rb
  34. +28 −21 lib/rspec/core/formatters/base_text_formatter.rb
  35. +1 −2 lib/rspec/core/formatters/html_formatter.rb
  36. +96 −35 lib/rspec/core/hooks.rb
  37. +58 −57 lib/rspec/core/let.rb
  38. +97 −79 lib/rspec/core/metadata.rb
  39. +4 −0 lib/rspec/core/metadata_hash_builder.rb
  40. +37 −44 lib/rspec/core/option_parser.rb
  41. +25 −3 lib/rspec/core/pending.rb
  42. +22 −3 lib/rspec/core/project_initializer.rb
  43. +2 −2 lib/rspec/core/runner.rb
  44. +1 −3 lib/rspec/core/shared_context.rb
  45. +1 −1 lib/rspec/core/version.rb
  46. +2 −0 lib/rspec/monkey/spork/test_framework/rspec.rb
  47. +15 −3 rspec-core.gemspec
  48. +19 −13 spec/command_line/order_spec.rb
  49. +0 −3 spec/rspec/core/command_line_spec.rb
  50. +17 −18 spec/rspec/core/configuration_options_spec.rb
  51. +28 −14 spec/rspec/core/configuration_spec.rb
  52. +20 −37 spec/rspec/core/drb_command_line_spec.rb
  53. +51 −3 spec/rspec/core/drb_options_spec.rb
  54. +18 −12 spec/rspec/core/example_group_spec.rb
  55. +14 −0 spec/rspec/core/example_spec.rb
  56. +114 −33 spec/rspec/core/filter_manager_spec.rb
  57. +17 −69 spec/rspec/core/formatters/html_formatted-1.8.7-jruby.html
  58. +2 −2 spec/rspec/core/formatters/html_formatted-1.8.7.html
  59. +2 −2 spec/rspec/core/formatters/html_formatted-1.9.2.html
  60. +2 −2 spec/rspec/core/formatters/html_formatted-1.9.3.html
  61. +20 −72 spec/rspec/core/formatters/text_mate_formatted-1.8.7-jruby.html
  62. +2 −2 spec/rspec/core/formatters/text_mate_formatted-1.8.7.html
  63. +2 −2 spec/rspec/core/formatters/text_mate_formatted-1.9.2.html
  64. +2 −2 spec/rspec/core/formatters/text_mate_formatted-1.9.3.html
  65. +38 −0 spec/rspec/core/metadata_spec.rb
  66. +5 −0 spec/rspec/core/option_parser_spec.rb
  67. +44 −12 spec/rspec/core/pending_example_spec.rb
  68. +2 −2 spec/rspec/core/project_initializer_spec.rb
  69. +0 −6 spec/rspec/core_spec.rb
  70. +2 −12 spec/support/matchers.rb
View
@@ -1,5 +1,5 @@
-README.markdown
lib/**/*.rb
-bin/*
-features/**/*.feature
+-
+README.md
License.txt
+Changelog.md
View
@@ -14,3 +14,5 @@ Gemfile.lock
bin
.rbx
.yardoc
+vendor
+Gemfile-custom
View
@@ -1,3 +1,2 @@
--default_path spec
--order rand
---tag ~ui
View
@@ -1,7 +1,8 @@
script: "bin/rake --trace 2>&1"
-bundler_args: "--binstubs --without development"
+bundler_args: "--binstubs"
rvm:
- 1.8.7
- 1.9.2
- 1.9.3
- ree
+ - jruby
View
@@ -1,7 +1,3 @@
--no-private
--exclude features
--markup markdown
--
-README.md
-Changelog.md
-License.txt
View
@@ -1,17 +1,39 @@
### dev
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.8.0.rc1...master)
+Bug fixes
+
+* Restore `--full_backtrace` option
+
+### 2.8.0 / 2012-01-04
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.8.0.rc2...v2.8.0)
+
+Bug fixes
+
+* For metadata filtering, restore passing the entire array to the proc, rather
+ than each item in the array (weidenfreak)
+* Ensure each spec file is loaded only once
+ * Fixes a bug that caused all the examples in a file to be run when
+ referenced twice with line numbers in a command, e.g.
+ * `rspec path/to/file:37 path/to/file:42`
+
+### 2.8.0.rc2 / 2011-12-19
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.8.0.rc1...v2.8.0.rc2)
Enhancments
* new `--init` command (Peter Schröder)
* generates `spec/spec_helper.rb`
- * deletes obsolete files (on confirmation)
+ * deletes obsolete files (on confirmation)
* merged with and deprecates `--configure` command, which generated
`.rspec`
* use `require_relative` when available (Ian Leitch)
* `include_context` and `include_examples` accept params (Calvin Bascom)
* print the time for every example in the html formatter (Richie Vos)
+* several tasty refactoring niblets (Sasha)
+* `it "does something", :x => [:foo,'bar',/baz/] (Ivan Neverov)
+ * supports matching n command line tag values with an example or group
### 2.8.0.rc1 / 2011-11-06
View
@@ -0,0 +1,28 @@
+## Set up the dev environment
+
+ git clone git://github.com/rspec/rspec-core.git
+ cd rspec-core
+ gem install bundler
+ bundle install
+
+Now you should be able to run any of:
+
+ rake
+ rake spec
+ rake cucumber
+
+Or, if you prefer to use the rspec and cucumber commands directly, you can either:
+
+ bundle exec rspec
+
+Or ...
+
+ bundle install --binstubs
+ bin/rspec
+
+## Customize the dev enviroment
+
+The Gemfile includes the gems you'll need to be able to run specs. If you want
+to customize your dev enviroment with additional tools like guard or
+ruby-debug, add any additional gem declarations to Gemfile-custom (see
+Gemfile-custom.sample for some examples).
View
@@ -1,7 +1,9 @@
source "http://rubygems.org"
+gemspec
+
### rspec libs
-%w[rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
+%w[rspec-core rspec-expectations rspec-mocks].each do |lib|
library_path = File.expand_path("../../#{lib}", __FILE__)
if File.exist?(library_path)
gem lib, :path => library_path
@@ -10,52 +12,8 @@ source "http://rubygems.org"
end
end
-### dev dependencies
-gem "rake", "0.9.2"
-gem "cucumber", "1.0.1"
-gem "aruba", "0.4.2"
-gem "ZenTest", "4.6.2"
-gem "nokogiri", "1.5.0"
-gem "fakefs", "0.4.0", :require => "fakefs/safe"
-
platforms :jruby do
gem "jruby-openssl"
end
-### rspec-core only
-gem "mocha", "~> 0.9.10"
-gem "rr", "~> 1.0.2"
-gem "flexmock", "0.8.8"
-
-### optional runtime deps
-gem "syntax", "1.0.0"
-
-group :development do
- gem 'interactive_rspec'
- gem 'yard'
- gem "relish", "~> 0.5.0"
- gem "guard-rspec", "0.5.0"
- gem "growl", "1.0.3"
- gem "spork", "0.9.0.rc9"
-
- platforms :mri_18, :jruby do
- gem "rcov", "0.9.10"
- end
-
- platforms :mri_18 do
- gem 'ruby-debug'
- end
-
- platforms :mri_19 do
- if RUBY_VERSION == '1.9.2'
- gem 'linecache19', '~> 0.5.12'
- gem 'ruby-debug19', '~> 0.11.6'
- gem 'ruby-debug-base19', '~> 0.11.25'
- end
- end
-
- platforms :mri_18, :mri_19 do
- gem "rb-fsevent", "~> 0.4.3.1"
- gem "ruby-prof", "~> 0.10.0"
- end
-end
+eval File.read('Gemfile-custom') if File.exist?('Gemfile-custom')
View
@@ -0,0 +1,36 @@
+group :development do
+ gem 'interactive_rspec'
+ gem 'yard', "~> 0.7.4"
+ gem "relish", "~> 0.5.0"
+ gem "guard-rspec", "0.5.0"
+ gem "growl", "1.0.3"
+ gem "spork", "0.9.0.rc9"
+
+ platforms :mri_18, :jruby do
+ gem "rcov", "0.9.10"
+ end
+
+ platforms :mri_18 do
+ gem 'ruby-debug'
+ end
+
+ platforms :mri_19 do
+ case RUBY_VERSION
+ when '1.9.2'
+ gem 'ruby-debug19', '0.11.6'
+ gem 'ruby-debug-base19', '0.11.25'
+ gem 'linecache19', '0.5.12'
+ when '1.9.3'
+ # NOTE - see http://blog.wyeworks.com/2011/11/1/ruby-1-9-3-and-ruby-debug
+ # for help setting up ruby-debug19 on ruby 1.9.3
+ gem 'ruby-debug19', '0.11.6'
+ gem 'ruby-debug-base19', '0.11.26'
+ gem 'linecache19', '0.5.13'
+ end
+ end
+
+ platforms :mri_18, :mri_19 do
+ gem "rb-fsevent", "~> 0.4.3.1"
+ gem "ruby-prof", "~> 0.10.0"
+ end
+end
Oops, something went wrong.

0 comments on commit db5a740

Please sign in to comment.