From fc8edb86fb95ea9225a9fa0e2ae1638165af60a0 Mon Sep 17 00:00:00 2001 From: James Adam Date: Wed, 24 Jan 2018 14:09:08 +0000 Subject: [PATCH] Update gems to work with Ruby 2.2+ This is what is running on the server now. --- .ruby-version | 2 +- .travis.yml | 2 +- Gemfile.lock | 121 +++++++++++++++++++++++++++----------------------- 3 files changed, 67 insertions(+), 58 deletions(-) diff --git a/.ruby-version b/.ruby-version index 77fee73..23a63f5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -1.9.3 +2.2.8 diff --git a/.travis.yml b/.travis.yml index 1a067b9..122e38a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ rvm: - - 2.3.0 + - 2.2 services: - redis-server before_install: diff --git a/Gemfile.lock b/Gemfile.lock index b896fd8..882c5fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/lazyatom/a2_printer.git - revision: 11c223b39695a04fe1246711356fa4d510dda47b + revision: 20c6db571bbd1e4cb322c4b892b6105ab6d839d0 specs: - a2_printer (0.1.0) - serialport (~> 1.0.4) + a2_printer (0.2.0) + serialport (~> 1.3) GIT remote: https://github.com/lazyatom/recap.git @@ -18,9 +18,12 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.2.8) - bcrypt-ruby (3.0.1) - capistrano (2.15.5) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + bcrypt (3.1.11) + bcrypt-ruby (3.1.5) + bcrypt (>= 3.1.3) + capistrano (2.15.9) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) @@ -36,14 +39,14 @@ GEM dm-transactions (~> 1.2.0) dm-types (~> 1.2.0) dm-validations (~> 1.2.0) - data_objects (0.10.12) + data_objects (0.10.17) addressable (~> 2.1) dm-aggregates (1.2.0) dm-core (~> 1.2.0) dm-constraints (1.2.0) dm-core (~> 1.2.0) - dm-core (1.2.0) - addressable (~> 2.2.6) + dm-core (1.2.1) + addressable (~> 2.3) dm-do-adapter (1.2.0) data_objects (~> 0.10.6) dm-core (~> 1.2.0) @@ -72,70 +75,76 @@ GEM uuidtools (~> 2.1) dm-validations (1.2.0) dm-core (~> 1.2.0) - do_postgres (0.10.12) - data_objects (= 0.10.12) - dotenv (0.11.1) - dotenv-deployment (~> 0.0.2) - dotenv-deployment (0.0.2) + do_postgres (0.10.17) + data_objects (= 0.10.17) fastercsv (1.5.5) - foreman (0.74.0) - dotenv (~> 0.11.1) + ffi (1.9.18) + foreman (0.84.0) thor (~> 0.19.1) - highline (1.6.21) - json (1.7.7) - json_pure (1.7.7) - kgio (2.8.0) - metaclass (0.0.1) - minitest (5.10.1) - mocha (0.13.2) + highline (1.7.10) + json (1.8.6) + json_pure (1.8.6) + kgio (2.11.1) + metaclass (0.0.4) + minitest (5.11.1) + mocha (1.3.0) metaclass (~> 0.0.1) - multi_json (1.6.1) + mono_logger (1.1.0) + multi_json (1.13.1) + mustermann (1.0.1) net-scp (1.2.1) net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (2.9.1) - net-ssh-gateway (1.2.0) - net-ssh (>= 2.6.5) + net-ssh (4.2.0) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) open4 (1.3.4) - rack (1.5.2) - rack-protection (1.3.2) + public_suffix (3.0.1) + rack (2.0.3) + rack-protection (2.0.0) rack - rack-test (0.6.2) - rack (>= 1.0) - raindrops (0.10.0) - rake (10.0.3) - redis (3.0.2) - redis-namespace (1.2.1) - redis (~> 3.0.0) - resque (1.23.0) + rack-test (0.8.2) + rack (>= 1.0, < 3) + raindrops (0.19.0) + rake (12.3.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + redis (4.0.1) + redis-namespace (1.6.0) + redis (>= 3.0.4) + resque (1.27.4) + mono_logger (~> 1.0) multi_json (~> 1.0) - redis-namespace (~> 1.0) + redis-namespace (~> 1.3) sinatra (>= 0.9.2) vegas (~> 0.1.2) - resque-pool (0.3.0) + resque-pool (0.6.0) rake - resque (~> 1.20) - trollop (~> 1.16) - rmagick (2.13.2) - sass (3.2.6) - serialport (1.0.4) - sinatra (1.3.5) - rack (~> 1.4) - rack-protection (~> 1.3) - tilt (~> 1.3, >= 1.3.3) + resque (~> 1.22) + rmagick (2.16.0) + sass (3.5.5) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + serialport (1.3.1) + sinatra (2.0.0) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.0) + tilt (~> 2.0) stringex (1.5.1) - thor (0.19.1) - tilt (1.3.3) - trollop (1.16.2) - unicorn (4.6.2) + thor (0.19.4) + tilt (2.0.8) + unicorn (5.4.0) kgio (~> 2.6) - rack raindrops (~> 0.7) - uuidtools (2.1.3) + uuidtools (2.1.5) vegas (0.1.11) rack (>= 1.0.0) - yajl-ruby (1.1.0) + yajl-ruby (1.3.1) PLATFORMS ruby @@ -160,4 +169,4 @@ DEPENDENCIES yajl-ruby BUNDLED WITH - 1.14.6 + 1.16.1