pt-flow 0.7.0 → 0.8.0

data/README.md

@@ -15,14 +15,14 @@ Set up webhook for Pivotal Tracker:
 ### Usage
 
 ```bash
-$ flow start
+$ git start
 # shows lists of tasks - choosing one starts/assigns the task on pt and checks out a new branch.
 
-$ flow finish
+$ git finish
 # pushes branch, finishes task on pt, and creates a pull request
 # reviewer comments :+1: to approve on github
 # committer presses merge button on github which delivers task on pivotal tracker
 
-$ flow cleanup
+$ git cleanup
 # cleans up local/remote story branches already merged with current release branch
 ```

data/bin/git-cleanup

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'pt-flow'
+
+PT::Flow::UI.new('cleanup', ARGV)

data/bin/git-create

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'pt-flow'
+
+PT::Flow::UI.new('create', ARGV)

data/bin/git-finish

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'pt-flow'
+
+PT::Flow::UI.new('finish', ARGV)

data/bin/git-start

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'pt-flow'
+
+PT::Flow::UI.new('start', ARGV)

data/lib/pt-flow/ui.rb

@@ -1,9 +1,8 @@
 module PT::Flow
   class UI < PT::UI
 
-    def my_work #default command
-      super
-      help
+    def initialize(command, args = [])
+      super [command] + (args)
     end
 
     def start
@@ -20,15 +19,6 @@ module PT::Flow
       run("git checkout -b #{Branch.from_task(task)}")
     end
 
-    def finish
-      run("git push origin #{branch} -u")
-      task = PivotalTracker::Story.find(branch.task_id, @project.id)
-      title = task.name.gsub('"',"'") + " [Delivers ##{task.id}]"
-
-      run("hub pull-request -b #{branch.target} -h #{repo.user}:#{branch} \"#{title}\"")
-      finish_task(task)
-    end
-
     def create
       name = @params[0] || ask("Name for the new story:")
       types = { 'c' => 'chore', 'b' => 'bug', 'f' => 'feature' }
@@ -42,6 +32,15 @@ module PT::Flow
       end
     end
 
+    def finish
+      run("git push origin #{branch} -u")
+      task = PivotalTracker::Story.find(branch.task_id, @project.id)
+      title = task.name.gsub('"',"'") + " [Delivers ##{task.id}]"
+
+      run("hub pull-request -b #{branch.target} -h #{repo.user}:#{branch} \"#{title}\"")
+      finish_task(task)
+    end
+
     def cleanup
       title("Cleaning merged story branches for [#{branch.target}]")
 
@@ -61,17 +60,6 @@ module PT::Flow
       congrats("Deleted branches merged with [#{branch.target}]")
     end
 
-    def help
-      if ARGV[0] && ARGV[0] != 'help'
-        message("Command #{ARGV[0]} not recognized. Showing help.")
-      end
-
-      title("Command line usage")
-      puts("flow start                             # start working on a story")
-      puts("flow finish                            # finish a story and create a pull request")
-      puts("flow cleanup                           # deleted merged local/remote branches and prune origin")
-    end
-
     private
 
     def branch

data/lib/pt-flow/version.rb

@@ -1,5 +1,5 @@
 module PT
   module Flow
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/pt-flow.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'pt'
   gem.add_dependency 'hub'
+  gem.add_dependency 'pivotal-tracker', '< 0.5.9'
   gem.add_dependency 'active_support'
   gem.add_dependency 'i18n'
   gem.add_dependency 'hirb-colors'

data/spec/fixtures/story_4460038.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<story>
+  <id type="integer">4460038</id>
+  <project_id type="integer">102622</project_id>
+  <story_type>feature</story_type>
+  <url>http://www.pivotaltracker.com/story/show/4460038</url>
+  <estimate type="integer">1</estimate>
+  <current_state>unstarted</current_state>
+  <description>This is a story that has comments.</description>
+  <name>This is for comments</name>
+  <requested_by>Jon Mischo</requested_by>
+  <created_at type="datetime">2010/07/27 21:53:16 UTC</created_at>
+  <updated_at type="datetime">2010/07/27 22:20:48 UTC</updated_at>
+  <notes type="array">
+    <note>
+      <id type="integer">2111593</id>
+      <text>This is a comment...whee!</text>
+      <author>Jon</author>
+      <noted_at type="datetime">2010/07/27 22:15:48 UTC</noted_at>
+    </note>
+    <note>
+      <id type="integer">2128955</id>
+      <text>Test note</text>
+      <author>Test Suite Access</author>
+      <noted_at type="datetime">2010/07/29 18:15:09 UTC</noted_at>
+    </note>
+    <note>
+      <id type="integer">2128959</id>
+      <text>Test note</text>
+      <author>Test Suite Access</author>
+      <noted_at type="datetime">2010/07/29 18:16:12 UTC</noted_at>
+    </note>
+    <note>
+      <id type="integer">2129077</id>
+      <text>Test note</text>
+      <author>Test Suite Access</author>
+      <noted_at type="datetime">2010/07/29 18:22:26 UTC</noted_at>
+    </note>
+    <note>
+      <id type="integer">2129374</id>
+      <text>Test note</text>
+      <author>Test Suite Access</author>
+      <noted_at type="datetime">2010/07/29 18:55:44 UTC</noted_at>
+    </note>
+  </notes>
+</story>

data/spec/lib/pt-flow/ui_spec.rb

@@ -10,7 +10,10 @@ describe PT::Flow::UI do
     stub_request(:get, /projects$/).to_return(body: fixture_file('projects.xml'))
     stub_request(:get, /stories\?/).to_return(body: fixture_file('stories.xml'))
     stub_request(:post, /stories$/).to_return(body: fixture_file('chore.xml'))
-    stub_request(:any, /stories\/\d+/).to_return(body: fixture_file('story.xml'))
+    stub_request(:any, /stories\/\d+/).to_return do |request|
+      id = request.uri.to_s.split('/').last
+      { body: fixture_file("story_#{id}.xml") }
+    end
   end
 
   describe '#start' do
@@ -19,7 +22,7 @@ describe PT::Flow::UI do
         prompt.should_receive(:ask).with("Please select a task to start working on (1-14, 'q' to exit)".bold).and_return('2')
         prompt.should_receive(:ask).with("How many points do you estimate for it? (0,1,2,3)".bold).and_return('3')
 
-        PT::Flow::UI.new %w{ start }
+        PT::Flow::UI.new('start')
 
         WebMock.should have_requested(:get, "#{endpoint}/projects/102622/stories?filter=current_state:unscheduled,unstarted,started")
         WebMock.should have_requested(:put, "#{endpoint}/projects/102622/stories/4459994").with(body: /<estimate>3<\/estimate>/)
@@ -33,7 +36,7 @@ describe PT::Flow::UI do
     context 'given an already estimated story' do
       it "does not prompt to estimate" do
         prompt.should_receive(:ask).once.with("Please select a task to start working on (1-14, 'q' to exit)".bold).and_return('3')
-        PT::Flow::UI.new %w{ start }
+        PT::Flow::UI.new('start')
       end
     end
 
@@ -42,7 +45,7 @@ describe PT::Flow::UI do
 
       it "creates an appropriately namespaced branch" do
         prompt.should_receive(:ask).and_return('3')
-        PT::Flow::UI.new %w{ start }
+        PT::Flow::UI.new('start')
         current_branch.should == 'new_feature.this-is-for-comments.4460038'
       end
     end
@@ -52,7 +55,7 @@ describe PT::Flow::UI do
 
       it "creates a branch within the same namespace" do
         prompt.should_receive(:ask).and_return('3')
-        PT::Flow::UI.new %w{ start }
+        PT::Flow::UI.new('start')
         current_branch.should == 'new_feature.this-is-for-comments.4460038'
       end
     end
@@ -61,7 +64,7 @@ describe PT::Flow::UI do
       it "creates and starts a new story with that name" do
         prompt.should_receive(:ask).with("Type? (c)hore, (b)ug, (f)eature".bold).and_return('c')
 
-        PT::Flow::UI.new ['start','a new feature']
+        PT::Flow::UI.new('start', ['a new feature'])
 
         WebMock.should have_requested(:post, "#{endpoint}/projects/102622/stories").with(body: /<name>a new feature<\/name>/).with(body: /<story_type>chore<\/story_type>/).with(body: /<requested_by>Jon Mischo<\/requested_by>/)
         WebMock.should have_requested(:put, "#{endpoint}/projects/102622/stories/4459994").with(body: /<owned_by>Jon Mischo<\/owned_by>/)
@@ -72,17 +75,20 @@ describe PT::Flow::UI do
 
   describe '#finish' do
     before do
-      #TODO: Stubbed endpoint ALWAYS returns story 4459994, need a way to check it is actually getting the right id from the branch
-      system('git checkout -B new_feature.as-a-user-i-should.4459994')
+      system('git checkout -B new_feature')
+      system('git remote rm origin')
       system('git remote add origin git@github.com:cookpad/pt-flow.git')
+
+      prompt.should_receive(:ask).and_return('3')
+      PT::Flow::UI.new('start')
     end
 
     it "pushes the current branch to origin, flags the story as finished, and opens a github pull request" do
-      PT::Flow::UI.any_instance.should_receive(:run).with('git push origin new_feature.as-a-user-i-should.4459994 -u')
-      PT::Flow::UI.any_instance.should_receive(:run).with("hub pull-request -b new_feature -h cookpad:new_feature.as-a-user-i-should.4459994 \"As a user I should see an Unestimated Feature with a fairly long name [Delivers #4459994]\"")
-      PT::Flow::UI.new %w{ finish }
-      current_branch.should == 'new_feature.as-a-user-i-should.4459994'
-      WebMock.should have_requested(:put, "#{endpoint}/projects/102622/stories/4459994").with(body: /<current_state>finished<\/current_state>/)
+      PT::Flow::UI.any_instance.should_receive(:run).with('git push origin new_feature.this-is-for-comments.4460038 -u')
+      PT::Flow::UI.any_instance.should_receive(:run).with("hub pull-request -b new_feature -h cookpad:new_feature.this-is-for-comments.4460038 \"This is for comments [Delivers #4460038]\"")
+      PT::Flow::UI.new('finish')
+      current_branch.should == 'new_feature.this-is-for-comments.4460038'
+      WebMock.should have_requested(:put, "#{endpoint}/projects/102622/stories/4460038").with(body: /<current_state>finished<\/current_state>/)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pt-flow
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pt
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pivotal-tracker
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.5.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.5.9
 - !ruby/object:Gem::Dependency
   name: active_support
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +191,10 @@ description: Some extra methods for the pt gem to use in our dev flow.
 email:
 - jens@balvig.com
 executables:
-- flow
+- git-cleanup
+- git-create
+- git-finish
+- git-start
 extensions: []
 extra_rdoc_files: []
 files:
@@ -186,7 +205,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/flow
+- bin/git-cleanup
+- bin/git-create
+- bin/git-finish
+- bin/git-start
 - lib/pt-flow.rb
 - lib/pt-flow/branch.rb
 - lib/pt-flow/repo.rb
@@ -200,7 +222,8 @@ files:
 - spec/fixtures/local_config.yml
 - spec/fixtures/projects.xml
 - spec/fixtures/stories.xml
-- spec/fixtures/story.xml
+- spec/fixtures/story_4459994.xml
+- spec/fixtures/story_4460038.xml
 - spec/lib/pt-flow/ui_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy.rb
@@ -221,7 +244,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1204691239520265833
+      hash: 2421475747873387563
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -230,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1204691239520265833
+      hash: 2421475747873387563
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -243,7 +266,8 @@ test_files:
 - spec/fixtures/local_config.yml
 - spec/fixtures/projects.xml
 - spec/fixtures/stories.xml
-- spec/fixtures/story.xml
+- spec/fixtures/story_4459994.xml
+- spec/fixtures/story_4460038.xml
 - spec/lib/pt-flow/ui_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy.rb

data/bin/flow

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pathname'
-
-lib = (Pathname.new(__FILE__).realpath.dirname  + '../lib').to_s
-$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
-
-require 'pt-flow'
-
-PT::Flow::UI.new ARGV