pt-flow 0.1.6 → 0.2

data/lib/pt-flow/ui.rb

@@ -7,35 +7,32 @@ class PT::Flow::UI < PT::UI
   def start
     tasks = @client.get_work(@project)
     table = PT::TasksTable.new(tasks)
-    if @params[0]
-      task = table[@params[0].to_i]
-    else
-      title("Available tasks in #{project_to_s}")
-      task = select("Please select a task to start working on", table)
-    end
+    title("Available tasks in #{project_to_s}")
+    task = select("Please select a task to start working on", table)
 
     estimate_task(task, ask("How many points do you estimate for it? (#{@project.point_scale})")) if task.estimate && task.estimate < 0
     assign_task(task, @local_config[:user_name])
     start_task(task)
-    `git checkout -B #{task.id}`
+    `git checkout -B #{current_target}-#{task.id}`
   end
 
   def finish
     `git push origin #{current_branch}`
-    task = PivotalTracker::Story.find(current_branch, @project.id)
+    task = PivotalTracker::Story.find(current_task_id, @project.id)
     finish_task(task)
-    pull_request_url = "#{github_page_url}/pull/new/#{current_branch}?title=#{task.name} [##{task.id}]&body=#{task.url}"
+    pull_request_url = "#{github_page_url}/pull/new/#{current_target}...#{current_branch}?title=#{task.name} [##{task.id}]&body=#{task.url}"
     `open '#{pull_request_url}'`
   end
 
   def deliver
-    branch = @params[0] || current_branch
-    `git checkout master`
-    `git merge #{branch}`
-    `git push origin master`
-    `git push origin :#{branch}`
-    `git branch -d #{branch}`
-    task = PivotalTracker::Story.find(branch, @project.id)
+    `git fetch`
+    `git checkout #{current_target}`
+    `git pull --rebase origin #{current_target}`
+    `git merge #{current_branch}`
+    `git push origin #{current_target}`
+    `git push origin :#{current_branch}`
+    `git branch -d #{current_branch}`
+    task = PivotalTracker::Story.find(current_task_id, @project.id)
     deliver_task(task)
   end
 
@@ -87,4 +84,12 @@ class PT::Flow::UI < PT::UI
   def current_branch
     @current_branch ||= `git rev-parse --abbrev-ref HEAD`.strip
   end
+
+  def current_target
+    current_branch.split('-').first
+  end
+
+  def current_task_id
+    current_branch.split('-').last
+  end
 end

data/lib/pt-flow/version.rb

@@ -1,5 +1,5 @@
 module PT
   module Flow
-    VERSION = "0.1.6"
+    VERSION = "0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pt-flow
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pt
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70237517292560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70237517292560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70237509107220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.9'
+  version_requirements: *70237509107220
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70237509108900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70237509108900
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70237513253180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,12 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70237513253180
 description: Some extra methods for the pt gem to use in our dev flow.
 email:
 - jens@balvig.com
@@ -112,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3650737686470413081
+      hash: 3947336664115380543
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,10 +101,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3650737686470413081
+      hash: 3947336664115380543
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Some extra methods for the pt gem to use in our dev flow.