[ARVADOS] created: 860ebb15dead1d708e8a871ecc8955705c6d7122
Git user
git at public.curoverse.com
Thu Mar 10 15:00:01 EST 2016
at 860ebb15dead1d708e8a871ecc8955705c6d7122 (commit)
commit 860ebb15dead1d708e8a871ecc8955705c6d7122
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Mar 10 14:59:50 2016 -0500
5737: Update bundle for ruby 2.2 compat
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..8bbe6cf
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.2
diff --git a/services/api/Gemfile b/services/api/Gemfile
index 48998aa..7ee9471 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '~> 3.2.0'
+gem 'rails', '~> 3.2'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -9,6 +9,7 @@ group :test, :development do
gem 'factory_girl_rails'
gem 'database_cleaner'
gem 'ruby-prof'
+ gem 'test-unit', '~> 3.0'
# Note: "require: false" here tells bunder not to automatically
# 'require' the packages during application startup. Installation is
# still mandatory.
@@ -31,8 +32,8 @@ gem 'oj'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', '>= 3.2.0'
- gem 'coffee-rails', '~> 3.2.0'
+ gem 'sass-rails', '>= 3.2'
+ gem 'coffee-rails', '~> 3.2'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index ac6be5a..9dd0b16 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -1,12 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.17)
- actionpack (= 3.2.17)
+ actionmailer (3.2.22.2)
+ actionpack (= 3.2.22.2)
mail (~> 2.5.4)
- actionpack (3.2.17)
- activemodel (= 3.2.17)
- activesupport (= 3.2.17)
+ actionpack (3.2.22.2)
+ activemodel (= 3.2.22.2)
+ activesupport (= 3.2.22.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -14,34 +14,34 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.17)
- activesupport (= 3.2.17)
+ activemodel (3.2.22.2)
+ activesupport (= 3.2.22.2)
builder (~> 3.0.0)
- activerecord (3.2.17)
- activemodel (= 3.2.17)
- activesupport (= 3.2.17)
+ activerecord (3.2.22.2)
+ activemodel (= 3.2.22.2)
+ activesupport (= 3.2.22.2)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.17)
- activemodel (= 3.2.17)
- activesupport (= 3.2.17)
- activesupport (3.2.17)
+ activeresource (3.2.22.2)
+ activemodel (= 3.2.22.2)
+ activesupport (= 3.2.22.2)
+ activesupport (3.2.22.2)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
acts_as_api (0.4.2)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
- addressable (2.3.8)
+ addressable (2.4.0)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.20150615153458)
+ arvados (0.1.20151207150126)
activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
google-api-client (~> 0.6.3, >= 0.6.3)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
- arvados-cli (0.1.20151207150126)
+ arvados-cli (0.1.20160302214005)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.20150128223554)
@@ -56,36 +56,35 @@ GEM
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
builder (3.0.4)
- capistrano (2.15.5)
+ capistrano (2.15.7)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- coffee-rails (3.2.1)
+ coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
- railties (~> 3.2.0.beta)
- coffee-script (2.2.0)
+ railties (~> 3.2.0)
+ coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.7.0)
- curb (0.8.8)
- daemon_controller (1.2.0)
- database_cleaner (1.2.0)
+ coffee-script-source (1.10.0)
+ curb (0.9.1)
+ database_cleaner (1.5.1)
erubis (2.7.0)
- eventmachine (1.0.3)
- execjs (2.0.2)
+ eventmachine (1.0.9.1)
+ execjs (2.6.0)
extlib (0.9.16)
- factory_girl (4.4.0)
+ factory_girl (4.5.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.4.1)
- factory_girl (~> 4.4.0)
+ factory_girl_rails (4.6.0)
+ factory_girl (~> 4.5.0)
railties (>= 3.0.0)
- faraday (0.8.9)
+ faraday (0.8.11)
multipart-post (~> 1.2.0)
- faye-websocket (0.7.2)
+ faye-websocket (0.10.3)
eventmachine (>= 0.12.0)
- websocket-driver (>= 0.3.1)
+ websocket-driver (>= 0.5.1)
google-api-client (0.6.4)
addressable (>= 2.3.2)
autoparse (>= 0.3.3)
@@ -97,12 +96,12 @@ GEM
signet (~> 0.4.5)
uuidtools (>= 2.1.0)
hashie (1.2.0)
- highline (1.6.21)
+ highline (1.7.8)
hike (1.2.3)
httpauth (0.2.1)
i18n (0.7.0)
journey (1.0.4)
- jquery-rails (3.1.0)
+ jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
@@ -110,7 +109,7 @@ GEM
multi_json (>= 1.5)
launchy (2.4.3)
addressable (~> 2.3)
- libv8 (3.16.14.3)
+ libv8 (3.16.14.13)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -118,13 +117,13 @@ GEM
mime-types (1.25.1)
mocha (1.1.0)
metaclass (~> 0.0.1)
- multi_json (1.11.1)
+ multi_json (1.11.2)
multipart-post (1.2.0)
- net-scp (1.2.0)
+ net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.8.0)
+ net-ssh (3.0.2)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
oauth2 (0.8.1)
@@ -133,54 +132,53 @@ GEM
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
- oj (2.11.4)
+ oj (2.14.6)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
- passenger (4.0.41)
- daemon_controller (>= 1.2.0)
+ passenger (5.0.26)
rack
rake (>= 0.8.1)
- pg (0.17.1)
+ pg (0.18.4)
pg_power (1.6.4)
pg
rails (~> 3.1)
- polyglot (0.3.4)
- puma (2.8.2)
- rack (>= 1.1, < 2.0)
- rack (1.4.5)
- rack-cache (1.2)
+ polyglot (0.3.5)
+ power_assert (0.2.2)
+ puma (3.1.0)
+ rack (1.4.7)
+ rack-cache (1.6.1)
rack (>= 0.4)
rack-ssl (1.3.4)
rack
- rack-test (0.6.2)
+ rack-test (0.6.3)
rack (>= 1.0)
- rails (3.2.17)
- actionmailer (= 3.2.17)
- actionpack (= 3.2.17)
- activerecord (= 3.2.17)
- activeresource (= 3.2.17)
- activesupport (= 3.2.17)
+ rails (3.2.22.2)
+ actionmailer (= 3.2.22.2)
+ actionpack (= 3.2.22.2)
+ activerecord (= 3.2.22.2)
+ activeresource (= 3.2.22.2)
+ activesupport (= 3.2.22.2)
bundler (~> 1.0)
- railties (= 3.2.17)
- railties (3.2.17)
- actionpack (= 3.2.17)
- activesupport (= 3.2.17)
+ railties (= 3.2.22.2)
+ railties (3.2.22.2)
+ actionpack (= 3.2.22.2)
+ activesupport (= 3.2.22.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.2.2)
+ rake (11.0.1)
rdoc (3.12.2)
json (~> 1.4)
- ref (1.0.5)
- ruby-prof (0.15.2)
- rvm-capistrano (1.5.1)
+ ref (2.0.0)
+ ruby-prof (0.15.9)
+ rvm-capistrano (1.5.6)
capistrano (~> 2.15.4)
- sass (3.3.4)
+ sass (3.4.21)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -196,16 +194,19 @@ GEM
simplecov-html (0.7.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
- sprockets (2.2.2)
+ sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sshkey (1.6.1)
- test_after_commit (0.2.3)
+ sshkey (1.8.0)
+ test-unit (3.0.8)
+ power_assert
+ test_after_commit (1.0.0)
+ activerecord (>= 3.2)
themes_for_rails (0.5.1)
rails (>= 3.0.0)
- therubyracer (0.12.1)
+ therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
@@ -213,13 +214,15 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- trollop (2.1.1)
- tzinfo (0.3.39)
- uglifier (2.5.0)
+ trollop (2.1.2)
+ tzinfo (0.3.46)
+ uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
uuidtools (2.1.5)
- websocket-driver (0.3.2)
+ websocket-driver (0.6.3)
+ websocket-extensions (>= 0.1.0)
+ websocket-extensions (0.1.2)
PLATFORMS
ruby
@@ -229,7 +232,7 @@ DEPENDENCIES
andand
arvados (>= 0.1.20150615153458)
arvados-cli (>= 0.1.20151207150126)
- coffee-rails (~> 3.2.0)
+ coffee-rails (~> 3.2)
database_cleaner
factory_girl_rails
faye-websocket
@@ -244,13 +247,14 @@ DEPENDENCIES
pg
pg_power
puma
- rails (~> 3.2.0)
+ rails (~> 3.2)
ruby-prof
rvm-capistrano
- sass-rails (>= 3.2.0)
+ sass-rails (>= 3.2)
simplecov (~> 0.7.1)
simplecov-rcov
sshkey
+ test-unit (~> 3.0)
test_after_commit
themes_for_rails
therubyracer
@@ -258,4 +262,4 @@ DEPENDENCIES
uglifier (>= 1.0.3)
BUNDLED WITH
- 1.10.6
+ 1.11.2
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list