Also add Gemfile entry for JRuby

fparaggio · Jul 22, 2011 · 1ad401a · 1ad401a
1 parent 7859c4c
commit 1ad401a
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 0 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,6 +4,7 @@ gem "mocha"
 gem "rake"
 # gem "ruby-debug", :platform => :ruby_18
 # gem "ruby-debug19", :platform => :ruby_19
+gem "jruby-openssl", :platform => :jruby
 gem "aws-s3", :require => "aws/s3"
 gem "sqlite3-ruby", "~>1.3.0"
 gem "appraisal"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -13,6 +13,7 @@ GEM
       builder
       mime-types
       xml-simple
+    bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
@@ -26,6 +27,7 @@ GEM
     diff-lcs (1.1.2)
     excon (0.6.3)
     ffi (1.0.9)
+    ffi (1.0.9-java)
     fog (0.8.2)
       builder
       excon (~> 0.6.1)
@@ -38,11 +40,18 @@ GEM
     formatador (0.1.4)
     gherkin (2.4.5)
       json (>= 1.4.6)
+    gherkin (2.4.5-java)
+      json (>= 1.4.6)
+    jruby-openssl (0.7.4)
+      bouncy-castle-java
     json (1.5.3)
+    json (1.5.3-java)
     mime-types (1.16)
     mocha (0.9.12)
     net-ssh (2.1.4)
     nokogiri (1.4.4)
+    nokogiri (1.4.4-java)
+      weakling (>= 0.0.3)
     rake (0.9.2)
     rdoc (3.8)
     rspec (2.6.0)
@@ -59,9 +68,11 @@ GEM
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.5)
+    weakling (0.0.4-java)
     xml-simple (1.0.16)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -70,6 +81,7 @@ DEPENDENCIES
   bundler
   cocaine
   fog
+  jruby-openssl
   mime-types
   mocha
   rake

diff --git a/gemfiles/rails2.gemfile b/gemfiles/rails2.gemfile
@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "shoulda"
 gem "mocha"
 gem "rake"
+gem "jruby-openssl", :platform=>:jruby
 gem "aws-s3", :require=>"aws/s3"
 gem "sqlite3-ruby", "~>1.3.0"
 gem "appraisal"

diff --git a/gemfiles/rails2.gemfile.lock b/gemfiles/rails2.gemfile.lock
@@ -27,6 +27,7 @@ GEM
       xml-simple
     bcat (0.6.1)
       rack (~> 1.0)
+    bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
     childprocess (0.2.0)
       ffi (~> 1.0.6)
@@ -40,6 +41,7 @@ GEM
     diff-lcs (1.1.2)
     excon (0.6.5)
     ffi (1.0.9)
+    ffi (1.0.9-java)
     fog (0.9.0)
       builder
       excon (~> 0.6.1)
@@ -53,13 +55,19 @@ GEM
     formatador (0.2.0)
     gherkin (2.4.5)
       json (>= 1.4.6)
+    gherkin (2.4.5-java)
+      json (>= 1.4.6)
+    jruby-openssl (0.7.4)
+      bouncy-castle-java
     json (1.5.3)
+    json (1.5.3-java)
     mime-types (1.16)
     mocha (0.9.12)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.1.4)
     nokogiri (1.5.0)
+    nokogiri (1.5.0-java)
     rack (1.1.2)
     rails (2.3.12)
       actionmailer (= 2.3.12)
@@ -88,6 +96,7 @@ GEM
     xml-simple (1.1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -96,6 +105,7 @@ DEPENDENCIES
   bundler
   cocaine
   fog
+  jruby-openssl
   mime-types
   mocha
   rails (~> 2.3.12)

diff --git a/gemfiles/rails3.gemfile b/gemfiles/rails3.gemfile
@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "shoulda"
 gem "mocha"
 gem "rake"
+gem "jruby-openssl", :platform=>:jruby
 gem "aws-s3", :require=>"aws/s3"
 gem "sqlite3-ruby", "~>1.3.0"
 gem "appraisal"

diff --git a/gemfiles/rails3.gemfile.lock b/gemfiles/rails3.gemfile.lock
@@ -45,6 +45,7 @@ GEM
       xml-simple
     bcat (0.6.1)
       rack (~> 1.0)
+    bouncy-castle-java (1.5.0146.1)
     builder (2.1.2)
     childprocess (0.2.0)
       ffi (~> 1.0.6)
@@ -60,6 +61,7 @@ GEM
       abstract (>= 1.0.0)
     excon (0.6.5)
     ffi (1.0.9)
+    ffi (1.0.9-java)
     fog (0.9.0)
       builder
       excon (~> 0.6.1)
@@ -73,8 +75,13 @@ GEM
     formatador (0.2.0)
     gherkin (2.4.5)
       json (>= 1.4.6)
+    gherkin (2.4.5-java)
+      json (>= 1.4.6)
     i18n (0.5.0)
+    jruby-openssl (0.7.4)
+      bouncy-castle-java
     json (1.5.3)
+    json (1.5.3-java)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -86,6 +93,7 @@ GEM
       net-ssh (>= 1.99.1)
     net-ssh (2.1.4)
     nokogiri (1.5.0)
+    nokogiri (1.5.0-java)
     polyglot (0.3.1)
     rack (1.2.3)
     rack-mount (0.6.14)
@@ -130,6 +138,7 @@ GEM
     xml-simple (1.1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -138,6 +147,7 @@ DEPENDENCIES
   bundler
   cocaine
   fog
+  jruby-openssl
   mime-types
   mocha
   rails (~> 3.0.9)

diff --git a/gemfiles/rails3_1.gemfile b/gemfiles/rails3_1.gemfile
@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "shoulda"
 gem "mocha"
 gem "rake"
+gem "jruby-openssl", :platform=>:jruby
 gem "aws-s3", :require=>"aws/s3"
 gem "sqlite3-ruby", "~>1.3.0"
 gem "appraisal"

diff --git a/gemfiles/rails3_1.gemfile.lock b/gemfiles/rails3_1.gemfile.lock
@@ -49,6 +49,8 @@ GEM
     bcat (0.6.1)
       rack (~> 1.0)
     bcrypt-ruby (2.1.4)
+    bcrypt-ruby (2.1.4-java)
+    bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
     childprocess (0.2.0)
       ffi (~> 1.0.6)
@@ -63,6 +65,7 @@ GEM
     erubis (2.7.0)
     excon (0.6.5)
     ffi (1.0.9)
+    ffi (1.0.9-java)
     fog (0.9.0)
       builder
       excon (~> 0.6.1)
@@ -76,9 +79,14 @@ GEM
     formatador (0.2.0)
     gherkin (2.4.5)
       json (>= 1.4.6)
+    gherkin (2.4.5-java)
+      json (>= 1.4.6)
     hike (1.2.0)
     i18n (0.6.0)
+    jruby-openssl (0.7.4)
+      bouncy-castle-java
     json (1.5.3)
+    json (1.5.3-java)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -90,6 +98,7 @@ GEM
       net-ssh (>= 1.99.1)
     net-ssh (2.1.4)
     nokogiri (1.5.0)
+    nokogiri (1.5.0-java)
     polyglot (0.3.1)
     rack (1.3.1)
     rack-cache (1.0.2)
@@ -144,6 +153,7 @@ GEM
     xml-simple (1.1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -152,6 +162,7 @@ DEPENDENCIES
   bundler
   cocaine
   fog
+  jruby-openssl
   mime-types
   mocha
   rails (~> 3.1.0.rc4)