gitscape 1.4.0 → 1.4.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -21,13 +21,6 @@ class Gitscape::Base
21
21
  @repo.branches.map { |b| b.full }
22
22
  end
23
23
 
24
- def checkout(branch_name)
25
- puts "--- Switching to branch '#{branch_name}' ---"
26
- `git checkout -b #{branch_name}`
27
-
28
- throw "!!! Failed to switch to branch #{branch_name} !!!" if current_branch_name != branch_name
29
- end
30
-
31
24
  def git_working_copy_is_clean puts_changes=true
32
25
 
33
26
  # Check if the working copy is clean, if not, exit
@@ -74,7 +67,7 @@ class Gitscape::Base
74
67
  end
75
68
 
76
69
  def hotfix_start(hotfix_branch=nil)
77
- checkout "live"
70
+ puts `git checkout live`
78
71
 
79
72
  if hotfix_branch.length == 0
80
73
  exception_message = "*** Improper Usage ***\nExpected Usage: hotfix_start <hotfix_branch>"
@@ -125,9 +118,10 @@ class Gitscape::Base
125
118
  exit 1 if !$?.success?
126
119
  raise "Merge on #{branch} has failed.\nResolve the conflicts and run the script again." if git_has_conflicts
127
120
 
128
- # If we just merged the live branch, tag this revision
121
+ # If we just merged the live branch, tag this revision, and push that tag to origin
129
122
  if branch == "live"
130
123
  `git tag live/i#{live_iteration}/#{hotfix_branch}`
124
+ `git push --tags`
131
125
  end
132
126
 
133
127
  end
@@ -1,3 +1,3 @@
1
1
  module Gitscape
2
- VERSION = '1.4.0'
2
+ VERSION = '1.4.1'
3
3
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 4
8
- - 0
9
- version: 1.4.0
8
+ - 1
9
+ version: 1.4.1
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-03-28 00:00:00 -04:00
18
+ date: 2013-04-01 00:00:00 -04:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency