git_pivotal_tracker 0.0.2 → 0.0.3

data/.gitignore

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

data/README.md

@@ -1,4 +1,4 @@
-git-tracker
+git_pivotal_tracker
 ===========
 
 Inspired by [Hashrocket's blend of git and Pivotal Tracker](http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html) and [Carbon Five's article on effective git workflows](http://blog.carbonfive.com/2010/11/01/integrating-topic-branches-in-git/) and [the git-pivotal gem](https://github.com/trydionel/git-pivotal), I wanted a tool that makes the git workflow fun and simple.
@@ -18,7 +18,7 @@ These commands collect the first available story from your Pivotal Tracker proje
 
 * `git-finish`
 
-When on a topic branch, this command will fetch the latest integration branch ('master' by default), rebase your topic branch from it, merge the branch into the integration branch with no-fast-forword and push the integration branch to origin.
+When on a topic branch, this command will fetch the latest integration branch ('master' by default), rebase your topic branch from it, merge the branch into the integration branch with no-fast-forward and push the integration branch to origin.
 
 * `git-info`
 
@@ -49,9 +49,13 @@ The project id is best placed within your project's git config:
 
 ``git config -f .git/config pivotal.project-id 88888``
 
+If you project's access is setup to use HTTPS:
+
+``git config -f .git/config pivotal.use-ssl 1``
+
 If you prefer to merge back to a branch other than master when you've finished a story, you can configure that:
 
-``git config --global pivotal.integration-branch develop``
+``git config -f .git/config pivotal.integration-branch develop``
 
 If you prefer to fetch and rebase from origin before merging (default is no):
 

data/git_pivotal_tracker.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
 
   s.add_development_dependency "rspec"
+  s.add_development_dependency "webmock"
   s.add_runtime_dependency "grit"
   s.add_runtime_dependency "pivotal-tracker"
 

data/lib/git_pivotal_tracker/base.rb

@@ -33,6 +33,8 @@ module GitPivotalTracker
       end
 
       PivotalTracker::Client.token = options[:api_token]
+      PivotalTracker::Client.use_ssl = options[:use_ssl]
+
       nil
     end
 
@@ -47,7 +49,9 @@ module GitPivotalTracker
     end
 
     def story_id
-      @story_id ||= current_branch[/\d+/].to_i
+      if current_branch =~ /-(\d+)-/
+        $1
+      end
     end
 
     def project
@@ -72,18 +76,21 @@ module GitPivotalTracker
       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']
     end
 
     def parse_argv(*args)
       OptionParser.new do |opts|
         opts.banner = "Usage: git <feature|chore|bug> [options]"
-        opts.on("-k", "--api-key=", "Pivotal Tracker API key") { |k| options[:api_token] = k }
+        opts.on("-t", "--api-token=", "Pivotal Tracker API key") { |k| options[:api_token] = k }
         opts.on("-p", "--project-id=", "Pivotal Tracker project id") { |p| options[:project_id] = p }
         opts.on("-b", "--integration-branch=", "The branch to merge finished stories back down onto") { |b| options[:integration_branch] = b }
-        opts.on("-f", "--fast-forward=", "Merge topic branch with fast forward") { |f| options[:fast_foward] = f }
         opts.on("-n", "--full-name=", "Your Pivotal Tracker full name") { |n| options[:full_name] = n }
-        opts.on("-r", "--rebase=", "Fetch and rebase the integration branch before merging") { |r| options[:rebase] = r }
-        opts.on("-v", "--verbose=", "Verbose command logging") { |v| options[:verbose] = v }
+
+        opts.on("-F", "--fast-forward", "Merge topic branch with fast forward") { |f| options[:fast_forward] = f }
+        opts.on("-S", "--use-ssl", "Use SSL for connection to Pivotal Tracker") { |s| options[:use_ssl] = s }
+        opts.on("-R", "--rebase", "Fetch and rebase the integration branch before merging") { |r| options[:rebase] = r }
+        opts.on("-V", "--verbose", "Verbose command logging") { |v| options[:verbose] = v }
         opts.on_tail("-h", "--help", "This usage guide") { put opts.to_s; exit 0 }
       end.parse!(args)
     end

data/lib/git_pivotal_tracker/finish.rb

@@ -5,24 +5,25 @@ module GitPivotalTracker
       return 1 if super
 
       unless story_id
-        put "Branch name must contain a Pivotal Tracker story id"
+        puts "Branch name must contain a Pivotal Tracker story id"
         return 1
       end
 
       if options[:rebase]
         puts "Fetching origin and rebasing #{current_branch}"
-        log repository.git.fetch({:raise => true}, "origin")
-        log repository.git.rebase({:raise => true}, "origin/#{integration_branch}")
+        log repository.git.pull({:raise => true})
+        log repository.git.rebase({:raise => true}, integration_branch)
       end
 
       puts "Merging #{current_branch} into #{integration_branch}"
       log repository.git.checkout({:raise => true}, integration_branch)
 
-      flags = options[:fast_forward] ? {} : {:'no-ff' => true}
-      log repository.git.merge({:raise => true}.merge(flags), current_branch)
+      merge_options = {:raise => true}
+      merge_options[:no_ff] = true unless options[:fast_forward]
+      log repository.git.merge(merge_options, current_branch)
 
-      puts "Pushing #{integration_branch} to origin"
-      log repository.git.push({:raise => true}, "origin", integration_branch)
+      puts "Pushing #{integration_branch}"
+      log repository.git.push({:raise => true})
 
       puts "Marking Story #{story_id} as finished..."
       if story.update(:current_state => finished_state)

data/lib/git_pivotal_tracker/story.rb

@@ -24,7 +24,7 @@ module GitPivotalTracker
       log repository.git.checkout({:b => true, :raise => true}, branch)
 
       puts "Updating #{type} status in Pivotal Tracker..."
-      if story.update(:owned_by => options[:name], :current_state => :started)
+      if story.update(:owned_by => options[:full_name], :current_state => :started)
         puts "Success"
         return 0
       else
@@ -33,15 +33,14 @@ module GitPivotalTracker
       end
     end
 
-    private
-
     def type
       self.class.name.downcase.split(/::/).last
     end
 
+    private
+
     def fetch_story
-      # TODO: check for rejected stories as well
-      conditions = { :current_state => "unstarted", :limit => 1, :offset => 0 }
+      conditions = { :current_state => "unstarted", :limit => 1 }
       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.2'
+  VERSION = '0.0.3'
 end

data/spec/fixtures/finish_story.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<story>
+  <name>Pause the film</name>
+  <description>As a moderator,
+I can pause the film
+In order to allow another activity to take place (discussion, etc).</description>
+  <story_type>feature</story_type>
+  <estimate>2</estimate>
+  <current_state>finished</current_state>
+  <requested_by>Ben Lindsey</requested_by>
+  <owned_by>Ben Lindsey</owned_by>
+  <labels>moderate,2_needs_design</labels>
+  <project_id>123</project_id>
+  <other_id></other_id>
+  <integration_id></integration_id>
+  <created_at>2011-07-14T23:06:28+00:00</created_at>
+</story>

data/spec/fixtures/no_stories.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stories type="array" count="0" total="2" limit="0">
+</stories>

data/spec/fixtures/one_story.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stories type="array" count="1" total="2" limit="1">
+  <story>
+    <id type="integer">1234567890</id>
+    <project_id type="integer">123</project_id>
+    <story_type>feature</story_type>
+    <url>http://www.pivotaltracker.com/story/show/1234567890</url>
+    <estimate type="integer">2</estimate>
+    <current_state>unstarted</current_state>
+    <description>As a moderator,
+I can pause the film
+In order to allow another activity to take place (discussion, etc).</description>
+    <name>Pause the film</name>
+    <requested_by>Ben Lindsey</requested_by>
+    <created_at type="datetime">2011/07/14 23:06:28 UTC</created_at>
+    <updated_at type="datetime">2011/07/14 23:13:24 UTC</updated_at>
+    <labels>moderate,2_needs_design</labels>
+  </story>
+</stories>

data/spec/fixtures/project.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <id>123</id>
+  <name>Test Project</name>
+  <iteration_length type="integer">1</iteration_length>
+  <week_start_day>Monday</week_start_day>
+  <point_scale>0,1,2,3,5,8</point_scale>
+  <account>Carbon Five</account>
+  <start_date type="date">2011/07/18</start_date>
+  <first_iteration_start_time type="datetime">2011/07/18 07:00:00 UTC</first_iteration_start_time>
+  <current_iteration_number type="integer">1</current_iteration_number>
+  <enable_tasks type="boolean">true</enable_tasks>
+  <velocity_scheme>Average of 3 iterations</velocity_scheme>
+  <current_velocity>10</current_velocity>
+  <initial_velocity>10</initial_velocity>
+  <number_of_done_iterations_to_show>12</number_of_done_iterations_to_show>
+  <labels>1_needs_definition,2_needs_design,discuss,moderate</labels>
+  <last_activity_at type="datetime">2011/07/14 23:16:29 UTC</last_activity_at>
+  <allow_attachments>true</allow_attachments>
+  <public>false</public>
+  <use_https>false</use_https>
+  <bugs_and_chores_are_estimatable>false</bugs_and_chores_are_estimatable>
+  <commit_mode>false</commit_mode>
+  <memberships type="array">
+    <membership>
+      <id>1058581</id>
+      <person>
+        <email>ben@carbonfive.com</email>
+        <name>Ben Lindsey</name>
+        <initials>BL</initials>
+      </person>
+      <role>Owner</role>
+    </membership>
+  </memberships>
+  <integrations type="array">
+  </integrations>
+</project>

data/spec/fixtures/start_story.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<story>
+  <name>Pause the film</name>
+  <description>As a moderator,
+I can pause the film
+In order to allow another activity to take place (discussion, etc).</description>
+  <story_type>feature</story_type>
+  <estimate>2</estimate>
+  <current_state>started</current_state>
+  <requested_by>Ben Lindsey</requested_by>
+  <owned_by>Ben Lindsey</owned_by>
+  <labels>moderate,2_needs_design</labels>
+  <project_id>123</project_id>
+  <other_id></other_id>
+  <integration_id></integration_id>
+  <created_at>2011-07-14T23:06:28+00:00</created_at>
+</story>

data/spec/fixtures/story.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<story>
+  <id>1234567890</id>
+  <name>Pause the film</name>
+  <description>As a moderator,
+I can pause the film
+In order to allow another activity to take place (discussion, etc).</description>
+  <story_type>feature</story_type>
+  <estimate>2</estimate>
+  <current_state>started</current_state>
+  <requested_by>Ben Lindsey</requested_by>
+  <owned_by>Ben Lindsey</owned_by>
+  <labels>moderate,2_needs_design</labels>
+  <project_id>123</project_id>
+  <other_id></other_id>
+  <integration_id></integration_id>
+  <created_at>2011-07-14T23:06:28+00:00</created_at>
+</story>

data/spec/git_pivotal_tracker/base_spec.rb

@@ -0,0 +1,196 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe GitPivotalTracker::Base do
+  describe "#parse_argv" do
+
+    context "by default" do
+      before do
+        stub_git_config
+        subject = GitPivotalTracker::Base.new
+      end
+
+      it "leaves integration_branch nil" 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
+    end
+
+    it "sets the api_token" do
+      GitPivotalTracker::Base.new("--api-token", "8a8a8a8").options[:api_token].should == '8a8a8a8'
+      GitPivotalTracker::Base.new("-t", "8a8a8a8").options[:api_token].should == '8a8a8a8'
+    end
+
+    it "sets the project_id" do
+      GitPivotalTracker::Base.new("--project-id", "123").options[:project_id].should == '123'
+      GitPivotalTracker::Base.new("-p", "123").options[:project_id].should == '123'
+    end
+
+    it "sets the integration_branch" do
+      GitPivotalTracker::Base.new("--integration-branch", "development").options[:integration_branch].should == 'development'
+      GitPivotalTracker::Base.new("-b", "development").options[:integration_branch].should == 'development'
+    end
+
+    it "sets full_name" do
+      GitPivotalTracker::Base.new("--full-name", "Full Name").options[:full_name].should == 'Full Name'
+      GitPivotalTracker::Base.new("-n", "Full Name").options[:full_name].should == 'Full Name'
+    end
+
+    it "sets fast_forward" do
+      GitPivotalTracker::Base.new("--fast-forward").options[:fast_forward].should be
+      GitPivotalTracker::Base.new("-F").options[:fast_forward].should be
+    end
+
+    it "sets use_ssl" do
+      GitPivotalTracker::Base.new("--use-ssl").options[:use_ssl].should be
+      GitPivotalTracker::Base.new("-S").options[:use_ssl].should be
+    end
+
+    it "sets rebase" do
+      GitPivotalTracker::Base.new("--rebase").options[:rebase].should be
+      GitPivotalTracker::Base.new("-R").options[:rebase].should be
+    end
+
+    it "sets verbose" do
+      GitPivotalTracker::Base.new("--verbose").options[:verbose].should be
+      GitPivotalTracker::Base.new("-V").options[:verbose].should be
+    end
+  end
+
+  describe "#parse_gitconfig" do
+    context "with a full-name" do
+      before do
+        stub_git_config 'pivotal.full-name' => 'Full Name', 'user.name' => 'User Name'
+        subject = GitPivotalTracker::Base.new
+      end
+
+      it "sets the full_name to the full name" do
+        subject.options[:full_name].should == 'Full Name'
+      end
+    end
+
+    context "with no full-name" do
+      before do
+        stub_git_config({
+          'user.name' => 'User Name',
+          'pivotal.integration-branch' => 'development',
+          'pivotal.fast-forward' => 1,
+          'pivotal.rebase' => 1,
+          'pivotal.verbose' => 1,
+          'pivotal.use-ssl' => 1
+        })
+        subject = GitPivotalTracker::Base.new
+      end
+
+      it "sets use_ssl" do
+        subject.options[:use_ssl].should be
+      end
+
+      it "sets the api_token" do
+        subject.options[:api_token].should == '8a8a8a8'
+      end
+
+      it "sets the project_id" do
+        subject.options[:project_id].should == '123'
+      end
+
+      it "sets fast_forward" do
+        subject.options[:fast_forward].should be
+      end
+
+      it "sets rebase" do
+        subject.options[:rebase].should be
+      end
+
+      it "sets verbose" do
+        subject.options[:verbose].should be
+      end
+
+      it "sets the full_name to the user name" do
+        subject.options[:full_name].should == 'User Name'
+      end
+    end
+  end
+
+  describe ".new" do
+    context "given an invalid git root" do
+      before do
+        @current_dir = Dir.pwd
+        Dir.chdir("/")
+      end
+
+      it "fails to initialize" do
+        expect { GitPivotalTracker::Base.new }.to raise_error "No .git directory found"
+      end
+
+      after do
+        Dir.chdir @current_dir
+      end
+    end
+
+    context "given no prepare-commit-msg hook" do
+      before do
+        File.delete ".git/hooks/prepare-commit-msg"
+        GitPivotalTracker::Base.new
+      end
+
+      it "installs the hook" do
+        File.executable?(".git/hooks/prepare-commit-msg").should be
+      end
+    end
+  end
+
+  describe "#run!" do
+    context "given a config with an api token and a project id" do
+      before do
+        stub_git_config
+        subject = GitPivotalTracker::Base.new
+        PivotalTracker::Client.should_receive(:token=).with('8a8a8a8')
+      end
+
+      it "succeeds" do
+        subject.run!.should be_nil
+      end
+    end
+
+    context "given the config has no api token" do
+      before do
+        stub_git_config 'pivotal.api-token' => nil
+        subject = GitPivotalTracker::Base.new
+      end
+
+      it "fails" do
+        subject.run!.should == 1
+      end
+    end
+
+    context "given the config has no project id" do
+      before do
+        stub_git_config 'pivotal.project-id' => nil
+        subject = GitPivotalTracker::Base.new
+      end
+
+      it "fails" do
+        subject.run!.should == 1
+      end
+    end
+  end
+end

data/spec/git_pivotal_tracker/finish_spec.rb

@@ -0,0 +1,84 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe GitPivotalTracker::Finish do
+
+  before do
+    stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123').
+        to_return :body => File.read("#{FIXTURES_PATH}/project.xml")
+    stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories/1234567890').
+        to_return :body => File.read("#{FIXTURES_PATH}/story.xml")
+    @current_head = finish.repository.head
+  end
+
+  after do
+    puts finish.repository.git.checkout({}, @current_head.name)
+    puts finish.repository.git.reset({}, @current_head.commit.sha)
+  end
+
+  let(:finish) { GitPivotalTracker::Finish.new("-t", "8a8a8a8", "-p", "123") }
+
+  context "given I am not on a topic branch" do
+    before do
+      @new_branch = 'invalid-topic-branch'
+      finish.repository.git.branch({:D => true}, @new_branch)
+      finish.repository.git.checkout({:b => true, :raise => true}, @new_branch)
+    end
+
+    it "fails" do
+      finish.run!.should == 1
+    end
+  end
+
+  context "given I am on a topic branch with a commit" do
+    before do
+      finish.options[:integration_branch] = @current_head.name
+
+      finish_xml = File.read("#{FIXTURES_PATH}/finish_story.xml")
+      stub_request(:put, 'http://www.pivotaltracker.com/services/v3/projects/123/stories/1234567890').
+          with(:body => finish_xml).to_return(:body => finish_xml)
+
+      @repo = finish.repository
+      @new_branch = "testing-1234567890-branch_name"
+      @repo.git.branch({:D => true}, @new_branch)
+      @repo.git.checkout({:b => true, :raise => true}, @new_branch)
+
+      index = @repo.index
+      index.read_tree @new_branch
+      message = "Test commit: #{rand()}"
+      index.add('test.txt', message)
+      @sha = index.commit(message, [@repo.heads.detect { |h| h.name == @new_branch }.commit], nil, nil, @new_branch)
+
+      @repo.git.should_receive(:push).with(:raise => true)
+    end
+
+    it "merges the topic branch into the integration branch with a merge commit" do
+      finish.run!.should == 0
+      @repo.head.name.should == @current_head.branch
+      @repo.commits.first.parents.should have(2).items
+      @repo.heads.detect { |h| h.name == @current_head.name }.commit.sha.should == @sha
+    end
+
+    context "when I have rebase turned on" do
+      before do
+        finish.options[:rebase] = 1
+        finish.repository.git.should_receive(:pull).with(:raise => true)
+        finish.repository.git.should_receive(:rebase).with({:raise => true}, @current_head.name)
+      end
+
+      it "succeeds" do
+        finish.run!.should == 0
+      end
+    end
+
+    context "when I have fast forward turned on" do
+      before do
+        finish.options[:fast_forward] = 1
+      end
+
+      it "merges the topic branch without a merge commit" do
+        finish.run!.should == 0
+        @repo.heads.detect { |h| h.name == @current_head.name }.commit.sha.should == @sha
+      end
+    end
+  end
+end

data/spec/git_pivotal_tracker/story_spec.rb

@@ -0,0 +1,99 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe GitPivotalTracker::Story do
+  describe "#run!" do
+    before do
+      stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123').
+          to_return :body => File.read("#{FIXTURES_PATH}/project.xml")
+    end
+
+    let(:story) { GitPivotalTracker::Story.new("-t", "8a8a8a8", "-p", "123") }
+
+    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').
+            to_return :body => File.read("#{FIXTURES_PATH}/no_stories.xml")
+      end
+
+      it "fails" do
+        story.run!.should == 1
+      end
+    end
+
+    context "given there is a story" do
+      before do
+        start_xml = File.read("#{FIXTURES_PATH}/start_story.xml")
+        stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted&limit=1').
+            to_return :body => File.read("#{FIXTURES_PATH}/one_story.xml")
+        stub_request(:put, 'http://www.pivotaltracker.com/services/v3/projects/123/stories/1234567890').
+            with(:body => start_xml).to_return(:body => start_xml)
+
+        @current_branch = story.repository.head.name
+      end
+
+      context "then I accept the default branch suffix" do
+        before do
+          @expected_branch = 'feature-1234567890-pause_the_film'
+          story.repository.git.branch({:D => true}, @expected_branch)
+
+          story.should_receive(:gets).and_return "\n"
+          story.run!
+        end
+
+        it "creates a new branch" do
+          story.repository.head.name.should == @expected_branch
+        end
+      end
+
+      context "then I customize the branch suffix" do
+        before do
+          @expected_branch = 'feature-1234567890-new_name'
+          story.repository.git.branch({:D => true}, @expected_branch)
+
+          story.should_receive(:gets).and_return "new_name\n"
+          story.run!
+        end
+
+        it "creates a new branch" do
+          story.repository.head.name.should == @expected_branch
+        end
+      end
+
+      after do
+        story.repository.git.checkout({:raise => true}, @current_branch)
+      end
+    end
+
+  end
+
+  describe "#type" do
+    it "is a story" do
+      GitPivotalTracker::Story.new.type.should == 'story'
+    end
+  end
+end
+
+describe GitPivotalTracker::Bug do
+  describe "#type" do
+    it "is a bug" do
+      GitPivotalTracker::Bug.new.type.should == 'bug'
+    end
+  end
+end
+
+describe GitPivotalTracker::Feature do
+  describe "#type" do
+    it "is a feature" do
+      GitPivotalTracker::Feature.new.type.should == 'feature'
+    end
+  end
+end
+
+describe GitPivotalTracker::Chore do
+  describe "#type" do
+    it "is a chore" do
+      GitPivotalTracker::Chore.new.type.should == 'chore'
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,6 +1,13 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib git_pivotal_tracker]))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-Spec::Runner.configure do |config|
+require 'git_pivotal_tracker'
+require 'rspec'
+require 'webmock/rspec'
+
+FIXTURES_PATH = File.join(File.dirname(__FILE__), 'fixtures')
+
+RSpec.configure do |config|
   # == Mock Framework
   #
   # RSpec uses it's own mocking framework by default. If you prefer to
@@ -10,3 +17,11 @@ Spec::Runner.configure do |config|
   # config.mock_with :flexmock
   # config.mock_with :rr
 end
+
+def stub_git_config(opts = {})
+  git_options = {
+    "pivotal.api-token" => "8a8a8a8",
+    "pivotal.project-id" => "123"
+  }.merge opts
+  Grit::Repo.stub!(:new).and_return mock('Grit::Repo', :config => git_options)
+end

metadata

@@ -2,7 +2,7 @@
 name: git_pivotal_tracker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ben Lindsey
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-14 00:00:00 -07:00
+date: 2011-07-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +25,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: grit
+  name: webmock
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -33,10 +33,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: pivotal-tracker
+  name: grit
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -46,6 +46,17 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: pivotal-tracker
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    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
@@ -82,7 +93,15 @@ files:
 - lib/git_pivotal_tracker/info.rb
 - lib/git_pivotal_tracker/story.rb
 - lib/git_pivotal_tracker/version.rb
-- spec/git_pivotal_tracker_spec.rb
+- spec/fixtures/finish_story.xml
+- spec/fixtures/no_stories.xml
+- spec/fixtures/one_story.xml
+- spec/fixtures/project.xml
+- spec/fixtures/start_story.xml
+- spec/fixtures/story.xml
+- spec/git_pivotal_tracker/base_spec.rb
+- spec/git_pivotal_tracker/finish_spec.rb
+- spec/git_pivotal_tracker/story_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: https://github.com/blindsey/git_pivotal_tracker
@@ -113,5 +132,13 @@ signing_key:
 specification_version: 3
 summary: A git workflow integrated with Pivotal Tracker
 test_files: 
-- spec/git_pivotal_tracker_spec.rb
+- spec/fixtures/finish_story.xml
+- spec/fixtures/no_stories.xml
+- spec/fixtures/one_story.xml
+- spec/fixtures/project.xml
+- spec/fixtures/start_story.xml
+- spec/fixtures/story.xml
+- spec/git_pivotal_tracker/base_spec.rb
+- spec/git_pivotal_tracker/finish_spec.rb
+- spec/git_pivotal_tracker/story_spec.rb
 - spec/spec_helper.rb

data/spec/git_pivotal_tracker_spec.rb

@@ -1,4 +0,0 @@
-require File.join(File.dirname(__FILE__), %w[spec_helper])
-
-describe GitPivotalTracker do
-end