git-topic 0.1.3 → 0.1.4

data/.rspec

@@ -1 +1,2 @@
 --color
+--debug

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2-rc1
+rvm 1.9.2

data/.vimproject

@@ -8,7 +8,9 @@ project=$PWD cd=. {
   git-topic
  }
  lib=lib {
-  git-topic.rb
+  git_topic=git_topic{
+  }
+  git_topic.rb
   util.rb
  }
  spec=spec {

data/Rakefile

@@ -3,6 +3,15 @@ require 'rake'
 
 Dir[ 'lib/tasks/**/*' ].each{ |l| require l }
 
+# TODO 1: cleanup specs (possibly have specs setup repos, or possibly tar up
+#         repos and extract them)
+# TODO 2: topic abandon <topic>
+# TODO 1: handle malformed args
+# TODO 1: git-topic comment
+#           edit files & have the diffs pulled into notes?
+
+# TODO 1: git work-on <topic> should kill review branch
+
 
 begin
   require 'jeweler'

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/bin/git-topic

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 require 'trollop'
-require 'git-topic'
+require 'git_topic'
 
 
 module GitTopic

data/git-topic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-topic}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David J. Hamilton"]
-  s.date = %q{2010-07-08}
+  s.date = %q{2010-07-13}
   s.default_executable = %q{git-topic}
   s.description = %q{
       gem command around reviewed topic branches.  Supports workflow of the form:
@@ -57,9 +57,11 @@ Gem::Specification.new do |s|
      "autotest/discover.rb",
      "bin/git-topic",
      "git-topic.gemspec",
-     "lib/git-topic.rb",
-     "lib/util.rb",
-     "spec/git-topic_spec.rb",
+     "lib/core_ext.rb",
+     "lib/git_topic.rb",
+     "lib/git_topic/git.rb",
+     "lib/git_topic/naming.rb",
+     "spec/git_topic_spec.rb",
      "spec/spec_helper.rb",
      "spec/template/origin/HEAD",
      "spec/template/origin/config",
@@ -102,7 +104,7 @@ Gem::Specification.new do |s|
   s.summary = %q{git command around reviewed topic branches}
   s.test_files = [
     "spec/spec_helper.rb",
-     "spec/git-topic_spec.rb"
+     "spec/git_topic_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/git_topic/git.rb

@@ -0,0 +1,58 @@
+
+module GitTopic; end
+module GitTopic::Git
+  module ClassMethods
+
+    protected
+
+    def working_tree_clean?
+      git [ "diff --quiet", "diff --quiet --cached" ]
+      $?.success?
+    end
+
+    def working_tree_dirty?
+      not working_tree_clean?
+    end
+
+
+    def display_git_output?
+      @@display_git_output ||= false
+    end
+
+    def display_git_output!
+      @@display_git_output = true
+    end
+
+
+    def switch_to_branch( branch, tracking=nil )
+      if branches.include?( branch )
+        "checkout #{branch}"
+      else
+        "checkout -b #{branch} #{tracking}"
+      end
+    end
+
+    def cmd_redirect_suffix( opts )
+      if !opts[:show] && !display_git_output?
+        "> /dev/null 2> /dev/null"
+      end
+    end
+
+    def git( cmds=[], opts={} )
+      cmds  = [cmds] if cmds.is_a? String
+      redir = cmd_redirect_suffix( opts )
+      system cmds.map{|c| "git #{c} #{redir}"}.join( " && " )
+    end
+
+    def capture_git( cmds=[] )
+      cmds = [cmds] if cmds.is_a? String
+      redir = "2> /dev/null" unless display_git_output?
+      `#{cmds.map{|c| "git #{c} #{redir}"}.join( " && " )}`
+    end
+
+  end
+
+  def self.included( base )
+    base.extend ClassMethods
+  end
+end

data/lib/git_topic/naming.rb

@@ -0,0 +1,150 @@
+
+module GitTopic; end
+
+module GitTopic::Naming
+  module ClassMethods
+
+    protected
+
+    def backup_branch( topic )
+      "backup/#{user}/#{topic}"
+    end
+
+    def wip_branch( topic )
+      "wip/#{user}/#{topic}"
+    end
+
+    def rejected_branch( topic )
+      "rejected/#{user}/#{topic}"
+    end
+
+    def review_branch( topic, user=user )
+      "review/#{user}/#{topic}"
+    end
+
+    def remote_rejected_branch( topic, user=user )
+      "rejected/#{user}/#{topic}"
+    end
+
+
+    def find_remote_review_branch( topic )
+      others_review_branches.find{|b| b.index topic}
+    end
+
+
+    def user_topic_name( branch )
+      if branch =~ %r{^origin}
+        branch =~ %r{^\S*?/\S*?/(\S*?)/(\S*)}
+        [$1, $2]
+      else
+        branch =~ %r{^\S*?/(\S*?)/(\S*)}
+        [$1, $2]
+      end
+    end
+
+    def topic_parts( spec )
+      p = {}
+      parts = spec.split( '/' )
+      case parts.size
+      when 2
+        p[:user], p[:topic] = parts
+      when 1
+        p[:topic] = parts.first
+      else
+        raise "Unexpected topic: #{spec}"
+      end
+      p
+    end
+
+
+    def user
+      @@user ||= (ENV['USER'] || `whoami`)
+    end
+
+    def current_topic
+      current_branch =~ %r{wip/\S*?/(\S*)}
+      $1
+    end
+
+    def current_branch
+      @@current_branch ||= capture_git( "branch --no-color" ).split( "\n" ).find do |b|
+        b =~ %r{^\*}
+      end[ 2..-1 ]
+    end
+
+    def branches
+      @@branches ||= capture_git( "branch --no-color" ).split( "\n" ).map{|b| b[2..-1]}
+    end
+
+    def remote_branches
+      @@remote_branches ||= capture_git( "branch -r --no-color" ).split( "\n" ).map{|b| b[2..-1]}
+    end
+
+    def others_review_branches
+      remote_branches.select do
+        |b| b =~ %r{/review/}
+      end.reject do |b|
+        b =~ %r{/#{user}/}
+      end
+    end
+
+    def remote_branches_organized
+      @@remote_branches_organized ||= (
+        rb = remote_branches.dup
+        # Convert a bunch of remote branch names, like
+        #   origin/HEAD -> origin/masterr
+        #   origin/master
+        #   origin/review/user1/topic1
+        #   origin/something-else
+        #   origin/rejected/user2/topic2
+        #
+        # Into a hash with keys 'review' and 'rejected' pointing to hashes of
+        # user-topic(s) pairs.
+        rb.map!{|s| s.gsub( /->.*/, '')}
+        rb.map!{|s| s.strip.split( '/' )}
+        namespace_ut = rb.group_by{|remote, namespace, user, topic| namespace if topic}
+        namespace_ut.reject!{|k,v| not %w(rejected review).include? k}
+
+        namespace_ut.each do |k,v|
+          v.each{|a| a.shift( 2 )}
+          v = namespace_ut[k] = v.group_by{|user, topic| user if topic}
+          v.each{|kk,vv| vv.each(&:shift); vv.flatten!}
+        end
+
+        namespace_ut.symbolize_keys!
+        namespace_ut[:review] ||= {}
+        namespace_ut[:rejected] ||= {}
+
+        namespace_ut[:review].reject!{|k,v| k == user}
+        namespace_ut
+      )
+    end
+
+    def oldest_review_branch
+      return nil if others_review_branches.empty?
+
+      commits_by_age = capture_git([
+        "log --date-order --reverse --pretty=format:%d",
+        "^origin/master #{others_review_branches.join( ' ' )}",
+      ].join( " " )).split( "\n" )
+
+      commits_by_age.find do |ref|
+        # no ‘,’, i.e. only one ref matches the commit
+        ref.index( ',' ).nil?
+      end.strip[ 1..-2 ] # chomp the leading and trailing parenthesis
+    end
+
+    def oldest_review_user_topic
+      user_topic_name( oldest_review_branch )
+    end
+
+    def on_review_branch?
+      current_branch =~ %r{^review/}
+    end
+
+  end
+
+  def self.included( base )
+    base.extend ClassMethods
+  end
+end

data/lib/{git-topic.rb → git_topic.rb}

@@ -4,12 +4,18 @@
 require 'active_support'
 require 'active_support/core_ext/hash/keys'
 
-require 'util'
+require 'core_ext'
+require 'git_topic/git'
+require 'git_topic/naming'
 
 
 module GitTopic
+  include GitTopic::Git
+  include GitTopic::Naming
+
   GlobalOptKeys = [ :verbose, :help, :verbose_given ]
 
+
   class << self
 
     # Switch to a branch for the given topic.
@@ -116,17 +122,21 @@ module GitTopic
         if review_branches.empty?
           puts "nothing to review."
           return
+        else
+          user, topic = oldest_review_user_topic
         end
-
-        user, topic = oldest_review_user_topic
       else
-        user, topic = spec.split( '/' )
+        p             = topic_parts( spec )
+        user, topic   = p[:user], p[:topic]
       end
 
       if remote_topic_branch = find_remote_review_branch( topic )
+        # Get the actual user/topic, e.g. to get the user if spec only specifies
+        # the topic.
+        real_user, real_topic = user_topic_name( remote_topic_branch )
         git [
           switch_to_branch(
-            review_branch( topic, user ),
+            review_branch( real_topic, real_user ),
             remote_topic_branch )]
       else
         raise "No review topic found matching ‘#{spec}’"
@@ -200,176 +210,6 @@ module GitTopic
       ]
     end
 
-
-    private
-
-
-    def backup_branch( topic )
-      "backup/#{user}/#{topic}"
-    end
-
-    def wip_branch( topic )
-      "wip/#{user}/#{topic}"
-    end
-
-    def rejected_branch( topic )
-      "rejected/#{user}/#{topic}"
-    end
-
-    def review_branch( topic, user=user )
-      "review/#{user}/#{topic}"
-    end
-
-    def remote_rejected_branch( topic, user=user )
-      "rejected/#{user}/#{topic}"
-    end
-
-
-    def find_remote_review_branch( topic )
-      others_review_branches.find{|b| b.index topic}
-    end
-
-
-    def user_topic_name( branch )
-      if branch =~ %r{^origin}
-        branch =~ %r{^\S*?/\S*?/(\S*?)/(\S*)}
-        [$1, $2]
-      else
-        branch =~ %r{^\S*?/(\S*?)/(\S*)}
-        [$1, $2]
-      end
-    end
-
-
-    def user
-      @@user ||= (ENV['USER'] || `whoami`)
-    end
-
-    def current_topic
-      current_branch =~ %r{wip/\S*?/(\S*)}
-      $1
-    end
-
-    def current_branch
-      @@current_branch ||= capture_git( "branch --no-color" ).split( "\n" ).find do |b|
-        b =~ %r{^\*}
-      end[ 2..-1 ]
-    end
-
-    def branches
-      @@branches ||= capture_git( "branch --no-color" ).split( "\n" ).map{|b| b[2..-1]}
-    end
-
-    def remote_branches
-      @@remote_branches ||= capture_git( "branch -r --no-color" ).split( "\n" ).map{|b| b[2..-1]}
-    end
-
-    def others_review_branches
-      remote_branches.select do
-        |b| b =~ %r{/review/}
-      end.reject do |b|
-        b =~ %r{/#{user}/}
-      end
-    end
-
-    def remote_branches_organized
-      @@remote_branches_organized ||= (
-        rb = remote_branches.dup
-        # Convert a bunch of remote branch names, like
-        #   origin/HEAD -> origin/masterr
-        #   origin/master
-        #   origin/review/user1/topic1
-        #   origin/something-else
-        #   origin/rejected/user2/topic2
-        #
-        # Into a hash with keys 'review' and 'rejected' pointing to hashes of
-        # user-topic(s) pairs.
-        rb.map!{|s| s.gsub( /->.*/, '')}
-        rb.map!{|s| s.strip.split( '/' )}
-        namespace_ut = rb.group_by{|remote, namespace, user, topic| namespace if topic}
-        namespace_ut.reject!{|k,v| not %w(rejected review).include? k}
-
-        namespace_ut.each do |k,v|
-          v.each{|a| a.shift( 2 )}
-          v = namespace_ut[k] = v.group_by{|user, topic| user if topic}
-          v.each{|kk,vv| vv.each(&:shift); vv.flatten!}
-        end
-
-        namespace_ut.symbolize_keys!
-        namespace_ut[:review] ||= {}
-        namespace_ut[:rejected] ||= {}
-
-        namespace_ut[:review].reject!{|k,v| k == user}
-        namespace_ut
-      )
-    end
-
-    def oldest_review_branch
-      return nil if others_review_branches.empty?
-
-      commits_by_age = capture_git([
-        "log --date-order --reverse --pretty=format:%d",
-        "^origin/master #{others_review_branches.join( ' ' )}",
-      ].join( " " )).split( "\n" )
-
-      commits_by_age.find do |ref|
-        # no ‘,’, i.e. only one ref matches the commit
-        ref.index( ',' ).nil?
-      end.strip[ 1..-2 ] # chomp the leading and trailing parenthesis
-    end
-
-    def oldest_review_user_topic
-      user_topic_name( oldest_review_branch )
-    end
-
-    def on_review_branch?
-      current_branch =~ %r{^review/}
-    end
-
-    def working_tree_clean?
-      git [ "diff --quiet", "diff --quiet --cached" ]
-      $?.success?
-    end
-
-    def working_tree_dirty?
-      not working_tree_clean?
-    end
-
-
-    def display_git_output?
-      @@display_git_output ||= false
-    end
-
-    def display_git_output!
-      @@display_git_output = true
-    end
-
-
-    def switch_to_branch( branch, tracking=nil )
-      if branches.include?( branch )
-        "checkout #{branch}"
-      else
-        "checkout -b #{branch} #{tracking}"
-      end
-    end
-
-    def cmd_redirect_suffix( opts )
-      if !opts[:show] && !display_git_output?
-        "> /dev/null 2> /dev/null"
-      end
-    end
-
-    def git( cmds=[], opts={} )
-      cmds  = [cmds] if cmds.is_a? String
-      redir = cmd_redirect_suffix( opts )
-      system cmds.map{|c| "git #{c} #{redir}"}.join( " && " )
-    end
-
-    def capture_git( cmds=[] )
-      cmds = [cmds] if cmds.is_a? String
-      redir = "2> /dev/null" unless display_git_output?
-      `#{cmds.map{|c| "git #{c} #{redir}"}.join( " && " )}`
-    end
   end
 end
 

data/spec/{git-topic_spec.rb → git_topic_spec.rb}

@@ -258,6 +258,17 @@ describe GitTopic do
         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 error if an illegal topic is specified" do
         lambda{ GitTopic.review( 'fakeuser/faketopic' )}.should raise_error
       end

data/spec/spec_helper.rb

@@ -1,31 +1,29 @@
 # encoding: utf-8
-require 'git-topic'
+require 'git_topic'
 
 
 # Disable caching on GitTopic for specs since we're calling the methods directly
 # rather than assuming atmoic invocations.
-module GitTopic
-  class << self
-    %w( current_branch remote_branches remote_branches_organized branches
-        ).each do |m|
-
-      define_method( "#{m}_with_nocache" ) do
-        rv = send( "#{m}_without_nocache" )
-        self.class_variable_set( "@@#{m}", nil )
-        rv
-      end
-      alias_method_chain m.to_sym, :nocache
+class << GitTopic
+  %w( current_branch remote_branches remote_branches_organized branches
+      ).each do |m|
+
+    define_method( "#{m}_with_nocache" ) do
+      rv = send( "#{m}_without_nocache" )
+      GitTopic::Naming::ClassMethods.class_variable_set( "@@#{m}", nil )
+      rv
     end
+    alias_method_chain m.to_sym, :nocache
+  end
 
-    def git_with_implicit_capture( cmds=[], opts={} )
-      if opts[:show]
-        puts capture_git( cmds )
-      else
-        git_without_implicit_capture( cmds, opts )
-      end
+  def git_with_implicit_capture( cmds=[], opts={} )
+    if opts[:show]
+      puts capture_git( cmds )
+    else
+      git_without_implicit_capture( cmds, opts )
     end
-    alias_method_chain  :git, :implicit_capture
   end
+  alias_method_chain  :git, :implicit_capture
 end
 
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - David J. Hamilton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -07:00
+date: 2010-07-13 00:00:00 -07:00
 default_executable: git-topic
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,9 +84,11 @@ files:
 - autotest/discover.rb
 - bin/git-topic
 - git-topic.gemspec
-- lib/git-topic.rb
-- lib/util.rb
-- spec/git-topic_spec.rb
+- lib/core_ext.rb
+- lib/git_topic.rb
+- lib/git_topic/git.rb
+- lib/git_topic/naming.rb
+- spec/git_topic_spec.rb
 - spec/spec_helper.rb
 - spec/template/origin/HEAD
 - spec/template/origin/config
@@ -155,4 +157,4 @@ specification_version: 3
 summary: git command around reviewed topic branches
 test_files: 
 - spec/spec_helper.rb
-- spec/git-topic_spec.rb
+- spec/git_topic_spec.rb