Merge pull request #60 from 5apps/update_dependencies

Update dependencies

Gemfile

@@ -2,11 +2,12 @@ source "https://rubygems.org"
 
 gem "sinatra", '~> 1.4'
 gem "sinatra-contrib"
-gem "activesupport", '~> 3.2'
+gem "activesupport", '~> 4.2'
 gem "riak-client", :github => "5apps/riak-ruby-client", :branch => "invalid_uri_error"
 gem "fog"
 gem "rest-client"
 gem "redis"
+gem "mime-types", "~> 2.6.1", require: 'mime/types/columnar'
 
 group :test do
   gem 'rake'

Gemfile.lock

@@ -13,13 +13,17 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.18)
+    activesupport (4.2.1)
-      i18n (~> 0.6, >= 0.6.4)
+      i18n (~> 0.7)
-      multi_json (~> 1.0)
+      json (~> 1.7, >= 1.7.7)
-    backports (3.6.1)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    backports (3.6.4)
     beefcake (0.3.7)
     builder (3.2.2)
-    eventmachine (1.0.3)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
     excon (0.16.10)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
@@ -33,54 +37,66 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.4)
+    formatador (0.2.5)
-    i18n (0.6.9)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    i18n (0.7.0)
     innertube (1.0.2)
-    kgio (2.9.2)
+    json (1.8.2)
-    m (1.2.1)
+    kgio (2.9.3)
+    m (1.3.4)
       method_source (>= 0.6.7)
-      rake (>= 0.9.2.2, < 1.0.0)
+      rake (>= 0.9.2.2)
-    method_source (0.8)
+    method_source (0.8.2)
-    mime-types (1.23)
+    mime-types (2.6.1)
-    minitest (2.10.0)
+    minitest (5.6.1)
-    multi_json (1.10.0)
+    multi_json (1.11.0)
     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)
-    purdytest (1.0.0)
+    purdytest (2.0.0)
-      minitest (~> 2.2)
+      minitest (~> 5.5)
-    rack (1.5.2)
+    rack (1.6.1)
     rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rainbows (4.6.1)
+    rainbows (4.6.2)
       kgio (~> 2.5)
       rack (~> 1.1)
       unicorn (~> 4.8)
     raindrops (0.13.0)
-    rake (0.9.2.2)
+    rake (10.4.2)
-    redis (3.0.7)
+    redis (3.2.1)
-    rest-client (1.6.7)
+    rest-client (1.8.0)
-      mime-types (>= 1.16)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     ruby-hmac (0.4.0)
-    sentry-raven (0.13.1)
+    sentry-raven (0.13.3)
       faraday (>= 0.7.6)
-    sinatra (1.4.5)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.0)
+    sinatra-contrib (1.4.2)
       backports (>= 2.0)
-      eventmachine
+      multi_json
       rack-protection
       rack-test
-      sinatra (~> 1.4.2)
+      sinatra (~> 1.4.0)
       tilt (~> 1.3)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    unicorn (4.8.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)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -89,9 +105,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.2)
+  activesupport (~> 4.2)
   fog
   m
+  mime-types (~> 2.6.1)
   purdytest
   rainbows
   rake

liquor-cabinet.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.add_dependency('sinatra')
   s.add_dependency('sinatra-contrib')
   s.add_dependency('riak-client')
-  s.add_dependency('airbrake')
 
   s.files        = Dir.glob("{bin,lib}/**/*") + Dir['*.rb']
   # s.executables  = ['config.ru']