Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rspec/rspec-core
base: v2.6.2
...
head fork: rspec/rspec-core
compare: v2.6.3
  • 17 commits
  • 6 files changed
  • 0 commit comments
  • 2 contributors
View
2  Gemfile
@@ -11,7 +11,7 @@ source "http://rubygems.org"
end
### dev dependencies
-gem "rake", "~> 0.8"
+gem "rake", "~> 0.9"
gem "cucumber", "~> 0.10.2"
gem "aruba", "~> 0.3.6"
gem "rcov", "0.9.9", :platforms => :mri
View
15 Rakefile
@@ -23,21 +23,9 @@ require "rake/rdoctask"
require "rspec/core/rake_task"
require "rspec/core/version"
-cucumber_loaded = false
-
begin
require "cucumber/rake/task"
-
Cucumber::Rake::Task.new(:cucumber)
-
- 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
- end
- cucumber_loaded = true
rescue LoadError => e
puts "unable to load cucumber, some tasks unavailable"
task :cucumber do
@@ -52,7 +40,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
t.verbose = false
end
-
namespace :rcov do
task :cleanup do
rm_rf 'coverage.data'
@@ -64,7 +51,7 @@ namespace :rcov do
t.rcov_opts << %[--no-html --aggregate coverage.data]
end
- if cucumber_loaded
+ if defined?(Cucumber)
Cucumber::Rake::Task.new :cucumber do |t|
t.cucumber_opts = %w{--format progress}
t.rcov = true
View
10 features/Changelog.md
@@ -1,3 +1,13 @@
+### 2.6.3 / 2011-05-24
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.2...v2.6.3)
+
+* Bug fixes
+ * Explicitly convert exit code to integer, avoiding TypeError when return
+ value of run is IO object proxied by `DRb::DRbObject` (Julian Scheid)
+ * Clarify behavior of `--example` command line option
+ * Build using a rubygems-1.6.2 to avoid downstream yaml parsing error
+
### 2.6.2 / 2011-05-21
[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.1...v2.6.2)
View
3  lib/rspec/core/option_parser.rb
@@ -40,8 +40,7 @@ def parser(options)
options[:debug] = true
end
- parser.on('-e', '--example PATTERN', "Run examples whose full descriptions match this pattern",
- "(PATTERN is compiled into a Ruby regular expression)") do |o|
+ parser.on('-e', '--example STRING', "Run examples whose full nested names include STRING") do |o|
options[:full_description] = Regexp.compile(Regexp.escape(o))
end
View
2  lib/rspec/core/runner.rb
@@ -8,7 +8,7 @@ class Runner
def self.autorun
return if autorun_disabled? || installed_at_exit? || running_in_drb?
@installed_at_exit = true
- at_exit { exit(run(ARGV, $stderr, $stdout)) }
+ at_exit { exit(run(ARGV, $stderr, $stdout).to_i) }
end
AT_EXIT_HOOK_BACKTRACE_LINE = "#{__FILE__}:#{__LINE__ - 2}:in `autorun'"
View
2  lib/rspec/core/version.rb
@@ -1,7 +1,7 @@
module RSpec # :nodoc:
module Core # :nodoc:
module Version # :nodoc:
- STRING = '2.6.2'
+ STRING = '2.6.3'
end
end
end

No commit comments for this range

Something went wrong with that request. Please try again.