middleman-gh-pages 0.0.3 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4d105923da0ffb05b86b9d8dcf340a589b064a58
+  data.tar.gz: 9027c3db09483baef0fb7e51fed0b32f8369372a
+SHA512:
+  metadata.gz: 189c7373aabe82d014f04d34893a5d6c06ab1592e9fb1d4660eea0a0aefe8f7bf12112864550f9df274dbc06fa570bbb51e5967f68c28ad828bafebe311b394b
+  data.tar.gz: 4850ef79050cf7ebacd98d40e413cf0a8748e615a55676d61c7ed0a77d5041b83af92420f4e72105017f69c465e4c37ba1cb22a9292ea33ae45a033108d6ed86

data/README.md

@@ -1,8 +1,8 @@
 # Middleman Github Pages
 
-[Middleman](http://middlemanapp.com) makes creating static sites a joy, [Github 
-Pages](http://pages.github.com) hosts static sites for free, Middleman Github 
-Pages brings the two together. Middleman Github Pages is just a few rake tasks 
+[Middleman](http://middlemanapp.com) makes creating static sites a joy, [Github
+Pages](http://pages.github.com) hosts static sites for free, Middleman Github
+Pages brings the two together. Middleman Github Pages is just a few rake tasks
 that automate the process of deploying a Middleman site to Github Pages.
 
 ## Installation
@@ -28,8 +28,8 @@ rake build    # Compile all files into the build directory
 rake publish  # Build and publish to Github Pages
 ```
 
-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 
+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.
 
 ## Options
@@ -44,7 +44,7 @@ bundle exec rake publish ALLOW_DIRTY=true
 You can append a custom suffix to commit messages on the build branch:
 
 ```shell
-bundle exec rake publish COMMIT_MESSAGE_SUFFIX="--skip-ci"
+bundle exec rake publish COMMIT_MESSAGE_SUFFIX="[skip-ci]"
 ```
 
 You can change the remote that you deploy to:
@@ -53,6 +53,12 @@ You can change the remote that you deploy to:
 bundle exec rake publish REMOTE_NAME=upstream
 ```
 
+If you're publishing a personal or organization page, you may want to use the branch `master` instead of `gh-pages`:
+
+```shell
+bundle exec rake publish BRANCH_NAME=master
+```
+
 ## Custom Domain
 
 To set up a custom domain, you can follow the [GitHub help page](https://help.github.com/articles/setting-up-a-custom-domain-with-pages).

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

@@ -1,12 +1,30 @@
-require 'fileutils'
+require "fileutils"
+require "tmpdir"
 
 def remote_name
   ENV.fetch("REMOTE_NAME", "origin")
 end
 
-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/#{remote_name}/gh-pages")
+def branch_name
+  ENV.fetch("BRANCH_NAME", "gh-pages")
+end
+
+def uncommitted_changes?
+  `git status --porcelain`.chomp.length > 0
+end
+
+def backup_and_restore(dir, file, &block)
+  yield unless File.exist?(File.join(dir, file))
+  Dir.mktmpdir do |tmpdir|
+    mv File.join(dir, file), tmpdir
+    yield
+    mv File.join(tmpdir, file), dir
+  end
+end
+
+PROJECT_ROOT = ENV.fetch("PROJECT_ROOT", `git rev-parse --show-toplevel`.chomp)
+BUILD_DIR    = ENV.fetch("BUILD_DIR", File.join(PROJECT_ROOT, "build"))
+GH_PAGES_REF = File.join(BUILD_DIR, ".git/refs/remotes/#{remote_name}/#{branch_name}")
 
 directory BUILD_DIR
 
@@ -14,23 +32,22 @@ file GH_PAGES_REF => BUILD_DIR do
   repo_url = nil
 
   cd PROJECT_ROOT do
-    repo_url = `git config --get remote.#{remote_name}.url`.strip
+    repo_url = `git config --get remote.#{remote_name}.url`.chomp
   end
 
   cd BUILD_DIR do
     sh "git init"
     sh "git remote add #{remote_name} #{repo_url}"
     sh "git fetch #{remote_name}"
-    sh "git checkout master"
 
-    if `git branch -r` =~ /gh-pages/
-      sh "git checkout gh-pages"
+    if `git branch -r` =~ /#{branch_name}/
+      sh "git checkout #{branch_name}"
     else
-      sh "git checkout --orphan gh-pages"
-      sh "touch index.html"
+      sh "git checkout --orphan #{branch_name}"
+      FileUtils.touch("index.html")
       sh "git add ."
-      sh "git commit -m 'initial gh-pages commit'"
-      sh "git push #{remote_name} gh-pages"
+      sh "git commit -m \"initial gh-pages commit\""
+      sh "git push #{remote_name} #{branch_name}"
     end
   end
 end
@@ -42,22 +59,24 @@ task :prepare_git_remote_in_build_dir => GH_PAGES_REF
 task :sync do
   cd BUILD_DIR do
     sh "git fetch #{remote_name}"
-    sh "git reset --hard #{remote_name}/gh-pages"
+    sh "git reset --hard #{remote_name}/#{branch_name}"
   end
 end
 
 # Prevent accidental publishing before committing changes
 task :not_dirty do
-  puts "***#{ENV['ALLOW_DIRTY']}***"
-  unless ENV['ALLOW_DIRTY']
-    fail "Directory not clean" if /nothing to commit/ !~ `git status`
+  if uncommitted_changes?
+    puts "*** WARNING: You currently have uncommitted changes. ***"
+    fail "Build aborted, because project directory is not clean." unless ENV["ALLOW_DIRTY"]
   end
 end
 
 desc "Compile all files into the build directory"
 task :build do
-  cd PROJECT_ROOT do
-    sh "bundle exec middleman build --clean"
+  backup_and_restore(BUILD_DIR, ".git") do
+    cd PROJECT_ROOT do
+      sh "bundle exec middleman build --clean"
+    end
   end
 end
 
@@ -67,17 +86,17 @@ task :publish => [:not_dirty, :prepare_git_remote_in_build_dir, :sync, :build] d
   suffix = ENV["COMMIT_MESSAGE_SUFFIX"]
 
   cd PROJECT_ROOT do
-    head = `git log --pretty="%h" -n1`.strip
+    head = `git log --pretty="%h" -n1`.chomp
     message = ["Site updated to #{head}", suffix].compact.join("\n\n")
   end
 
   cd BUILD_DIR do
-    sh 'git add --all'
-    if /nothing to commit/ =~ `git status`
-      puts "No changes to commit."
-    else
+    sh "git add --all"
+    if uncommitted_changes?
       sh "git commit -m \"#{message}\""
+    else
+      puts "No changes to commit."
     end
-    sh "git push #{remote_name} gh-pages"
+    sh "git push #{remote_name} #{branch_name}"
   end
 end

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

@@ -1,5 +1,5 @@
 module Middleman
   module GithubPages
-    VERSION = "0.0.3"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: middleman-gh-pages
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Adam McCrea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.9.3
 description: Easy deployment of Middleman sites to Github Pages
@@ -34,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -45,27 +42,25 @@ files:
 - middleman-gh-pages.gemspec
 homepage: http://github.com/newcontext/middleman-gh-pages
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easy deployment of Middleman sites to Github Pages
 test_files: []
-has_rdoc: