theme-juice 0.18.8 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c59188ebf84f3e3432720b1d49a820bdcb00304
-  data.tar.gz: 38735743688d79422dfe6a4f8495683f14591f9f
+  metadata.gz: 6e7769e9fb8c292f5791e2e079d104e75ef0f442
+  data.tar.gz: b01866437508a70fd372f21d29f676f223bd211e
 SHA512:
-  metadata.gz: 869a755300d98e7e241e2074eb238f8006d7a9990332aab6c1a41c4af2a23fe2dae66454fd3dbf89ddcfa3fe74bf1d5431b2b3f710582d21ccc641e776a60626
-  data.tar.gz: 32e13868a0e0fe1cbfda6a9fcb4e3c335becf35e8c673a6284f0f834058b41112b865c8b49bbcd3cbd381d524427442df90df27d78e1c73fadb2a1361ae62f1c
+  metadata.gz: 81124fe571a02fafd00dd1eb98125287f71d8c0a22a3d80297e9b1714b559125154b431ece6cee7660d5d7438726629841df5e34dbaa56e9ece0dfe3c2f4db65
+  data.tar.gz: 3a40bd424bebd452fe5f94e348d9c51e27dac974b9182ec0c26ebb4e595f98f01d15a9570db73a7acb6b4edd839a47e0f3f30a387982895cb17d514dd62f9319

data/lib/theme-juice/cli.rb

@@ -40,6 +40,8 @@ module ThemeJuice
         @env.trace           = options[:trace]
         @env.dryrun          = options[:dryrun]
         @env.nginx           = options[:nginx]
+        @env.archive         = options[:archive]
+        @env.branch          = options[:branch]
       end
     end
 
@@ -160,6 +162,7 @@ module ThemeJuice
 
     desc "deploy STAGE [,ARGS]", "Deploy a project"
     method_option :archive, :type => :boolean, :aliases => %w[--tar --gzip --zip], :desc => ""
+    method_option :branch,  :type => :string,  :aliases => "-b", :default => nil,  :desc => ""
     def deploy(stage, *args)
       @deploy.new(options).send(stage, *args).execute
     end

data/lib/theme-juice/commands/deploy.rb

@@ -11,7 +11,6 @@ module ThemeJuice
           self.class.send :define_method, stage do |*args|
             @env.cap     = Capistrano::Application.new
             @env.stage   = stage.to_sym
-            @env.archive = opts[:archive]
 
             runner do |tasks|
               tasks << Tasks::Settings.new

data/lib/theme-juice/env.rb

@@ -24,6 +24,7 @@ module ThemeJuice
     attr_accessor :stage
     attr_accessor :cap
     attr_accessor :archive
+    attr_accessor :branch
 
     def vm_box=(val)
       @vm_box = val || ENV.fetch("TJ_VM_BOX") { "git@github.com:ezekg/theme-juice-vvv.git" }

data/lib/theme-juice/man/tj-deploy

@@ -38,6 +38,10 @@ Deploy!
 .SH "GLOBAL OPTIONS"
 .
 .TP
+\fB\-b\fR, \fB\-\-branch\fR=\fIbranch\fR
+Use an alternate git(1) branch for current deployment
+.
+.TP
 \fB\-\-archive\fR, \fB\-\-tar\fR, \fB\-\-gzip\fR, \fB\-\-zip\fR
 Archive directories with tar(1) when performing file transfers
 .

data/lib/theme-juice/man/tj-deploy.txt

@@ -32,6 +32,9 @@ SETUP
 
 
 GLOBAL OPTIONS
+       -b, --branch=branch
+	      Use an alternate git(1) branch for current deployment
+
        --archive, --tar, --gzip, --zip
 	      Archive directories with tar(1) when performing file transfers
 

data/lib/theme-juice/tasks/settings.rb

@@ -24,33 +24,36 @@ module ThemeJuice
 
       # Required global settings
       def configure_required_settings
-        begin
-          set :application,  @config.deployment.application.name
-          set :archive,      @env.archive
-
-          set :linked_files, fetch(:linked_files, []).concat(fetch(:shared_files, []))
-          set :linked_dirs,  fetch(:linked_dirs, []).concat(fetch(:shared_dirs, []))
-             .push(fetch(:uploads_dir, ""))
-
-          %w[settings repository].each do |task|
-            @config.deployment.send(task).symbolize_keys.each do |key, value|
-              set key, proc { value }
-            end
-          end
-        rescue NoMethodError => err
-          @io.error "Oops! It looks like you're missing a few deployment settings" do
-            puts err
+        set :application,  @config.deployment.application.name
+        set :archive,      @env.archive
+
+        set :linked_files, fetch(:linked_files, []).concat(fetch(:shared_files, []))
+        set :linked_dirs,  fetch(:linked_dirs, []).concat(fetch(:shared_dirs, []))
+           .push(fetch(:uploads_dir, ""))
+
+        %w[settings repository].each do |task|
+          @config.deployment.send(task).symbolize_keys.each do |key, value|
+            set key, proc { value }
           end
         end
+
+        # Allow the branch to be overridden (casts possible nil to string)
+        unless @env.branch.to_s.empty?
+          set :branch, @env.branch
+        end
+      rescue NoMethodError => err
+        @io.error "Oops! It looks like you're missing a few deployment settings" do
+          puts err
+        end
       end
 
       # Optional namespaced settings
       def configure_optional_settings
         %w[rsync slack].each do |task|
-          if @config.deployment.key? task
-            @config.deployment.send(task).each do |key, value|
-              set :"#{task}_#{key}", proc { value }
-            end
+          next unless @config.deployment.key? task
+
+          @config.deployment.send(task).each do |key, value|
+            set :"#{task}_#{key}", proc { value }
           end
         end
       end

data/lib/theme-juice/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module ThemeJuice
-  VERSION = "0.18.8"
+  VERSION = "0.19.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.18.8
+  version: 0.19.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement