socialcast-git-extensions 3.0.2 → 3.0.4
Sign up to get free protection for your applications and to get access to all the features.
@@ -53,13 +53,13 @@ module Socialcast
|
|
53
53
|
run_cmd "git pull origin #{branch}" rescue nil
|
54
54
|
run_cmd "git pull origin #{Socialcast::Gitx::BASE_BRANCH}"
|
55
55
|
run_cmd 'git push origin HEAD'
|
56
|
-
run_cmd 'git remote prune origin'
|
57
56
|
end
|
58
57
|
|
59
58
|
desc 'cleanup', 'Cleanup branches that have been merged into master from the repo'
|
60
59
|
def cleanup
|
61
60
|
run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
|
62
61
|
run_cmd "git pull"
|
62
|
+
run_cmd 'git remote prune origin'
|
63
63
|
|
64
64
|
say "Deleting branches that have been merged into "
|
65
65
|
say Socialcast::Gitx::BASE_BRANCH, :green
|
@@ -143,9 +143,9 @@ module Socialcast
|
|
143
143
|
|
144
144
|
update
|
145
145
|
integrate_branch branch, Socialcast::Gitx::BASE_BRANCH
|
146
|
-
invoke :integrate, ['staging']
|
147
146
|
run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
|
148
|
-
|
147
|
+
invoke :integrate, ['staging', '--quiet']
|
148
|
+
cleanup
|
149
149
|
|
150
150
|
post "#worklog releasing #{branch} to production #scgitx"
|
151
151
|
end
|
@@ -70,8 +70,8 @@ module Socialcast
|
|
70
70
|
say "into "
|
71
71
|
say destination_branch, :green
|
72
72
|
|
73
|
-
run_cmd "git remote prune origin"
|
74
73
|
run_cmd "git checkout #{destination_branch}"
|
74
|
+
run_cmd "git pull origin #{destination_branch}"
|
75
75
|
run_cmd "git pull . #{branch}"
|
76
76
|
run_cmd "git push origin HEAD"
|
77
77
|
run_cmd "git checkout #{branch}"
|
data/spec/cli_spec.rb
CHANGED
@@ -27,8 +27,7 @@ describe Socialcast::Gitx::CLI do
|
|
27
27
|
Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
|
28
28
|
'git pull origin FOO',
|
29
29
|
'git pull origin master',
|
30
|
-
'git push origin HEAD'
|
31
|
-
'git remote prune origin'
|
30
|
+
'git push origin HEAD'
|
32
31
|
]
|
33
32
|
end
|
34
33
|
end
|
@@ -43,9 +42,8 @@ describe Socialcast::Gitx::CLI do
|
|
43
42
|
"git pull origin FOO",
|
44
43
|
"git pull origin master",
|
45
44
|
"git push origin HEAD",
|
46
|
-
"git remote prune origin",
|
47
|
-
"git remote prune origin",
|
48
45
|
"git checkout prototype",
|
46
|
+
"git pull origin prototype",
|
49
47
|
"git pull . FOO",
|
50
48
|
"git push origin HEAD",
|
51
49
|
"git checkout FOO",
|
@@ -62,9 +60,8 @@ describe Socialcast::Gitx::CLI do
|
|
62
60
|
"git pull origin FOO",
|
63
61
|
"git pull origin master",
|
64
62
|
"git push origin HEAD",
|
65
|
-
"git remote prune origin",
|
66
|
-
"git remote prune origin",
|
67
63
|
"git checkout prototype",
|
64
|
+
"git pull origin prototype",
|
68
65
|
"git pull . FOO",
|
69
66
|
"git push origin HEAD",
|
70
67
|
"git checkout FOO",
|
@@ -81,14 +78,13 @@ describe Socialcast::Gitx::CLI do
|
|
81
78
|
"git pull origin FOO",
|
82
79
|
"git pull origin master",
|
83
80
|
"git push origin HEAD",
|
84
|
-
"git remote prune origin",
|
85
|
-
"git remote prune origin",
|
86
81
|
"git checkout staging",
|
82
|
+
"git pull origin staging",
|
87
83
|
"git pull . FOO",
|
88
84
|
"git push origin HEAD",
|
89
85
|
"git checkout FOO",
|
90
|
-
"git remote prune origin",
|
91
86
|
"git checkout prototype",
|
87
|
+
"git pull origin prototype",
|
92
88
|
"git pull . staging",
|
93
89
|
"git push origin HEAD",
|
94
90
|
"git checkout staging",
|
@@ -125,29 +121,29 @@ describe Socialcast::Gitx::CLI do
|
|
125
121
|
"git pull origin FOO",
|
126
122
|
"git pull origin master",
|
127
123
|
"git push origin HEAD",
|
128
|
-
"git remote prune origin",
|
129
|
-
"git remote prune origin",
|
130
124
|
"git checkout master",
|
125
|
+
"git pull origin master",
|
131
126
|
"git pull . FOO",
|
132
127
|
"git push origin HEAD",
|
133
128
|
"git checkout FOO",
|
129
|
+
"git checkout master",
|
134
130
|
"git pull origin FOO",
|
135
131
|
"git pull origin master",
|
136
132
|
"git push origin HEAD",
|
137
|
-
"git remote prune origin",
|
138
|
-
"git remote prune origin",
|
139
133
|
"git checkout staging",
|
134
|
+
"git pull origin staging",
|
140
135
|
"git pull . FOO",
|
141
136
|
"git push origin HEAD",
|
142
137
|
"git checkout FOO",
|
143
|
-
"git remote prune origin",
|
144
138
|
"git checkout prototype",
|
139
|
+
"git pull origin prototype",
|
145
140
|
"git pull . staging",
|
146
141
|
"git push origin HEAD",
|
147
142
|
"git checkout staging",
|
148
143
|
"git checkout FOO",
|
149
144
|
"git checkout master",
|
150
|
-
"
|
145
|
+
"git pull",
|
146
|
+
"git remote prune origin"
|
151
147
|
]
|
152
148
|
end
|
153
149
|
end
|
@@ -259,8 +255,7 @@ describe Socialcast::Gitx::CLI do
|
|
259
255
|
Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
|
260
256
|
"git pull origin FOO",
|
261
257
|
"git pull origin master",
|
262
|
-
"git push origin HEAD"
|
263
|
-
"git remote prune origin"
|
258
|
+
"git push origin HEAD"
|
264
259
|
]
|
265
260
|
end
|
266
261
|
end
|
@@ -275,14 +270,13 @@ describe Socialcast::Gitx::CLI do
|
|
275
270
|
"git pull origin FOO",
|
276
271
|
"git pull origin master",
|
277
272
|
"git push origin HEAD",
|
278
|
-
"git remote prune origin",
|
279
|
-
"git remote prune origin",
|
280
273
|
"git checkout staging",
|
274
|
+
"git pull origin staging",
|
281
275
|
"git pull . FOO",
|
282
276
|
"git push origin HEAD",
|
283
277
|
"git checkout FOO",
|
284
|
-
"git remote prune origin",
|
285
278
|
"git checkout prototype",
|
279
|
+
"git pull origin prototype",
|
286
280
|
"git pull . staging",
|
287
281
|
"git push origin HEAD",
|
288
282
|
"git checkout staging",
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: socialcast-git-extensions
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.
|
4
|
+
version: 3.0.4
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
230
230
|
version: '0'
|
231
231
|
segments:
|
232
232
|
- 0
|
233
|
-
hash:
|
233
|
+
hash: 2981719831077906514
|
234
234
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
235
235
|
none: false
|
236
236
|
requirements:
|
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
239
239
|
version: '0'
|
240
240
|
segments:
|
241
241
|
- 0
|
242
|
-
hash:
|
242
|
+
hash: 2981719831077906514
|
243
243
|
requirements: []
|
244
244
|
rubyforge_project: socialcast-git-extensions
|
245
245
|
rubygems_version: 1.8.24
|