git-pivotal 0.2.3 → 0.8.0

data/.gitignore

@@ -2,3 +2,5 @@ pkg
 coverage
 *.gem
 *.swp
+tmp
+Gemfile.lock

data/CHANGELOG

@@ -1,3 +1,11 @@
+v 0.8.0
+- Drop home-rolled PivotalTracker API for pivotal-tracker gem
+- Add Gemfile for easier development
+- Add better test suite with Cucumber and Aruba
+- Add option for appending the branch name (rather than prepending) [Addy
+Naik]
+- Add new `git info` command [Addy Naik]
+
 v 0.2.3
 - Allow the developer to specify the integration branch for git finish [Graeme Mathieson]
 - Fixed bug which prevented chores from finishing successfully [Joshua Vial]
@@ -29,4 +37,4 @@ v 0.1.1
 v 0.1.0
 - Initial release
 - Basic framework for reading from Pivotal Tracker
-- git pick utility
+- git pick utility

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'spec/rake/spectask'
 
 $LOAD_PATH.unshift('lib')
 
@@ -14,13 +13,13 @@ begin
     gemspec.homepage = "http://github.com/trydionel/git-pivotal"
     gemspec.authors = ["Jeff Tucker", "Sam Stokes"]
     
-    gemspec.add_dependency "nokogiri"
-    gemspec.add_dependency "rest-client", "~>1.4.0"
     gemspec.add_dependency "builder"
+    gemspec.add_dependency "pivotal-tracker", "~>0.3.1"
     
-    gemspec.add_development_dependency "rspec"
+    gemspec.add_development_dependency "rspec", "~>2.5.0"
     gemspec.add_development_dependency "rcov"
-    gemspec.add_development_dependency "mocha"
+    gemspec.add_development_dependency "cucumber", "~>0.9.2"
+    gemspec.add_development_dependency "aruba", "~>0.2.3"
   end
   
   Jeweler::GemcutterTasks.new
@@ -28,8 +27,22 @@ rescue
   puts "Jeweler not available. Install it with: gem install jeweler"
 end
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--color']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'gems']
-end
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new do |t|
+    t.rspec_opts = ['--color']
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'gems']
+  end
+rescue LoadError => e
+  puts "RSpec not installed"
+end
+
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features) do |t|
+    t.cucumber_opts = "features --format pretty"
+  end
+rescue LoadError => e
+  puts "Cucumber not installed"
+end

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.8.0

data/bin/git-bug

@@ -2,7 +2,6 @@
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-require 'pivotal'
 require 'commands/bug'
 
 exit Commands::Bug.new(STDIN, STDOUT, *ARGV).run!

data/bin/git-chore

@@ -2,7 +2,6 @@
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-require 'pivotal'
 require 'commands/chore'
 
 exit Commands::Chore.new(STDIN, STDOUT, *ARGV).run!

data/bin/git-feature

@@ -2,7 +2,6 @@
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-require 'pivotal'
 require 'commands/feature'
 
 exit Commands::Feature.new(STDIN, STDOUT, *ARGV).run!

data/bin/git-finish

@@ -2,7 +2,6 @@
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-require 'pivotal'
 require 'commands/finish'
 
 exit Commands::Finish.new(STDIN, STDOUT, *ARGV).run!

data/bin/git-info

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'commands/info'
+
+exit Commands::Info.new(STDIN, STDOUT, *ARGV).run!

data/bin/git-pick

@@ -2,7 +2,6 @@
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-require 'pivotal'
 require 'commands/feature'
 
 STDOUT.puts "DEPRECATION WARNING: git pick has been deprecated.  Please use git feature instead."

data/features/bug.feature

@@ -0,0 +1,9 @@
+Feature: git bug
+
+  Background:
+    Given I have a Pivotal Tracker bug
+
+  Scenario: Verifying created branch
+    When I run "git-bug -k 10bfe281783e2bdc2d6592c0ea21e8d5 -p 52815 -D"
+    Then the output should contain "Switched to a new branch '5799841-bugfix'"
+    And I should be on the "5799841-bugfix" branch

data/features/chore.feature

@@ -0,0 +1,22 @@
+Feature: git chore
+
+  Background:
+    Given I have a Pivotal Tracker chore
+
+  Scenario: Executing with inline options
+    When I run "git-chore -k 10bfe281783e2bdc2d6592c0ea21e8d5 -p 52815 -D"
+    Then the output should contain "Switched to a new branch '5799841-chore'"
+    And I should be on the "5799841-chore" branch
+    
+  Scenario: Executing with git configuration
+    Given a file named ".gitconfig" with:
+      """
+      [pivotal]
+              api-token = 10bfe281783e2bdc2d6592c0ea21e8d5
+              full-name = Jeff Tucker
+              integration-branch = develop
+              project-id = 52815
+      """
+    When I run "git-chore -D"
+    Then the output should contain "Switched to a new branch '5799841-chore'"
+    And I should be on the "5799841-chore" branch  

data/features/feature.feature

@@ -0,0 +1,37 @@
+Feature: git feature
+
+  Background:
+    Given I have a Pivotal Tracker feature
+
+  Scenario: Executing with no settings
+    When I run "git-feature"
+    Then the output should contain:
+      """
+      Pivotal Tracker API Token and Project ID are required
+      """
+    And the exit status should be 1
+  
+  Scenario: Executing with inline options
+    When I run "git-feature -k 10bfe281783e2bdc2d6592c0ea21e8d5 -p 52815 -D"
+    Then the output should contain:
+      """
+      Retrieving latest features from Pivotal Tracker...
+      Story: Test Story
+      URL:   http://www.pivotaltracker.com/story/show/5799841
+      Updating feature status in Pivotal Tracker...
+      Switched to a new branch '5799841-feature'
+      """
+    And I should be on the "5799841-feature" branch
+
+  Scenario: Executing with git configuration
+    Given a file named ".gitconfig" with:
+      """
+      [pivotal]
+              api-token = 10bfe281783e2bdc2d6592c0ea21e8d5
+              full-name = Jeff Tucker
+              integration-branch = develop
+              project-id = 52815
+      """
+    When I run "git-feature -D"
+    Then the output should contain "Switched to a new branch '5799841-feature'"
+    And I should be on the "5799841-feature" branch

data/features/finish.feature

@@ -0,0 +1,79 @@
+Feature: git finish
+
+  Background:
+    Given I have a started Pivotal Tracker feature
+    And I am on the "5799841-feature" branch
+
+  Scenario: Executing with no settings
+    When I run "git-finish"
+    Then the output should contain:
+      """
+      Pivotal Tracker API Token and Project ID are required
+      """
+    And the exit status should be 1
+
+  Scenario: Excuting with inline settings
+    When I run "git-finish -k 10bfe281783e2bdc2d6592c0ea21e8d5 -p 52815"
+    Then the output should contain:
+      """
+      Marking Story 5799841 as finished...
+      Merging 5799841-feature into master
+      Removing 5799841-feature branch
+      """
+    And I should be on the "master" branch
+  
+  Scenario: Executing with git configuration
+    Given a file named ".gitconfig" with:
+      """
+      [pivotal]
+              api-token = 10bfe281783e2bdc2d6592c0ea21e8d5
+              full-name = Jeff Tucker
+              project-id = 52815
+      """
+    When I run "git-finish -k 10bfe281783e2bdc2d6592c0ea21e8d5 -p 52815"
+    Then the output should contain:
+      """
+      Marking Story 5799841 as finished...
+      Merging 5799841-feature into master
+      Removing 5799841-feature branch
+      """
+    And I should be on the "master" branch
+  
+  Scenario: Specifying an integration branch
+    Given I have a "develop" branch
+    And a file named ".gitconfig" with:
+      """
+      [pivotal]
+              api-token = 10bfe281783e2bdc2d6592c0ea21e8d5
+              full-name = Jeff Tucker
+              integration-branch = develop
+              project-id = 52815
+      """
+    When I run "git-finish -k 10bfe281783e2bdc2d6592c0ea21e8d5 -p 52815"
+    Then the output should contain:
+      """
+      Marking Story 5799841 as finished...
+      Merging 5799841-feature into develop
+      Removing 5799841-feature branch
+      """
+    And I should be on the "develop" branch
+
+  Scenario: Closing chore stories
+    Given I have a started Pivotal Tracker chore
+    And I am on the "5799841-chore" branch
+    And a file named ".gitconfig" with:
+      """
+      [pivotal]
+              api-token = 10bfe281783e2bdc2d6592c0ea21e8d5
+              full-name = Jeff Tucker
+              project-id = 52815
+      """
+    When I run "git-finish -k 10bfe281783e2bdc2d6592c0ea21e8d5 -p 52815"
+    Then the output should contain:
+      """
+      Marking Story 5799841 as finished...
+      Merging 5799841-chore into master
+      Removing 5799841-chore branch
+      """
+    And I should be on the "master" branch
+  

data/features/info.feature

@@ -0,0 +1,39 @@
+Feature: git info
+
+  Background:
+    Given I have a Pivotal Tracker feature
+    And I am on the "5799841-feature" branch
+
+  Scenario: Executing with no settings
+    When I run "git-info"
+    Then the output should contain:
+      """
+      Pivotal Tracker API Token and Project ID are required
+      """
+    And the exit status should be 1
+
+  Scenario: Executing with inline options
+    When I run "git-info -k 10bfe281783e2bdc2d6592c0ea21e8d5 -p 52815 -D"
+    Then the output should contain:
+      """
+      Story:         Test Story
+      URL:           http://www.pivotaltracker.com/story/show/5799841
+      Description:   This is the description!
+      """
+
+  Scenario: Executing with git configuration
+    Given a file named ".gitconfig" with:
+      """
+      [pivotal]
+              api-token = 10bfe281783e2bdc2d6592c0ea21e8d5
+              full-name = Jeff Tucker
+              integration-branch = develop
+              project-id = 52815
+      """
+    When I run "git-info"
+    Then the output should contain:
+      """
+      Story:         Test Story
+      URL:           http://www.pivotaltracker.com/story/show/5799841
+      Description:   This is the description!
+      """

data/features/step_definitions/steps.rb

@@ -0,0 +1,18 @@
+STORY_TYPE = /feature|bug|chore|release/
+STORY_STATE = /unscheduled|unstarted|started|finished|delivered|accepted|rejected/
+
+Given /^I have a(?:n)? (#{STORY_STATE})?\s?Pivotal Tracker (#{STORY_TYPE})$/ do |status, type|
+  update_test_story(type, status)
+end
+
+Given /^I am on the "([^"]*)" branch$/ do |branch|
+  `git checkout -b #{branch} > /dev/null 2>&1`
+end
+
+Given /^I have a "([^"]*)" branch$/ do |branch|
+  `git branch #{branch} > /dev/null 2>&1`
+end
+
+Then /^I should be on the "([^"]*)" branch$/ do |branch|
+  current_branch.should == branch
+end

data/features/support/env.rb

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

data/features/support/git-pivotal.rb

@@ -0,0 +1,47 @@
+require 'fileutils'
+
+PIVOTAL_API_KEY = "10bfe281783e2bdc2d6592c0ea21e8d5"
+PIVOTAL_TEST_PROJECT = 52815
+PIVOTAL_TEST_ID = 5799841
+
+Before do
+  build_temp_paths
+  set_env_variables
+end
+
+at_exit do
+  # The features seem to have trouble repeating accurately without
+  # setting the test story to an unstarted feature for the next run.
+  update_test_story("feature", "unstarted")
+end
+
+def build_temp_paths
+  _mkdir(current_dir)
+
+  test_repo = File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_repo'))
+  FileUtils.cp_r(test_repo, current_dir)
+  Dir.chdir(File.join(current_dir, 'test_repo')) do
+    FileUtils.mv('working.git', '.git')
+  end
+end
+
+def set_env_variables
+  set_env "GIT_DIR", File.expand_path(File.join(current_dir, 'test_repo', '.git'))
+  set_env "GIT_WORK_TREE", File.expand_path(File.join(current_dir, 'test_repo'))
+  set_env "HOME", File.expand_path(current_dir)
+end
+
+def update_test_story(type, status = nil)
+  PivotalTracker::Client.token = PIVOTAL_API_KEY
+  project = PivotalTracker::Project.find(PIVOTAL_TEST_PROJECT)
+  story   = project.stories.find(PIVOTAL_TEST_ID)
+  
+  story.update(:story_type    => type.to_s,
+               :current_state => status || "unstarted",
+               :estimate      => (type.to_s == "feature" ? 1 : nil))
+  sleep(4) # let the data propagate
+end
+
+def current_branch
+  `git symbolic-ref HEAD`.chomp.split('/').last
+end

data/features/test_repo/readme

@@ -0,0 +1 @@
+Testing repo

data/features/test_repo/working.git/COMMIT_EDITMSG

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

data/features/test_repo/working.git/HEAD

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

data/features/test_repo/working.git/config

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

data/features/test_repo/working.git/description

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

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