git-topic 0.1.6.3 → 0.1.6.4

data/.autotest

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+
+Autotest.add_hook :initialize do |at|
+  at.add_exception %r{tmp\/}
+  at.add_exception %r{template\/}
+  %w(.git).each do |ex|
+    at.add_exception ex
+  end
+end

data/.vimrc

@@ -1 +1,21 @@
-let $RUBYOPT = 'lib' 
+let $RUBYPATH = 'lib' 
+
+function! s:run_example()
+    if &ft != "ruby"
+        " Not ruby, do nothing.
+        return
+    endif
+
+    " look for it ", with no word character just before ‘it’
+    let line    = search( '\w\@<!it "', "bnW" )
+    let cmd     = "rspec --no-color " . expand( "%" ) . " -l " . line
+
+    if line > 0
+        execute "!" . cmd
+    else
+        echo "No rspec example found at or before cursor position."
+    endif
+endfun
+nmap <leader>t :call <SID>run_example()<CR>
+
+

data/Gemfile

@@ -14,6 +14,8 @@ group :development do
   gem 'ZenTest'
   gem 'yard'
   gem 'gemcutter'
+
+  gem 'autotest-screen'
 end
 
 

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     ZenTest (4.3.3)
     activesupport (3.0.0.beta4)
+    autotest-screen (0.1.0.1)
     diff-lcs (1.1.2)
     gemcutter (0.5.0)
       json_pure
@@ -32,6 +33,7 @@ PLATFORMS
 DEPENDENCIES
   ZenTest
   activesupport (>= 3.0.0.beta4)
+  autotest-screen
   gemcutter
   jeweler
   rake

data/Rakefile

@@ -3,16 +3,7 @@ require 'yaml'
 require 'rubygems'
 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
+Dir[ 'lib/tasks/**/*' ].each{ |l| load l }
 
 
 begin
@@ -76,7 +67,9 @@ task 'version:write:build' do
   }
   v.merge!( y ) if y.is_a? Hash
   v[ :build ] = ENV['BUILD']
-  File.open( "VERSION.yml", "w" ){|f| f.puts YAML::dump( v )}
+
+  v.each{|k,v| ENV[ k.to_s.upcase ] = v.to_s}
+  Rake::Task["version:write"].invoke
 end
 
 task 'version:bump:build' do

data/VERSION.yml

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

data/bin/git-topic

@@ -1,173 +1,9 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'yaml'
-
 require 'rubygems'
-
-require 'trollop'
 require 'git_topic'
-
-
-module GitTopic
-  SubCommands = %w(work-on done status review accept reject install-aliases)
-  Version = lambda {
-    h = YAML::load_file( "#{File.dirname( __FILE__ )}/../VERSION.yml" )
-    if h.is_a? Hash
-      [h[:major], h[:minor], h[:patch], h[:build]].compact.join( "." )
-    end
-  }.call
-
-  class << self
-    def run
-      global_opts = Trollop::options do
-        banner "
-          git-topic #{Version}
-          Manage a topic/review workflow.
-
-          see <http://github.com/hjdivad/git-topic>
-
-          Commands are:
-            #{SubCommands.join( "
-            " )}
-
-            Global Options:
-        ".cleanup
-        version Version
-
-        opt :verbose,   "Verbose output, including complete traces on errors."
-        stop_on         SubCommands
-      end
-
-      cmd       = ARGV.shift
-      cmd_opts  = Trollop::options do
-        case cmd
-        when "work-on"
-          banner "
-            git work-on <topic>
-            git-topic work-on <topic>
-
-            Switches to a local work-in-progress (wip) branch for <topic>.  The
-            branch (and a matching remote branch) is created if necessary.
-
-            If this is a rejected topic, work will continue from the state of
-            the rejected topic branch.
-
-            Options:
-          ".cleanup
-        when /done(-with)?/
-          banner "
-            git done
-            git-topic done
-
-            Indicate that this topic branch is ready for review.  Push to a
-            remote review branch and switch back to master.
-
-            Options:
-          ".cleanup
-        when "status"
-          banner "
-            git st
-            git-topic status
-
-            Print a status, showing rejected branches to work on and branches
-            that can be reviewed.
-
-            Options:
-          ".cleanup
-          opt   :prepended,
-                "
-                  Prepend status to git status output (for a complete view of
-                  status).
-                ".oneline,
-                :default => false
-        when "review"
-          banner "
-            git review [<topic>]
-            git-topic reivew [<topic>]
-
-            Review <topic>.  If <topic> is unspecified, review the oldest (by HEAD) topic.
-
-            Options:
-          ".cleanup
-        when "accept"
-          banner "
-            git accept
-            git-topic accept
-
-            Accept the current in-review topic, merging it to master and
-            cleaning up the remote branch.  This will fail if the branch does
-            not merge as a fast-forward in master.  If that happens, the topic
-            should either be rejected, or you can manually rebase.
-
-            Options:
-          ".cleanup
-        when "reject"
-          banner "
-            git reject
-            git-topic reject
-
-            Reject the current in-review topic.
-
-            Options:
-          ".cleanup
-        when "install-aliases"
-          banner "
-            git-topic install-aliases
-
-            Install aliases to make git topic nicer to work with.  The aliases are as follows:
-
-            w[ork-on]   topic work-on
-            done        topic done
-            r[eview]    topic review
-            accept      topic accept
-            reject      topic reject
-
-            st          topic status --prepended
-
-            Options:
-          ".cleanup
-
-          opt   :local,
-                "
-                  Install aliases non-globally (i.e. in .git/config instead of
-                  $HOME/.gitconfig
-                ".oneline,
-                :default => false
-        end
-      end
-
-      opts = global_opts.merge( cmd_opts )
-      display_git_output! if opts[:verbose]
-
-      case cmd
-      when "work-on"
-        topic             = ARGV.shift
-        work_on           topic, opts
-      when /done(-with)?/
-        topic             = ARGV.shift
-        done              topic, opts
-      when "status"
-        status            opts
-      when "review"
-        spec              = ARGV.shift
-        review            spec, opts
-      when "accept"
-        topic             = ARGV.shift
-        accept            topic, opts
-      when "reject"
-        topic             = ARGV.shift
-        reject            topic, opts
-      when "install-aliases"
-        install_aliases   opts
-      end
-    rescue => error
-      puts "Error: #{error.message}"
-      puts error.backtrace.join( "\n" ) if opts[:verbose]
-    end
-  end
-end
+require 'git_topic/cli'
 
 
 GitTopic::run
-

data/git-topic

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+
+# Do not run this file.  It is for developer testing only.  Use bin/git-topic.
+
+$:.unshift "#{File.dirname(__FILE__)}/lib"
+require 'git_topic'
+require 'git_topic/cli'
+
+require 'ruby-debug'
+
+GitTopic::run

data/git-topic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-topic}
-  s.version = "0.1.6.3"
+  s.version = "0.1.6.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-14}
+  s.date = %q{2010-07-21}
   s.default_executable = %q{git-topic}
   s.description = %q{
       gem command around reviewed topic branches.  Supports workflow of the form:
@@ -41,7 +41,8 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
+    ".autotest",
+     ".gitignore",
      ".gvimrc",
      ".rspec",
      ".rvmrc",
@@ -56,14 +57,50 @@ Gem::Specification.new do |s|
      "VERSION.yml",
      "autotest/discover.rb",
      "bin/git-topic",
+     "git-topic",
      "git-topic.gemspec",
      "lib/core_ext.rb",
      "lib/git_topic.rb",
+     "lib/git_topic/cli.rb",
      "lib/git_topic/git.rb",
      "lib/git_topic/naming.rb",
+     "lib/tasks/annotations.rake",
      "spec/git_topic_spec.rb",
      "spec/spec_helper.rb",
+     "spec/template/origin-fresh/HEAD",
+     "spec/template/origin-fresh/RENAMED-REF",
+     "spec/template/origin-fresh/config",
+     "spec/template/origin-fresh/description",
+     "spec/template/origin-fresh/hooks/applypatch-msg.sample",
+     "spec/template/origin-fresh/hooks/commit-msg.sample",
+     "spec/template/origin-fresh/hooks/post-commit.sample",
+     "spec/template/origin-fresh/hooks/post-receive.sample",
+     "spec/template/origin-fresh/hooks/post-update.sample",
+     "spec/template/origin-fresh/hooks/pre-applypatch.sample",
+     "spec/template/origin-fresh/hooks/pre-commit.sample",
+     "spec/template/origin-fresh/hooks/pre-rebase.sample",
+     "spec/template/origin-fresh/hooks/prepare-commit-msg.sample",
+     "spec/template/origin-fresh/hooks/update.sample",
+     "spec/template/origin-fresh/info/exclude",
+     "spec/template/origin-fresh/objects/0a/da6d051b94cd0df50f5a0b7229aec26f0d2cdf",
+     "spec/template/origin-fresh/objects/0c/e06c616769768f09f5e629cfcc68eabe3dee81",
+     "spec/template/origin-fresh/objects/20/049991cdafdce826f5a3c01e10ffa84d6997ec",
+     "spec/template/origin-fresh/objects/33/1d827fd47fb234af54e3a4bbf8c6705e9116cc",
+     "spec/template/origin-fresh/objects/41/51899b742fd6b1c873b177b9d13451682089bc",
+     "spec/template/origin-fresh/objects/44/ffd9c9c8b52b201659e3ad318cdad6ec836b46",
+     "spec/template/origin-fresh/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904",
+     "spec/template/origin-fresh/objects/55/eeb01bdf874d1a35870bcf24a970c475c63344",
+     "spec/template/origin-fresh/objects/8d/09f9b8d80ce282218125cb0cbf53cccf022203",
+     "spec/template/origin-fresh/objects/b4/8e68d5cac189af36abe48e893d11c24b7b2a19",
+     "spec/template/origin-fresh/objects/c0/838ed2ee8f2e83c8bda859fc5e332b92f0a5a3",
+     "spec/template/origin-fresh/objects/cd/f7b9dbc4911a0d1404db54cde2ed448f6a6afd",
+     "spec/template/origin-fresh/objects/d2/6b33daea1ed9823a189992bba38fbc913483c1",
+     "spec/template/origin-fresh/objects/fe/4e254557e19f338f40ccfdc00a7517771db880",
+     "spec/template/origin-fresh/refs/heads/master",
+     "spec/template/origin-fresh/refs/heads/wip/USER/zombie-basic",
      "spec/template/origin/HEAD",
+     "spec/template/origin/ORIG_HEAD",
+     "spec/template/origin/RENAMED-REF",
      "spec/template/origin/config",
      "spec/template/origin/description",
      "spec/template/origin/hooks/applypatch-msg.sample",
@@ -80,22 +117,28 @@ Gem::Specification.new do |s|
      "spec/template/origin/objects/0a/da6d051b94cd0df50f5a0b7229aec26f0d2cdf",
      "spec/template/origin/objects/0c/e06c616769768f09f5e629cfcc68eabe3dee81",
      "spec/template/origin/objects/20/049991cdafdce826f5a3c01e10ffa84d6997ec",
+     "spec/template/origin/objects/2d/a16986c7f742f808a3a3e68108bd2e4dae009d",
      "spec/template/origin/objects/33/1d827fd47fb234af54e3a4bbf8c6705e9116cc",
      "spec/template/origin/objects/41/51899b742fd6b1c873b177b9d13451682089bc",
      "spec/template/origin/objects/44/ffd9c9c8b52b201659e3ad318cdad6ec836b46",
      "spec/template/origin/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904",
      "spec/template/origin/objects/55/eeb01bdf874d1a35870bcf24a970c475c63344",
+     "spec/template/origin/objects/65/3d7112dadcacaaae6390612eac58c234f92b18",
      "spec/template/origin/objects/8d/09f9b8d80ce282218125cb0cbf53cccf022203",
      "spec/template/origin/objects/b4/8e68d5cac189af36abe48e893d11c24b7b2a19",
      "spec/template/origin/objects/c0/838ed2ee8f2e83c8bda859fc5e332b92f0a5a3",
      "spec/template/origin/objects/cd/f7b9dbc4911a0d1404db54cde2ed448f6a6afd",
      "spec/template/origin/objects/d2/6b33daea1ed9823a189992bba38fbc913483c1",
+     "spec/template/origin/objects/dd/26afde91bbae18e13e4df1cd1da56a75ccc665",
      "spec/template/origin/objects/fe/4e254557e19f338f40ccfdc00a7517771db880",
      "spec/template/origin/refs/heads/master",
-     "spec/template/origin/refs/heads/rejected/davidjh/krakens",
-     "spec/template/origin/refs/heads/review/davidjh/pirates",
+     "spec/template/origin/refs/heads/rejected/USER/krakens",
+     "spec/template/origin/refs/heads/review/USER/pirates",
      "spec/template/origin/refs/heads/review/user24601/ninja-basic",
-     "spec/template/origin/refs/heads/review/user24601/zombie-basic"
+     "spec/template/origin/refs/heads/review/user24601/zombie-basic",
+     "spec/template/origin/refs/heads/wip/USER/pirates-advanced",
+     "spec/template/origin/refs/heads/wip/USER/zombie-basic",
+     "spec/template/origin/refs/heads/wip/prevent-ff"
   ]
   s.homepage = %q{http://github.com/hjdivad/git-topic}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -120,6 +163,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ZenTest>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<gemcutter>, [">= 0"])
+      s.add_development_dependency(%q<autotest-screen>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
       s.add_dependency(%q<trollop>, [">= 0"])
@@ -129,6 +173,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ZenTest>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<gemcutter>, [">= 0"])
+      s.add_dependency(%q<autotest-screen>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
@@ -139,6 +184,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ZenTest>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<gemcutter>, [">= 0"])
+    s.add_dependency(%q<autotest-screen>, [">= 0"])
   end
 end
 

data/lib/git_topic/cli.rb

@@ -0,0 +1,171 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'yaml'
+
+require 'rubygems'
+
+require 'trollop'
+require 'git_topic'
+
+
+module GitTopic
+  SubCommands = %w(work-on done status review accept reject install-aliases)
+  Version = lambda {
+    h = YAML::load_file( "#{File.dirname( __FILE__ )}/../../VERSION.yml" )
+    if h.is_a? Hash
+      [h[:major], h[:minor], h[:patch], h[:build]].compact.join( "." )
+    end
+  }.call
+
+  class << self
+    def run
+      global_opts = self.global_opts = Trollop::options do
+        banner "
+          git-topic #{Version}
+          Manage a topic/review workflow.
+
+          see <http://github.com/hjdivad/git-topic>
+
+          Commands are:
+            #{SubCommands.join( "
+            " )}
+
+            Global Options:
+        ".cleanup
+        version Version
+
+        opt :verbose,   "Verbose output, including complete traces on errors."
+        stop_on         SubCommands
+      end
+
+      cmd       = ARGV.shift
+      cmd_opts  = Trollop::options do
+        case cmd
+        when "work-on"
+          banner "
+            git work-on <topic>
+            git-topic work-on <topic>
+
+            Switches to a local work-in-progress (wip) branch for <topic>.  The
+            branch (and a matching remote branch) is created if necessary.
+
+            If this is a rejected topic, work will continue from the state of
+            the rejected topic branch.
+
+            Options:
+          ".cleanup
+        when /done(-with)?/
+          banner "
+            git done
+            git-topic done
+
+            Indicate that this topic branch is ready for review.  Push to a
+            remote review branch and switch back to master.
+
+            Options:
+          ".cleanup
+        when "status"
+          banner "
+            git st
+            git-topic status
+
+            Print a status, showing rejected branches to work on and branches
+            that can be reviewed.
+
+            Options:
+          ".cleanup
+          opt   :prepended,
+                "
+                  Prepend status to git status output (for a complete view of
+                  status).
+                ".oneline,
+                :default => false
+        when "review"
+          banner "
+            git review [<topic>]
+            git-topic reivew [<topic>]
+
+            Review <topic>.  If <topic> is unspecified, review the oldest (by HEAD) topic.
+
+            Options:
+          ".cleanup
+        when "accept"
+          banner "
+            git accept
+            git-topic accept
+
+            Accept the current in-review topic, merging it to master and
+            cleaning up the remote branch.  This will fail if the branch does
+            not merge as a fast-forward in master.  If that happens, the topic
+            should either be rejected, or you can manually rebase.
+
+            Options:
+          ".cleanup
+        when "reject"
+          banner "
+            git reject
+            git-topic reject
+
+            Reject the current in-review topic.
+
+            Options:
+          ".cleanup
+        when "install-aliases"
+          banner "
+            git-topic install-aliases
+
+            Install aliases to make git topic nicer to work with.  The aliases are as follows:
+
+            w[ork-on]   topic work-on
+            done        topic done
+            r[eview]    topic review
+            accept      topic accept
+            reject      topic reject
+
+            st          topic status --prepended
+
+            Options:
+          ".cleanup
+
+          opt   :local,
+                "
+                  Install aliases non-globally (i.e. in .git/config instead of
+                  $HOME/.gitconfig
+                ".oneline,
+                :default => false
+        end
+      end
+
+      opts = global_opts.merge( cmd_opts )
+      display_git_output! if opts[:verbose]
+
+      case cmd
+      when "work-on"
+        topic             = ARGV.shift
+        work_on           topic, opts
+      when /done(-with)?/
+        topic             = ARGV.shift
+        done              topic, opts
+      when "status"
+        status            opts
+      when "review"
+        spec              = ARGV.shift
+        review            spec, opts
+      when "accept"
+        topic             = ARGV.shift
+        accept            topic, opts
+      when "reject"
+        topic             = ARGV.shift
+        reject            topic, opts
+      when "install-aliases"
+        install_aliases   opts
+      end
+    rescue => error
+      puts "Error: #{error.message}"
+      puts error.backtrace.join( "\n" ) if opts[:verbose]
+    end
+  end
+end
+
+

data/lib/git_topic/git.rb

@@ -1,5 +1,9 @@
 
-module GitTopic; end
+module GitTopic
+  class << self; attr_accessor :global_opts end
+  self.global_opts = {}
+end
+
 module GitTopic::Git
   module ClassMethods
 
@@ -41,13 +45,19 @@ module GitTopic::Git
     def git( cmds=[], opts={} )
       cmds  = [cmds] if cmds.is_a? String
       redir = cmd_redirect_suffix( opts )
-      system cmds.map{|c| "git #{c} #{redir}"}.join( " && " )
+      cmd = cmds.map{|c| "git #{c} #{redir}"}.join( " && " )
+
+      puts cmd if GitTopic::global_opts[:verbose]
+      system cmd
     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( " && " )}`
+      cmd = "#{cmds.map{|c| "git #{c} #{redir}"}.join( " && " )}"
+
+      puts cmd if GitTopic::global_opts[:verbose]
+      `#{cmd}`
     end
 
   end

data/lib/git_topic/naming.rb

@@ -7,23 +7,23 @@ module GitTopic::Naming
     protected
 
     def backup_branch( topic )
-      "backup/#{user}/#{topic}"
+      "backup/#{user}/#{strip_namespace topic}"
     end
 
     def wip_branch( topic )
-      "wip/#{user}/#{topic}"
+      "wip/#{user}/#{strip_namespace topic}"
     end
 
     def rejected_branch( topic )
-      "rejected/#{user}/#{topic}"
+      "rejected/#{user}/#{strip_namespace topic}"
     end
 
     def review_branch( topic, user=user )
-      "review/#{user}/#{topic}"
+      "review/#{user}/#{strip_namespace topic}"
     end
 
     def remote_rejected_branch( topic, user=user )
-      "rejected/#{user}/#{topic}"
+      "rejected/#{user}/#{strip_namespace topic}"
     end
 
 
@@ -31,6 +31,14 @@ module GitTopic::Naming
       others_review_branches.find{|b| b.index topic}
     end
 
+    def strip_namespace( ref )
+      if ref =~ %r{(?:wip|rejected|review)/\S*/(.*)}
+        $1
+      else
+        ref
+      end
+    end
+
 
     def user_topic_name( branch )
       if branch =~ %r{^origin}
@@ -42,16 +50,16 @@ module GitTopic::Naming
       end
     end
 
-    def topic_parts( spec )
+    def topic_parts( ref )
       p = {}
-      parts = spec.split( '/' )
+      parts = ref.split( '/' )
       case parts.size
       when 2
         p[:user], p[:topic] = parts
       when 1
         p[:topic] = parts.first
       else
-        raise "Unexpected topic: #{spec}"
+        raise "Unexpected topic: #{ref}"
       end
       p
     end