socialcast-git-extensions 3.0.6 → 3.0.7

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.
Files changed (4) hide show
  1. data/lib/socialcast-git-extensions/git.rb +1 -0
  2. data/lib/socialcast-git-extensions/version.rb +1 -1
  3. data/spec/cli_spec.rb +7 -0
  4. metadata +4 -4
data/lib/socialcast-git-extensions/git.rb CHANGED
@@ -73,6 +73,7 @@ module Socialcast
73
73
 
74
74
  run_cmd "git branch -D #{destination_branch}"
75
75
  run_cmd "git checkout #{destination_branch}"
76
+ run_cmd "git pull origin #{destination_branch}"
76
77
  run_cmd "git pull . #{branch}"
77
78
  run_cmd "git push origin HEAD"
78
79
  run_cmd "git checkout #{branch}"
data/lib/socialcast-git-extensions/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Socialcast
2
2
  module Gitx
3
- VERSION = "3.0.6"
3
+ VERSION = "3.0.7"
4
4
  end
5
5
  end
data/spec/cli_spec.rb CHANGED
@@ -48,6 +48,7 @@ describe Socialcast::Gitx::CLI do
48
48
  "git push origin HEAD",
49
49
  "git branch -D prototype",
50
50
  "git checkout prototype",
51
+ "git pull origin prototype",
51
52
  "git pull . FOO",
52
53
  "git push origin HEAD",
53
54
  "git checkout FOO",
@@ -68,6 +69,7 @@ describe Socialcast::Gitx::CLI do
68
69
  "git push origin HEAD",
69
70
  "git branch -D prototype",
70
71
  "git checkout prototype",
72
+ "git pull origin prototype",
71
73
  "git pull . FOO",
72
74
  "git push origin HEAD",
73
75
  "git checkout FOO",
@@ -88,11 +90,13 @@ describe Socialcast::Gitx::CLI do
88
90
  "git push origin HEAD",
89
91
  "git branch -D staging",
90
92
  "git checkout staging",
93
+ "git pull origin staging",
91
94
  "git pull . FOO",
92
95
  "git push origin HEAD",
93
96
  "git checkout FOO",
94
97
  "git branch -D prototype",
95
98
  "git checkout prototype",
99
+ "git pull origin prototype",
96
100
  "git pull . staging",
97
101
  "git push origin HEAD",
98
102
  "git checkout staging",
@@ -137,6 +141,7 @@ describe Socialcast::Gitx::CLI do
137
141
  "git push origin HEAD",
138
142
  "git branch -D staging",
139
143
  "git checkout staging",
144
+ "git pull origin staging",
140
145
  "git pull . master",
141
146
  "git push origin HEAD",
142
147
  "git checkout master",
@@ -271,11 +276,13 @@ describe Socialcast::Gitx::CLI do
271
276
  "git push origin HEAD",
272
277
  "git branch -D staging",
273
278
  "git checkout staging",
279
+ "git pull origin staging",
274
280
  "git pull . FOO",
275
281
  "git push origin HEAD",
276
282
  "git checkout FOO",
277
283
  "git branch -D prototype",
278
284
  "git checkout prototype",
285
+ "git pull origin prototype",
279
286
  "git pull . staging",
280
287
  "git push origin HEAD",
281
288
  "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.6
4
+ version: 3.0.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-06 00:00:00.000000000 Z
12
+ date: 2012-09-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: grit
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
230
230
  version: '0'
231
231
  segments:
232
232
  - 0
233
- hash: 2832499571703574372
233
+ hash: -1512186750897379892
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: 2832499571703574372
242
+ hash: -1512186750897379892
243
243
  requirements: []
244
244
  rubyforge_project: socialcast-git-extensions
245
245
  rubygems_version: 1.8.24