theme-juice 0.18.8 → 0.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1c59188ebf84f3e3432720b1d49a820bdcb00304
4
- data.tar.gz: 38735743688d79422dfe6a4f8495683f14591f9f
3
+ metadata.gz: 6e7769e9fb8c292f5791e2e079d104e75ef0f442
4
+ data.tar.gz: b01866437508a70fd372f21d29f676f223bd211e
5
5
  SHA512:
6
- metadata.gz: 869a755300d98e7e241e2074eb238f8006d7a9990332aab6c1a41c4af2a23fe2dae66454fd3dbf89ddcfa3fe74bf1d5431b2b3f710582d21ccc641e776a60626
7
- data.tar.gz: 32e13868a0e0fe1cbfda6a9fcb4e3c335becf35e8c673a6284f0f834058b41112b865c8b49bbcd3cbd381d524427442df90df27d78e1c73fadb2a1361ae62f1c
6
+ metadata.gz: 81124fe571a02fafd00dd1eb98125287f71d8c0a22a3d80297e9b1714b559125154b431ece6cee7660d5d7438726629841df5e34dbaa56e9ece0dfe3c2f4db65
7
+ data.tar.gz: 3a40bd424bebd452fe5f94e348d9c51e27dac974b9182ec0c26ebb4e595f98f01d15a9570db73a7acb6b4edd839a47e0f3f30a387982895cb17d514dd62f9319
@@ -40,6 +40,8 @@ module ThemeJuice
40
40
  @env.trace = options[:trace]
41
41
  @env.dryrun = options[:dryrun]
42
42
  @env.nginx = options[:nginx]
43
+ @env.archive = options[:archive]
44
+ @env.branch = options[:branch]
43
45
  end
44
46
  end
45
47
 
@@ -160,6 +162,7 @@ module ThemeJuice
160
162
 
161
163
  desc "deploy STAGE [,ARGS]", "Deploy a project"
162
164
  method_option :archive, :type => :boolean, :aliases => %w[--tar --gzip --zip], :desc => ""
165
+ method_option :branch, :type => :string, :aliases => "-b", :default => nil, :desc => ""
163
166
  def deploy(stage, *args)
164
167
  @deploy.new(options).send(stage, *args).execute
165
168
  end
@@ -11,7 +11,6 @@ module ThemeJuice
11
11
  self.class.send :define_method, stage do |*args|
12
12
  @env.cap = Capistrano::Application.new
13
13
  @env.stage = stage.to_sym
14
- @env.archive = opts[:archive]
15
14
 
16
15
  runner do |tasks|
17
16
  tasks << Tasks::Settings.new
@@ -24,6 +24,7 @@ module ThemeJuice
24
24
  attr_accessor :stage
25
25
  attr_accessor :cap
26
26
  attr_accessor :archive
27
+ attr_accessor :branch
27
28
 
28
29
  def vm_box=(val)
29
30
  @vm_box = val || ENV.fetch("TJ_VM_BOX") { "git@github.com:ezekg/theme-juice-vvv.git" }
@@ -38,6 +38,10 @@ Deploy!
38
38
  .SH "GLOBAL OPTIONS"
39
39
  .
40
40
  .TP
41
+ \fB\-b\fR, \fB\-\-branch\fR=\fIbranch\fR
42
+ Use an alternate git(1) branch for current deployment
43
+ .
44
+ .TP
41
45
  \fB\-\-archive\fR, \fB\-\-tar\fR, \fB\-\-gzip\fR, \fB\-\-zip\fR
42
46
  Archive directories with tar(1) when performing file transfers
43
47
  .
@@ -32,6 +32,9 @@ SETUP
32
32
 
33
33
 
34
34
  GLOBAL OPTIONS
35
+ -b, --branch=branch
36
+ Use an alternate git(1) branch for current deployment
37
+
35
38
  --archive, --tar, --gzip, --zip
36
39
  Archive directories with tar(1) when performing file transfers
37
40
 
@@ -24,33 +24,36 @@ module ThemeJuice
24
24
 
25
25
  # Required global settings
26
26
  def configure_required_settings
27
- begin
28
- set :application, @config.deployment.application.name
29
- set :archive, @env.archive
30
-
31
- set :linked_files, fetch(:linked_files, []).concat(fetch(:shared_files, []))
32
- set :linked_dirs, fetch(:linked_dirs, []).concat(fetch(:shared_dirs, []))
33
- .push(fetch(:uploads_dir, ""))
34
-
35
- %w[settings repository].each do |task|
36
- @config.deployment.send(task).symbolize_keys.each do |key, value|
37
- set key, proc { value }
38
- end
39
- end
40
- rescue NoMethodError => err
41
- @io.error "Oops! It looks like you're missing a few deployment settings" do
42
- puts err
27
+ set :application, @config.deployment.application.name
28
+ set :archive, @env.archive
29
+
30
+ set :linked_files, fetch(:linked_files, []).concat(fetch(:shared_files, []))
31
+ set :linked_dirs, fetch(:linked_dirs, []).concat(fetch(:shared_dirs, []))
32
+ .push(fetch(:uploads_dir, ""))
33
+
34
+ %w[settings repository].each do |task|
35
+ @config.deployment.send(task).symbolize_keys.each do |key, value|
36
+ set key, proc { value }
43
37
  end
44
38
  end
39
+
40
+ # Allow the branch to be overridden (casts possible nil to string)
41
+ unless @env.branch.to_s.empty?
42
+ set :branch, @env.branch
43
+ end
44
+ rescue NoMethodError => err
45
+ @io.error "Oops! It looks like you're missing a few deployment settings" do
46
+ puts err
47
+ end
45
48
  end
46
49
 
47
50
  # Optional namespaced settings
48
51
  def configure_optional_settings
49
52
  %w[rsync slack].each do |task|
50
- if @config.deployment.key? task
51
- @config.deployment.send(task).each do |key, value|
52
- set :"#{task}_#{key}", proc { value }
53
- end
53
+ next unless @config.deployment.key? task
54
+
55
+ @config.deployment.send(task).each do |key, value|
56
+ set :"#{task}_#{key}", proc { value }
54
57
  end
55
58
  end
56
59
  end
@@ -1,5 +1,5 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  module ThemeJuice
4
- VERSION = "0.18.8"
4
+ VERSION = "0.19.0"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: theme-juice
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.18.8
4
+ version: 0.19.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ezekiel Gabrielse
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-12-29 00:00:00.000000000 Z
11
+ date: 2016-01-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -100,14 +100,14 @@ dependencies:
100
100
  requirements:
101
101
  - - ~>
102
102
  - !ruby/object:Gem::Version
103
- version: 1.3.2
103
+ version: 1.3.8
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - ~>
109
109
  - !ruby/object:Gem::Version
110
- version: 1.3.2
110
+ version: 1.3.8
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bundler
113
113
  requirement: !ruby/object:Gem::Requirement