git-pivotal 0.2.3 → 0.8.0

data/features/test_repo/working.git/hooks/pre-rebase.sample

@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".

data/features/test_repo/working.git/hooks/prepare-commit-msg.sample

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

data/features/test_repo/working.git/hooks/update.sample

@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

data/features/test_repo/working.git/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

data/features/test_repo/working.git/logs/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 10ecf2b7ce989f01f3f7266e712b48d9275f2635 Jeff Tucker <trydionel@gmail.com> 1279979728 -0400	commit (initial): A blank repo for testing

data/features/test_repo/working.git/logs/refs/heads/master

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 10ecf2b7ce989f01f3f7266e712b48d9275f2635 Jeff Tucker <trydionel@gmail.com> 1279979728 -0400	commit (initial): A blank repo for testing

data/features/test_repo/working.git/refs/heads/master

@@ -0,0 +1 @@
+10ecf2b7ce989f01f3f7266e712b48d9275f2635

data/git-pivotal.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-pivotal}
-  s.version = "0.2.3"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Tucker", "Sam Stokes"]
-  s.date = %q{2010-07-23}
+  s.date = %q{2011-04-10}
   s.description = %q{A collection of git utilities to ease integration with Pivotal Tracker}
   s.email = %q{jeff@trydionel.com}
-  s.executables = ["git-bug", "git-chore", "git-feature", "git-finish", "git-pick"]
+  s.executables = ["git-bug", "git-chore", "git-feature", "git-finish", "git-info", "git-pick"]
   s.extra_rdoc_files = [
     "LICENSE"
   ]
@@ -26,22 +26,48 @@ Gem::Specification.new do |s|
      "bin/git-chore",
      "bin/git-feature",
      "bin/git-finish",
+     "bin/git-info",
      "bin/git-pick",
+     "features/bug.feature",
+     "features/chore.feature",
+     "features/feature.feature",
+     "features/finish.feature",
+     "features/info.feature",
+     "features/step_definitions/steps.rb",
+     "features/support/env.rb",
+     "features/support/git-pivotal.rb",
+     "features/test_repo/readme",
+     "features/test_repo/working.git/COMMIT_EDITMSG",
+     "features/test_repo/working.git/HEAD",
+     "features/test_repo/working.git/config",
+     "features/test_repo/working.git/description",
+     "features/test_repo/working.git/hooks/applypatch-msg.sample",
+     "features/test_repo/working.git/hooks/commit-msg.sample",
+     "features/test_repo/working.git/hooks/post-commit.sample",
+     "features/test_repo/working.git/hooks/post-receive.sample",
+     "features/test_repo/working.git/hooks/post-update.sample",
+     "features/test_repo/working.git/hooks/pre-applypatch.sample",
+     "features/test_repo/working.git/hooks/pre-commit.sample",
+     "features/test_repo/working.git/hooks/pre-rebase.sample",
+     "features/test_repo/working.git/hooks/prepare-commit-msg.sample",
+     "features/test_repo/working.git/hooks/update.sample",
+     "features/test_repo/working.git/index",
+     "features/test_repo/working.git/info/exclude",
+     "features/test_repo/working.git/logs/HEAD",
+     "features/test_repo/working.git/logs/refs/heads/master",
+     "features/test_repo/working.git/objects/0c/6f7b1384910d1a2f137590095f008a06c7e00c",
+     "features/test_repo/working.git/objects/10/ecf2b7ce989f01f3f7266e712b48d9275f2635",
+     "features/test_repo/working.git/objects/a5/71d56305df09fb060f6ccb730b46080d305beb",
+     "features/test_repo/working.git/refs/heads/master",
      "git-pivotal.gemspec",
      "lib/commands/base.rb",
      "lib/commands/bug.rb",
      "lib/commands/chore.rb",
      "lib/commands/feature.rb",
      "lib/commands/finish.rb",
+     "lib/commands/info.rb",
      "lib/commands/pick.rb",
-     "lib/pivotal.rb",
-     "lib/pivotal/api.rb",
-     "lib/pivotal/associations.rb",
-     "lib/pivotal/attributes.rb",
-     "lib/pivotal/base.rb",
-     "lib/pivotal/collection.rb",
-     "lib/pivotal/project.rb",
-     "lib/pivotal/story.rb",
+     "lib/git-pivotal.rb",
      "readme.markdown",
      "spec/commands/base_spec.rb",
      "spec/commands/bug_spec.rb",
@@ -50,14 +76,6 @@ Gem::Specification.new do |s|
      "spec/commands/finish_spec.rb",
      "spec/factories.rb",
      "spec/factory.rb",
-     "spec/pivotal/api_spec.rb",
-     "spec/pivotal/associations_spec.rb",
-     "spec/pivotal/attributes_spec.rb",
-     "spec/pivotal/base_spec.rb",
-     "spec/pivotal/collection_spec.rb",
-     "spec/pivotal/project_spec.rb",
-     "spec/pivotal/story_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/trydionel/git-pivotal}
@@ -73,13 +91,6 @@ Gem::Specification.new do |s|
      "spec/commands/finish_spec.rb",
      "spec/factories.rb",
      "spec/factory.rb",
-     "spec/pivotal/api_spec.rb",
-     "spec/pivotal/associations_spec.rb",
-     "spec/pivotal/attributes_spec.rb",
-     "spec/pivotal/base_spec.rb",
-     "spec/pivotal/collection_spec.rb",
-     "spec/pivotal/project_spec.rb",
-     "spec/pivotal/story_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -88,27 +99,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, ["~> 1.4.0"])
       s.add_runtime_dependency(%q<builder>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_runtime_dependency(%q<pivotal-tracker>, ["~> 0.3.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<aruba>, ["~> 0.2.3"])
     else
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<rest-client>, ["~> 1.4.0"])
       s.add_dependency(%q<builder>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<pivotal-tracker>, ["~> 0.3.1"])
+      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<cucumber>, ["~> 0.9.2"])
+      s.add_dependency(%q<aruba>, ["~> 0.2.3"])
     end
   else
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<rest-client>, ["~> 1.4.0"])
     s.add_dependency(%q<builder>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<pivotal-tracker>, ["~> 0.3.1"])
+    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<cucumber>, ["~> 0.9.2"])
+    s.add_dependency(%q<aruba>, ["~> 0.2.3"])
   end
 end
 

data/lib/commands/base.rb

@@ -1,48 +1,54 @@
+require 'rubygems'
+require 'pivotal-tracker'
 require 'optparse'
 
 module Commands
   class Base
 
     attr_accessor :input, :output, :options
-  
+
     def initialize(input=STDIN, output=STDOUT, *args)
       @input = input
       @output = output
       @options = {}
-      
+
       parse_gitconfig
       parse_argv(*args)
     end
-  
+
     def put(string, newline=true)
       @output.print(newline ? string + "\n" : string) unless options[:quiet]
     end
 
     def sys(cmd)
       put cmd if options[:verbose]
-      system cmd
+      system "#{cmd} > /dev/null 2>&1"
     end
 
     def get(cmd)
       put cmd if options[:verbose]
       `#{cmd}`
     end
-    
+
     def run!
       unless options[:api_token] && options[:project_id]
         put "Pivotal Tracker API Token and Project ID are required"
         return 1
       end
+
+      PivotalTracker::Client.token = options[:api_token]
+
+      return 0
     end
 
   protected
 
-    def project
-      @project ||= api.projects.find(:id => options[:project_id])
+    def current_branch
+      @current_branch ||= get('git symbolic-ref HEAD').chomp.split('/').last
     end
 
-    def api
-      @api ||= Pivotal::Api.new(:api_token => options[:api_token])
+    def project
+      @project ||= PivotalTracker::Project.find(options[:project_id])
     end
 
     def integration_branch
@@ -57,12 +63,14 @@ module Commands
       name               = get("git config --get pivotal.full-name").strip
       integration_branch = get("git config --get pivotal.integration-branch").strip
       only_mine          = get("git config --get pivotal.only-mine").strip
+      append_name        = get("git config --get pivotal.append-name").strip
 
       options[:api_token]          = token              unless token == ""
       options[:project_id]         = id                 unless id == ""
       options[:full_name]          = name               unless name == ""
       options[:integration_branch] = integration_branch unless integration_branch == ""
       options[:only_mine]          = (only_mine != "")  unless name == ""
+      options[:append_name]        = (append_name != "")
     end
 
     def parse_argv(*args)
@@ -73,6 +81,8 @@ module Commands
         opts.on("-n", "--full-name=", "Pivotal Trakcer full name") { |n| options[:full_name] = n }
         opts.on("-b", "--integration-branch=", "The branch to merge finished stories back down onto") { |b| options[:integration_branch] = b }
         opts.on("-m", "--only-mine", "Only select Pivotal Tracker stories assigned to you") { |m| options[:only_mine] = m }
+        opts.on("-a", "--append-name", "whether to append the story id to branch name instead of prepend") { |a| options[:append_name] = a }
+        opts.on("-D", "--defaults", "Accept default options. No-interaction mode") { |d| options[:defaults] = d }
         opts.on("-q", "--quiet", "Quiet, no-interaction mode") { |q| options[:quiet] = q }
         opts.on("-v", "--[no-]verbose", "Run verbosely") { |v| options[:verbose] = v }
         opts.on_tail("-h", "--help", "This usage guide") { put opts.to_s; exit 0 }

data/lib/commands/finish.rb

@@ -2,17 +2,17 @@ require 'commands/base'
 
 module Commands
   class Finish < Base
-  
+
     def run!
       super
-      
+
       unless story_id
         put "Branch name must contain a Pivotal Tracker story id"
         return 1
       end
 
       put "Marking Story #{story_id} as finished..."
-      if story.update_attributes(:current_state => story.finished_state)
+      if story.update(:current_state => finished_state)
         put "Merging #{current_branch} into #{integration_branch}"
         sys "git checkout #{integration_branch}"
         sys "git merge --no-ff #{current_branch}"
@@ -23,24 +23,27 @@ module Commands
         return 0
       else
         put "Unable to mark Story #{story_id} as finished"
-        
+
         return 1
       end
     end
 
   protected
 
-    # FIXME: clunky way to get branch name... need better method
-    def current_branch
-      @current_branch ||= get('git status | head -1').gsub(/^.+On branch /, '').chomp
+    def finished_state
+      if story.story_type == "chore"
+        "accepted"
+      else
+        "finished"
+      end
     end
 
     def story_id
-      current_branch[/\d+/]
+      current_branch[/\d+/].to_i
     end
 
     def story
-      @story ||= project.stories.find(:id => story_id)
+      @story ||= project.stories.find(story_id)
     end
   end
 end

data/lib/commands/info.rb

@@ -0,0 +1,31 @@
+require 'commands/base'
+
+module Commands
+  class Info < Base
+
+    def run!
+      super
+
+      unless story_id
+        put "Branch name must contain a Pivotal Tracker story id"
+        return 1
+      end
+
+      put "Story:         #{story.name}"
+      put "URL:           #{story.url}"
+      put "Description:   #{story.description}"
+
+      return 0
+    end
+
+  protected
+
+    def story_id
+      current_branch[/\d+/].to_i
+    end
+
+    def story
+      @story ||= project.stories.find(story_id)
+    end
+  end
+end