From 4492193be14432b11e88e473aa889baa3a9fdaca Mon Sep 17 00:00:00 2001 From: Patrick Davey Date: Sun, 23 Nov 2014 17:49:39 +1300 Subject: [PATCH] Using middleman-deploy --- Gemfile | 2 +- Gemfile.lock | 13 +++++++++---- config.rb | 51 +++++---------------------------------------------- 3 files changed, 15 insertions(+), 51 deletions(-) diff --git a/Gemfile b/Gemfile index e51e4c7..814b974 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,6 @@ gem "middleman", "~>3.2.1" gem "middleman-livereload", "~> 3.1.0" # For publishing on GitHub -gem "middleman-gh-pages" +gem "middleman-deploy" gem "bootstrap-sass" diff --git a/Gemfile.lock b/Gemfile.lock index 21c7970..040278a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,8 +52,10 @@ GEM rack-test (~> 0.6.1) thor (>= 0.15.2, < 2.0) tilt (~> 1.4.1) - middleman-gh-pages (0.0.2) - rake (> 0.9.3) + middleman-deploy (1.0.0) + middleman-core (>= 3.2) + net-sftp + ptools middleman-livereload (3.1.0) em-websocket (>= 0.2.0) middleman-core (>= 3.0.2) @@ -65,12 +67,15 @@ GEM sprockets-helpers (~> 1.0.0) sprockets-sass (~> 1.0.0) multi_json (1.8.2) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.9.1) + ptools (1.2.6) rack (1.5.2) rack-livereload (0.3.15) rack rack-test (0.6.2) rack (>= 1.0) - rake (10.1.1) rb-fsevent (0.9.3) rb-inotify (0.9.3) ffi (>= 0.5.0) @@ -99,5 +104,5 @@ PLATFORMS DEPENDENCIES bootstrap-sass middleman (~> 3.2.1) - middleman-gh-pages + middleman-deploy middleman-livereload (~> 3.1.0) diff --git a/config.rb b/config.rb index ad032c2..7da3acf 100644 --- a/config.rb +++ b/config.rb @@ -1,49 +1,3 @@ -### -# Compass -### - -# Change Compass configuration -# compass_config do |config| -# config.output_style = :compact -# end - -### -# Page options, layouts, aliases and proxies -### - -# Per-page layout changes: -# -# With no layout -# page "/path/to/file.html", :layout => false -# -# With alternative layout -# page "/path/to/file.html", :layout => :otherlayout -# -# A path which all have the same layout -# with_layout :admin do -# page "/admin/*" -# end - -# Proxy pages (http://middlemanapp.com/dynamic-pages/) -# proxy "/this-page-has-no-template.html", "/template-file.html", :locals => { -# :which_fake_page => "Rendering a fake page with a local variable" } - -### -# Helpers -### - -# Automatic image dimensions on image_tag helper -# activate :automatic_image_sizes - -# Reload the browser automatically whenever files change -# activate :livereload - -# Methods defined in the helpers block are available in templates -# helpers do -# def some_helper -# "Helping" -# end -# end set :css_dir, 'css' @@ -51,6 +5,7 @@ set :images_dir, 'img' + # Build-specific configuration configure :build do # For example, change the Compass output style for deployment @@ -68,3 +23,7 @@ # Or use a different image path # set :http_prefix, "/Content/images/" end + +activate :deploy do |deploy| + deploy.method = :git +end