scrumninja-git-cli 0.0.4 → 0.0.5

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+.scrumninja.yml

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/sgc

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
+require 'rubygems'
 require 'scrum_ninja_git_cli'
 ScrumNinjaGitCli.run_command(*ARGV)

data/lib/git_wrapper.rb

@@ -59,10 +59,40 @@ module GitWrapper
   ##### Modification commands:  these just shell out to git (directly or indirectly) #####
   def checkout(branch_name, remote='origin')
     fetch(remote)
-    create_branch(branch_name) unless local_branch_exists?(branch_name)
-    publish_remote_branch(branch_name, remote) unless remote_branch_exists?(branch_name, remote)
+    lb, rb = local_branch_exists?(branch_name), remote_branch_exists?(branch_name, remote)
+    case
+    when  lb &&  rb
+      checkout_with_existing_local_and_existing_remote(branch_name, remote)
+    when  lb && !rb
+      checkout_with_existing_local_and_NON_existing_remote(branch_name, remote)
+    when !lb &&  rb
+      checkout_with_NON_existing_local_and_existing_remote(branch_name, remote)
+    when !lb && !rb
+      checkout_with_NON_existing_local_and_NON_existing_remote(branch_name, remote)
+    end
+    return "That was fun!"
+  end
+
+  def checkout_with_existing_local_and_existing_remote(branch_name, remote)
+    checkout_branch(branch_name)
     track_remote_branch(branch_name, remote)
+    merge_without_remote_update(branch_name, remote)
+  end
+  def checkout_with_existing_local_and_NON_existing_remote(branch_name, remote)
+    checkout_branch(branch_name)
+    publish_remote_branch(branch_name, remote)
+    track_remote_branch(branch_name, remote)
+  end
+  def checkout_with_NON_existing_local_and_existing_remote(branch_name, remote)
     checkout_branch(branch_name, remote)
+    create_branch(branch_name)
+    track_remote_branch(branch_name, remote)
+  end
+  def checkout_with_NON_existing_local_and_NON_existing_remote(branch_name, remote)
+    checkout_branch 'master'  # yes, really
+    create_branch(branch_name)
+    publish_remote_branch(branch_name, remote)
+    track_remote_branch(branch_name, remote)
   end
 
   def fetch(remote='origin')
@@ -85,8 +115,13 @@ module GitWrapper
     run_git "branch --set-upstream #{branch_name} #{remote}/#{branch_name}"
   end
 
-  def checkout_branch(branch_name, remote='origin')
-    run_git "checkout #{branch_name}"
+  def checkout_branch(branch_name, remote=nil)
+    refspec = [remote, branch_name].reject(&:nil?) * '/'
+    run_git "checkout #{refspec}"
+  end
+
+  def merge_without_remote_update(branch, remote)
+    run_git "merge #{remote}/#{branch}"
   end
 
   def merge_from_master

data/test/test_git_wrapper.rb

@@ -13,13 +13,15 @@ class GitWrapperUnitTest < Test::Unit::TestCase
   def setup
     # Holler if we ever inadvertently try to run a git command
     GitWrapper.expects(:run_git).never
+    @s=nil
   end
 
   def expect_git_command(command, interactive=false)
+    @s||=sequence('git commands sequence')
     if interactive
-      GitWrapper.expects(:run_git).with(command, true)
+      GitWrapper.expects(:run_git).with(command, true).in_sequence(@s)
     else
-      GitWrapper.expects(:run_git).with(command)
+      GitWrapper.expects(:run_git).with(command).in_sequence(@s)
     end
   end
 
@@ -136,18 +138,8 @@ class GitWrapperUnitTest < Test::Unit::TestCase
     end
   end
 
-  context "checkout" do
-    should 'fetch' do
-      expect_git_command 'fetch origin'
-      expect_git_command 'branch my-story'
-      expect_git_command 'push origin my-story:refs/heads/my-story'
-      expect_git_command 'branch --set-upstream my-story origin/my-story'
-      expect_git_command 'checkout my-story'
-
-      GitWrapper.checkout('my-story')
-    end
-
-    should "take an optional 'remote' parameter" do
+  context 'checkout (with optional remote arg)' do
+    should_eventually 'work' do
       expect_git_command 'fetch nonstandard_remote'
       expect_git_command 'branch my-story'
       expect_git_command 'push nonstandard_remote my-story:refs/heads/my-story'
@@ -156,6 +148,12 @@ class GitWrapperUnitTest < Test::Unit::TestCase
 
       GitWrapper.checkout('my-story', 'nonstandard_remote')
     end
+  end
+
+  context "checkout" do
+    setup do
+      expect_git_command 'fetch origin'
+    end
 
     context "when remote branch 'my-story' does not exist" do
       setup do
@@ -164,14 +162,12 @@ class GitWrapperUnitTest < Test::Unit::TestCase
         GitWrapper.git.stubs(:remotes).returns(@remotes)
       end
 
-      should "create local 'my-story' branch, check it out, publish it, and track it" do
-        expect_git_command 'fetch origin'
-        expect_git_command 'branch local-story-branch'
-        expect_git_command 'push origin local-story-branch:refs/heads/local-story-branch'
-        expect_git_command 'branch --set-upstream local-story-branch origin/local-story-branch'
-        expect_git_command 'checkout local-story-branch'
-
-        GitWrapper.checkout('local-story-branch')
+      context "and local branch 'my-story' does not exist" do
+        should "create local 'my-story' branch, check it out, publish it, and track it" do
+          GitWrapper.expects(:checkout_with_NON_existing_local_and_NON_existing_remote) \
+                    .with('my-story', 'origin')
+          GitWrapper.checkout('my-story')
+        end
       end
 
       context "and local branch 'my-story' exists" do
@@ -179,12 +175,10 @@ class GitWrapperUnitTest < Test::Unit::TestCase
           @branches << branch('my-story')
         end
         should "check out the remote branch and track it" do
-          expect_git_command 'fetch origin'
-          expect_git_command 'push origin my-story:refs/heads/my-story'
-          expect_git_command 'branch --set-upstream my-story origin/my-story'
-          expect_git_command 'checkout my-story'
-
+          GitWrapper.expects(:checkout_with_existing_local_and_NON_existing_remote) \
+                    .with('my-story', 'origin')
           GitWrapper.checkout('my-story')
+
         end
       end
     end
@@ -196,30 +190,60 @@ class GitWrapperUnitTest < Test::Unit::TestCase
         GitWrapper.git.stubs(:remotes).returns(@remotes)
       end
 
-      should "create local 'my-story' branch, make it track the remote branch, and check it out" do
-        expect_git_command 'fetch origin'
-        expect_git_command 'branch my-story'
-        expect_git_command 'branch --set-upstream my-story origin/my-story'
-        expect_git_command 'checkout my-story'
-
-        GitWrapper.checkout('my-story')
+      context "and local branch 'my-story' does not exist" do
+        should "create local 'my-story' branch, make it track the remote branch, and check it out" do
+          GitWrapper.expects(:checkout_with_NON_existing_local_and_existing_remote) \
+                    .with('my-story', 'origin')
+          GitWrapper.checkout('my-story')
+        end
       end
 
       context "when local branch 'my-story' exists" do
         setup do
           @branches << branch('my-story')
         end
-        should "make it track the remote branch, and check it out" do
-          expect_git_command 'fetch origin'
-          expect_git_command 'branch --set-upstream my-story origin/my-story'
-          expect_git_command 'checkout my-story'
 
+        should "make it track the remote branch, and check it out" do
+          GitWrapper.expects(:checkout_with_existing_local_and_existing_remote) \
+                    .with('my-story', 'origin')
           GitWrapper.checkout('my-story')
         end
       end
     end
   end
 
+  context 'stupid truthy-tably methods' do
+    should '#checkout_with_existing_local_and_existing_remote' do
+      expect_git_command 'checkout my-story'
+      expect_git_command 'branch --set-upstream my-story origin/my-story'
+      expect_git_command 'merge origin/my-story'
+
+      GitWrapper.checkout_with_existing_local_and_existing_remote('my-story', 'origin')
+    end
+    should '#checkout_with_existing_local_and_NON_existing_remote' do
+      expect_git_command 'checkout my-story'
+      expect_git_command 'push origin my-story:refs/heads/my-story'
+      expect_git_command 'branch --set-upstream my-story origin/my-story'
+
+      GitWrapper.checkout_with_existing_local_and_NON_existing_remote('my-story', 'origin')
+    end
+    should '#checkout_with_NON_existing_local_and_existing_remote' do
+      expect_git_command 'checkout origin/my-story'
+      expect_git_command 'branch my-story'
+      expect_git_command 'branch --set-upstream my-story origin/my-story'
+
+      GitWrapper.checkout_with_NON_existing_local_and_existing_remote('my-story', 'origin')
+    end
+    should '#checkout_with_NON_existing_local_and_NON_existing_remote' do
+      expect_git_command 'checkout master'
+      expect_git_command 'branch my-story'
+      expect_git_command 'push origin my-story:refs/heads/my-story'
+      expect_git_command 'branch --set-upstream my-story origin/my-story'
+
+      GitWrapper.checkout_with_NON_existing_local_and_NON_existing_remote('my-story', 'origin')
+    end
+  end
+
   context "#is_state_clean?" do
     should "be true when it is" do
       expect_git_command('status').returns <<-EOF

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - John Wilger
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -07:00
+date: 2010-03-30 00:00:00 -07:00
 default_executable: sgc
 dependencies: 
 - !ruby/object:Gem::Dependency