From a5b574d7b22bd85c75fb9d5d458a785b9c291533 Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Sat, 14 Jan 2017 18:06:45 +0000 Subject: [PATCH] Update gems and config --- Gemfile | 8 ++- Gemfile.lock | 173 +++++++++++++++++++++++---------------------------- Rakefile | 4 -- config.rb | 5 -- 4 files changed, 83 insertions(+), 107 deletions(-) delete mode 100644 Rakefile diff --git a/Gemfile b/Gemfile index ffe10f3..0e9d7ef 100644 --- a/Gemfile +++ b/Gemfile @@ -2,11 +2,13 @@ # the following line to use "http://" instead source 'https://rubygems.org' -gem "middleman", "~>3.3.7" -gem "middleman-deploy" +gem "bourbon" + +gem "middleman" +gem "mgd" # Live-reloading plugin -gem "middleman-livereload", "~> 3.1.0" +gem "middleman-livereload" # For faster file watcher updates on Windows: gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw] diff --git a/Gemfile.lock b/Gemfile.lock index 0a0d318..0a48a37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,141 +1,124 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.1.16) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) + activesupport (5.0.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) minitest (~> 5.1) - thread_safe (~> 0.1) tzinfo (~> 1.1) - celluloid (0.16.0) - timers (~> 4.0.0) - chunky_png (1.3.6) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + backports (3.6.8) + bourbon (4.2.7) + sass (~> 3.4) + thor (~> 0.19) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) + coffee-script-source (1.12.2) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) + concurrent-ruby (1.0.4) + contracts (0.13.0) + dotenv (2.1.1) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.2.0.1) + eventmachine (1.2.1) execjs (2.7.0) - ffi (1.9.14) + fast_blank (1.0.0) + fastimage (2.0.1) + addressable (~> 2) + ffi (1.9.17) haml (4.0.7) tilt - hike (1.2.3) - hitimes (1.2.4) - hooks (0.4.1) - uber (~> 0.0.14) + hamster (3.0.0) + concurrent-ruby (~> 1.0) + hashie (3.4.6) http_parser.rb (0.6.0) i18n (0.7.0) - json (1.8.3) - kramdown (1.11.1) - listen (2.10.1) - celluloid (~> 0.16.0) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - middleman (3.3.12) + kramdown (1.13.2) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + memoist (0.15.0) + mgd (0.2.0) + middleman (>= 3.0.0) + trollop (= 2.1.2) + middleman (4.2.0) coffee-script (~> 2.2) - compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) - execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.3.12) - middleman-sprockets (>= 3.1.2) + middleman-cli (= 4.2.0) + middleman-core (= 4.2.0) sass (>= 3.4.0, < 4.0) - uglifier (~> 2.5) - middleman-core (3.3.12) - activesupport (~> 4.1.0) + middleman-cli (4.2.0) + thor (>= 0.17.0, < 2.0) + middleman-core (4.2.0) + activesupport (>= 4.2, < 5.1) + addressable (~> 2.3) + backports (~> 3.6) bundler (~> 1.1) + contracts (~> 0.13.0) + dotenv erubis - hooks (~> 0.3) + execjs (~> 2.0) + fast_blank + fastimage (~> 2.0) + hamster (~> 3.0) + hashie (~> 3.4) i18n (~> 0.7.0) - listen (>= 2.7.9, < 3.0) - padrino-helpers (~> 0.12.3) - rack (>= 1.4.5, < 2.0) - rack-test (~> 0.6.2) - thor (>= 0.15.2, < 2.0) - tilt (~> 1.4.1, < 2.0) - middleman-deploy (1.0.0) - middleman-core (>= 3.2) - net-sftp - ptools - middleman-livereload (3.1.1) - em-websocket (>= 0.2.0) - middleman-core (>= 3.0.2) - multi_json (~> 1.0) - rack-livereload - middleman-sprockets (3.4.2) + listen (~> 3.0.0) + memoist (~> 0.14) + padrino-helpers (~> 0.13.0) + parallel + rack (>= 1.4.5, < 3) + sass (>= 3.4) + servolux + tilt (~> 2.0) + uglifier (~> 3.0) + middleman-livereload (3.4.6) + em-websocket (~> 0.5.1) middleman-core (>= 3.3) - sprockets (~> 2.12.1) - sprockets-helpers (~> 1.1.0) - sprockets-sass (~> 1.3.0) - minitest (5.9.0) - multi_json (1.12.1) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (3.2.0) - padrino-helpers (0.12.8) + rack-livereload (~> 0.3.15) + minitest (5.10.1) + padrino-helpers (0.13.3.3) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.8) - tilt (~> 1.4.1) - padrino-support (0.12.8) + padrino-support (= 0.13.3.3) + tilt (>= 1.4.1, < 3) + padrino-support (0.13.3.3) activesupport (>= 3.1) - ptools (1.3.3) - rack (1.6.4) + parallel (1.10.0) + public_suffix (2.0.5) + rack (2.0.1) rack-livereload (0.3.16) rack - rack-test (0.6.3) - rack (>= 1.0) - rb-fsevent (0.9.7) + rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) - sass (3.4.22) - sprockets (2.12.4) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-helpers (1.1.0) - sprockets (~> 2.0) - sprockets-sass (1.3.1) - sprockets (~> 2.0) - tilt (~> 1.1) - thor (0.19.1) + sass (3.4.23) + servolux (0.12.0) + thor (0.19.4) thread_safe (0.3.5) - tilt (1.4.1) - timers (4.0.4) - hitimes + tilt (2.0.5) + trollop (2.1.2) tzinfo (1.2.2) thread_safe (~> 0.1) - uber (0.0.15) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.0.4) + execjs (>= 0.3.0, < 3) PLATFORMS ruby DEPENDENCIES - middleman (~> 3.3.7) - middleman-deploy - middleman-livereload (~> 3.1.0) + bourbon + mgd + middleman + middleman-livereload tzinfo-data wdm (~> 0.1.0) BUNDLED WITH - 1.12.5 + 1.13.6 diff --git a/Rakefile b/Rakefile deleted file mode 100644 index 1e111a1..0000000 --- a/Rakefile +++ /dev/null @@ -1,4 +0,0 @@ -task "deploy" do - sh "git add public; git commit -m 'Deployed to gh-pages'" - sh "git subtree push --prefix public origin gh-pages" -end diff --git a/config.rb b/config.rb index 4e6496c..71d4478 100644 --- a/config.rb +++ b/config.rb @@ -72,8 +72,3 @@ configure :build do # Or use a different image path # set :http_prefix, "/Content/images/" end - -activate :deploy do |deploy| - deploy.method = :git - deploy.branch = 'gh-pages' -end