Skip to content

Commit 1d89823

Browse files
committed
Remove pry from gemspec for JRuby compatibility
pry-debugger doesn't compile on JRuby, and we're really only using that locally.
1 parent 2f404c9 commit 1d89823

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

Gemfile

+9-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ source "https://rubygems.org"
22

33
gemspec
44

5-
gem "jruby-openssl", :platform => :jruby
6-
gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
7-
gem "sqlite3", :platform => :ruby
5+
platform :jruby do
6+
gem 'jruby-openssl'
7+
gem 'activerecord-jdbcsqlite3-adapter'
8+
end
9+
10+
platform :ruby do
11+
gem 'pry'
12+
gem 'pry-debugger'
13+
end

paperclip.gemspec

-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ Gem::Specification.new do |s|
4545
s.add_development_dependency('capybara', '= 2.0.3')
4646
s.add_development_dependency('bundler')
4747
s.add_development_dependency('fog', '~> 1.0')
48-
s.add_development_dependency('pry')
49-
s.add_development_dependency('pry-debugger')
5048
s.add_development_dependency('launchy')
5149
s.add_development_dependency('rake')
5250
s.add_development_dependency('fakeweb')

test/helper.rb

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313
require 'mime/types'
1414
require 'pathname'
1515
require 'ostruct'
16-
require 'pry'
16+
17+
begin
18+
require 'pry'
19+
rescue LoadError
20+
# Pry is not available, just ignore.
21+
end
1722

1823
puts "Testing against version #{ActiveRecord::VERSION::STRING}"
1924

0 commit comments

Comments
 (0)