git_pivotal_tracker 0.0.8 → 0.0.9

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 test.txt
+tmp

data/.rvmrc

@@ -1 +1 @@
-rvm use --create ruby-1.9.2-p180@git_pivotal_tracker
+rvm use --create ruby-1.9.2-p290@git_pivotal_tracker

data/Rakefile

@@ -1,2 +1,12 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:cucumber) do |t|
+  t.cucumber_opts = '--format progress'
+end
+
+task :default => [:cucumber, :spec]

data/cucumber.yml

@@ -0,0 +1,8 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/features/diagnostics.feature

@@ -0,0 +1,15 @@
+Feature: Diagnostics
+  In order to determine what Pivotal Tracker story I'm working on
+  As a developer
+  I want to be able to view the Pivotal Tracker story associated with my current topic branch
+
+  Background: A git repo for a project in Pivotal Tracker
+    Given the following git repo:
+      | Name                | Pivotal Tracker Api Token/Project Id    |
+      | git_pivotal_tracker | aa0469780e3d7322b17ab19de416c874/217457 |
+
+  Scenario: View the Pivotal Tracker Story for the Current Topic Branch
+    When I run `git-story` interactively
+      And I type ""
+      And I run `git-info`
+    Then the output should contain "feature-17553875-sample_feature"

data/features/getting_started.feature

@@ -0,0 +1,35 @@
+Feature: Getting Started
+  In order to begin work on an unstarted Pivotal Tracker story
+  As a developer
+  I want to be able to start a new git branch for the latest unstarted Pivotal Tracker story from the command line
+
+  Background: A git repo for a project in Pivotal Tracker
+    Given the following git repo:
+      | Name                | Pivotal Tracker Api Token/Project Id    |
+      | git_pivotal_tracker | aa0469780e3d7322b17ab19de416c874/217457 |
+
+  Scenario Outline: Begin Working on a Latest Unstarted Story
+    When I run `<command>` interactively
+      And I type ""
+      And I run `git branch`
+    Then the output should contain "<git-branch-name>"
+
+    Examples:
+      | command     | git-branch-name                 |
+      | git-story   | feature-17553875-sample_feature |
+      | git-feature | feature-17553875-sample_feature |
+      | git-chore   | chore-17553885-sample_chore     |
+      | git-bug     | bug-17553879-sample_bug         |
+
+  Scenario Outline: Begin Working on the Latest Unstarted Story in a Custom Branch
+    When I run `<command>` interactively
+      And I type "<custom-git-branch-name>"
+      And I run `git branch`
+    Then the output should contain "<custom-git-branch-name>"
+
+    Examples:
+      | command     | custom-git-branch-name              |
+      | git-story   | feature-17553875-custom_branch_name |
+      | git-feature | feature-17553875-custom_branch_name |
+      | git-chore   | chore-17553885-custom_branch_name   |
+      | git-bug     | bug-17553879-custom_branch_name     |

data/features/hooks/aruba.rb

@@ -0,0 +1,3 @@
+Before do
+  @aruba_timeout_seconds = 10
+end

data/features/step_definitions/git_steps.rb

@@ -0,0 +1,14 @@
+Given /^the following git repo:$/ do |table|
+  hash = table.hashes.first
+  api_token, project_id = hash['Pivotal Tracker Api Token/Project Id'].split '/'
+  steps %Q{
+    Given a directory named "#{hash[:Name]}"
+      And I cd to "#{hash[:Name]}"
+      And I run `git init`
+      And I run `git config --local pivotal.api-token #{api_token}`
+      And I run `git config --local pivotal.project-id #{project_id}`
+      And an empty file named "README"
+      And I run `git add .`
+      And I run `git commit -m "Initial Commit"`
+  }
+end

data/features/support/env.rb

@@ -0,0 +1 @@
+require 'aruba/cucumber'

data/git_pivotal_tracker.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version     = GitPivotalTracker::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ben Lindsey"]
-  s.email       = ["ben@carbonfive.com"]
+  s.email       = ["ben@cumulo.us"]
   s.homepage    = "https://github.com/blindsey/git_pivotal_tracker"
   s.summary     = "A git workflow integrated with Pivotal Tracker"
   s.description = "provides a set of git workflow tools to start and finish Pivotal Tracker stories in topic branches"
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "webmock"
+  s.add_development_dependency "aruba"
   s.add_runtime_dependency "grit"
   s.add_runtime_dependency "pivotal-tracker"
 

data/lib/git_pivotal_tracker/base.rb

@@ -69,16 +69,15 @@ module GitPivotalTracker
     private
 
     def parse_gitconfig
-      options[:api_token]          = repository.config['pivotal.api-token']
-      options[:project_id]         = repository.config['pivotal.project-id']
-      options[:integration_branch] = repository.config['pivotal.integration-branch']
-      options[:only_mine]          = repository.config['pivotal.only-mine']
-      options[:include_rejected]   = repository.config['pivotal.include-rejected']
-      options[:fast_forward]       = repository.config['pivotal.fast-forward']
-      options[:rebase]             = repository.config['pivotal.rebase']
-      options[:full_name]          = repository.config['pivotal.full-name'] || repository.config['user.name']
-      options[:verbose]            = repository.config['pivotal.verbose']
-      options[:use_ssl]            = repository.config['pivotal.use-ssl']
+      ['api-token', 'project-id', 'integration-branch'].each do |key|
+        options[key.sub(/-/, '_').to_sym] = repository.config["pivotal.#{key}"]
+      end
+
+      ['only-mine', 'include-rejected', 'fast-forward', 'rebase', 'verbose', 'use-ssl'].each do |key|
+        options[key.sub(/-/, '_').to_sym] = repository.config["pivotal.#{key}"] == '1'
+      end
+
+      options[:full_name] = repository.config['pivotal.full-name'] || repository.config['user.name']
     end
 
     def parse_argv(*args)

data/lib/git_pivotal_tracker/finish.rb

@@ -34,6 +34,9 @@ module GitPivotalTracker
         puts "Unable to mark Story #{story_id} as finished"
         return 1
       end
+    rescue Grit::Git::CommandFailed => e
+      puts "git error: #{e.err}"
+      return 1
     end
 
     private

data/lib/git_pivotal_tracker/info.rb

@@ -13,6 +13,9 @@ module GitPivotalTracker
       puts "Story:         #{story.name}"
       puts "Description:   #{story.description}"
 
+      notes = story.notes.all.collect(&:text).join("\n")
+      puts "Comments:      #{notes}"
+
       return 0
     end
   end

data/lib/git_pivotal_tracker/story.rb

@@ -30,6 +30,9 @@ module GitPivotalTracker
         puts "Unable to mark #{type} as started"
         return 1
       end
+    rescue Grit::Git::CommandFailed => e
+      puts "git error: #{e.err}"
+      return 1
     end
 
     def type
@@ -41,8 +44,8 @@ module GitPivotalTracker
     def fetch_story
       state = options[:include_rejected] ? "unstarted,rejected" : "unstarted"
       conditions = { :current_state => state, :limit => 1 }
+      conditions[:story_type] = type == 'story' ? 'bug,chore,feature' : type
       conditions[:owned_by] = "\"#{options[:full_name]}\"" if options[:only_mine]
-      conditions[:story_type] = type unless type == 'story'
       project.stories.all(conditions).first
     end
 

data/lib/git_pivotal_tracker/version.rb

@@ -1,3 +1,3 @@
 module GitPivotalTracker
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/spec/fixtures/notes.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notes type="array">
+  <note>
+    <id type="integer">12563167</id>
+    <text>Testing comments</text>
+    <author>Ben Lindsey</author>
+    <noted_at type="datetime">2011/12/05 05:27:33 UTC</noted_at>
+  </note>
+</notes>

data/spec/fixtures/story.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <story>
   <id>1234567890</id>
+  <url>http://www.pivotaltracker.com/story/show/1234567890</url>
   <name> Pause the film!</name>
   <description>As a moderator,
 I can pause the film

data/spec/git_pivotal_tracker/base_spec.rb

@@ -13,32 +13,14 @@ describe GitPivotalTracker::Base do
         subject.options[:integration_branch].should be_nil
       end
 
-      it "leaves fast_forward nil" do
-        subject.options[:fast_forward].should be_nil
-      end
-
-      it "leaves rebase nil" do
-        subject.options[:rebase].should be_nil
-      end
-
-      it "leaves verbose nil" do
-        subject.options[:verbose].should be_nil
-      end
-
-      it "leaves use_ssl nil" do
-        subject.options[:use_ssl].should be_nil
-      end
-
       it "leaves full_name nil" do
         subject.options[:full_name].should be_nil
       end
 
-      it "leaves include_rejected nil" do
-        subject.options[:include_rejected].should be_nil
-      end
-
-      it "leaves only_mine nil" do
-        subject.options[:only_mine].should be_nil
+      [:fast_forward, :rebase, :verbose, :use_ssl, :include_rejected, :only_mine].each do |key|
+        it "does not set #{key}" do
+          subject.options[key].should_not be
+        end
       end
     end
 
@@ -110,12 +92,12 @@ describe GitPivotalTracker::Base do
         stub_git_config({
           'user.name' => 'User Name',
           'pivotal.integration-branch' => 'development',
-          'pivotal.only-mine' => 1,
-          'pivotal.include-rejected' => 1,
-          'pivotal.fast-forward' => 1,
-          'pivotal.rebase' => 1,
-          'pivotal.verbose' => 1,
-          'pivotal.use-ssl' => 1
+          'pivotal.only-mine' => '1',
+          'pivotal.include-rejected' => '1',
+          'pivotal.fast-forward' => '1',
+          'pivotal.rebase' => '1',
+          'pivotal.verbose' => '1',
+          'pivotal.use-ssl' => '1'
         })
         subject = GitPivotalTracker::Base.new
       end
@@ -132,28 +114,34 @@ describe GitPivotalTracker::Base do
         subject.options[:project_id].should == '123'
       end
 
-      it "sets only_mine" do
-        subject.options[:only_mine].should be
-      end
-
-      it "sets include_rejected" do
-        subject.options[:include_rejected].should be
+      [:only_mine, :include_rejected, :fast_forward, :rebase, :verbose, :use_ssl].each do |key|
+        it "sets #{key}" do
+          subject.options[key].should be
+        end
       end
 
-      it "sets fast_forward" do
-        subject.options[:fast_forward].should be
-      end
-
-      it "sets rebase" do
-        subject.options[:rebase].should be
+      it "sets the full_name to the user name" do
+        subject.options[:full_name].should == 'User Name'
       end
+    end
 
-      it "sets verbose" do
-        subject.options[:verbose].should be
+    context "with options set to 0" do
+      before do
+        stub_git_config({
+          'pivotal.only-mine' => '0',
+          'pivotal.include-rejected' => '0',
+          'pivotal.fast-forward' => '0',
+          'pivotal.rebase' => '0',
+          'pivotal.verbose' => '0',
+          'pivotal.use-ssl' => '0'
+        })
+        subject = GitPivotalTracker::Base.new
       end
 
-      it "sets the full_name to the user name" do
-        subject.options[:full_name].should == 'User Name'
+      [:only_mine, :include_rejected, :fast_forward, :rebase, :verbose, :use_ssl].each do |key|
+        it "does not set #{key}" do
+          subject.options[key].should_not be
+        end
       end
     end
   end

data/spec/git_pivotal_tracker/info_spec.rb

@@ -2,15 +2,38 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe GitPivotalTracker::Story do
   describe "#run!" do
+    before do
+      stub_git_config
+      stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123').
+          to_return :body => File.read("#{FIXTURES_PATH}/project.xml")
+      @story = GitPivotalTracker::Info.new("-t", "8a8a8a8", "-p", "123")
+    end
+
     context "given no story ID is found" do
       before do
-        stub_git_config
-        @subject = GitPivotalTracker::Info.new
-        @subject.stub!(:story_id).and_return(nil)
+        @story.stub!(:story_id).and_return(nil)
       end
 
       it "fails" do
-        @subject.run!.should == 1
+        @story.run!.should == 1
+      end
+    end
+
+    context "given a story exists" do
+      before do
+        @story.stub!(:story_id).and_return('1234567890')
+        stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories/1234567890').
+            to_return :body => File.read("#{FIXTURES_PATH}/story.xml")
+        stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories/1234567890/notes').
+            to_return :body => File.read("#{FIXTURES_PATH}/notes.xml")
+      end
+
+      it "outputs correctly" do
+        @story.should_receive(:puts).with("URL:           http://www.pivotaltracker.com/story/show/1234567890")
+        @story.should_receive(:puts).with("Story:          Pause the film!")
+        @story.should_receive(:puts).with("Description:   As a moderator,\nI can pause the film\nIn order to allow another activity to take place (discussion, etc).")
+        @story.should_receive(:puts).with("Comments:      Testing comments")
+        @story.run!.should == 0
       end
     end
   end

data/spec/git_pivotal_tracker/story_spec.rb

@@ -10,7 +10,7 @@ describe GitPivotalTracker::Story do
 
     context "given there are no stories" do
       before do
-        stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted&limit=1').
+        stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted%20story_type:bug,chore,feature&limit=1').
             to_return :body => File.read("#{FIXTURES_PATH}/no_stories.xml")
       end
 
@@ -35,7 +35,7 @@ describe GitPivotalTracker::Story do
         before do
           @story = GitPivotalTracker::Story.new("-t", "8a8a8a8", "-p", "123", "--include-rejected")
 
-          stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted,rejected&limit=1').
+          stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted,rejected%20story_type:bug,chore,feature&limit=1').
               to_return :body => File.read("#{FIXTURES_PATH}/one_story.xml")
         end
 
@@ -48,7 +48,7 @@ describe GitPivotalTracker::Story do
       context "when the only-mine flag is set" do
         before do
           @story = GitPivotalTracker::Story.new("-t", "8a8a8a8", "-p", "123", "--full-name", "Ben Lindsey", "--only-mine")
-          stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted%20owned_by:%22Ben%20Lindsey%22&limit=1').
+          stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted%20story_type:bug,chore,feature%20owned_by:%22Ben%20Lindsey%22&limit=1').
               to_return :body => File.read("#{FIXTURES_PATH}/one_story.xml")
         end
 
@@ -60,7 +60,7 @@ describe GitPivotalTracker::Story do
 
       context "when the default options are used" do
         before do
-          stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted&limit=1').
+          stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted%20story_type:bug,chore,feature&limit=1').
               to_return :body => File.read("#{FIXTURES_PATH}/one_story.xml")
         end
 

metadata

@@ -1,66 +1,76 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git_pivotal_tracker
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.9
   prerelease: 
-  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Ben Lindsey
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-19 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70119800499000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70119800499000
+- !ruby/object:Gem::Dependency
   name: webmock
+  requirement: &70119800498540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70119800498540
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &70119800498120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: grit
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70119800498120
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: &70119800497700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: pivotal-tracker
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70119800497700
+- !ruby/object:Gem::Dependency
+  name: pivotal-tracker
+  requirement: &70119800497280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-description: provides a set of git workflow tools to start and finish Pivotal Tracker stories in topic branches
-email: 
-- ben@carbonfive.com
-executables: 
+  prerelease: false
+  version_requirements: *70119800497280
+description: provides a set of git workflow tools to start and finish Pivotal Tracker
+  stories in topic branches
+email:
+- ben@cumulo.us
+executables:
 - git-bug
 - git-chore
 - git-feature
@@ -69,10 +79,8 @@ executables:
 - git-story
 - prepare-commit-msg
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -86,6 +94,12 @@ files:
 - bin/git-info
 - bin/git-story
 - bin/prepare-commit-msg
+- cucumber.yml
+- features/diagnostics.feature
+- features/getting_started.feature
+- features/hooks/aruba.rb
+- features/step_definitions/git_steps.rb
+- features/support/env.rb
 - git_pivotal_tracker.gemspec
 - lib/git_pivotal_tracker.rb
 - lib/git_pivotal_tracker/base.rb
@@ -95,6 +109,7 @@ files:
 - lib/git_pivotal_tracker/version.rb
 - spec/fixtures/finish_story.xml
 - spec/fixtures/no_stories.xml
+- spec/fixtures/notes.xml
 - spec/fixtures/one_story.xml
 - spec/fixtures/project.xml
 - spec/fixtures/start_story.xml
@@ -104,37 +119,39 @@ files:
 - spec/git_pivotal_tracker/info_spec.rb
 - spec/git_pivotal_tracker/story_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/blindsey/git_pivotal_tracker
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A git workflow integrated with Pivotal Tracker
-test_files: 
+test_files:
+- features/diagnostics.feature
+- features/getting_started.feature
+- features/hooks/aruba.rb
+- features/step_definitions/git_steps.rb
+- features/support/env.rb
 - spec/fixtures/finish_story.xml
 - spec/fixtures/no_stories.xml
+- spec/fixtures/notes.xml
 - spec/fixtures/one_story.xml
 - spec/fixtures/project.xml
 - spec/fixtures/start_story.xml