gitscape 1.6.3 → 1.6.4

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.
data/bin/gitscape CHANGED
@@ -51,6 +51,14 @@ op = OptionParser.new do |op|
51
51
  op.on '-e', '--env-depth=ENV', [:staging, :qa, :live], 'The level of environments to push changes to' do |depth|
52
52
  options[:env_depth] = depth
53
53
  end
54
+
55
+ op.on '--qa', 'Sets the environment depth for the command to the qa environment' do
56
+ options[:env_depth] = :qa
57
+ end
58
+
59
+ op.on '--live', 'Sets the environment depth for the command to the live environment' do
60
+ options[:env_depth] = :live
61
+ end
54
62
  end
55
63
 
56
64
  op.parse!(ARGV)
data/lib/gitscape/base.rb CHANGED
@@ -62,7 +62,12 @@ class Gitscape::Base
62
62
  end
63
63
 
64
64
  def current_release_branch_name
65
- "release/i#{current_release_branch_number}"
65
+ release_number = current_release_branch_number
66
+ if !release_number.nil?
67
+ "release/i#{current_release_branch_number}"
68
+ else
69
+ nil
70
+ end
66
71
  end
67
72
 
68
73
  def git_has_conflicts puts_conflicts=true
@@ -1,3 +1,3 @@
1
1
  module Gitscape
2
- VERSION = '1.6.3'
2
+ VERSION = '1.6.4'
3
3
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 6
8
- - 3
9
- version: 1.6.3
8
+ - 4
9
+ version: 1.6.4
10
10
  platform: ruby
11
11
  authors:
12
12
  - Jon Botelho
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2013-05-10 00:00:00 -04:00
18
+ date: 2013-05-14 00:00:00 -04:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency