diff --git a/Gemfile b/Gemfile index 4659a23f..1371493e 100644 --- a/Gemfile +++ b/Gemfile @@ -46,9 +46,9 @@ group :development do end group :development, :test do - gem 'byebug' + gem 'byebug', platform: :ruby gem 'spring' - gem 'web-console', '~> 2.0' + gem 'web-console', '~> 2.0', platform: :ruby end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 42716639..fe0ce24c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,6 +31,11 @@ GEM activemodel (= 4.2.0) activesupport (= 4.2.0) arel (~> 6.0) + activerecord-jdbc-adapter (1.3.14) + activerecord (>= 2.2) + activerecord-jdbcpostgresql-adapter (1.3.14) + activerecord-jdbc-adapter (~> 1.3.14) + jdbc-postgres (>= 9.1) activesupport (4.2.0) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) @@ -45,6 +50,7 @@ GEM autotest-rails (4.2.1) ZenTest (~> 4.5) bcrypt (3.1.10) + bcrypt (3.1.10-java) better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -103,6 +109,7 @@ GEM columnize (0.9.0) concurrent-ruby (0.8.0) ref (~> 1.0, >= 1.0.5) + concurrent-ruby (0.8.0-java) concurrent-ruby-ext (0.8.0) concurrent-ruby (~> 0.8.0) database_cleaner (1.4.0) @@ -125,6 +132,7 @@ GEM faraday (0.9.1) multipart-post (>= 1.2, < 3) ffi (1.9.6) + ffi (1.9.6-java) forgery (0.6.0) globalid (0.3.3) activesupport (>= 4.1.0) @@ -138,6 +146,7 @@ GEM jbuilder (2.2.7) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) + jdbc-postgres (9.4.1200) jquery-rails (4.0.3) rails-dom-testing (~> 1.0) railties (>= 4.2.0) @@ -146,6 +155,7 @@ GEM railties (>= 3.1.0) turbolinks json (1.8.2) + json (1.8.2-java) jwt (1.2.1) kramdown (1.5.0) loofah (2.0.1) @@ -166,6 +176,7 @@ GEM net-ssh (2.9.2) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) + nokogiri (1.6.6.2-java) nyan-cat-formatter (0.11) rspec (>= 2.99, >= 2.14.2, < 4) oauth (0.4.7) @@ -185,8 +196,15 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) + pry (0.10.1-java) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + spoon (~> 0.0) puma (2.11.1) rack (>= 1.1, < 2.0) + puma (2.11.1-java) + rack (>= 1.1, < 2.0) pundit (0.3.0) activesupport (>= 3.0.0) rack (1.6.0) @@ -291,6 +309,8 @@ GEM bcrypt (~> 3.1) oauth (~> 0.4, >= 0.4.4) oauth2 (>= 0.8.0) + spoon (0.0.4) + ffi spring (1.3.2) sprockets (2.12.3) hike (~> 1.2) @@ -310,6 +330,7 @@ GEM temple (0.7.5) thor (0.19.1) thread_safe (0.3.4) + thread_safe (0.3.4-java) tilt (1.4.1) turbolinks (2.5.3) coffee-rails @@ -331,6 +352,7 @@ GEM nokogiri (~> 1.3) PLATFORMS + java ruby DEPENDENCIES