middleman-gh-pages 0.0.1 → 0.0.2

data/README.md

@@ -32,7 +32,12 @@ The only assumption is that you are deploying to a gh-pages branch in the same
 remote as the source. `rake publish` will create this branch for you if it 
 doesn't exist.
 
-Note that you cannot deploy your site if you have uncommitted changes.
+Note that you cannot deploy your site if you have uncommitted changes. You can
+override this with the `ALLOW_DIRTY` option:
+
+```shell
+bundle exec rake publish ALLOW_DIRTY=true
+```
 
 ## Contributing
 

data/lib/middleman-gh-pages/tasks/gh-pages.rake

@@ -1,12 +1,17 @@
 require 'fileutils'
 
-BUILD_DIR = File.join(File.dirname(__FILE__), "build")
+PROJECT_ROOT = `git rev-parse --show-toplevel`.strip
+BUILD_DIR    = File.join(PROJECT_ROOT, "build")
 GH_PAGES_REF = File.join(BUILD_DIR, ".git/refs/remotes/origin/gh-pages")
 
 directory BUILD_DIR
 
 file GH_PAGES_REF => BUILD_DIR do
-  repo_url = `git config --get remote.origin.url`.strip
+  repo_url = nil
+
+  cd PROJECT_ROOT do
+    repo_url = `git config --get remote.origin.url`.strip
+  end
 
   cd BUILD_DIR do
     sh "git init"
@@ -38,18 +43,27 @@ end
 
 # Prevent accidental publishing before committing changes
 task :not_dirty do
-  fail "Directory not clean" if /nothing to commit/ !~ `git status`
+  puts "***#{ENV['ALLOW_DIRTY']}***"
+  unless ENV['ALLOW_DIRTY']
+    fail "Directory not clean" if /nothing to commit/ !~ `git status`
+  end
 end
 
 desc "Compile all files into the build directory"
 task :build do
-  sh "bundle exec middleman build --clean"
+  cd PROJECT_ROOT do
+    sh "bundle exec middleman build --clean"
+  end
 end
 
 desc "Build and publish to Github Pages"
 task :publish => [:not_dirty, :prepare_git_remote_in_build_dir, :sync, :build] do
-  head = `git log --pretty="%h" -n1`.strip
-  message = "Site updated to #{head}"
+  message = nil
+
+  cd PROJECT_ROOT do
+    head = `git log --pretty="%h" -n1`.strip
+    message = "Site updated to #{head}"
+  end
 
   cd BUILD_DIR do
     sh 'git add --all'

data/lib/middleman-gh-pages/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module GithubPages
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-gh-pages
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -55,18 +55,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 576739196795499365
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 576739196795499365
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24