From bd16e9edbed9b5e12f56f436b59a9607827e2fda Mon Sep 17 00:00:00 2001
From: Brett Rann <brettrann@gmail.com>
Date: Fri, 29 Jan 2016 14:08:11 +1100
Subject: [PATCH] update fog to 1.36 to fix missing net-ssh error

using the correct Gemfile, but installing at different times to the book,
resulted in different version of numerous items in the Gemfile.lock

those version differences meant that On git push heroku master the following
deployment error occurred:

remote:        Could not detect rake tasks
remote:        ensure you can run `$ bundle exec rake -P` against your app with
no environment variables present
remote:        and using the production group of your Gemfile.
remote:        rake aborted!
remote:        LoadError: cannot load such file -- net/ssh
remote:
/tmp/build_e9fe78a314ac8fb6d1bd3fd9b48ae6af/vendor/bundle/ruby/2.2.0/gems/activesupport-4.2.1/lib/active_support/dependencies.rb:274:in `require'

https://github.com/fog/fog/issues/3765

noted net-ssh was removed because of compatability errors, and is fixed in
fog 1.36.0
---
 Gemfile      |  7 +++++--
 Gemfile.lock | 31 ++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index ea13ecd..341eaf6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,8 +88,11 @@ end
 
 group :production do
   # file store with s3
-  # gem "fog", "~> 1.36.0"
-  gem "fog", "~> 1.29.0"
+  # gem "fog", "~> 1.29.0"
+  # updating fog due to recent net-ssh error with some changes from
+  # `bundle update`
+  # https://github.com/fog/fog/issues/3765
+  gem "fog", "~> 1.36.0"
   # but use postgresql for production
   gem "pg",     group: :production
   # 12factor for logging and assets
diff --git a/Gemfile.lock b/Gemfile.lock
index 488a45e..71f7ba2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -103,12 +103,15 @@ GEM
     ffi (1.9.10)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.29.0)
+    fog (1.36.0)
+      fog-aliyun (>= 0.1.0)
       fog-atmos
-      fog-aws (~> 0.0)
+      fog-aws (>= 0.6.0)
       fog-brightbox (~> 0.4)
-      fog-core (~> 1.27, >= 1.27.4)
-      fog-ecloud
+      fog-core (~> 1.32)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
+      fog-google (<= 0.1.0)
       fog-json
       fog-local
       fog-powerdns (>= 0.1.1)
@@ -122,9 +125,15 @@ GEM
       fog-terremark
       fog-vmfusion
       fog-voxel
+      fog-xenserver
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
+    fog-aliyun (0.1.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
@@ -141,9 +150,17 @@ GEM
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
+    fog-dynect (0.0.2)
+      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-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
@@ -186,6 +203,9 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
+    fog-xenserver (0.2.3)
+      fog-core
+      fog-xml
     fog-xml (0.1.2)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
@@ -320,6 +340,7 @@ GEM
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
     websocket (1.2.2)
+    xml-simple (1.1.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -336,7 +357,7 @@ DEPENDENCIES
   devise (~> 3.4.1)
   email_spec (~> 1.6.0)
   factory_girl_rails (~> 4.5)
-  fog (~> 1.29.0)
+  fog (~> 1.36.0)
   font-awesome-rails (~> 4.3)
   jbuilder (~> 2.0)
   jquery-rails