git-topic 0.2.5 → 0.2.6

data/lib/git_topic/cli.rb

@@ -11,7 +11,8 @@ require 'git_topic'
 
 module GitTopic
   SubCommands = %w(
-    work-on done status review comment comments accept reject install-aliases
+    work-on done abandon status review comment comments accept reject
+    install-aliases
   )
   Version = lambda {
     h = YAML::load_file( "#{File.dirname( __FILE__ )}/../../VERSION.yml" )
@@ -34,13 +35,15 @@ module GitTopic
             " )}
 
             Global Options:
-        ".cleanup
+        ".unindent
         version Version
 
         opt :verbose,   
             "Verbose output, including complete traces on errors."
         opt :completion_help,
             "View instructions for setting up autocompletion."
+        opt :no_log,
+            "Disable logging."
 
         stop_on         SubCommands
       end
@@ -62,17 +65,18 @@ module GitTopic
                 For more information, see:
 
                   http://redmine.ruby-lang.org/issues/show/3465
-        }.cleanup
+        }.unindent
         exit 0
       end
 
-
+      info      ''
+      info      ARGV.join( " " )
       cmd       = ARGV.shift
       cmd_opts  = Trollop::options do
         case cmd
         when "work-on"
           banner "
-            git[-topic] work-on <topic>
+            git[-topic] work-on <topic> [<upstream> | --continue]
 
             Switches to a local work-in-progress (wip) branch for <topic>.  The
             branch (and a matching remote branch) is created if necessary.
@@ -81,11 +85,23 @@ module GitTopic
             the rejected topic branch.  Similarly, if this is a review topic,
             the review will be pulled and work will continue on that topic.
 
-            <topic>'s branches HEAD will point to <upstream>.  If <upstream> is
-            omitted, it will default to the current HEAD.
+            <topic>'s branch's HEAD will point to <upstream>, if supplied.  If
+            --continue is supplied instead, HEAD will point to the most recent
+            review (i.e. submitted) of your topic branches.  If you have just
+            submitted a topic with git done, git work-on next-topic --continue
+            would begin the next topic starting from where you had left off.
+           
+            If both <upstream> and --continue are omitted, <topic>'s branch's
+            HEAD will default to the current HEAD.
 
             Options:
-          ".cleanup
+          ".unindent
+        when "abandon"
+          banner "
+            git[-topic] abandon [<topic>]
+
+            Deletes <topic> locally and remotely.  Defaults to current topic if unspecified.
+          ".unindent
         when /done(-with)?/
           banner "
             git[-topic] done
@@ -94,7 +110,7 @@ module GitTopic
             remote review branch and switch back to master.
 
             Options:
-          ".cleanup
+          ".unindent
         when "status"
           banner "
             git st
@@ -104,7 +120,7 @@ module GitTopic
             that can be reviewed.
 
             Options:
-          ".cleanup
+          ".unindent
           opt   :prepended,
                 "
                   Prepend status to git status output (for a complete view of
@@ -118,7 +134,7 @@ module GitTopic
             Review <topic>.  If <topic> is unspecified, review the oldest (by HEAD) topic.
 
             Options:
-          ".cleanup
+          ".unindent
         when "comment"
           banner "
             git[-topic] comment
@@ -153,7 +169,7 @@ module GitTopic
                 comments.
 
             Options:
-          ".cleanup
+          ".unindent
 
           opt   :force_update,
                 "
@@ -169,7 +185,7 @@ module GitTopic
             know what to do to appease the reviewer.
 
             Options:
-          ".cleanup
+          ".unindent
         when "accept"
           banner "
             git[-topic] accept
@@ -180,7 +196,7 @@ module GitTopic
             should either be rejected, or you can manually rebase.
 
             Options:
-          ".cleanup
+          ".unindent
         when "reject"
           banner "
             git[-topic] reject
@@ -188,7 +204,7 @@ module GitTopic
             Reject the current in-review topic.
 
             Options:
-          ".cleanup
+          ".unindent
 
           opt   :save_comments,
                 "
@@ -211,7 +227,7 @@ module GitTopic
             st          topic status --prepended
 
             Options:
-          ".cleanup
+          ".unindent
 
           opt   :local,
                 "
@@ -235,6 +251,9 @@ module GitTopic
           :upstream       => upstream
         })
         work_on           topic, opts
+      when "abandon"
+        topic             = ARGV.shift
+        abandon           topic
       when /done(-with)?/
         topic             = ARGV.shift
         done              topic, opts

data/lib/git_topic/comment.rb

@@ -75,7 +75,7 @@ module GitTopic::Comment
           # Ceterum censeo, Carthaginem esse delendam.
           #
           #
-        }.cleanup
+        }.unindent
         f.puts( fs_notes.lines.map do |line|
             "# #{line}"
           end.join )
@@ -235,7 +235,7 @@ module GitTopic::Comment
           #                                                     Douglas Adams
           #
           #
-        }.cleanup
+        }.unindent
         f.puts( notes.lines.map do |line|
             "# #{line}"
           end.join )

data/lib/{core_ext.rb → git_topic/core_ext.rb}

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'open3'
+
 require 'active_support'
 require 'active_support/inflector'
 require 'active_support/core_ext/module/aliasing'
@@ -7,7 +9,7 @@ require 'active_support/core_ext/string/inflections'
 
 
 class String
-  def cleanup
+  def unindent
       indent = (index /^([ \t]+)/; $1) || ''
       regex = /^#{Regexp::escape( indent )}/
       strip.gsub regex, ''
@@ -17,6 +19,10 @@ class String
       strip.gsub( /\n\s+/, ' ' )
   end
 
+  def blank?
+    nil? || empty?
+  end
+
   # Annoyingly, the useful version of pluralize in texthelpers isn't in the
   # string core extensions.
   def pluralize_with_count( count )
@@ -49,11 +55,18 @@ class String
         original_indentation = $1.size
       end
 
+      # If the line has more than the original indentation, it is ‘indented’
+      # and to be left unformatted
       if line =~ /^\s{#{original_indentation}}\s/
         sbuf << "\n#{indent}" unless start_of_line.call
         sbuf << line.slice( original_indentation, line.size )
         new_line.call
         next
+      # Leave line breaks intact to allow paragraph separataion.
+      elsif line.strip.empty?
+        sbuf << "\n"
+        new_line.call
+        next
       end
 
       leading_space = 
@@ -78,7 +91,7 @@ class String
    
     sbuf[ 0...heading.size ] = heading
 
-    sbuf
+    sbuf.rstrip
   end
 
   def wrap!( width, heading_indentation=nil, heading=nil )
@@ -89,8 +102,60 @@ end
 
 
 class Object
-    # Deep duplicate via remarshaling.  Not always applicable.
-    def ddup
-        Marshal.load( Marshal.dump( self ))
+  # Deep duplicate via remarshaling.  Not always applicable.
+  def ddup
+      Marshal.load( Marshal.dump( self ))
+  end
+end
+
+
+module Kernel
+  alias_method  :λ,  :lambda
+end
+
+
+class IO
+
+  def self.dpopen  *args, &block
+    Execution.new.run *args, &block
+  end
+
+  class Execution
+
+    attr_accessor :output_callback, :error_callback
+
+    def run  *args, &block
+      self.output_callback  = proc{ }
+      self.error_callback   = proc{ }
+
+      # Let the block set up error, output hooks
+      self.instance_eval &block
+
+      Open3.popen3 *args do |pin, pout, perr, wait_thread|
+        nothing_read = false
+        until nothing_read do
+          nothing_read = true
+          if s = pout.gets
+            self.output_callback[ s ]
+            nothing_read = false
+          end
+
+          if s = perr.gets
+            self.error_callback[ s ]
+            nothing_read = false
+          end
+        end
+
+        wait_thread.value
+      end
+    end
+
+    def on_error  &block
+      self.error_callback = block
     end
+
+    def on_output &block
+      self.output_callback  = block
+    end
+  end
 end

data/lib/git_topic/git.rb

@@ -25,8 +25,8 @@ module GitTopic::Git
       @@git_author_name_short ||= (
         full_name = capture_git( "config user.name" )
         raise "
-          whatever
-        " unless $?.success?
+          Unable to determine author name from git config user.name
+        " unless $pstatus.success?
 
         parts     = full_name.split( " " )
         fname     = parts.shift
@@ -39,19 +39,33 @@ module GitTopic::Git
 
     def working_tree_clean?
       git [ "diff --quiet", "diff --quiet --cached" ]
-      $?.success?
     end
 
     def working_tree_dirty?
       not working_tree_clean?
     end
 
-    def existing_comments?( branch=current_branch )
-      ref = notes_ref( branch )
-      not capture_git( "notes --ref #{ref} list" ).chomp.empty?
+    def rebased_to_master?  from=nil
+      capture_git( "rev-list -n 1 #{from}..master" ).strip.empty?
     end
 
-    def existing_comments( spec=nil )
+    def existing_comments?  branch=current_branch
+      ref         = notes_ref( branch )
+      # The list of all notes objects, and the commits they annotate, for the
+      # given ref
+      notes_list  = capture_git( "notes --ref #{ref} list" ).split  "\n"
+      # simply checking ! notes_list.empty? tells us that there were some
+      # comments on this ref at some point.  However, they may be comments on
+      # commits from a previous topic with the same name, so we check to ensure
+      # at least one of them is not an ancestor of origin/master (i.e. a commit
+      # that has already been accepted).
+      ! notes_list.find do |pair|
+        commit = pair.split( ' ' ).last
+        ! capture_git( "rev-list -n 1 origin/master..#{commit}" ).chomp.empty?
+      end.nil?
+    end
+
+    def existing_comments spec=nil
       ref = notes_ref( *[ spec ].compact )
       capture_git( "notes --ref #{ref} show" ).chomp
     end
@@ -69,6 +83,13 @@ module GitTopic::Git
       capture_git( "name-rev --name-only HEAD" )
     end
 
+    def ref_age ref=current_branch
+      date_str = capture_git  "log #{ref}^..#{ref} --pretty=%aD"
+      return nil if date_str.empty?
+
+      ( Date.today - Date.parse( date_str )).to_i
+    end
+
 
     def display_git_output?
       @@display_git_output ||= false
@@ -79,7 +100,7 @@ module GitTopic::Git
     end
 
 
-    def switch_to_branch( branch, tracking=nil )
+    def switch_to_branch  branch, tracking=nil
       if branches.include?( branch )
         "checkout #{branch}"
       else
@@ -87,59 +108,75 @@ module GitTopic::Git
       end
     end
 
-    def invoke_git_editor( file )
+    def invoke_git_editor file
       system "#{git_editor} #{file}"
     end
 
-    def cmd_redirect_suffix( opts )
+    def cmd_redirect_suffix opts
       if !opts[:show] && !display_git_output?
         "> /dev/null 2> /dev/null"
       end
     end
 
-    def git( cmds=[], opts={} )
+    def git *args
+      output, err, pstatus = _git  *args
+      pstatus && pstatus.success?
+    end
+
+    def capture_git *args
+      output, err, pstatus = _git  *args
+      output
+    end
+
+
+    protected
+
+    def _git  cmds=[], opts={}
       opts.assert_valid_keys    :must_succeed, :show
 
-      cmds  = [cmds] if cmds.is_a? String
-      redir = cmd_redirect_suffix( opts )
-      cmd = cmds.map{|c| "git #{c} #{redir}"}.join( " && " )
+      cmds = [ cmds ] if cmds.is_a? String
+      return if cmds.empty?
 
-      puts cmd if GitTopic::global_opts[:verbose]
-      result = system( cmd )
+      cmd = "#{cmds.map{|c| "git #{c}"}.join( " && " )}"
 
-      if opts[:must_succeed] && !$?.success?
-        raise "
-          Required git command failed:\n  #{cmd}.\n  re-run with --verbose to
-          see git output.
-        ".cleanup
-      end
 
-      result
-    end
+      puts  cmd if GitTopic::global_opts[:verbose]
+      debug cmd
 
-    def capture_git( cmds=[], opts={} )
-      opts.assert_valid_keys    :must_succeed
+      cmd_error   = ''
+      cmd_output  = ''
+      $pstatus = pstatus = IO.dpopen( cmd ) do
+        on_output{ |o| cmd_output << o }
+        on_error{ |e| cmd_error << e }
+      end
 
-      cmds = [cmds] if cmds.is_a? String
-      redir = "2> /dev/null" unless display_git_output?
-      cmd = "#{cmds.map{|c| "git #{c} #{redir}"}.join( " && " )}"
+      if display_git_output? || opts[:show]
+        puts cmd_output
+        puts cmd_error
+      end
 
-      puts cmd if GitTopic::global_opts[:verbose]
-      result = `#{cmd}`
+      debug cmd_output  unless cmd_output.empty?
+      unless cmd_error.empty?
+        if pstatus.success?
+          debug cmd_error
+        else
+          warn  cmd_error
+        end
+      end
 
-      if opts[:must_succeed] && !$?.success?
+      if opts[:must_succeed] && ! pstatus.success?
         raise "
           Required git command failed:\n  #{cmd}.\n  re-run with --verbose to
           see git output.
-        ".cleanup
+        ".unindent
       end
 
-      result
+      [ cmd_output, cmd_error, pstatus ]
     end
 
   end
 
-  def self.included( base )
+  def self.included base
     base.extend ClassMethods
   end
 end