Skip to content

Commit

Permalink
Adding back Jruby compatibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremy McNevin committed Sep 25, 2012
1 parent 6f3084a commit 76ac8f0
Show file tree
Hide file tree
Showing 9 changed files with 771 additions and 173 deletions.
13 changes: 6 additions & 7 deletions Gemfile
View file
@@ -1,15 +1,14 @@
source "http://rubygems.org"
# Add dependencies required to use your gem here.

gem 'rails'
gem 'rake'
gem 'pg'

# Add dependencies to develop your gem here.
# Include everything needed to run rake, tests, features, etc.
gem 'pg', :platform => :ruby
gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby

group :development, :test do
gem "shoulda", ">= 0"
gem "bundler", "~> 1.1.3"
gem "jeweler", "~> 1.8.3"
gem "shoulda"
gem "jeweler"
gem "rdoc"
gem "rspec"
end
13 changes: 10 additions & 3 deletions Gemfile.lock
View file
Expand Up @@ -22,6 +22,10 @@ GEM
activesupport (= 3.2.8)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activerecord-jdbc-adapter (1.2.2)
activerecord-jdbcpostgresql-adapter (1.2.2)
activerecord-jdbc-adapter (~> 1.2.2)
jdbc-postgres (>= 9.0, < 9.2)
activeresource (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
Expand All @@ -35,13 +39,15 @@ GEM
git (1.2.5)
hike (1.2.1)
i18n (0.6.1)
jdbc-postgres (9.1.901)
jeweler (1.8.4)
bundler (~> 1.0)
git (>= 1.2.5)
rake
rdoc
journey (1.0.4)
json (1.7.5)
json (1.7.5-java)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
Expand Down Expand Up @@ -82,7 +88,7 @@ GEM
rspec-core (2.11.1)
rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.2)
rspec-mocks (2.11.3)
shoulda (3.1.1)
shoulda-context (~> 1.0)
shoulda-matchers (~> 1.2)
Expand All @@ -101,11 +107,12 @@ GEM
tzinfo (0.3.33)

PLATFORMS
java
ruby

DEPENDENCIES
bundler (~> 1.1.3)
jeweler (~> 1.8.3)
activerecord-jdbcpostgresql-adapter
jeweler
pg
rails
rake
Expand Down
15 changes: 6 additions & 9 deletions activerecord-postgres-hstore.gemspec
View file
Expand Up @@ -104,29 +104,26 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<rails>, [">= 0"])
s.add_runtime_dependency(%q<rake>, [">= 0"])
s.add_runtime_dependency(%q<pg>, [">= 0"])
s.add_development_dependency(%q<shoulda>, [">= 0"])
s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
s.add_development_dependency(%q<bundler>, ["~> 0"])
s.add_development_dependency(%q<jeweler>, ["~> 0"])
s.add_development_dependency(%q<rdoc>, [">= 0"])
s.add_development_dependency(%q<rspec>, [">= 0"])
else
s.add_dependency(%q<rails>, [">= 0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<pg>, [">= 0"])
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1.1.3"])
s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
s.add_dependency(%q<bundler>, ["~> 0"])
s.add_dependency(%q<jeweler>, ["~> 0"])
s.add_dependency(%q<rdoc>, [">= 0"])
s.add_dependency(%q<rspec>, [">= 0"])
end
else
s.add_dependency(%q<rails>, [">= 0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<pg>, [">= 0"])
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<bundler>, ["~> 1.1.3"])
s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
s.add_dependency(%q<bundler>, ["~> 0"])
s.add_dependency(%q<jeweler>, ["~> 0"])
s.add_dependency(%q<rdoc>, [">= 0"])
s.add_dependency(%q<rspec>, [">= 0"])
end
Expand Down
26 changes: 4 additions & 22 deletions app/Gemfile
View file
@@ -1,27 +1,9 @@
source 'http://rubygems.org'

gem 'rails', '3.0.0'
gem 'pg'
gem 'activerecord-postgres-hstore', :path => '../'

# Use unicorn as the web server
# gem 'unicorn'
gem 'rails'

# Deploy with Capistrano
# gem 'capistrano'
gem 'pg', :platform => :ruby
gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby

# To use debugger
# gem 'ruby-debug'

# Bundle the extra gems:
# gem 'bj'
# gem 'nokogiri', '1.4.1'
# gem 'sqlite3-ruby', :require => 'sqlite3'
# gem 'aws-s3', :require => 'aws/s3'
gem 'activerecord-postgres-hstore', :path => '../'

# Bundle gems for the local environment. Make sure to
# put test-only gems in this group so their generators
# and rake tasks are available in development mode:
# group :development, :test do
# gem 'webrat'
# end
150 changes: 86 additions & 64 deletions app/Gemfile.lock
View file
@@ -1,81 +1,103 @@
PATH
remote: ../
specs:
activerecord-postgres-hstore (0.1.2)
activerecord
activerecord-postgres-hstore (0.4.1)
rails
rake

GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
actionmailer (3.0.0)
actionpack (= 3.0.0)
mail (~> 2.2.5)
actionpack (3.0.0)
activemodel (= 3.0.0)
activesupport (= 3.0.0)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.4.1)
rack (~> 1.2.1)
rack-mount (~> 0.6.12)
rack-test (~> 0.5.4)
tzinfo (~> 0.3.23)
activemodel (3.0.0)
activesupport (= 3.0.0)
builder (~> 2.1.2)
i18n (~> 0.4.1)
activerecord (3.0.0)
activemodel (= 3.0.0)
activesupport (= 3.0.0)
arel (~> 1.0.0)
tzinfo (~> 0.3.23)
activeresource (3.0.0)
activemodel (= 3.0.0)
activesupport (= 3.0.0)
activesupport (3.0.0)
arel (1.0.1)
activesupport (~> 3.0.0)
builder (2.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
i18n (0.4.1)
mail (2.2.5)
activesupport (>= 2.3.6)
mime-types
treetop (>= 1.4.5)
mime-types (1.16)
pg (0.9.0)
polyglot (0.3.1)
rack (1.2.1)
rack-mount (0.6.13)
rack (>= 1.0.0)
rack-test (0.5.4)
actionmailer (3.2.8)
actionpack (= 3.2.8)
mail (~> 2.4.4)
actionpack (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.3)
activemodel (3.2.8)
activesupport (= 3.2.8)
builder (~> 3.0.0)
activerecord (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activerecord-jdbc-adapter (1.2.2)
activerecord-jdbcpostgresql-adapter (1.2.2)
activerecord-jdbc-adapter (~> 1.2.2)
jdbc-postgres (>= 9.0, < 9.2)
activeresource (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activesupport (3.2.8)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
builder (3.0.3)
erubis (2.7.0)
hike (1.2.1)
i18n (0.6.1)
jdbc-postgres (9.1.901)
journey (1.0.4)
json (1.7.5)
json (1.7.5-java)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.3.6)
pg (0.14.1)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
rails (3.0.0)
actionmailer (= 3.0.0)
actionpack (= 3.0.0)
activerecord (= 3.0.0)
activeresource (= 3.0.0)
activesupport (= 3.0.0)
bundler (~> 1.0.0)
railties (= 3.0.0)
railties (3.0.0)
actionpack (= 3.0.0)
activesupport (= 3.0.0)
rake (>= 0.8.4)
thor (~> 0.14.0)
rake (0.8.7)
thor (0.14.0)
treetop (1.4.8)
rails (3.2.8)
actionmailer (= 3.2.8)
actionpack (= 3.2.8)
activerecord (= 3.2.8)
activeresource (= 3.2.8)
activesupport (= 3.2.8)
bundler (~> 1.0)
railties (= 3.2.8)
railties (3.2.8)
actionpack (= 3.2.8)
activesupport (= 3.2.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.16.0)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.23)
tzinfo (0.3.33)

PLATFORMS
java
ruby

DEPENDENCIES
activerecord-jdbcpostgresql-adapter
activerecord-postgres-hstore!
pg
rails (= 3.0.0)
rails

0 comments on commit 76ac8f0

Please sign in to comment.