wax_tasks 0.0.45 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a75d3ea8f36bfcc65d78630d5d80a986fff7e563fbd801e1bafd4563bb9fa460
-  data.tar.gz: 0dfd5662a0b3a3aee3c5dcec55661002f0e333475f77417a1eb24afff604d2cc
+  metadata.gz: '08373f20a96f8beb7d8da2f0080874f53434ca22946e978f1810341f8b0d0789'
+  data.tar.gz: d519743109cc40019c40b2ff0cb53165c9f35e7b8e37ba3bf849a64b240157bc
 SHA512:
-  metadata.gz: 6c8cb6ca729aef790de7ec0feb0ab5ba5d62bce8b05cc7ab3c487dfdbdaa120359d03f16edf9f385affc163219241557faf2d220313e7013db7d445c79074f37
-  data.tar.gz: 9a544534a61fe0b545ccda39dda60bbd3f6e9cd34f3934a1d7c3876b3971ff01c8b88a0d84faf4c4d1f0e29f3ad5797fe332ef6b571eb08afcdc52fd50ee39e6
+  metadata.gz: 336d3b60f04a17515e95d55d2787ef8243b9bdbbc634ff52ede4e64745269e54149995e7df8bf586a035c074136c195c3d5484a0052028a20d1b0a19fb872150
+  data.tar.gz: 7576e0dd98d98ef35b3b89c1908969553e9edd0905d06f92610e16bd5ee886d569e6ede8e0e4f1eb92cd9c0cf69e59834d88123a6294ed6538d68a9a42b72127

data/lib/tasks/push_gh.rake

@@ -0,0 +1,42 @@
+include FileUtils
+require 'wax_tasks'
+require 'jekyll'
+
+namespace :wax do
+  namespace :push do
+    desc 'build site with gh-baseurl and push to gh-pages branch'
+    task :gh do
+      if ENV['CI']
+        REPO_SLUG = ENV['TRAVIS_REPO_SLUG']
+        USER = REPO_SLUG.split("/")[0]
+        TOKEN = ENV['ACCESS_TOKEN']
+        COMMIT_MSG = "Site updated via #{ENV['TRAVIS_COMMIT']}".freeze
+        ORIGIN = "https://#{USER}:#{TOKEN}@github.com/#{REPO_SLUG}.git".freeze
+        puts "Deploying to gh-oages branch from Travis as #{USER}"
+      else
+        ORIGIN = `git config --get remote.origin.url`.freeze
+        COMMIT_MSG = "Site updated at #{Time.now.utc}".freeze
+        puts "Deploying to gh-pages branch from local task"
+      end
+      config = read_config
+      rm_rf('_site')
+
+      opts = {
+        'source' => '.',
+        'destination' => '_site',
+        'config' => '_config.yml',
+        'baseurl' => config['gh-baseurl']
+      }
+
+      Jekyll::Site.new(Jekyll.configuration(opts)).process
+      Dir.mktmpdir do |tmp|
+        cp_r '_site/.', tmp
+        Dir.chdir tmp
+        system 'git init'
+        system "git add . && git commit -m '#{COMMIT_MSG}'"
+        system 'git remote add origin ' + ORIGIN
+        system 'git push origin master:refs/heads/gh-pages --force'
+      end
+    end
+  end
+end

data/lib/tasks/push_s3.rake

@@ -0,0 +1,31 @@
+include FileUtils
+require 'wax_tasks'
+
+namespace :wax do
+  namespace :push do
+    desc 'push built site to s3 branch'
+    task :s3 do
+      if ENV['CI']
+        REPO_SLUG = ENV['TRAVIS_REPO_SLUG']
+        USER = REPO_SLUG.split("/")[0]
+        TOKEN = ENV['ACCESS_TOKEN']
+        COMMIT_MSG = "Site updated via #{ENV['TRAVIS_COMMIT']}".freeze
+        ORIGIN = "https://#{USER}:#{TOKEN}@github.com/#{REPO_SLUG}.git".freeze
+        puts "Deploying to s3 branch from Travis as #{USER}"
+      else
+        ORIGIN = `git config --get remote.origin.url`.freeze
+        COMMIT_MSG = "Site updated at #{Time.now.utc}".freeze
+        puts "Deploying to s3 branch from local task"
+      end
+
+      Dir.mktmpdir do |tmp|
+        cp_r '_site/.', tmp
+        Dir.chdir tmp
+        system 'git init'
+        system "git add . && git commit -m '#{COMMIT_MSG}'"
+        system 'git remote add origin ' + ORIGIN
+        system 'git push origin master:refs/heads/s3 --force'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wax_tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.0.46
 platform: ruby
 authors:
 - Marii Nyrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -144,12 +144,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- lib/tasks/ghbranch.rake
 - lib/tasks/iiif.rake
 - lib/tasks/jspackage.rake
 - lib/tasks/lunr.rake
 - lib/tasks/pagemaster.rake
-- lib/tasks/s3branch.rake
+- lib/tasks/push_gh.rake
+- lib/tasks/push_s3.rake
 - lib/tasks/test.rake
 - lib/wax_tasks.rb
 - lib/wax_tasks/collection.rb

data/lib/tasks/ghbranch.rake

@@ -1,34 +0,0 @@
-include FileUtils
-require 'wax_tasks'
-require 'jekyll'
-
-namespace :wax do
-  desc 'build site with gh-baseurl and publish to gh-pages branch'
-  task :ghbranch do
-    config = read_config
-    rm_rf('_site')
-
-    opts = {
-      'source' => '.',
-      'destination' => '_site',
-      'config' => '_config.yml',
-      'baseurl' => config['gh-baseurl'],
-      'incremental' => true,
-      'verbose' => true
-    }
-
-    Jekyll::Site.new(Jekyll.configuration(opts)).process
-
-    origin = `git config --get remote.origin.url`
-
-    Dir.mktmpdir do |tmp|
-      cp_r '_site/.', tmp
-      Dir.chdir tmp
-
-      system 'git init' # Init the repo.
-      system "git add . && git commit -m 'Site updated at #{Time.now.utc}'"
-      system 'git remote add origin ' + origin
-      system 'git push origin master:refs/heads/gh-pages --force'
-    end
-  end
-end

data/lib/tasks/s3branch.rake

@@ -1,18 +0,0 @@
-include FileUtils
-require 'wax_tasks'
-require 'jekyll'
-
-namespace :wax do
-  desc 'build site with baseurl and publish to s3 branch'
-  task :s3branch do
-    origin = `git config --get remote.origin.url`
-    Dir.mktmpdir do |tmp|
-      cp_r '_site/.', tmp
-      Dir.chdir tmp
-      system 'git init' # Init the repo.
-      system "git add . && git commit -m 'Site updated at #{Time.now.utc}'"
-      system 'git remote add origin ' + origin
-      system 'git push origin master:refs/heads/s3 --force'
-    end
-  end
-end