From b396a6dfd1c1a6910f579796bdefb07a0882ec3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 26 Feb 2016 13:47:34 +0100 Subject: [PATCH] Update Ruby gems --- Gemfile | 8 +++-- Gemfile.lock | 82 +++++++++++++++++++++++++++------------------------- 2 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Gemfile b/Gemfile index 694b773..7157326 100644 --- a/Gemfile +++ b/Gemfile @@ -2,12 +2,14 @@ source "https://rubygems.org" gem "sinatra", '~> 1.4' gem "sinatra-contrib" -gem "activesupport", '~> 4.2' +gem "activesupport" gem "riak-client", :github => "5apps/riak-ruby-client", :branch => "invalid_uri_error" -gem "fog" +gem "fog-aws" gem "rest-client" gem "redis" -gem "mime-types", "~> 2.6.1", require: 'mime/types/columnar' +# Remove require when we can update to 3.0, which sets the new storage +# format to columnar by default. Increases performance +gem "mime-types", "~> 2.99", require: 'mime/types/columnar' group :test do gem 'rake' diff --git a/Gemfile.lock b/Gemfile.lock index 9d3cc8f..1601888 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,51 +13,56 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (4.2.2) + activesupport (4.2.5.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - backports (3.6.4) + backports (3.6.8) beefcake (0.3.7) builder (3.2.2) - domain_name (0.5.24) + domain_name (0.5.20160216) unf (>= 0.0.5, < 1.0.0) - excon (0.16.10) - faraday (0.9.1) + excon (0.45.4) + faraday (0.9.2) multipart-post (>= 1.2, < 3) - fog (1.7.0) + fog-aws (0.8.1) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-core (1.36.0) builder - excon (~> 0.14) - formatador (~> 0.2.0) - mime-types - multi_json (~> 1.0) - net-scp (~> 1.0.4) - net-ssh (>= 2.1.3) - nokogiri (~> 1.5.0) - ruby-hmac + excon (~> 0.45) + formatador (~> 0.2) + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-xml (0.1.2) + fog-core + nokogiri (~> 1.5, >= 1.5.11) formatador (0.2.5) http-cookie (1.0.2) domain_name (~> 0.5) i18n (0.7.0) innertube (1.0.2) + ipaddress (0.8.3) json (1.8.3) - kgio (2.9.3) - m (1.3.4) + kgio (2.10.0) + m (1.4.2) method_source (>= 0.6.7) rake (>= 0.9.2.2) method_source (0.8.2) - mime-types (2.6.1) - minitest (5.7.0) + mime-types (2.99.1) + mini_portile2 (2.0.0) + minitest (5.8.4) minitest-stub_any_instance (1.0.1) - multi_json (1.11.1) + multi_json (1.11.2) multipart-post (2.0.0) - net-scp (1.0.4) - net-ssh (>= 1.99.1) - net-ssh (2.6.7) - netrc (0.10.3) - nokogiri (1.5.11) + netrc (0.11.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) purdytest (2.0.0) minitest (~> 5.5) rack (1.6.4) @@ -65,25 +70,24 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rainbows (4.6.2) + rainbows (5.0.0) kgio (~> 2.5) rack (~> 1.1) - unicorn (~> 4.8) - raindrops (0.13.0) - rake (10.4.2) + unicorn (~> 5.0) + raindrops (0.15.0) + rake (10.5.0) redis (3.2.2) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - ruby-hmac (0.4.0) - sentry-raven (0.15.2) + sentry-raven (0.15.6) faraday (>= 0.7.6) - sinatra (1.4.6) - rack (~> 1.4) + sinatra (1.4.7) + rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - sinatra-contrib (1.4.4) + sinatra-contrib (1.4.6) backports (>= 2.0) multi_json rack-protection @@ -91,13 +95,13 @@ GEM sinatra (~> 1.4.0) tilt (>= 1.3, < 3) thread_safe (0.3.5) - tilt (2.0.1) + tilt (2.0.2) tzinfo (1.2.2) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) - unicorn (4.9.0) + unf_ext (0.0.7.2) + unicorn (5.0.1) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -106,10 +110,10 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 4.2) - fog + activesupport + fog-aws m - mime-types (~> 2.6.1) + mime-types (~> 2.99) minitest-stub_any_instance purdytest rainbows