gitscape 1.3.8 → 1.3.9
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/gitscape/base.rb +12 -9
- data/lib/gitscape/version.rb +1 -1
- metadata +3 -3
data/lib/gitscape/base.rb
CHANGED
@@ -135,9 +135,8 @@ class Gitscape::Base
|
|
135
135
|
|
136
136
|
def release_start
|
137
137
|
# Switch to master branch
|
138
|
-
|
139
|
-
`git
|
140
|
-
# puts"Checkout of master branch successful"
|
138
|
+
puts `git checkout master`
|
139
|
+
puts `git pull origin master`
|
141
140
|
|
142
141
|
# Check that the working copy is clean
|
143
142
|
exit 1 unless git_working_copy_is_clean
|
@@ -151,7 +150,7 @@ class Gitscape::Base
|
|
151
150
|
release_branch_name = "i#{new_version_number}"
|
152
151
|
|
153
152
|
# Cut the branch
|
154
|
-
`git checkout -b "release/#{release_branch_name}" master`
|
153
|
+
puts `git checkout -b "release/#{release_branch_name}" master`
|
155
154
|
exit 1 unless $?.exitstatus == 0
|
156
155
|
|
157
156
|
# Bump the version number
|
@@ -159,13 +158,15 @@ class Gitscape::Base
|
|
159
158
|
exit 1 unless $?.exitstatus == 0
|
160
159
|
|
161
160
|
# Commit the bump
|
162
|
-
`git commit -a -m "Begin #{release_branch_name} release candidate"`
|
161
|
+
puts `git commit -a -m "Begin #{release_branch_name} release candidate"`
|
163
162
|
exit 1 unless $?.exitstatus == 0
|
164
163
|
|
165
|
-
#
|
166
|
-
`git push origin
|
164
|
+
# Update qa to the new commit
|
165
|
+
puts `git push origin "release/#{release_branch_name}:qa"`
|
167
166
|
exit 1 unless $?.exitstatus == 0
|
168
|
-
|
167
|
+
|
168
|
+
# Push to origin
|
169
|
+
puts `git push origin -u "release/#{release_branch_name}"`
|
169
170
|
exit 1 unless $?.exitstatus == 0
|
170
171
|
end
|
171
172
|
|
@@ -182,6 +183,8 @@ class Gitscape::Base
|
|
182
183
|
release_branch_name = "release/i#{new_version_number}"
|
183
184
|
release_branch = @repo.branch release_branch_name
|
184
185
|
|
186
|
+
# Fetch in order to have the latest branch revisions
|
187
|
+
|
185
188
|
# Get branch information for checks
|
186
189
|
branch_keys = ["name", "revision", "message"]
|
187
190
|
branch_values = `git branch -av`.scan(/^[ \*]*([^ \*]+) +([^ ]+) +(.*)$/)
|
@@ -189,7 +192,7 @@ class Gitscape::Base
|
|
189
192
|
branch_revisions = Hash[ branches.map {|branch| [branch["name"], branch["revision"]] } ]
|
190
193
|
|
191
194
|
# Check if the required branches in sync
|
192
|
-
required_synced_branches = [
|
195
|
+
required_synced_branches = [[release_branch_name, "remotes/origin/qa"]]
|
193
196
|
required_synced_branches.each do |branch_pair|
|
194
197
|
if branch_revisions[ branch_pair[0] ] != branch_revisions[ branch_pair[0] ]
|
195
198
|
puts "*** ERROR: The #{branch_pair[0]} branch is not the same as the #{branch_pair[1]} branch.
|
data/lib/gitscape/version.rb
CHANGED
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 1
|
7
7
|
- 3
|
8
|
-
-
|
9
|
-
version: 1.3.
|
8
|
+
- 9
|
9
|
+
version: 1.3.9
|
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-
|
18
|
+
date: 2013-03-20 00:00:00 -04:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|