git-topic 0.2.5 → 0.2.6

data/spec/git_topic_comments_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 

data/spec/git_topic_done_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 
@@ -58,7 +59,7 @@ describe GitTopic do
               f.puts %Q{
                 I have some general comments, mostly relating to the quality of our
                 zombie-control policies.  Basically, they're not working.
-              }.cleanup
+              }.unindent
             end
           end
 
@@ -72,16 +73,16 @@ describe GitTopic do
               #       destroy z
               #     end
               # This should take care of our issues with zombies.
-            }.cleanup
+            }.unindent
           end
           GitTopic.should_receive( :invoke_git_editor ).once
           GitTopic.should_receive(
             :git_author_name_short
           ).once.and_return( "Spec 123" )
 
-          File.exists?(
+          old_review = File.read(
             "../origin/refs/notes/reviews/#{@user}/krakens"
-          ).should                                == false
+          )
 
           lambda do
             GitTopic.work_on  'krakens'
@@ -95,9 +96,10 @@ describe GitTopic do
             GitTopic.done
           end.should_not                          raise_error
 
-          File.exists?(
+          new_review = File.read(
             "../origin/refs/notes/reviews/#{@user}/krakens"
-          ).should                                == true
+          )
+          new_review.should_not                   == old_review
         end
 
       end

data/spec/git_topic_install_aliases_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 

data/spec/git_topic_logging_spec.rb

@@ -0,0 +1,74 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe GitTopic do
+
+  describe "logging" do
+    before :each do
+      use_repo  'in-progress'
+      @log_path = "#{@starting_dir}/tmp/home/.git_topic/log"
+    end
+
+
+    it "should log to $HOME/.git_topic/log" do
+      File.exists?( @log_path ).should    be_false
+      with_argv( %w( work-on something origin/review/user24601/ninja-basic )) do
+        GitTopic.run
+      end
+      File.exists?( @log_path ).should    be_true
+    end
+
+    it "should log complete commands" do
+      with_argv( %w( work-on something origin/review/user24601/ninja-basic )) do
+        GitTopic.run
+      end
+      File.exists?( @log_path ).should    be_true
+      log = File.read @log_path
+
+      log.should      =~ %r{work-on something origin/review/user24601/ninja-basic}
+    end
+
+    it "should log all git commands invoked" do
+      with_argv( %w( work-on something origin/review/user24601/ninja-basic )) do
+        GitTopic.run
+      end
+      File.exists?( @log_path ).should    be_true
+      log = File.read @log_path
+
+      [
+        "git branch -r --no-color",
+        "git push origin HEAD:refs/heads/wip/#{@user}/something",
+        "git branch",
+        "git checkout -b wip/#{@user}/something origin/wip/#{@user}/something",
+        "git reset --hard origin/review/user24601/ninja-basic",
+        "git branch",
+      ].each do |cmd|
+        log.should      =~ %r{#{cmd}}
+      end
+    end
+
+    it "should log all errors from git" do
+      with_argv( %w( work-on something totally/invalid/upstream )) do
+        GitTopic.run
+      end
+      File.exists?( @log_path ).should    be_true
+      log = File.read @log_path
+
+      [
+        "fatal: ambiguous argument 'totally/invalid/upstream': unknown revision",
+      ].each do |cmd|
+        log.should      =~ %r{#{cmd}}
+      end
+    end
+
+    it "should not log if --no-log is specified" do
+      File.exists?( @log_path ).should    be_false
+      with_argv( %w( --no-log work-on something origin/review/user24601/ninja-basic )) do
+        GitTopic.run
+      end
+      File.exists?( @log_path ).should    be_false
+    end
+  end
+
+end
+

data/spec/git_topic_reject_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 RejectFirstComment = %Q{
@@ -63,7 +64,7 @@ describe GitTopic do
               f.puts %Q{
                 I have some general comments, mostly relating to the quality of our
                 zombie-control policies.  Basically, they're not working.
-              }.cleanup
+              }.unindent
             end
           end
 
@@ -77,7 +78,7 @@ describe GitTopic do
               #       destroy z
               #     end
               # This should take care of our issues with zombies.
-            }.cleanup
+            }.unindent
           end
           GitTopic.should_receive( :invoke_git_editor ).once
           GitTopic.should_receive(
@@ -111,7 +112,7 @@ describe GitTopic do
               f.puts %Q{
                 I have some general comments, mostly relating to the quality of our
                 zombie-control policies.  Basically, they're not working.
-              }.cleanup
+              }.unindent
             end
           end
 
@@ -125,7 +126,7 @@ describe GitTopic do
               #       destroy z
               #     end
               # This should take care of our issues with zombies.
-            }.cleanup
+            }.unindent
           end
           GitTopic.should_receive( :invoke_git_editor ).once
           GitTopic.should_receive(

data/spec/git_topic_review_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 
@@ -62,7 +63,7 @@ describe GitTopic do
         system "git checkout master > /dev/null 2> /dev/null"
 
         git_branch.should                       == "master"
-        lambda do
+        λ do
           GitTopic.review 'zombie-basic' 
         end.should_not                          raise_error
         git_branch.should                       == "review/user24601/zombie-basic"
@@ -96,14 +97,61 @@ describe GitTopic do
 
       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
+        λ{ 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
+        λ{ GitTopic.review( 'fakeuser/faketopic' )}.should raise_error
+      end
+
+      describe "when the review branch is not rebased to master" do
+        it "should attempt to auto-rebase" do
+          git_head.should           == '331d827fd47fb234af54e3a4bbf8c6705e9116cc'
+          system [
+            "git checkout --quiet master",
+            "echo 'content' > some_file",
+            "git add .",
+            "git commit --all -m 'force rebase' > /dev/null",
+          ].join( "&& ")
+
+          head = git_head
+          head.should_not           == '331d827fd47fb234af54e3a4bbf8c6705e9116cc'
+
+          GitTopic.review 'ninja-basic'
+          git_head( '^' ).should    == head
+        end
+
+        it "should inform the user when it has auto-rebased" do
+          system [
+            "git checkout --quiet master",
+            "echo 'content' > some_file",
+            "git add .",
+            "git commit --all -m 'force rebase' > /dev/null",
+          ].join( "&& ")
+          GitTopic.review 'ninja-basic'
+
+          @output.should            =~ /rebase/    
+        end
+
+        it "should issue a warning if auto-rebasing fails" do
+          git_head.should             == '331d827fd47fb234af54e3a4bbf8c6705e9116cc'
+          system [
+            "git checkout --quiet master",
+            "echo 'conflicting content' > ninjas",
+            "git add .",
+            "git commit --all -m 'force failed rebase' > /dev/null",
+          ].join( "&& ")
+
+          head = git_head
+          head.should_not             == '331d827fd47fb234af54e3a4bbf8c6705e9116cc'
+
+          λ do
+            GitTopic.review 'ninja-basic'
+          end.should                raise_error
+        end
       end
     end
 

data/spec/git_topic_setup_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 
@@ -81,7 +82,7 @@ describe GitTopic do
       before( :each ) { use_repo 'in-progress' }
 
       it "should ask the user to #setup or configure no-whine" do
-        with_argv( [] ) do
+        with_argv do
           GitTopic.run
           @err.should                           =~ /setup/
         end
@@ -99,7 +100,7 @@ describe GitTopic do
 
         system "git config --add remote.origin.fetch refs/notes/reviews/*:refs/notes/reviews/*"
 
-        with_argv( [] ) do
+        with_argv do
           GitTopic.run
           @err.should                       =~ /setup/
         end

data/spec/git_topic_status_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 
@@ -17,8 +18,18 @@ describe GitTopic do
         @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
+        @output.should          =~ /2 topics/m
+        @output.should          =~ /^#\s*ninja-basic\s*/m
+        @output.should          =~ /^#\s*zombie-basic\s*/m
+      end
+
+      it "should show the age of others' unreviewed branches" do
+
+        jul_12 = Date.parse( "12 July 2010" )
+        Date.should_receive(:today).at_least(:once).and_return  jul_12
+        GitTopic.status
+
+        @output.should          =~ /5 days/
       end
 
       it "should not show others' rejected topics" do

data/spec/git_topic_work_on_spec.rb

@@ -40,7 +40,7 @@ describe GitTopic do
       end
 
       it "should fail if no topic is given" do
-        lambda { GitTopic.work_on( nil )}.should  raise_error
+        λ { GitTopic.work_on( nil )}.should  raise_error
       end
 
       it "should provide feedback to the user" do
@@ -68,14 +68,14 @@ describe GitTopic do
 
       it "should switch to (rather than create) an existing topic branch" do
         git_branches.should include( "wip/#{@user}/zombie-basic" )
-        lambda{ GitTopic.work_on  'zombie-basic' }.should_not raise_error
+        λ{ GitTopic.work_on  'zombie-basic' }.should_not raise_error
 
         git_branch.should   == "wip/#{@user}/zombie-basic"
       end
 
       it "should accept upstream as an argument" do
         git_remote_branches.should include( "review/#{@user}/pirates" )
-        lambda do
+        λ do
           GitTopic.work_on  'pirates-etc',
                             :upstream => "origin/review/#{@user}/pirates"
         end.should_not raise_error
@@ -84,6 +84,48 @@ describe GitTopic do
         git_head.should     == 'c0838ed2ee8f2e83c8bda859fc5e332b92f0a5a3'
       end
 
+      describe "--continue flag" do
+        describe "when one has an as-yet unaccepted review branch" do
+          it "should set <upstream> to the latest such branch" do
+            λ do
+              GitTopic.work_on  'pirates-etc'
+              dirty_branch!
+              system "git add . && git commit -a -m 'arrrrr' > /dev/null 2> /dev/null"
+              GitTopic.done
+            end.should_not        raise_error
+
+            head = git_remote   "origin/review/#{@user}/pirates-etc"
+            head.should_not     == '331d827fd47fb234af54e3a4bbf8c6705e9116cc'
+
+            GitTopic.work_on    'yet-more-pirates',
+                                :continue => true
+
+            git_head.should     == head
+          end
+        end
+
+        describe "when one has no pending review branches" do
+          before( :each ){ use_repo 'fresh' }
+
+          it "should have no effect" do
+            GitTopic.work_on  'yet-more-pirates',
+                              :continue => true
+
+            git_head.should   == '331d827fd47fb234af54e3a4bbf8c6705e9116cc'
+          end
+        end
+
+        describe "when an explicit <upstream> is also supplied" do
+          it "should fail with an error" do
+            λ do
+              GitTopic.work_on  'pirates-etc',
+                                :continue => true,
+                                :upstream => "origin/review/#{@user}/pirates"
+            end.should          raise_error
+          end
+        end
+      end
+
       it "
         should use (and then destroy) the rejected branch for the topic, if one
         exists
@@ -95,6 +137,9 @@ describe GitTopic do
         git_remote_branches.should_not    include( "rejected/#{@user}/krakens" )
         git_remote_branches.should        include( "wip/#{@user}/krakens" )
         git_head.should                   == '44ffd9c9c8b52b201659e3ad318cdad6ec836b46'
+        git_remote(
+          "wip/#{@user}/krakens"
+        ).should                          == '44ffd9c9c8b52b201659e3ad318cdad6ec836b46'
       end
 
       it "
@@ -108,16 +153,31 @@ describe GitTopic do
       end
 
       it "
-        should use (and then destroy) the review branch for the topic, if one
-        exists
+        should not report the presence of comments, for comments that belong to
+        commits from an earlier topic branch of the same name
       ".oneline do
 
         git_remote_branches.should        include( "rejected/#{@user}/krakens" )
-        GitTopic.work_on    'krakens'
-        git_branch.should                 == "wip/#{@user}/krakens"
+        refspecs = "origin/rejected/#{@user}/krakens:master :rejected/#{@user}/krakens"
+        system "git push origin #{refspecs} > /dev/null 2> /dev/null"
         git_remote_branches.should_not    include( "rejected/#{@user}/krakens" )
-        git_remote_branches.should        include( "wip/#{@user}/krakens" )
-        git_head.should                   == '44ffd9c9c8b52b201659e3ad318cdad6ec836b46'
+
+        GitTopic.work_on    'krakens'
+        git_head.should                   == '331d827fd47fb234af54e3a4bbf8c6705e9116cc'
+        @output.should_not                =~ /comments/
+      end
+
+      it "
+        should use (and then destroy) the review branch for the topic, if one
+        exists
+      ".oneline do
+
+        git_remote_branches.should        include( "review/#{@user}/pirates" )
+        GitTopic.work_on    'pirates'
+        git_branch.should                 == "wip/#{@user}/pirates"
+        git_remote_branches.should_not    include( "review/#{@user}/pirates" )
+        git_remote_branches.should        include( "wip/#{@user}/pirates" )
+        git_head.should                   == 'c0838ed2ee8f2e83c8bda859fc5e332b92f0a5a3'
       end
 
     end

data/spec/spec_helper.rb

@@ -15,10 +15,10 @@ class << GitTopic
       ).each do |m|
 
     define_method( "#{m}_with_nocache" ) do
-      rv = send( "#{m}_without_nocache" )
-      GitTopic::Naming::ClassMethods.class_variable_set(  "@@#{m}", nil )
-      GitTopic::Git::ClassMethods.class_variable_set(     "@@#{m}", nil )
-      rv
+      send( "#{m}_without_nocache" ).tap do
+        GitTopic::Naming::ClassMethods.class_variable_set(  "@@#{m}", nil )
+        GitTopic::Git::ClassMethods.class_variable_set(     "@@#{m}", nil )
+      end
     end
     alias_method_chain m.to_sym, :nocache
   end
@@ -32,7 +32,7 @@ class << GitTopic
   end
   alias_method_chain  :git, :implicit_capture
 
-  def invoke_git_editor( file )
+  def invoke_git_editor file
     raise "
       invoke_git_editor invoked with (#{file}).  If you expect this method to be
       called, mock or stub it.
@@ -41,6 +41,13 @@ class << GitTopic
 
 end
 
+class << GitTopic::Logger
+  def logger_with_nocache
+    logger_without_nocache.tap{ @logger = nil }
+  end
+  alias_method_chain :logger, :nocache
+end
+
 
 # Track original $stdout, $stderr write methods so we can “unmock” them for
 # debugging
@@ -63,6 +70,7 @@ class Object
       alias_method :write, :real_write
     end
 
+    $debugging = true
     require 'ruby-debug'
     debugger
   end
@@ -76,12 +84,14 @@ Rspec.configure do |c|
   c.before( :all ) do
     @starting_dir   = Dir.pwd
     @user           = ENV['USER'] || `whoami`
+    ENV['HOME']     = "#{@starting_dir}/tmp/home"
   end
 
   c.before( :each ) do
     # setup the directories
     FileUtils.rm_rf   './tmp'
     FileUtils.mkdir   './tmp'
+    FileUtils.mkdir   './tmp/home'
 
     # Copy our repos into tmp
     %w(fresh in-progress).each do |d|
@@ -105,6 +115,10 @@ Rspec.configure do |c|
         FileUtils.mv  ".git/refs/notes/reviews/USER",
                       ".git/refs/notes/reviews/#{@user}"
       end
+      if File.exists? "./refs/notes/reviews/USER"
+        FileUtils.mv  "./refs/notes/reviews/USER",
+                      "./refs/notes/reviews/#{@user}"
+      end
       Dir.chdir @starting_dir
     end
     Dir.chdir         "#{@starting_dir}/tmp"
@@ -127,7 +141,7 @@ end
 # helpers # {{{
 
 def use_repo( repo )
-  Dir.chdir( repo )
+  Dir.chdir( "#{@starting_dir}/tmp/#{repo}" )
   # Exit if e.g. GIT_DIR is set
   raise "Spec error" unless git_dir == '.git'
 end
@@ -144,15 +158,19 @@ def git_branch
   current_branch[ 2..-1 ] unless current_branch.nil?
 end
 
-def git_head
-  `git rev-parse HEAD`.chomp
+def git_head  suffix=nil
+  `git rev-parse HEAD#{suffix}`.chomp
+end
+
+def git_remote  branch
+  `git rev-parse #{branch}`.chomp
 end
 
 def git_origin_master
   `git rev-parse origin/master`.chomp
 end
 
-def git_config( key )
+def git_config  key 
   `git config #{key}`.chomp
 end
 
@@ -178,7 +196,7 @@ def git_remote_branches
   end
 end
 
-def git_notes_list( ref )
+def git_notes_list  ref
   `git notes --ref #{ref}`.split( "\n" )
 end
 
@@ -197,13 +215,14 @@ def dirty_branch!
 end
 
 
-def with_argv( val )
+def with_argv *val 
   restore = ARGV.dup
-  ARGV.replace( val )
+  ARGV.replace( val.flatten )
   rv = yield
   ARGV.replace( restore )
   rv
 end
 
+
 # }}}