git-topic 0.1.6.4 → 0.2.1

data/spec/git_topic_work_on_spec.rb

@@ -0,0 +1,121 @@
+require 'spec_helper'
+
+
+describe GitTopic do
+
+  describe "#work_on" do
+
+    share_examples_for "#work_on general cases" do
+
+      it "
+        should trim namespaces from args and output a warning
+      ".oneline do
+
+        git_branch.should_not                   == "wip/#{@user}/topic"
+        GitTopic.work_on "wip/#{@user}/topic"
+        git_branch.should                       == "wip/#{@user}/topic"
+      end
+
+      it "should trim partial namespaces (with implicit ‘user’)" do
+        git_branch.should_not                   == "wip/#{@user}/topic"
+        GitTopic.work_on "wip/topic"
+        git_branch.should                       == "wip/#{@user}/topic"
+      end
+
+    end
+
+    describe "in fresh" do
+      before( :each ) { use_repo( 'fresh' )}
+      after( :each )  { Dir.chdir( '..' )}
+
+      it_should_behave_like "#work_on general cases"
+
+      it "
+       should create (and switch to) a new branch with a name that matches the
+       given topic, in the wip namespace.  A remote tracking branch should also
+       be set up.
+      ".oneline do
+
+        GitTopic.work_on( 'topic' )
+        git_branch.should               == "wip/#{@user}/topic"
+        git_branch_remote.should        == 'origin'
+        git_branch_merge.should         == "refs/heads/wip/#{@user}/topic"
+      end
+
+      it "should fail if no topic is given" do
+        lambda { GitTopic.work_on( nil )}.should  raise_error
+      end
+
+      it "should provide feedback to the user" do
+        GitTopic.work_on( 'topic' )
+        $?.success?.should          == true
+        @output.should_not          be_nil
+        @output.should_not          be_empty
+      end
+
+    end
+
+    describe "in in-progress" do
+
+      before( :each ) { use_repo( 'in-progress' )}
+      after( :each )  { Dir.chdir( '..' )}
+
+      it_should_behave_like "#work_on general cases"
+
+      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
+
+        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
+          GitTopic.work_on  'pirates-etc',
+                            :upstream => "origin/review/#{@user}/pirates"
+        end.should_not raise_error
+
+        git_branch.should   == "wip/#{@user}/pirates-etc"
+        git_head.should     == 'c0838ed2ee8f2e83c8bda859fc5e332b92f0a5a3'
+      end
+
+      it "
+        should use (and then destroy) the rejected branch for the topic, if one
+        exists
+      ".oneline do
+
+        git_remote_branches.should        include( "rejected/#{@user}/krakens" )
+        GitTopic.work_on    'krakens'
+        git_branch.should                 == "wip/#{@user}/krakens"
+        git_remote_branches.should_not    include( "rejected/#{@user}/krakens" )
+        git_remote_branches.should        include( "wip/#{@user}/krakens" )
+        git_head.should                   == '44ffd9c9c8b52b201659e3ad318cdad6ec836b46'
+      end
+
+      it "
+        should report the presence of comments to the user, when the topic has
+        been rejected.
+      ".oneline do
+
+        git_remote_branches.should        include( "rejected/#{@user}/krakens" )
+        GitTopic.work_on    'krakens'
+        @output.should                    =~ /comments/
+      end
+
+      it "
+        should use (and then destroy) the review branch for the topic, if one
+        exists
+      ".oneline do
+
+        git_remote_branches.should        include( "rejected/#{@user}/krakens" )
+        GitTopic.work_on    'krakens'
+        git_branch.should                 == "wip/#{@user}/krakens"
+        git_remote_branches.should_not    include( "rejected/#{@user}/krakens" )
+        git_remote_branches.should        include( "wip/#{@user}/krakens" )
+        git_head.should                   == '44ffd9c9c8b52b201659e3ad318cdad6ec836b46'
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,12 @@
 # encoding: utf-8
+
+require 'fileutils'
+
 require 'git_topic'
 
 
+# Testing-specific monkeypatching # {{{
+
 # Disable caching on GitTopic for specs since we're calling the methods directly
 # rather than assuming atmoic invocations.
 class << GitTopic
@@ -24,6 +29,14 @@ class << GitTopic
     end
   end
   alias_method_chain  :git, :implicit_capture
+
+  def invoke_git_editor( file )
+    raise "
+      invoke_git_editor invoked with (#{file}).  If you expect this method to be
+      called, mock or stub it.
+    ".oneline
+  end
+
 end
 
 
@@ -52,3 +65,126 @@ class Object
     debugger
   end
 end
+
+# }}}
+
+
+Rspec.configure do |c|
+
+  c.before( :all ) do
+    @starting_dir   = Dir.pwd
+    @user           = ENV['USER'] || `whoami`
+  end
+
+  c.before( :each ) do
+    # setup the directories
+    FileUtils.rm_rf   './tmp'
+    FileUtils.mkdir   './tmp'
+
+    # Copy our repos into tmp
+    %w(fresh in-progress).each do |d|
+      FileUtils.mkdir "./tmp/#{d}"
+      FileUtils.cp_r "spec/template/#{d}",          "./tmp/#{d}/.git"
+    end
+    FileUtils.cp_r "spec/template/origin",          './tmp'
+    FileUtils.cp_r "spec/template/origin-fresh",    './tmp'
+
+    %w(origin origin-fresh fresh in-progress).each do |repo|
+      # set template branches to their proper name (i.e. matching @user)
+      Dir.chdir "./tmp/#{repo}"
+      git_branches.each do |orig_name|
+        new_name = orig_name.gsub( 'USER', @user )
+        system(
+          "git branch -m #{orig_name} #{new_name}"
+        ) unless orig_name == new_name
+        system "git fetch --prune > /dev/null 2> /dev/null"
+      end
+      if File.exists? ".git/refs/notes/reviews/USER"
+        FileUtils.mv  ".git/refs/notes/reviews/USER",
+                      ".git/refs/notes/reviews/#{@user}"
+      end
+      Dir.chdir @starting_dir
+    end
+    Dir.chdir         './tmp'
+
+    # capture output
+    @output         = ''
+    @err            = ''
+    $stdout.stub!( :write ) { |*args| @output.<<( *args )}
+    $stderr.stub!( :write ) { |*args| @err.<<( *args )}
+  end
+
+  c.after( :each ) { Dir.chdir @starting_dir }
+end
+
+
+# helpers # {{{
+
+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'
+end
+
+
+def git_branch
+  all_branches    = `git branch --no-color`.split( "\n" )
+  current_branch  = all_branches.find{|b| b =~ /^\*/}
+
+  current_branch[ 2..-1 ] unless current_branch.nil?
+end
+
+def git_head
+  `git rev-parse HEAD`.chomp
+end
+
+def git_origin_master
+  `git rev-parse origin/master`.chomp
+end
+
+def git_config( key )
+  `git config #{key}`.chomp
+end
+
+def git_branch_merge
+  git_config "branch.#{git_branch}.merge"
+end
+
+def git_branch_remote
+  git_config "branch.#{git_branch}.remote"
+end
+
+def git_branches
+  `git branch --no-color`.split( "\n" ).map do |bn|
+    bn.gsub /^\*?\s*/, ''
+  end
+end
+
+def git_remote_branches
+  `git branch -r --no-color`.split( "\n" ).map do |bn|
+    bn.gsub! %r{^\s*origin/}, ''
+    bn.gsub! %r{ ->.*$}, ''
+    bn
+  end
+end
+
+def git_notes_list( ref )
+  `git notes --ref #{ref}`.split( "\n" )
+end
+
+def git_notes_show( ref, commit='HEAD' )
+  `git notes --ref #{ref} show #{commit}`.chomp
+end
+
+def git_diff
+  `git diff --no-color`.chomp
+end
+
+
+def dirty_branch!
+  File.open( 'dirty', 'w' ){|f| f.puts "some content" }
+  system "git add -N dirty"
+end
+
+# }}}
+

metadata

@@ -4,10 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 6
-  - 4
-  version: 0.1.6.4
+  version: 0.2.1
 platform: ruby
 authors: 
 - David J. Hamilton
@@ -15,8 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -07:00
-default_executable: git-topic
+date: 2010-07-23 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -142,10 +141,11 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id009
-description: "\n      gem command around reviewed topic branches.  Supports workflow of the form:\n\n      # alexander:\n      git work-on <topic>\n      git done\n\n      # bismarck:\n      git status    # notice a review branch\n      git review <topic>\n      # happy, merge into master, push and cleanup\n      git accept\n\n      git review <topic2>\n      # unhappy\n      git reject\n\n      # alexander:\n      git status    # notice rejected topic\n      git work-on <topic>\n\n      see README.rdoc for more (any) details.\n    "
+description: "\n      gem command around reviewed topic branches.  Supports workflow of the form:\n\n      # alexander:\n      git work-on <topic>\n      git done\n\n      # bismarck:\n      git status    # notice a review branch\n      git review <topic>\n      # happy, merge into master, push and cleanup\n      git accept\n\n      git review <topic2>\n      # unhappy\n      git reject\n\n      # alexander:\n      git status    # notice rejected topic\n      git work-on <topic>\n\n      see README.rdoc for more (any) details.\n\n\n      To make use of bash autocompletion, you must do the following:\n\n        1.  Make sure you source share/completion.bash before you source git's completion.\n        2.  Optionally, copy git-topic-completion to your gem's bin directory.\n            This is to sidestep ruby issue 3465 which makes loading gems far too\n            slow for autocompletion.\n    "
 email: git-topic@hjdivad.com
 executables: 
 - git-topic
+- git-topic-completion
 extensions: []
 
 extra_rdoc_files: 
@@ -159,6 +159,8 @@ files:
 - .rvmrc
 - .vimproject
 - .vimrc
+- .vimspell.utf8.add
+- .vimspell.utf8.add.spl
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -167,16 +169,25 @@ files:
 - Rakefile
 - 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/comment.rb
 - lib/git_topic/git.rb
 - lib/git_topic/naming.rb
 - lib/tasks/annotations.rake
-- spec/git_topic_spec.rb
+- share/completion.bash
+- spec/bash_completion.rb
+- spec/comment_spec.rb
+- spec/git_topic_accept_spec.rb
+- spec/git_topic_comment_spec.rb
+- spec/git_topic_comments_spec.rb
+- spec/git_topic_done_spec.rb
+- spec/git_topic_install_aliases_spec.rb
+- spec/git_topic_reject_spec.rb
+- spec/git_topic_review_spec.rb
+- spec/git_topic_status_spec.rb
+- spec/git_topic_work_on_spec.rb
 - spec/spec_helper.rb
 - spec/template/origin-fresh/HEAD
 - spec/template/origin-fresh/RENAMED-REF
@@ -250,6 +261,8 @@ files:
 - 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
+- bin/git-topic
+- bin/git-topic-completion
 has_rdoc: true
 homepage: http://github.com/hjdivad/git-topic
 licenses: []
@@ -283,5 +296,15 @@ signing_key:
 specification_version: 3
 summary: git command around reviewed topic branches
 test_files: 
+- spec/git_topic_reject_spec.rb
+- spec/comment_spec.rb
+- spec/git_topic_comment_spec.rb
 - spec/spec_helper.rb
-- spec/git_topic_spec.rb
+- spec/git_topic_work_on_spec.rb
+- spec/git_topic_done_spec.rb
+- spec/bash_completion.rb
+- spec/git_topic_comments_spec.rb
+- spec/git_topic_install_aliases_spec.rb
+- spec/git_topic_status_spec.rb
+- spec/git_topic_accept_spec.rb
+- spec/git_topic_review_spec.rb

data/git-topic

@@ -1,13 +0,0 @@
-#!/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

@@ -1,190 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{git-topic}
-  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-21}
-  s.default_executable = %q{git-topic}
-  s.description = %q{
-      gem command around reviewed topic branches.  Supports workflow of the form:
-
-      # alexander:
-      git work-on <topic>
-      git done
-
-      # bismarck:
-      git status    # notice a review branch
-      git review <topic>
-      # happy, merge into master, push and cleanup
-      git accept
-
-      git review <topic2>
-      # unhappy
-      git reject
-
-      # alexander:
-      git status    # notice rejected topic
-      git work-on <topic>
-
-      see README.rdoc for more (any) details.
-    }
-  s.email = %q{git-topic@hjdivad.com}
-  s.executables = ["git-topic"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".autotest",
-     ".gitignore",
-     ".gvimrc",
-     ".rspec",
-     ".rvmrc",
-     ".vimproject",
-     ".vimrc",
-     "Gemfile",
-     "Gemfile.lock",
-     "History.txt",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "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",
-     "spec/template/origin/hooks/commit-msg.sample",
-     "spec/template/origin/hooks/post-commit.sample",
-     "spec/template/origin/hooks/post-receive.sample",
-     "spec/template/origin/hooks/post-update.sample",
-     "spec/template/origin/hooks/pre-applypatch.sample",
-     "spec/template/origin/hooks/pre-commit.sample",
-     "spec/template/origin/hooks/pre-rebase.sample",
-     "spec/template/origin/hooks/prepare-commit-msg.sample",
-     "spec/template/origin/hooks/update.sample",
-     "spec/template/origin/info/exclude",
-     "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/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/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"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{git command around reviewed topic branches}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/git_topic_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-      s.add_runtime_dependency(%q<trollop>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.16"])
-      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"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.16"])
-      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"])
-    s.add_dependency(%q<trollop>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.16"])
-    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
-