git-topic 0.1.6.4 → 0.2.1

data/spec/git_topic_comments_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+
+describe GitTopic do
+
+  describe "#comments" do
+
+    describe "on a branch with no comments" do
+
+      before( :each ) do
+        use_repo            'in-progress'
+        GitTopic.work_on    'pirates-advanced'
+      end
+      after( :each )  { Dir.chdir '..' }
+
+      it "should report that there are no comments" do
+        lambda{ GitTopic.comments }.should_not      raise_error
+        @output.should_not                          be_nil
+        @output.should                              =~ /no comments/i
+      end
+    end
+
+
+    describe "on a branch with comments" do
+
+      before( :each ) do
+        use_repo            'in-progress'
+        GitTopic.work_on    'krakens'
+      end
+
+      after( :each )  { Dir.chdir '..' }
+
+      it "should invoke git log to display the comments" do
+        GitTopic.should_receive( :git ) do |cmd|
+          cmd.should =~ /log/
+          cmd.should =~ %r{origin/master\.\.}
+          cmd.should =~ /--no-standard-notes/
+          cmd.should =~ %r{--show-notes=refs/notes/reviews/#{@user}/krakens}
+        end
+
+        lambda{ GitTopic.comments }.should_not      raise_error
+      end
+    end
+
+  end
+
+end

data/spec/git_topic_done_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+
+describe GitTopic do
+  
+  describe "#done" do
+
+    describe "in in-progress" do
+
+      before( :each ) { use_repo 'in-progress' }
+      after( :each )  { Dir.chdir '..' }
+
+      describe "without an argument" do
+
+        it "should fail if the working tree is dirty" do
+          GitTopic.work_on 'zombie-basic'
+          dirty_branch!
+
+          lambda{ GitTopic.done }.should raise_error
+        end
+
+        it "should fail if not on a wip branch" do
+          `git checkout master > /dev/null 2> /dev/null`
+          lambda{ GitTopic.done }.should raise_error
+        end
+
+        it "
+          should push the wip branch to origin in the review namespace, delete the
+          local branch, and leave the user on master
+        ".oneline do
+
+          git_branches.should             include( "wip/#{@user}/zombie-basic" )
+          git_remote_branches.should_not  include( "review/#{@user}/zombie-basic" )
+          GitTopic.work_on 'zombie-basic'
+          GitTopic.done
+         
+          git_branches.should_not         include( "wip/#{@user}/zombie-basic" )
+          git_remote_branches.should      include( "review/#{@user}/zombie-basic" )
+          git_remote_branches.should_not  include( "wip/#{@user}/zombie-basic" )
+          git_branch.should               == 'master'
+        end
+      end
+
+      describe "with an argument" do
+
+        it "should fail for non-wip branch arguments" do
+          git_branches.should_not         include( "wip/#{@user}/invalid-branch" )
+          lambda{ GitTopic.done( 'invalid-branch' )}.should raise_error
+        end
+
+        it "should succeed for superfluous wip-branch arguments" do
+          git_branches.should             include( "wip/#{@user}/zombie-basic" )
+          git_remote_branches.should_not  include( "review/#{@user}/zombie-basic" )
+          GitTopic.work_on 'zombie-basic'
+          GitTopic.done( 'zombie-basic' )
+         
+          git_branches.should_not         include( "wip/#{@user}/zombie-basic" )
+          git_remote_branches.should      include( "review/#{@user}/zombie-basic" )
+          git_remote_branches.should_not  include( "wip/#{@user}/zombie-basic" )
+          git_branch.should               == 'master'
+        end
+
+        it "
+          should succeed for wip-branch arguments, and leave the user on the
+          same branch
+        ".oneline do
+          git_branches.should             include( "wip/#{@user}/pirates-advanced" )
+          git_branches.should             include( "wip/#{@user}/zombie-basic" )
+          git_remote_branches.should_not  include( "review/#{@user}/zombie-basic" )
+
+          GitTopic.work_on  'pirates-advanced'
+          GitTopic.done     'zombie-basic'
+
+          git_branch.should               == "wip/#{@user}/pirates-advanced"
+          git_branches.should_not         include( "wip/#{@user}/zombie-basic" )
+          git_remote_branches.should      include( "review/#{@user}/zombie-basic" )
+          git_remote_branches.should_not  include( "wip/#{@user}/zombie-basic" )
+        end
+
+        it "should succeed for fully-qualified wip-branch arguments" do
+          git_branches.should             include( "wip/#{@user}/zombie-basic" )
+          git_remote_branches.should_not  include( "review/#{@user}/zombie-basic" )
+          GitTopic.done( "wip/#{@user}/zombie-basic" )
+         
+          git_branches.should_not         include( "wip/#{@user}/zombie-basic" )
+          git_remote_branches.should      include( "review/#{@user}/zombie-basic" )
+          git_remote_branches.should_not  include( "wip/#{@user}/zombie-basic" )
+          git_branch.should               == 'master'
+        end
+      end
+    end
+  end
+
+end

data/spec/git_topic_install_aliases_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+
+describe GitTopic do
+  
+  describe "#install_aliases" do
+    it "should install aliases" do
+      GitTopic.install_aliases  :local => true
+      git_config( 'alias.work-on' ).should    == 'topic work-on'
+      git_config( 'alias.done' ).should       == 'topic done'
+      git_config( 'alias.review' ).should     == 'topic review'
+      git_config( 'alias.accept' ).should     == 'topic accept'
+      git_config( 'alias.reject' ).should     == 'topic reject'
+      git_config( 'alias.comment' ).should    == 'topic comment'
+      git_config( 'alias.comments' ).should   == 'topic comments'
+
+      git_config( 'alias.w' ).should          == 'topic work-on'
+      git_config( 'alias.r' ).should          == 'topic review'
+      git_config( 'alias.st' ).should         == 'topic status --prepended'
+    end
+
+    it "should provide feedback to the user" do
+      GitTopic.install_aliases  :local => true
+      $?.success?.should          == true
+      @output.should_not          be_nil
+      @output.should_not          be_empty
+    end
+
+  end
+
+end
+

data/spec/git_topic_reject_spec.rb

@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+RejectFirstComment = %Q{
+Spec 123:           I have some general comments, mostly relating to the quality
+                    of our zombie-control policies.  Basically, they're not
+                    working.
+
+./zombies
+
+  Line 2
+    Spec 123:       I suggest we do the following instead:
+                        zombies.each{ |z| reason_with( z )}
+                        zomies.select do |z|
+                          z.unconvinced?
+                        end.each do |z|
+                          destroy z
+                        end
+                    This should take care of our issues with zombies.
+}.strip
+
+describe GitTopic do
+  
+  describe "#reject" do
+
+    describe "while on a review branch" do
+      before( :each ) do
+        use_repo 'in-progress'
+        GitTopic.review 'user24601/zombie-basic'
+      end
+      after( :each ) { Dir.chdir '..' }
+
+      describe "with no specified argument" do
+        it "
+          should move branch to the rejected namespace and destroy the local and
+          remote review branches
+        ".oneline do
+
+          git_branch.should               == 'review/user24601/zombie-basic'
+          GitTopic.reject
+          git_branch.should               == 'master'
+          git_branches.should_not         include( 'review/user24601/zombie-basic' )
+          git_remote_branches.should_not  include( 'review/user24601/zombie-basic' )
+          git_remote_branches.should      include( 'rejected/user24601/zombie-basic' )
+        end
+
+        it "should provide feedback to the user" do
+          GitTopic.reject
+          $?.success?.should          == true
+          @output.should_not          be_nil
+          @output.should_not          be_empty
+        end
+
+        it "should auto-save comments with the --save-comments options" do
+          GitTopic.stub!( :invoke_git_editor ) do |path|
+            File.open( path, 'w' ) do |f|
+              f.puts %Q{
+                I have some general comments, mostly relating to the quality of our
+                zombie-control policies.  Basically, they're not working.
+              }.cleanup
+            end
+          end
+
+          File.open( 'zombies', 'a' ) do |f|
+            f.puts %Q{
+              # I suggest we do the following instead:
+              #     zombies.each{ |z| reason_with( z )}
+              #     zomies.select do |z|
+              #       z.unconvinced?
+              #     end.each do |z|
+              #       destroy z
+              #     end
+              # This should take care of our issues with zombies.
+            }.cleanup
+          end
+          GitTopic.should_receive( :invoke_git_editor ).once
+          GitTopic.should_receive(
+            :git_author_name_short
+          ).once.and_return( "Spec 123" )
+
+          lambda do
+            GitTopic.reject :save_comments => true 
+          end.should_not                                  raise_error
+
+          git_notes_list(
+            "refs/notes/reviews/user24601/zombie-basic"
+          ).should_not                                    be_empty
+
+          git_notes_show(
+            "refs/notes/reviews/user24601/zombie-basic",
+            "origin/rejected/user24601/zombie-basic"
+          ).should                                        == RejectFirstComment
+        end
+
+        it "should fail if the working tree is dirty" do
+          dirty_branch!
+          lambda{ GitTopic.reject }.should    raise_error
+        end
+      end
+    end
+    
+    describe "while not on a review branch" do
+      before( :each ) { use_repo 'in-progress' }
+      after( :each ) { Dir.chdir '..' }
+
+      it "should fail" do
+        lambda{ GitTopic.reject }.should    raise_error
+      end
+    end
+
+  end
+
+end

data/spec/git_topic_review_spec.rb

@@ -0,0 +1,115 @@
+require 'spec_helper'
+
+
+describe GitTopic do
+  
+  describe "#review" do
+
+    describe "with no review branches" do
+      before( :each ) { use_repo 'fresh' }
+      after( :each )  { Dir.chdir '..' }
+
+      it "should report that there is nothing to do" do
+        git_remote_branches.each do |b|
+          b.should_not    =~ /review/
+        end
+
+        GitTopic.review
+        @output.should    =~ /nothing to review/
+      end
+    end
+
+    describe "with exactly one review branch" do
+      before( :each ) do
+        use_repo 'in-progress'
+        seen_a_review_b = false
+        git_remote_branches.each do |b|
+          if b =~ %r{review/user24601/(?!zombie-basic)}
+            system "git push origin :refs/heads/#{b} > /dev/null 2> /dev/null"
+          end
+        end
+      end
+      after( :each ) { Dir.chdir '..' }
+
+      it "should switch to the sole review branch when given no arguments." do
+        git_remote_branches.select do |branch|
+          branch =~ %r{review/user24601}
+        end.should                      == ['review/user24601/zombie-basic']
+        GitTopic.review
+        git_branch.should               == 'review/user24601/zombie-basic'
+        git_branch_remote.should        == 'origin'
+        git_branch_merge.should         == 'refs/heads/review/user24601/zombie-basic'
+      end
+    end
+
+    describe "with some review branches" do
+      before( :each ) { use_repo 'in-progress' }
+      after( :each )  { Dir.chdir '..' }
+
+      it "
+        should create a local tracking branch for the oldest remote review
+        branch if none was specified
+      ".oneline do
+
+        git_remote_branches.should      include 'review/user24601/zombie-basic'
+        GitTopic.review
+        git_branch.should               == 'review/user24601/zombie-basic'
+        git_branch_remote.should        == 'origin'
+        git_branch_merge.should         == 'refs/heads/review/user24601/zombie-basic'
+      end
+
+      it "should use the local tracking branch, if one exists" do
+        git_remote_branches.should      include 'review/user24601/zombie-basic'
+
+        GitTopic.review 'zombie-basic'
+        system "git checkout master > /dev/null 2> /dev/null"
+
+        git_branch.should                       == "master"
+        lambda do
+          GitTopic.review 'zombie-basic' 
+        end.should_not                          raise_error
+        git_branch.should                       == "review/user24601/zombie-basic"
+      end
+
+      it "should provide feedback to the user" do
+        GitTopic.review
+        $?.success?.should          == true
+        @output.should_not          be_nil
+        @output.should_not          be_empty
+      end
+
+      it "should create a local tracking branch for the specified topic" do
+        git_remote_branches.should      include 'review/user24601/ninja-basic'
+        GitTopic.review( 'user24601/ninja-basic' )
+        git_branch.should               == 'review/user24601/ninja-basic'
+        git_branch_remote.should        == 'origin'
+        git_branch_merge.should         == 'refs/heads/review/user24601/ninja-basic'
+      end
+
+      it "
+        should accept only a topic arg (vice <user>/<topic>) when the topic is
+        unambiguous.
+      ".oneline do
+        git_remote_branches.should      include 'review/user24601/ninja-basic'
+        GitTopic.review( 'ninja-basic' )
+        git_branch.should               == 'review/user24601/ninja-basic'
+        git_branch_remote.should        == 'origin'
+        git_branch_merge.should         == 'refs/heads/review/user24601/ninja-basic'
+      end
+
+      it "should handle fully-qualified topic args" do
+        git_remote_branches.should      include 'review/user24601/ninja-basic'
+        lambda{ GitTopic.review( 'review/user24601/ninja-basic' )}.should_not raise_error
+        git_branch.should               == 'review/user24601/ninja-basic'
+        git_branch_remote.should        == 'origin'
+        git_branch_merge.should         == 'refs/heads/review/user24601/ninja-basic'
+      end
+
+      it "should error if an illegal topic is specified" do
+        lambda{ GitTopic.review( 'fakeuser/faketopic' )}.should raise_error
+      end
+    end
+
+  end
+
+end

data/spec/git_topic_status_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+
+describe GitTopic do
+
+  describe "#status" do
+
+    describe "with pending review branches" do
+
+      before( :each ) { use_repo 'in-progress' }
+      after( :each )  { Dir.chdir '..' }
+
+
+      it "should not show my review branches, but it should show others'" do
+        git_remote_branches.should      include "review/#{@user}/pirates"
+
+        GitTopic.status
+        @output.should_not      be_nil
+
+        @output.should_not      =~ /^#\s*pirates\s*$/m
+        @output.should          =~ /^#\s*ninja-basic\s*$/m
+        @output.should          =~ /^#\s*zombie-basic\s*$/m
+      end
+
+      it "should not show others' rejected topics" do
+        git_remote_branches.should      include 'review/user24601/ninja-basic'
+        GitTopic.review 'user24601/ninja-basic'
+        GitTopic.reject
+        git_remote_branches.should_not  include 'review/user24601/ninja-basic'
+        git_remote_branches.should      include 'rejected/user24601/ninja-basic'
+
+        @output.clear
+        GitTopic.status
+        @output.should_not              =~ %r{ninja-basic}
+      end
+
+      it "
+        should show my rejected topics, and note that they have comments, when
+        they do.
+      " do
+        git_remote_branches.should      include "rejected/#{@user}/krakens"
+        GitTopic.status
+        @output.should_not      be_nil
+
+        @output.should          =~ /^#\s*krakens\s*\(reviewer comments\)\s*$/m
+      end
+
+    end
+
+
+    describe "passed the --prepended flag" do
+      before( :each ) { use_repo 'in-progress' }
+      after( :each )  { Dir.chdir '..' }
+
+      it "should invoke git status before producing its output" do
+        GitTopic.status( :prepended => true )
+        @output.should_not      be_nil
+        @output.should          =~ /# On branch master/
+      end
+    end
+  end
+
+end