Skip to content

Commit

Permalink
Use latest version of ruby-debug on 1.9.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
myronmarston committed Feb 8, 2011
1 parent f602a2a commit 6b6d19c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -34,7 +34,7 @@ group :extras do

platforms :mri_19 do
gem 'ruby-debug19'
gem 'ruby-debug-base19', '0.11.23'
gem 'ruby-debug-base19', RUBY_VERSION == '1.9.1' ? '0.11.23' : '~> 0.11.24'
end
end

7 changes: 7 additions & 0 deletions script/FullBuildRakeFile
Expand Up @@ -37,6 +37,13 @@ task :print_ruby_description do
end

task :bundle_install => :ensure_bundler_installed do
# Unfortunately, there is no version of ruby-debug that installs cleanly on 1.9.1 and 1.9.2.
# Our Gemfile specifies different versions using conditionals, but we still need to bundle update
# to get bundler to use the different versions.
if RUBY_VERSION =~ /^1\.9/
sh "bundle update ruby-debug-base19"
end

sh "bundle install"
end

Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Expand Up @@ -42,7 +42,7 @@ def reset!(stubbing_lib = :fakeweb)
config.extend WebMockMacros

config.color_enabled = true
config.debug = RUBY_INTERPRETER == :mri && RUBY_VERSION != '1.9.2'
config.debug = RUBY_INTERPRETER == :mri

config.before(:each) do
VCR.turn_on! unless VCR.turned_on?
Expand Down

0 comments on commit 6b6d19c

Please sign in to comment.