reinteractive-open · freibuis · May 3, 2018 · May 3, 2018 · May 3, 2018 · May 3, 2018
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,7 @@ aws.yml
 build/
 .powenv
 .envrc
-.idea/
+.idea/
+.vscode/
+
+vendor/
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.0.0
+2.5.1
diff --git a/Gemfile b/Gemfile
@@ -1,12 +1,16 @@
 source 'https://rubygems.org'
 
-ruby '2.0.0'
+ruby '2.5.1'
 
 gem "middleman", "~>3.1.6"
 
 # Using 861b15a55a1316e4cedc4f06e8833ccdf156aff6 until someone tests the next release.
 # 1.16.0 works but spews warnings all over the place.
-gem "fog", :git => 'git@github.com:fog/fog.git', :ref => '861b15a55a1316e4cedc4f06e8833ccdf156aff6'
+#gem "fog", :git => 'git@github.com:fog/fog.git', :ref => '861b15a55a1316e4cedc4f06e8833ccdf156aff6'
+
+#Switching to fog-aws instead of including every fog child gem
+gem 'fog-aws'
+
 gem 'middleman-s3_sync'
 
 # Live-reloading plugin
@@ -16,4 +20,4 @@ gem 'bourbon'
 gem 'neat'
 
 gem 'middleman-rouge'
-gem "redcarpet"
+gem "redcarpet"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,60 +1,61 @@
-GIT
-  remote: git@github.com:fog/fog.git
-  revision: 861b15a55a1316e4cedc4f06e8833ccdf156aff6
-  ref: 861b15a55a1316e4cedc4f06e8833ccdf156aff6
-  specs:
-    fog (1.16.0)
-      builder
-      excon (~> 0.27.0)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.18)
+    activesupport (3.2.22.5)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
+    ansi (1.5.0)
     bourbon (3.1.8)
       sass (>= 3.2.0)
       thor
-    builder (3.2.2)
+    builder (3.2.3)
     chunky_png (1.2.9)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
-    colorize (0.7.3)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
     em-websocket (0.5.0)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
-    eventmachine (1.0.3)
-    excon (0.27.6)
+    eventmachine (1.2.6)
+    excon (0.62.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    ffi (1.9.3)
-    formatador (0.2.4)
+    ffi (1.9.23)
+    fog-aws (3.0.0)
+      fog-core (~> 2.1)
+      fog-json (~> 1.1)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-core (2.1.0)
+      builder
+      excon (~> 0.58)
+      formatador (~> 0.2)
+      mime-types
+    fog-json (1.1.0)
+      fog-core (~> 2.0)
+      multi_json (~> 1.10)
+    fog-xml (0.1.3)
+      fog-core
+      nokogiri (>= 1.5.11, < 2.0.0)
+    formatador (0.2.5)
     fssm (0.2.10)
     haml (4.0.3)
       tilt
     hike (1.2.3)
     http_parser.rb (0.5.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
+    ipaddress (0.8.3)
     kramdown (1.2.0)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    map (6.5.3)
+    map (6.6.0)
     middleman (3.1.6)
       coffee-script (~> 2.2.0)
       compass (>= 0.12.2)
@@ -85,9 +86,9 @@ GEM
       middleman-core (>= 3.0.0)
       redcarpet (>= 2.2.0)
       rouge (>= 0.3.0)
-    middleman-s3_sync (3.0.26)
-      colorize
-      fog (>= 1.10.1)
+    middleman-s3_sync (3.0.47)
+      ansi (~> 1.5.0)
+      fog-aws (>= 0.1.1)
       map
       middleman-core (>= 3.0.0)
       pmap
@@ -99,32 +100,30 @@ GEM
       sprockets (~> 2.1)
       sprockets-helpers (~> 1.0.0)
       sprockets-sass (~> 1.0.0)
-    mime-types (2.2)
-    mini_portile (0.6.0)
-    multi_json (1.10.1)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.3.0)
+    multi_json (1.13.1)
     neat (1.4.0)
       bourbon (>= 2.1)
       sass (>= 3.2)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    pmap (1.0.1)
-    rack (1.5.2)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    pmap (1.1.1)
+    rack (1.6.10)
     rack-livereload (0.3.15)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rb-kqueue (0.2.5)
       ffi (>= 0.5.0)
     redcarpet (3.0.0)
     rouge (1.0.0)
-    ruby-hmac (0.4.0)
-    ruby-progressbar (1.5.1)
+    ruby-progressbar (1.9.0)
     sass (3.2.12)
     sprockets (2.10.0)
       hike (~> 1.2)
@@ -136,21 +135,22 @@ GEM
     sprockets-sass (1.0.2)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    thor (0.19.1)
+    thor (0.20.0)
     tilt (1.3.7)
     uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.6)
+    unf_ext (0.0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bourbon
-  fog!
+  eventmachine
+  fog-aws
   middleman (~> 3.1.6)
   middleman-livereload (~> 3.1.0)
   middleman-rouge
@@ -159,7 +159,7 @@ DEPENDENCIES
   redcarpet
 
 RUBY VERSION
-   ruby 2.0.0p648
+   ruby 2.5.1p57
 
 BUNDLED WITH
-   1.13.6
+   1.16.1
diff --git a/vendor/cache/activesupport-3.2.18.gem b/vendor/cache/activesupport-3.2.18.gem
diff --git a/vendor/cache/bourbon-3.1.8.gem b/vendor/cache/bourbon-3.1.8.gem
diff --git a/vendor/cache/builder-3.2.2.gem b/vendor/cache/builder-3.2.2.gem
diff --git a/vendor/cache/chunky_png-1.2.9.gem b/vendor/cache/chunky_png-1.2.9.gem
diff --git a/vendor/cache/coffee-script-2.2.0.gem b/vendor/cache/coffee-script-2.2.0.gem
diff --git a/vendor/cache/coffee-script-source-1.6.3.gem b/vendor/cache/coffee-script-source-1.6.3.gem
diff --git a/vendor/cache/colorize-0.7.3.gem b/vendor/cache/colorize-0.7.3.gem
diff --git a/vendor/cache/compass-0.12.2.gem b/vendor/cache/compass-0.12.2.gem
diff --git a/vendor/cache/em-websocket-0.5.0.gem b/vendor/cache/em-websocket-0.5.0.gem
diff --git a/vendor/cache/eventmachine-1.0.3.gem b/vendor/cache/eventmachine-1.0.3.gem
diff --git a/vendor/cache/excon-0.27.6.gem b/vendor/cache/excon-0.27.6.gem
diff --git a/vendor/cache/execjs-1.4.0.gem b/vendor/cache/execjs-1.4.0.gem
diff --git a/vendor/cache/ffi-1.9.3.gem b/vendor/cache/ffi-1.9.3.gem
diff --git a/vendor/cache/formatador-0.2.4.gem b/vendor/cache/formatador-0.2.4.gem
diff --git a/vendor/cache/fssm-0.2.10.gem b/vendor/cache/fssm-0.2.10.gem
diff --git a/vendor/cache/haml-4.0.3.gem b/vendor/cache/haml-4.0.3.gem
diff --git a/vendor/cache/hike-1.2.3.gem b/vendor/cache/hike-1.2.3.gem
diff --git a/vendor/cache/http_parser.rb-0.5.3.gem b/vendor/cache/http_parser.rb-0.5.3.gem
diff --git a/vendor/cache/i18n-0.6.9.gem b/vendor/cache/i18n-0.6.9.gem
diff --git a/vendor/cache/kramdown-1.2.0.gem b/vendor/cache/kramdown-1.2.0.gem
diff --git a/vendor/cache/listen-1.3.1.gem b/vendor/cache/listen-1.3.1.gem
diff --git a/vendor/cache/map-6.5.3.gem b/vendor/cache/map-6.5.3.gem
diff --git a/vendor/cache/middleman-3.1.6.gem b/vendor/cache/middleman-3.1.6.gem
diff --git a/vendor/cache/middleman-core-3.1.6.gem b/vendor/cache/middleman-core-3.1.6.gem
diff --git a/vendor/cache/middleman-livereload-3.1.0.gem b/vendor/cache/middleman-livereload-3.1.0.gem
diff --git a/vendor/cache/middleman-more-3.1.6.gem b/vendor/cache/middleman-more-3.1.6.gem
diff --git a/vendor/cache/middleman-rouge-0.0.1.gem b/vendor/cache/middleman-rouge-0.0.1.gem
diff --git a/vendor/cache/middleman-s3_sync-3.0.26.gem b/vendor/cache/middleman-s3_sync-3.0.26.gem
diff --git a/vendor/cache/middleman-sprockets-3.1.4.gem b/vendor/cache/middleman-sprockets-3.1.4.gem
diff --git a/vendor/cache/mime-types-2.2.gem b/vendor/cache/mime-types-2.2.gem
diff --git a/vendor/cache/mini_portile-0.6.0.gem b/vendor/cache/mini_portile-0.6.0.gem
diff --git a/vendor/cache/multi_json-1.10.1.gem b/vendor/cache/multi_json-1.10.1.gem
diff --git a/vendor/cache/neat-1.4.0.gem b/vendor/cache/neat-1.4.0.gem
diff --git a/vendor/cache/net-scp-1.2.1.gem b/vendor/cache/net-scp-1.2.1.gem
diff --git a/vendor/cache/net-ssh-2.9.1.gem b/vendor/cache/net-ssh-2.9.1.gem
diff --git a/vendor/cache/nokogiri-1.6.2.1.gem b/vendor/cache/nokogiri-1.6.2.1.gem
diff --git a/vendor/cache/pmap-1.0.1.gem b/vendor/cache/pmap-1.0.1.gem
diff --git a/vendor/cache/rack-1.5.2.gem b/vendor/cache/rack-1.5.2.gem
diff --git a/vendor/cache/rack-livereload-0.3.15.gem b/vendor/cache/rack-livereload-0.3.15.gem
diff --git a/vendor/cache/rack-test-0.6.2.gem b/vendor/cache/rack-test-0.6.2.gem
diff --git a/vendor/cache/rb-fsevent-0.9.4.gem b/vendor/cache/rb-fsevent-0.9.4.gem
diff --git a/vendor/cache/rb-inotify-0.9.4.gem b/vendor/cache/rb-inotify-0.9.4.gem
diff --git a/vendor/cache/rb-kqueue-0.2.2.gem b/vendor/cache/rb-kqueue-0.2.2.gem
diff --git a/vendor/cache/redcarpet-3.0.0.gem b/vendor/cache/redcarpet-3.0.0.gem
diff --git a/vendor/cache/rouge-1.0.0.gem b/vendor/cache/rouge-1.0.0.gem
diff --git a/vendor/cache/ruby-hmac-0.4.0.gem b/vendor/cache/ruby-hmac-0.4.0.gem
diff --git a/vendor/cache/ruby-progressbar-1.5.1.gem b/vendor/cache/ruby-progressbar-1.5.1.gem
diff --git a/vendor/cache/ruby/2.0.0/bundler/gems/fog-861b15a55a13 b/vendor/cache/ruby/2.0.0/bundler/gems/fog-861b15a55a13
diff --git a/vendor/cache/ruby/2.0.0/gems/em-websocket-0.5.1/em-websocket.gemspec b/vendor/cache/ruby/2.0.0/gems/em-websocket-0.5.1/em-websocket.gemspec
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,7 @@ aws.yml @@
     build/
     .powenv
     .envrc
-    .idea/
+    .idea/
+    .vscode/
+    vendor/