git-topic 0.2.3.1 → 0.2.3.2

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 2
 :patch: 3
-:build: "1"
+:build: "2"

data/bin/git-topic-completion

@@ -35,6 +35,14 @@ module GitTopic::Completion
       end.compact
     end
 
+    def all_reject_and_review_branches
+      branches.map do |b|
+        b =~ %r{^remotes/origin/(rejected|review)/(\S*)/(.*)}
+        suggestion = [$1,($2 unless $2 == user), $3].compact.join("/")
+        suggestion unless suggestion.strip.empty?
+      end.compact
+    end
+
     def complete
       suggestions = 
         case ARGV.shift
@@ -42,8 +50,11 @@ module GitTopic::Completion
         # others_review_branches here
         when "accept"
         when "reject"
+        when "comment"
         when "done"
           # nothing
+        when "comments"
+          all_reject_and_review_branches
         when "work-on"
           my_reject_review_and_all_wip_branches
         when "review"

data/lib/git_topic/cli.rb

@@ -161,11 +161,11 @@ module GitTopic
                 ".oneline
         when "comments"
           banner "
-            git[-topic] comments
+            git[-topic] comments [<topic>]
 
-            View the comments for the current topic.  If your branch was
-            rejected, you should read these comments so you know what to do to
-            appease the reviewer.
+            View the comments for <topic>, which defaults to the current topic.
+            If your branch was rejected, you should read these comments so you
+            know what to do to appease the reviewer.
 
             Options:
           ".cleanup
@@ -221,6 +221,8 @@ module GitTopic
         end
       end
 
+      check_for_setup unless cmd == "setup"
+
       opts = global_opts.merge( cmd_opts )
       display_git_output! if opts[:verbose]
 
@@ -243,7 +245,8 @@ module GitTopic
       when "comment"
         comment           opts
       when "comments"
-        comments          opts
+        spec              = ARGV.shift
+        comments          spec, opts
       when "accept"
         topic             = ARGV.shift
         accept            topic, opts
@@ -252,6 +255,8 @@ module GitTopic
         reject            topic, opts
       when "install-aliases"
         install_aliases   opts
+      when "setup"
+        setup             opts
       end
     rescue => error
       puts "Error: #{error.message}"

data/lib/git_topic/git.rb

@@ -51,8 +51,9 @@ module GitTopic::Git
       not capture_git( "notes --ref #{ref} list" ).chomp.empty?
     end
 
-    def existing_comments
-      capture_git( "notes --ref #{notes_ref} show" ).chomp
+    def existing_comments( spec=nil )
+      ref = notes_ref( *[ spec ].compact )
+      capture_git( "notes --ref #{ref} show" ).chomp
     end
 
 

data/lib/git_topic/naming.rb

@@ -44,25 +44,20 @@ module GitTopic::Naming
 
 
     def notes_ref( branch=current_branch )
-      user, topic = user_topic_name( branch )
+      user, topic = user_topic_name( branch, :lookup => true )
       "refs/notes/reviews/#{user}/#{topic}"
     end
 
 
-    def user_topic_name( branch )
-      if branch =~ %r{^origin}
-        branch =~ %r{^\S*?/\S*?/(\S*?)/(\S*)}
-        [$1, $2]
-      elsif branch =~ %r{^(?:\S*/)?(\S*?)/(\S*)}
-        [$1, $2]
-      else
-        raise "Cannot compute user_topic for [#{branch}]"
-      end
+    def user_topic_name( ref, opts={} )
+      p = topic_parts( ref, opts )
+      [ p[:user], p[:topic ] ]
     end
 
-    def topic_parts( ref )
+    def topic_parts( ref, opts={} )
       p = {}
       parts = ref.split( '/' )
+      parts.shift if parts.first == "origin"
       case parts.size
       when 3
         p[:namespace], p[:user], p[:topic] = parts
@@ -74,6 +69,19 @@ module GitTopic::Naming
       else
         raise "Unexpected topic: #{ref}"
       end
+
+      if opts[:lookup] && p[:user].nil?
+        remote_branches_organized.find do |namespace, v|
+          v.find do |user, vv|
+            if vv.find{ |topic| topic == p[:topic] }
+              p[:user]        = user
+              p[:namespace]   = namespace
+              true
+            end
+          end
+        end
+      end
+
       p
     end
 
@@ -141,13 +149,6 @@ module GitTopic::Naming
         namespace_ut[:review]   ||= {}
         namespace_ut[:rejected] ||= {}
 
-        namespace_ut[:rejected].each do |user, topics|
-          topics.map! do |topic|
-            suffix = " (reviewer comments) "
-            "#{topic}#{suffix if existing_comments?( "#{user}/#{topic}" )}"
-          end
-        end
-
         namespace_ut[:review].reject!{|k,v| k == user}
         namespace_ut
       )

data/lib/git_topic.rb

@@ -76,8 +76,13 @@ module GitTopic
 
       wb = wip_branch( topic )
       rb = review_branch( topic )
+      refspecs = [
+        "refs/heads/#{wb}:refs/heads/#{rb}",
+        ":refs/heads/#{wb}",
+        "refs/notes/reviews/*:refs/notes/reviews/*"
+      ].join( " " )
       git [
-        "push origin refs/heads/#{wb}:refs/heads/#{rb} :refs/heads/#{wb}",
+        "push origin #{refspecs}",
         ("checkout master" if strip_namespace( topic ) == current_topic),
         "branch -D #{wip_branch( topic )}"
       ].compact
@@ -119,7 +124,11 @@ module GitTopic
         end.join( "\n" )
       end
 
-      rejected_topics = rejected_ut[ user ] || []
+      rejected_topics = (rejected_ut[ user ] || []).dup
+      rejected_topics.map! do |topic|
+        suffix = " (reviewer comments) "
+        "#{topic}#{suffix if existing_comments?( "#{user}/#{topic}" )}"
+      end
       unless rejected_topics.empty?
         sb << "\n" unless review_ut.empty?
         verb = rejected_topics.size  == 1 ? 'is' : 'are'
@@ -261,13 +270,14 @@ module GitTopic
       report "Your comments have been saved."
     end
 
-    def comments( opts={} )
-      unless existing_comments?
+    def comments( spec=nil, opts={} )
+      args = [ spec ].compact
+      unless existing_comments? *args
         puts "There are no comments on this branch."
         return
       end
 
-      git "log origin/master.. --show-notes=#{notes_ref} --no-standard-notes",
+      git "log origin/master.. --show-notes=#{notes_ref *args} --no-standard-notes",
           :show => true
     end
 
@@ -301,6 +311,7 @@ module GitTopic
       refspecs = [
         "refs/heads/#{current_branch}:refs/heads/#{rem_rej_branch}",
         ":refs/heads/#{rem_review_branch}",
+        "refs/notes/reviews/*:refs/notes/reviews/*"
       ].join( " " )
       git [
         "checkout master",
@@ -312,6 +323,15 @@ module GitTopic
     end
 
 
+    # Setup .git/config.
+    #
+    # This amounts to setting up refspecs for origin fetching for review
+    # comments.
+    def setup( opts={} )
+      return if has_setup_refspec?
+      git "config --add remote.origin.fetch refs/notes/reviews/*:refs/notes/reviews/*"
+    end
+
     def install_aliases( opts={} )
       opts.assert_valid_keys  :local, :local_given, *GlobalOptKeys
 
@@ -350,6 +370,37 @@ module GitTopic
       end
     end
 
+
+    def check_for_setup
+      git_dir = `git rev-parse --git-dir 2> /dev/null`.chomp
+      return if git_dir.empty?
+
+      suppress_whine = `git config topic.checkForNotesRef`.chomp == "false"
+      return if suppress_whine
+
+      unless has_setup_refspec?
+        STDERR.puts "
+          Warning: git repository is not set up for git topic.  Review comments
+          will not automatically be pulled on git fetch.  You have two options
+          for suppressing this message:
+
+          1.  Run git-topic setup to setup fetch refspecs for origin.
+          2.  Run git config topic.checkForNotesRef false.
+              If you do this, you can manually fetch reviewers' comments with
+              the following command
+
+                  git fetch origin refs/notes/reviews/*:refs/notes/reviews/*
+        ".cleanup
+      end
+    end
+
+    def has_setup_refspec?
+      fetch_refspecs = capture_git( "config --get-all remote.origin.fetch" ).split( "\n" )
+      fetch_refspecs.any? do |refspec|
+        refspec == "refs/notes/reviews/*:refs/notes/reviews/*"
+      end
+    end
+
   end
 end
 

data/share/completion.bash

@@ -26,3 +26,13 @@ _git_reject() {
   __gitcomp "$(git-topic-completion reject 2> /dev/null)"
   return
 }
+
+_git_comment() {
+  __gitcomp "$(git-topic-completion comment 2> /dev/null)"
+  return
+}
+
+_git_comments() {
+  __gitcomp "$(git-topic-completion comments 2> /dev/null)"
+  return
+}

data/spec/git_topic_accept_spec.rb

@@ -10,7 +10,6 @@ describe GitTopic do
         use_repo 'in-progress'
         GitTopic.review 'user24601/zombie-basic'
       end
-      after( :each ) { Dir.chdir '..' }
 
       describe "with no specified argument" do
         it "
@@ -52,7 +51,6 @@ describe GitTopic do
         @original_git_Head    = git_head
         GitTopic.review 'user24601/zombie-basic'
       end
-      after( :each ) { Dir.chdir '..' }
 
       it "should refuse to accept the review branch" do
         git_branch.should                 == 'review/user24601/zombie-basic'
@@ -67,7 +65,6 @@ describe GitTopic do
 
     describe "while not on a review branch" do
       before( :each ) { use_repo 'in-progress' }
-      after( :each ) { Dir.chdir '..' }
 
       it "should fail" do
         lambda{ GitTopic.accept }.should    raise_error

data/spec/git_topic_comment_spec.rb

@@ -125,7 +125,6 @@ describe GitTopic do
         use_repo 'in-progress' 
         GitTopic.review 'user24601/zombie-basic'
       end
-      after( :each )  { Dir.chdir '..' }
 
 
       it "should fail if the diff includes added lines not prefixed with #" do
@@ -249,7 +248,6 @@ describe GitTopic do
           end
         end
       end
-      after( :each )  { Dir.chdir '..' }
 
 
       it "should fail if the working tree is dirty" do
@@ -326,7 +324,6 @@ describe GitTopic do
 
     describe "on a wip branch with no comments" do
       before( :each ) { use_repo 'in-progress' }
-      after( :each )  { Dir.chdir '..' }
 
       it "should report that there is nothing to do" do
         GitTopic.work_on 'pirates-advanced'
@@ -351,7 +348,6 @@ describe GitTopic do
           end
         end
       end
-      after( :each )  { Dir.chdir '..' }
 
 
       it "should fail if the working tree is dirty" do

data/spec/git_topic_comments_spec.rb

@@ -5,40 +5,103 @@ describe GitTopic do
 
   describe "#comments" do
 
-    describe "on a branch with no comments" do
+    describe "with an argument" do
 
-      before( :each ) do
-        use_repo            'in-progress'
-        GitTopic.work_on    'pirates-advanced'
-      end
-      after( :each )  { Dir.chdir '..' }
+      before( :each )   { use_repo 'in-progress' }
 
-      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
 
+      it "shows comments for the supplied topic" do
+        git_branch.should                     == 'master'
+        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
+        GitTopic.comments 'krakens'
+      end
 
-    describe "on a branch with comments" do
+      it "should strip fully qualified namespaces" do
+        git_branch.should                     == 'master'
+        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
+        GitTopic.comments "rejected/#{@user}/krakens"
+      end
 
-      before( :each ) do
-        use_repo            'in-progress'
-        GitTopic.work_on    'krakens'
+      it "should strip partially qualified namespaces" do
+        git_branch.should                     == 'master'
+        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
+        GitTopic.comments "#{@user}/krakens"
       end
 
-      after( :each )  { Dir.chdir '..' }
+      it "should strip fully qualified namespaces for other users" do
+        git_branch.should                     == 'master'
+        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/user24601/ninja-basic}
+        end
+        GitTopic.comments "review/user24601/ninja-basic"
+      end
 
-      it "should invoke git log to display the comments" do
+      it "should strip partially qualified namespaces for other users" do
+        git_branch.should                     == 'master'
         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}
+          cmd.should =~ %r{--show-notes=refs/notes/reviews/user24601/ninja-basic}
         end
+        GitTopic.comments "user24601/ninja-basic"
+      end
+
+    end
 
-        lambda{ GitTopic.comments }.should_not      raise_error
+    describe "with no argument" do
+
+      describe "on a branch with no comments" do
+
+        before( :each ) do
+          use_repo            'in-progress'
+          GitTopic.work_on    'pirates-advanced'
+        end
+
+        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
+
+
+        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
 

data/spec/git_topic_done_spec.rb

@@ -5,10 +5,22 @@ describe GitTopic do
   
   describe "#done" do
 
+    describe "while on a branch with no local refs/notes" do
+      before( :each )   { use_repo 'in-progress' }
+      
+      it "should not error on a missing refs/notes" do
+        File.exists?(
+          "./.git/refs/notes/reviews/"
+        ).should                                                == true
+        FileUtils.rm_rf "./.git/refs/notes/"
+        lambda{ GitTopic.work_on 'krakens' }.should_not         raise_error
+        lambda{ GitTopic.done }.should_not                      raise_error
+      end
+    end
+
     describe "in in-progress" do
 
       before( :each ) { use_repo 'in-progress' }
-      after( :each )  { Dir.chdir '..' }
 
       describe "without an argument" do
 
@@ -39,6 +51,55 @@ describe GitTopic do
           git_remote_branches.should_not  include( "wip/#{@user}/zombie-basic" )
           git_branch.should               == 'master'
         end
+
+        it "should push any replies to review comments" 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" )
+
+          File.exists?(
+            "../origin/refs/notes/reviews/#{@user}/krakens"
+          ).should                                == false
+
+          lambda do
+            GitTopic.work_on  'krakens'
+            cmd = [
+              "echo 'harder than you might think' >> kraken",
+              "git commit kraken -m 'working on krakens'",
+            ].join( " && " )
+            cmd << " 2> /dev/null > /dev/null"
+            system cmd
+            GitTopic.comment
+            GitTopic.done
+          end.should_not                          raise_error
+
+          File.exists?(
+            "../origin/refs/notes/reviews/#{@user}/krakens"
+          ).should                                == true
+        end
+
       end
 
       describe "with an argument" do

data/spec/git_topic_reject_spec.rb

@@ -22,12 +22,26 @@ describe GitTopic do
   
   describe "#reject" do
 
+
+    describe "while on a review branch in a repo with no local refs/notes" do
+      before( :each )   { use_repo 'in-progress' }
+
+      it "should not error on a missing refs/notes" do
+        File.exists?(
+          "./.git/refs/notes/reviews/"
+        ).should                                    == true
+        FileUtils.rm_rf "./.git/refs/notes/"
+        lambda{ GitTopic.review }.should_not        raise_error
+        lambda{ GitTopic.reject }.should_not        raise_error
+      end
+    end
+
+
     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 "
@@ -43,6 +57,47 @@ describe GitTopic do
           git_remote_branches.should      include( 'rejected/user24601/zombie-basic' )
         end
 
+        it "should push any review comments" 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" )
+
+          File.exists?(
+            "../origin/refs/notes/reviews/user24601/zombie-basic"
+          ).should                                == false
+
+          lambda do
+            GitTopic.comment
+            GitTopic.reject
+          end.should_not                          raise_error
+
+          File.exists?(
+            "../origin/refs/notes/reviews/user24601/zombie-basic"
+          ).should                                == true
+        end
+
         it "should provide feedback to the user" do
           GitTopic.reject
           $?.success?.should          == true
@@ -100,7 +155,6 @@ describe GitTopic do
     
     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

data/spec/git_topic_review_spec.rb

@@ -7,7 +7,6 @@ describe GitTopic 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|
@@ -29,7 +28,6 @@ describe GitTopic do
           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|
@@ -44,7 +42,6 @@ describe GitTopic do
 
     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

data/spec/git_topic_setup_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+
+describe GitTopic do
+
+  describe "#setup" do
+    before( :each ) { use_repo 'in-progress' }
+
+
+    it "should install reviews refspec for origin" do
+
+     %x{ 
+        git config --get-all remote.origin.fetch
+      }.should_not                            =~ %r{refs/notes}
+
+      GitTopic.setup
+     %x{ 
+        git config --get-all remote.origin.fetch
+      }.should                                =~ %r{refs/notes}
+    end
+
+    it "should be idempotent" do
+      File.exists?( ".git/config" ).should     == true
+      GitTopic.setup
+      content = File.read( ".git/config" )
+      GitTopic.setup
+
+      File.read( ".git/config" ).should         == content
+    end
+  end
+
+  describe "for any non --help command" do
+
+    describe "when not in a git repository" do
+      before( :each ) do
+        Dir.chdir '/tmp'
+      end
+
+      it "should not whine" do
+        git_dir.should                          == ""
+          GitTopic.run
+          @err.should_not                       =~ /setup/
+      end
+    end
+
+    describe "
+      when in a git repository that is neither setup nor configured to nowhine
+    ".oneline do
+
+      before( :each ) { use_repo 'in-progress' }
+
+      it "should ask the user to #setup or configure no-whine" do
+        with_argv( [] ) do
+          GitTopic.run
+          @err.should                           =~ /setup/
+        end
+      end
+    end
+
+    describe "when in a git repository configured for nowhining" do
+      before( :each ) { use_repo 'in-progress' }
+
+      it "should not whine, even when refs are not set up" do
+        system "git config topic.checkForNotesRef false > /dev/null 2> /dev/null"
+        GitTopic.run
+        @err.should_not                         =~ /setup/
+      end
+    end
+
+    describe "when in a git repository that is #setup" do
+
+      before( :each ) { use_repo 'in-progress' }
+
+      it "
+        should not whine, regardless of whether it is configured for whining or
+        not
+      ".oneline do
+
+        GitTopic.setup
+        GitTopic.run
+        @err.should_not                         =~ /setup/
+      end
+    end
+  end
+
+end

data/spec/git_topic_status_spec.rb

@@ -8,7 +8,6 @@ describe GitTopic 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
@@ -52,7 +51,6 @@ describe GitTopic do
 
     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 )

data/spec/git_topic_work_on_spec.rb

@@ -24,7 +24,6 @@ describe GitTopic do
 
     describe "in fresh" do
       before( :each ) { use_repo( 'fresh' )}
-      after( :each )  { Dir.chdir( '..' )}
 
       it_should_behave_like "#work_on general cases"
 
@@ -56,7 +55,6 @@ describe GitTopic do
     describe "in in-progress" do
 
       before( :each ) { use_repo( 'in-progress' )}
-      after( :each )  { Dir.chdir( '..' )}
 
       it_should_behave_like "#work_on general cases"
 

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@
 require 'fileutils'
 
 require 'git_topic'
+require 'git_topic/cli'
 
 
 # Testing-specific monkeypatching # {{{
@@ -105,7 +106,7 @@ Rspec.configure do |c|
       end
       Dir.chdir @starting_dir
     end
-    Dir.chdir         './tmp'
+    Dir.chdir         "#{@starting_dir}/tmp"
 
     # capture output
     @output         = ''
@@ -127,10 +128,14 @@ end
 def use_repo( repo )
   Dir.chdir( repo )
   # Exit if e.g. GIT_DIR is set
-  raise "Spec error" unless `git rev-parse --git-dir`.chomp == '.git'
+  raise "Spec error" unless git_dir == '.git'
 end
 
 
+def git_dir
+  `git rev-parse --git-dir 2> /dev/null`.chomp
+end
+
 def git_branch
   all_branches    = `git branch --no-color`.split( "\n" )
   current_branch  = all_branches.find{|b| b =~ /^\*/}
@@ -190,5 +195,14 @@ def dirty_branch!
   system "git add -N dirty"
 end
 
+
+def with_argv( val )
+  restore = ARGV.dup
+  ARGV.replace( val )
+  rv = yield
+  ARGV.replace( restore )
+  rv
+end
+
 # }}}
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 2
   - 3
-  - 1
-  version: 0.2.3.1
+  - 2
+  version: 0.2.3.2
 platform: ruby
 authors: 
 - David J. Hamilton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 -07:00
+date: 2010-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -187,6 +187,7 @@ files:
 - spec/git_topic_install_aliases_spec.rb
 - spec/git_topic_reject_spec.rb
 - spec/git_topic_review_spec.rb
+- spec/git_topic_setup_spec.rb
 - spec/git_topic_status_spec.rb
 - spec/git_topic_work_on_spec.rb
 - spec/spec_helper.rb
@@ -302,6 +303,7 @@ test_files:
 - spec/comment_spec.rb
 - spec/git_topic_comment_spec.rb
 - spec/spec_helper.rb
+- spec/git_topic_setup_spec.rb
 - spec/git_topic_work_on_spec.rb
 - spec/git_topic_done_spec.rb
 - spec/bash_completion.rb