Merge pull request #173 from codecation/update-more-things

Update Ruby -> v2.4.1
codecation · Mar 20, 2018 · 7611e1d · 7611e1d
2 parents fb92331 + d6d8dd6
commit 7611e1d
Show file tree

Hide file tree

Showing 5 changed files with 171 additions and 35 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.1.3
+2.4.1
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,6 @@ notifications:
   email:
     - false
 rvm:
-  - 2.1.3
+  - 2.4.1
 addons:
   postgresql: "9.3"
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "2.1.3"
+ruby "2.4.1"
 
 gem "airbrake"
 gem "autoprefixer-rails"
@@ -14,6 +14,7 @@ gem "email_reply_parser"
 gem "email_validator"
 gem "flutie"
 gem "fog"
+gem "xmlrpc"
 gem "griddler"
 gem "griddler-sendgrid"
 gem "groupdate"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.3.6)
     actionmailer (4.2.10)
       actionpack (= 4.2.10)
       actionview (= 4.2.10)
@@ -35,7 +36,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     airbrake (4.1.0)
       builder
       multi_json
@@ -86,7 +88,7 @@ GEM
     columnize (0.8.9)
     concurrent-ruby (1.0.5)
     connection_pool (2.0.0)
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.3)
     database_cleaner (1.3.0)
@@ -115,43 +117,167 @@ GEM
     email_validator (1.4.0)
       activemodel
     erubis (2.7.0)
-    excon (0.39.6)
+    excon (0.61.0)
     execjs (2.2.1)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    fake_stripe (0.0.8)
+    fake_stripe (0.1.0)
       capybara
       sinatra
       webmock
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
     flutie (2.0.0)
-    fog (1.23.0)
-      fog-brightbox
-      fog-core (~> 1.23)
+    fog (1.41.0)
+      fog-aliyun (>= 0.1.0)
+      fog-atmos
+      fog-aws (>= 0.6.0)
+      fog-brightbox (~> 0.4)
+      fog-cloudatcost (~> 0.1.0)
+      fog-core (~> 1.45)
+      fog-digitalocean (>= 0.3.0)
+      fog-dnsimple (~> 1.0)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
+      fog-google (<= 0.1.0)
+      fog-internet-archive
+      fog-joyent
       fog-json
+      fog-local
+      fog-openstack
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-rackspace
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
       fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-vsphere (>= 0.4.0)
+      fog-xenserver
+      fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.5.1)
+      json (>= 1.8, < 2.0)
+    fog-aliyun (0.2.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (2.0.1)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.14.0)
       fog-core (~> 1.22)
       fog-json
-      inflecto
-    fog-core (1.24.0)
+      inflecto (~> 0.0.2)
+    fog-cloudatcost (0.1.2)
+      fog-core (~> 1.36)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-core (1.45.0)
       builder
-      excon (~> 0.38)
+      excon (~> 0.58)
       formatador (~> 0.2)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-    fog-json (1.0.0)
-      multi_json (~> 1.0)
-    fog-softlayer (0.3.17)
+    fog-digitalocean (0.3.0)
+      fog-core (~> 1.42)
+      fog-json (>= 1.0)
+      fog-xml (>= 0.1)
+      ipaddress (>= 0.5)
+    fog-dnsimple (1.0.0)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+    fog-dynect (0.0.3)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
+      fog-core
+      fog-xml
+    fog-google (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-internet-archive (0.0.1)
+      fog-core
+      fog-json
+      fog-xml
+    fog-joyent (0.0.1)
+      fog-core (~> 1.42)
+      fog-json (>= 1.0)
+    fog-json (1.0.2)
+      fog-core (~> 1.0)
+      multi_json (~> 1.10)
+    fog-local (0.5.0)
+      fog-core (>= 1.27, < 3.0)
+    fog-openstack (0.1.25)
+      fog-core (~> 1.40)
+      fog-json (>= 1.0)
+      ipaddress (>= 0.8)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+    fog-profitbricks (4.1.1)
+      fog-core (~> 1.42)
+      fog-json (~> 1.0)
+    fog-rackspace (0.1.5)
+      fog-core (>= 1.35)
+      fog-json (>= 1.0)
+      fog-xml (>= 0.1)
+      ipaddress (>= 0.8)
+    fog-radosgw (0.0.5)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.7.5)
       fog-core
       fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (1.1.4)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-vsphere (2.0.1)
+      fog-core
+      rbvmomi (~> 1.9)
+    fog-xenserver (0.3.0)
+      fog-core
+      fog-xml
+    fog-xml (0.1.3)
+      fog-core
+      nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
-    formulaic (0.1.1)
+    formulaic (0.4.0)
       activesupport
       capybara
       i18n
@@ -164,10 +290,11 @@ GEM
       griddler
     groupdate (2.3.0)
       activesupport (>= 3)
+    hashdiff (0.3.7)
     high_voltage (2.2.1)
     highline (1.6.21)
     hike (1.2.3)
-    htmlentities (4.3.2)
+    htmlentities (4.3.4)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.9.5)
@@ -182,7 +309,7 @@ GEM
       term-ansicolor
       terminal-table
     inflecto (0.0.2)
-    ipaddress (0.8.0)
+    ipaddress (0.8.3)
     jquery-rails (4.0.4)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
@@ -209,9 +336,6 @@ GEM
     neat (1.5.1)
       bourbon (>= 3.1)
       sass (~> 3.2.19)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
     netrc (0.11.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
@@ -224,8 +348,9 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
+    public_suffix (3.0.2)
     rack (1.6.9)
-    rack-protection (1.5.3)
+    rack-protection (1.5.5)
       rack
     rack-ssl-enforcer (0.2.4)
     rack-test (0.6.3)
@@ -262,6 +387,11 @@ GEM
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
     rake (12.3.0)
+    rbvmomi (1.11.7)
+      builder (~> 3.0)
+      json (>= 1.8)
+      nokogiri (~> 1.5)
+      trollop (~> 2.1)
     recipient_interceptor (0.1.2)
       mail
     redis (3.1.0)
@@ -312,10 +442,10 @@ GEM
     simple_form (3.1.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    sinatra (1.4.5)
-      rack (~> 1.4)
+    sinatra (1.4.8)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     skylight (0.3.21)
       activesupport (>= 3.0.0)
     slop (3.6.0)
@@ -347,6 +477,7 @@ GEM
     title (0.0.5)
       i18n
       rails (>= 3.1)
+    trollop (2.1.2)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (2.5.3)
@@ -366,10 +497,13 @@ GEM
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    webmock (1.20.4)
+    webmock (3.3.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    xpath (2.0.0)
+      hashdiff
+    xml-simple (1.1.5)
+    xmlrpc (0.2.1)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -434,9 +568,10 @@ DEPENDENCIES
   unicorn
   web-console (~> 2.0)
   webmock
+  xmlrpc
 
 RUBY VERSION
-   ruby 2.1.3p242
+   ruby 2.4.1p111
 
 BUNDLED WITH
    1.16.0.pre.2
diff --git a/config/initializers/errors.rb b/config/initializers/errors.rb
@@ -23,7 +23,7 @@
   Net::SMTPAuthenticationError,
   Net::SMTPServerBusy,
   Net::SMTPUnknownError,
-  TimeoutError
+  Timeout::Error
 ]
 
 SMTP_CLIENT_ERRORS = [