git-pivotal-tracker 0.9.0

data/features/support/dsl/data.rb

@@ -0,0 +1,11 @@
+module GitPivotal
+  module FeatureHelpers
+    module Data
+      def data
+        @_dsl_data ||= {}
+      end
+    end
+  end
+end
+
+World(GitPivotal::FeatureHelpers::Data)

data/features/support/dsl/pivotal.rb

@@ -0,0 +1,76 @@
+module GitPivotal
+  module FeatureHelpers
+    module Pivotal
+      def pivotal_project
+        data[:pivotal_project] ||= (
+          PivotalTracker::Client.token = PIVOTAL_API_KEY
+          PivotalTracker::Project.find(PIVOTAL_TEST_PROJECT))
+      end
+      
+      def created_cards
+        data[:created_cards] ||= []
+      end
+      
+      def delete_created_cards
+       created_cards.each { |card| (card.delete rescue nil) }
+      end
+      
+      def current_card
+        data[:current_card]
+      end
+      
+      def refresh_current_card!
+        set_current_card pivotal_project.stories.find(current_card.id)
+      end
+      
+      def set_current_card(card)
+        data[:current_card] = card
+      end
+      
+      def create_test_story(type, options = {})
+        attrs = {
+          :name          => "a #{type}",
+          :story_type    => type.to_s,
+          :current_state => "unstarted",
+          :estimate      => (type.to_s == "feature" ? 1 : nil)
+        }.merge(options)
+        
+        story = pivotal_project.stories.create(attrs)
+        set_current_card story
+        created_cards << story
+        
+        # let data propagate on Pivotal
+        sleep 4
+        pivotal_project.stories.find(story.id)
+
+        story
+      end
+      
+      def comment_on_story(options = {})
+        current_card.notes.create options
+
+        # let data propagate on Pivotal
+        sleep 4
+      end
+
+      def update_test_story(options = {})
+        story = current_card || create_test_story("feature")
+        attrs = {
+          :current_state => "unstarted",
+          :estimate      => (story.story_type.to_s == "feature" ? 1 : nil)
+        }.merge(options)
+
+        story.update(attrs)
+
+        # let data propagate on Pivotal
+        sleep 4
+        pivotal_project.stories.find(story.id)
+        
+        story
+      end
+      
+    end
+  end
+end
+
+World(GitPivotal::FeatureHelpers::Pivotal)

data/features/support/env.rb

@@ -0,0 +1,6 @@
+$:.unshift('lib') unless $:.include?('lib')
+
+require 'aruba'
+require 'aruba/cucumber'
+require 'git-pivotal-tracker'
+require 'pivotal-tracker'

data/features/support/git-pivotal.rb

@@ -0,0 +1,69 @@
+require 'fileutils'
+require 'pry'
+
+PIVOTAL_API_KEY = "80f3c308cfdfbaa8f5a21aa524081690"
+PIVOTAL_TEST_PROJECT = 516377
+PIVOTAL_TEST_STORY = 27322725
+PIVOTAL_USER = "Robotic Zach"
+
+Before do
+  @aruba_io_wait_seconds = 1
+  @aruba_timeout_seconds = 60
+  build_temp_paths
+  set_env_variables
+end
+
+After do
+  # The features seem to have trouble repeating accurately without
+  # setting the test story to an unstarted feature for the next run.
+  delete_created_cards 
+end
+
+at_exit do
+  FileUtils.rm_r "tmp/aruba"
+  FileUtils.rm_r "tmp/origin.git"
+end
+
+def build_temp_paths
+  dir = File.expand_path(File.dirname(__FILE__))
+  test_repo = File.expand_path(File.join(dir, '..', 'test_repo'))
+  tmp = File.expand_path(File.join(dir, '..', '..', 'tmp'))
+  
+  FileUtils.cp_r "#{test_repo}/origin.git", "#{tmp}/origin.git"
+  `git clone #{tmp}/origin.git #{current_dir}/working.git`
+  
+  Dir.chdir(current_dir + "/working.git") do
+    system "git branch -D acceptance > /dev/null 2>&1"
+    system "git branch acceptance master > /dev/null 2>&1"
+  end
+end
+
+def set_env_variables
+  set_env "GIT_DIR", File.expand_path(File.join(current_dir, 'working.git', '.git'))
+  set_env "GIT_WORK_TREE", File.expand_path(File.join(current_dir, 'working.git'))
+  set_env "HOME", File.expand_path(current_dir)
+end
+
+
+def current_branch
+  `git symbolic-ref HEAD`.chomp.split('/').last
+end
+
+module RSpec
+  module Expectations
+    module DifferAsStringAcceptsArrays
+      def self.included(klass)
+        klass.class_eval do
+          alias_method :original_diff_as_string, :diff_as_string
+          define_method :diff_as_string do |data_new, data_old|
+            data_old = data_old.join if data_old.respond_to?(:join)
+            data_new = data_new.join if data_new.respond_to?(:join)
+            original_diff_as_string data_new, data_old
+          end
+        end
+      end
+    end
+      
+    Differ.send :include, DifferAsStringAcceptsArrays
+  end
+end

data/features/test_repo/origin.git/COMMIT_EDITMSG

@@ -0,0 +1 @@
+A blank repo for testing

data/features/test_repo/origin.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/features/test_repo/origin.git/config

@@ -0,0 +1,8 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+[pivotal]
+  project-id = 516377

data/features/test_repo/origin.git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

data/features/test_repo/origin.git/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

data/features/test_repo/origin.git/hooks/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

data/features/test_repo/origin.git/hooks/post-commit.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script that is called after a successful
+# commit is made.
+#
+# To enable this hook, rename this file to "post-commit".
+
+: Nothing

data/features/test_repo/origin.git/hooks/post-receive.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script for the "post-receive" event.
+#
+# The "post-receive" script is run after receive-pack has accepted a pack
+# and the repository has been updated.  It is passed arguments in through
+# stdin in the form
+#  <oldrev> <newrev> <refname>
+# For example:
+#  aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
+#
+# see contrib/hooks/ for a sample, or uncomment the next line and
+# rename the file to "post-receive".
+
+#. /usr/share/doc/git-core/contrib/hooks/post-receive-email

data/features/test_repo/origin.git/hooks/post-update.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

data/features/test_repo/origin.git/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:

data/features/test_repo/origin.git/hooks/pre-commit.sample

@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test "$(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0')"
+then
+	echo "Error: Attempt to add a non-ascii file name."
+	echo
+	echo "This can cause problems if you want to work"
+	echo "with people on other platforms."
+	echo
+	echo "To be portable it is advisable to rename the file ..."
+	echo
+	echo "If you know what you are doing you can disable this"
+	echo "check using:"
+	echo
+	echo "  git config hooks.allownonascii true"
+	echo
+	exit 1
+fi
+
+exec git diff-index --check --cached $against --

data/features/test_repo/origin.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".