scrumninja-git-cli 0.0.5 → 0.0.6

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/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.5
1
+ 0.0.6
data/lib/git_wrapper.rb CHANGED
@@ -86,11 +86,13 @@ module GitWrapper
86
86
  def checkout_with_NON_existing_local_and_existing_remote(branch_name, remote)
87
87
  checkout_branch(branch_name, remote)
88
88
  create_branch(branch_name)
89
+ checkout_branch(branch_name)
89
90
  track_remote_branch(branch_name, remote)
90
91
  end
91
92
  def checkout_with_NON_existing_local_and_NON_existing_remote(branch_name, remote)
92
93
  checkout_branch 'master' # yes, really
93
94
  create_branch(branch_name)
95
+ checkout_branch(branch_name)
94
96
  publish_remote_branch(branch_name, remote)
95
97
  track_remote_branch(branch_name, remote)
96
98
  end
@@ -11,13 +11,12 @@ class GitWrapperUnitTest < Test::Unit::TestCase
11
11
  end
12
12
 
13
13
  def setup
14
- # Holler if we ever inadvertently try to run a git command
15
- GitWrapper.expects(:run_git).never
16
- @s=nil
14
+ GitWrapper.expects(:run_git).never # Holler if we ever inadvertently try to run a git command
15
+ @s = nil # Reset Mocha expectation sequence
17
16
  end
18
17
 
19
18
  def expect_git_command(command, interactive=false)
20
- @s||=sequence('git commands sequence')
19
+ @s ||= sequence('git commands sequence')
21
20
  if interactive
22
21
  GitWrapper.expects(:run_git).with(command, true).in_sequence(@s)
23
22
  else
@@ -230,6 +229,7 @@ class GitWrapperUnitTest < Test::Unit::TestCase
230
229
  should '#checkout_with_NON_existing_local_and_existing_remote' do
231
230
  expect_git_command 'checkout origin/my-story'
232
231
  expect_git_command 'branch my-story'
232
+ expect_git_command 'checkout my-story'
233
233
  expect_git_command 'branch --set-upstream my-story origin/my-story'
234
234
 
235
235
  GitWrapper.checkout_with_NON_existing_local_and_existing_remote('my-story', 'origin')
@@ -237,6 +237,7 @@ class GitWrapperUnitTest < Test::Unit::TestCase
237
237
  should '#checkout_with_NON_existing_local_and_NON_existing_remote' do
238
238
  expect_git_command 'checkout master'
239
239
  expect_git_command 'branch my-story'
240
+ expect_git_command 'checkout my-story'
240
241
  expect_git_command 'push origin my-story:refs/heads/my-story'
241
242
  expect_git_command 'branch --set-upstream my-story origin/my-story'
242
243
 
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 5
9
- version: 0.0.5
8
+ - 6
9
+ version: 0.0.6
10
10
  platform: ruby
11
11
  authors:
12
12
  - John Wilger
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2010-03-30 00:00:00 -07:00
19
+ date: 2010-04-06 00:00:00 -07:00
20
20
  default_executable: sgc
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency