Skip to content

Commit

Permalink
Switched from middleman-deploy to middleman-gh-pages
Browse files Browse the repository at this point in the history
Much more light weight, and actually works as expected for git branch
management. Allows for more than one person to publish from separate
clones. middleman-deploy would force push the gh-pages history to
oblivion after every deploy.
  • Loading branch information
rmm5t committed Aug 11, 2013
1 parent 753d887 commit a287975
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source "https://rubygems.org"
gem "rake"
gem "middleman"
gem "middleman-livereload"
gem "middleman-deploy"
gem "middleman-gh-pages"
gem "middleman-syntax"
gem "middleman-google-analytics"
gem "bootstrap-sass"
Expand Down
12 changes: 3 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,8 @@ GEM
rack-test (~> 0.6.1)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.3.6)
middleman-deploy (0.1.1)
middleman-core (>= 3.0.0)
net-sftp
ptools
middleman-gh-pages (0.0.2)
rake (> 0.9.3)
middleman-google-analytics (0.0.1)
middleman-core (>= 3.0.6)
middleman-livereload (3.1.0)
Expand All @@ -75,10 +73,6 @@ GEM
middleman-core (~> 3.0)
rouge (~> 0.3.0)
multi_json (1.7.8)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.8)
ptools (1.2.2)
rack (1.5.2)
rack-livereload (0.3.15)
rack
Expand Down Expand Up @@ -116,7 +110,7 @@ PLATFORMS
DEPENDENCIES
bootstrap-sass
middleman
middleman-deploy
middleman-gh-pages
middleman-google-analytics
middleman-livereload
middleman-syntax
Expand Down
11 changes: 2 additions & 9 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require "middleman-gh-pages"

desc "Generates the site and runs local server while watching for changes"
task :preview do
sh "bundle exec middleman server"
Expand All @@ -11,15 +13,6 @@ end
task(:sleep) { sleep 5 } # cheap hack to wait for middleman to start
task :delayed_open => [:sleep, :open]

desc "Builds the static site"
task :build do
sh "bundle exec middleman build"
end

desc "Builds and publishes the static site to the configured deployment location"
task :publish do
sh "bundle exec middleman deploy --build-before"
end
task :deploy => :publish # alias

desc "Generates the site and opens the preview in your default browser"
Expand Down
4 changes: 0 additions & 4 deletions config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,3 @@
activate :livereload
activate :directory_indexes
activate :syntax

activate :deploy do |deploy|
deploy.method = :git
end
Binary file removed vendor/cache/middleman-deploy-0.1.1.gem
Binary file not shown.
Binary file added vendor/cache/middleman-gh-pages-0.0.2.gem
Binary file not shown.
Binary file removed vendor/cache/net-sftp-2.1.2.gem
Binary file not shown.
Binary file removed vendor/cache/net-ssh-2.6.8.gem
Binary file not shown.
Binary file removed vendor/cache/ptools-1.2.2.gem
Binary file not shown.

0 comments on commit a287975

Please sign in to comment.