Commit 804aac2c7c553dde2f904add8f6803bc4b0876f9
1 parent
74191451
Exists in
master
and in
1 other branch
Fixed ruby-debug conditional in Gemfile
Showing
2 changed files
with
10 additions
and
2 deletions
Show diff stats
Gemfile
@@ -36,9 +36,9 @@ gem 'json', '~> 1.4.6' | @@ -36,9 +36,9 @@ gem 'json', '~> 1.4.6' | ||
36 | group :development, :test do | 36 | group :development, :test do |
37 | gem 'rspec-rails', '~> 2.6' | 37 | gem 'rspec-rails', '~> 2.6' |
38 | gem 'webmock', :require => false | 38 | gem 'webmock', :require => false |
39 | - unless ENV['TRAVIS'] | 39 | + unless ENV["CI"] |
40 | gem 'ruby-debug', :platform => :mri_18 | 40 | gem 'ruby-debug', :platform => :mri_18 |
41 | - # gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug' | 41 | + gem (RUBY_VERSION == "1.9.2" ? 'ruby-debug19' : 'debugger'), :platform => :mri_19 |
42 | end | 42 | end |
43 | # gem 'rpm_contrib', :git => "git://github.com/bensymonds/rpm_contrib.git", :branch => "mongo-1.4.0_update" | 43 | # gem 'rpm_contrib', :git => "git://github.com/bensymonds/rpm_contrib.git", :branch => "mongo-1.4.0_update" |
44 | end | 44 | end |
Gemfile.lock
@@ -45,6 +45,13 @@ GEM | @@ -45,6 +45,13 @@ GEM | ||
45 | addressable | 45 | addressable |
46 | rdoc | 46 | rdoc |
47 | database_cleaner (0.6.7) | 47 | database_cleaner (0.6.7) |
48 | + debugger (1.1.3) | ||
49 | + columnize (>= 0.3.1) | ||
50 | + debugger-linecache (~> 1.1.1) | ||
51 | + debugger-ruby_core_source (~> 1.1.2) | ||
52 | + debugger-linecache (1.1.1) | ||
53 | + debugger-ruby_core_source (>= 1.1.1) | ||
54 | + debugger-ruby_core_source (1.1.2) | ||
48 | devise (1.5.3) | 55 | devise (1.5.3) |
49 | bcrypt-ruby (~> 3.0) | 56 | bcrypt-ruby (~> 3.0) |
50 | orm_adapter (~> 0.0.3) | 57 | orm_adapter (~> 0.0.3) |
@@ -214,6 +221,7 @@ DEPENDENCIES | @@ -214,6 +221,7 @@ DEPENDENCIES | ||
214 | bson (= 1.3.1) | 221 | bson (= 1.3.1) |
215 | bson_ext (= 1.3.1) | 222 | bson_ext (= 1.3.1) |
216 | database_cleaner (~> 0.6.0) | 223 | database_cleaner (~> 0.6.0) |
224 | + debugger | ||
217 | devise (~> 1.5.3) | 225 | devise (~> 1.5.3) |
218 | email_spec | 226 | email_spec |
219 | fabrication (~> 1.3.0) | 227 | fabrication (~> 1.3.0) |