jekyll-gh-pages 0.0.1 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODg3OWI0N2VhZTRmNDUwOTdiYmU1ZDRmZTNjY2E4MmVkYTExY2MxMA==
-  data.tar.gz: !binary |-
-    ZGMzMjg5ZDZkNzBmMGZhMzRiYmVlMzdhZmJiZWNmMjEwMWVjOTBhNg==
+SHA1:
+  metadata.gz: 79d95fcf9b08ce9796ce3e854d7e665fba3992f1
+  data.tar.gz: 7fcac1499a983e20bb498f23158155db0ea7dbd6
 SHA512:
-  metadata.gz: !binary |-
-    N2JjNDdlMjU0ZDMyODgxYTdmZjJiNWQ2YjMxNzY4N2QwYTdkYTkwYzY0NDY5
-    ZGFlNGU1MzI1OWU5MGIzZjgzZDdmNjVlMGQ2YWFhZDAwYWI5YTRiMWM5NzA4
-    MzdmNDViODlkN2UxYTI5Y2JjZDZhODVlMDBmYjI3ZjU5MTkzM2I=
-  data.tar.gz: !binary |-
-    NWZhNmZiNjBhMjJlYTlhOTU4YzU1MjMzNTFjN2FkYzc4ZWIyZDNhMWMzOTY0
-    YzYzNDgwMWU3YWU3MzE0NzIxOTMxYjBmYTMyNmI4NzNjZDdlNGY3YjUxNGNj
-    MDlhZjIzMzkyNzY4NmFmNmM5N2FmNjEyM2JlZWZlODQ4MTJhMzM=
+  metadata.gz: ac8482fe42af739ac8e54f13d091e1d64264ef98fecb44169086201ebfa2e62357a71798f2478b2b649b47f1bd3a2ba2aad1776bad07453860fa101013776a2f
+  data.tar.gz: 181b69791ccf3c4bd0b0305b8b2903243c53f6a22253f57f6fe6f8f455007a9be333f20c950242ecbffb328945374b4086a8e111cb76e41a617fb740d46a015b

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

@@ -1,10 +1,11 @@
 require 'fileutils'
 
 remote_name = ENV.fetch("REMOTE_NAME", "origin")
+branch_name = ENV.fetch("BRANCH_NAME", "gh-pages")
 
 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")
+GH_PAGES_REF = File.join(BUILD_DIR, ".git/refs/remotes/#{remote_name}/#{branch_name}")
 
 directory BUILD_DIR
 
@@ -20,14 +21,14 @@ file GH_PAGES_REF => BUILD_DIR do
     sh "git remote add #{remote_name} #{repo_url}"
     sh "git fetch #{remote_name}"
 
-    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 "git checkout --orphan #{branch_name}"
       sh "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 #{branch_name} commit'"
+      sh "git push #{remote_name} #{branch_name}"
     end
   end
 end
@@ -43,7 +44,11 @@ end
 desc "Build static files"
 task :build do
   cd PROJECT_ROOT do
-    sh "bundle exec jekyll build --destination #{BUILD_DIR} --config _config.yml,_config_prod.yml"
+    if File.exist?('_config_prod.yml')
+      sh "bundle exec jekyll build --destination #{BUILD_DIR} --config _config.yml,_config_prod.yml"
+    else
+      sh "bundle exec jekyll build --destination #{BUILD_DIR}"
+    end
   end
 end
 
@@ -64,6 +69,6 @@ task :deploy => [:build] do
     else
       sh "git commit -m \"#{message}\""
     end
-    sh "git push #{remote_name} gh-pages"
+    sh "git push #{remote_name} #{branch_name}"
   end
 end

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

@@ -1,3 +1,3 @@
 module JekyllGhPages
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-gh-pages
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryo Chikazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Inspired by middleman-gh-pages, Jekyll Github Pages helps deploying Jekyll
@@ -63,9 +63,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -73,7 +73,6 @@ files:
 - Rakefile
 - jekyll-gh-pages.gemspec
 - lib/jekyll-gh-pages.rb
-- lib/jekyll-gh-pages/tasks.rake
 - lib/jekyll-gh-pages/tasks/gh-pages.rake
 - lib/jekyll-gh-pages/version.rb
 - spec/jekyll-gh-pages_spec.rb
@@ -88,12 +87,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -105,3 +104,4 @@ summary: Deploy Jekyll sites to Github Pages easily
 test_files:
 - spec/jekyll-gh-pages_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

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

@@ -1,73 +0,0 @@
-require 'fileutils'
-
-remote_name = ENV.fetch("REMOTE_NAME", "origin")
-
-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")
-
-directory BUILD_DIR
-
-file GH_PAGES_REF => BUILD_DIR do
-  repo_url = nil
-
-  cd PROJECT_ROOT do
-    repo_url = `git config --get remote.#{remote_name}.url`.strip
-  end
-
-  cd BUILD_DIR do
-    sh "git init"
-    sh "git remote add #{remote_name} #{repo_url}"
-    sh "git fetch #{remote_name}"
-
-    if `git branch -r` =~ /gh-pages/
-      sh "git checkout gh-pages"
-    else
-      sh "git checkout --orphan gh-pages"
-      sh "touch index.html"
-      sh "git add ."
-      sh "git commit -m 'initial gh-pages commit'"
-      sh "git push #{remote_name} gh-pages"
-    end
-  end
-end
-
-desc "Prepare for build"
-task :prepare => GH_PAGES_REF
-
-desc "Watch"
-task :watch do
-  sh "bundle exec jekyll serve --watch"
-end
-
-desc "Build static files"
-task :build do
-  cd PROJECT_ROOT do
-    if File.exist?('_config_prod.yml')
-      sh "bundle exec jekyll build --destination #{BUILD_DIR} --config _config.yml,_config_prod.yml"
-    else
-      sh "bundle exec jekyll build --destination #{BUILD_DIR}"
-    end
-  end
-end
-
-desc "Deploy static files to gh-pages branch"
-task :deploy => [:build] do
-  message = nil
-  suffix = ENV["COMMIT_MESSAGE_SUFFIX"]
-
-  cd PROJECT_ROOT do
-    head = `git log --pretty="%h" -n1`.strip
-    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 commit -m \"#{message}\""
-    end
-    sh "git push #{remote_name} gh-pages"
-  end
-end