Fix jruby

arsduo · Apr 5, 2015 · 052625a · 052625a
1 parent 8212204
commit 052625a
Show file tree

Hide file tree

Showing 3 changed files with 118 additions and 88 deletions.
diff --git a/Gemfile b/Gemfile
@@ -16,6 +16,17 @@ group :development, :test do
   gem 'byebug', :platforms => [:mri_20, :mri_21]
   gem 'pry'
 
+  # testing the request infrastructure
+  gem "rails", "~> 4.2"
+  gem "sinatra"
+  gem "rspec"
+  gem "rspec-rails"
+  gem "rack-contrib"
+  # for CRuby, Rubinius, including Windows and RubyInstaller
+  gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+  # for JRuby
+  gem "jdbc-sqlite3", :platform => :jruby
+
   group :darwin do
     # OS X integration
     gem "ruby_gntp"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,41 +1,49 @@
 PATH
   remote: .
   specs:
-    batch_api (0.2.1)
+    batch_api (0.3.0)
       middleware
 
 GEM
   remote: http://rubygems.org/
   specs:
-    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)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
       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)
-    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.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
     byebug (3.0.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
@@ -47,10 +55,12 @@ GEM
       debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.3.8)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     faker (1.1.2)
       i18n (~> 0.5)
+    globalid (0.3.3)
+      activesupport (>= 4.1.0)
     guard (1.5.0)
       listen (>= 0.4.2)
       lumberjack (>= 1.0.2)
@@ -59,89 +69,104 @@ GEM
     guard-rspec (2.1.0)
       guard (>= 1.1)
       rspec (~> 2.11)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
+    hike (1.2.3)
+    i18n (0.7.0)
     json (1.8.2)
     listen (0.5.3)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
     lumberjack (1.0.2)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     method_source (0.8.1)
     middleware (0.1.0)
-    mime-types (1.19)
-    multi_json (1.3.6)
-    polyglot (0.3.3)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    multi_json (1.11.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     power_assert (0.2.2)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
+    rack (1.6.0)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
     rack-protection (1.2.0)
       rack
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    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)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
     rb-fsevent (0.9.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    rspec-rails (2.11.4)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-collection_matchers (1.1.2)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.3)
+    rspec-rails (2.99.0)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
+      rspec-collection_matchers
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
     ruby_gntp (0.3.4)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     slop (3.3.3)
-    sprockets (2.1.3)
+    sprockets (2.12.3)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
     test-unit (3.0.9)
       power_assert
-    thor (0.16.0)
-    tilt (1.3.3)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
     timecop (0.5.3)
-    treetop (1.4.11)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -153,9 +178,10 @@ DEPENDENCIES
   faker
   guard
   guard-rspec
+  jdbc-sqlite3
   pry
   rack-contrib
-  rails (~> 3.2)
+  rails (~> 4.2)
   rb-fsevent
   rspec
   rspec-rails

diff --git a/batch_api.gemspec b/batch_api.gemspec
@@ -18,11 +18,4 @@ Gem::Specification.new do |s|
   s.test_files = Dir["spec/**/*"]
 
   s.add_runtime_dependency("middleware")
-
-  s.add_development_dependency("rails", "~> 3.2")
-  s.add_development_dependency("sinatra")
-  s.add_development_dependency("rspec")
-  s.add_development_dependency("rspec-rails")
-  s.add_development_dependency("sqlite3")
-  s.add_development_dependency("rack-contrib")
 end