pt-flow 0.6.3 → 0.6.4

data/README.md

@@ -12,13 +12,7 @@ Set up webhook for Pivotal Tracker:
 
     https://github.com/#{repo}/admin/hooks
 
-## Usage
-
-- flow start
-- flow finish
-- flow review
-
-### Committer
+### Usage
 
 ```bash
 $ flow start
@@ -26,17 +20,11 @@ $ flow start
 
 $ flow finish
 # pushes branch, finishes task on pt, and opens github new pull request page.
-```
 
-### Reviewer
+# reviewer comments :+1: to approve on github
 
-```bash
-$ flow review
-# selecting a pull request opens github page, comment :+1: to approve
-```
-
-### Committer
+# committer presses merge button on github which delivers task on pivotal tracker
 
-```bash
-# pressing merge button on github delivers task on pivotal tracker
+$ flow cleanup
+# cleans up local/remote story branches already merged with current release branch
 ```

data/lib/pt-flow.rb

@@ -1,7 +1,6 @@
 require "pt"
 require "pt-flow/version"
 require "pt-flow/branch"
-require "pt-flow/pull_requests_table"
 require "pt-flow/repo"
 require "pt-flow/tasks_table"
 require "pt-flow/ui"

data/lib/pt-flow/repo.rb

@@ -1,11 +1,5 @@
 module PT::Flow
   class Repo
-    require "github_api"
-    CONFIG_PATH = ENV['HUB_CONFIG'] ||  ENV['HOME'] + '/.config/hub'
-
-    def pull_requests
-      client.pull_requests.all(user, name)
-    end
 
     def user
       path.split('/').first
@@ -21,13 +15,5 @@ module PT::Flow
       @path ||= `git config --get remote.origin.url`.strip.match(/:(\S+\/\S+)\.git/)[1]
     end
 
-    def client
-      @client ||= Github.new(oauth_token: oauth_token)
-    end
-
-    def oauth_token
-      @oauth_token ||= YAML.load(File.read(CONFIG_PATH)).values.flatten.first['oauth_token']
-    end
-
   end
 end

data/lib/pt-flow/ui.rb

@@ -21,7 +21,7 @@ module PT::Flow
     end
 
     def finish
-      run("git push origin #{branch}")
+      run("git push origin #{branch} -u")
       task = PivotalTracker::Story.find(branch.task_id, @project.id)
       title = task.name.gsub('"',"'") + " [Delivers ##{task.id}]"
 
@@ -42,14 +42,6 @@ module PT::Flow
       end
     end
 
-    def review
-      table = PullRequestsTable.new(repo.pull_requests)
-      pull_request = select("Please select a pull request to review", table)
-      run("open #{pull_request.html_url}/files")
-    rescue Github::Error::Unauthorized => e
-      error("Error from github: #{e.message}")
-    end
-
     def cleanup
       title("Cleaning merged story branches for [#{branch.target}]")
 
@@ -77,8 +69,6 @@ module PT::Flow
       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 review                            # review a pull request")
-      #puts("flow deliver                           # merge current branch and clean up")
       puts("flow cleanup                           # deleted merged local/remote branches and prune origin")
     end
 

data/lib/pt-flow/version.rb

@@ -1,5 +1,5 @@
 module PT
   module Flow
-    VERSION = "0.6.3"
+    VERSION = "0.6.4"
   end
 end

data/pt-flow.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'pt'
   gem.add_dependency 'hub'
-  gem.add_dependency 'github_api'
   gem.add_dependency 'active_support'
   gem.add_dependency 'i18n'
 

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

@@ -78,7 +78,7 @@ describe PT::Flow::UI do
     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')
+      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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pt-flow
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pt
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_api
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_support
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +157,6 @@ files:
 - bin/flow
 - lib/pt-flow.rb
 - lib/pt-flow/branch.rb
-- lib/pt-flow/pull_requests_table.rb
 - lib/pt-flow/repo.rb
 - lib/pt-flow/tasks_table.rb
 - lib/pt-flow/ui.rb
@@ -205,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4273464848554735973
+      hash: 1743957255277720657
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4273464848554735973
+      hash: 1743957255277720657
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/pt-flow/pull_requests_table.rb

@@ -1,7 +0,0 @@
-module PT::Flow
-  class PullRequestsTable < PT::DataTable
-    def self.fields
-      [:title]
-    end
-  end
-end