trellish 0.0.3 → 0.0.4

data/bin/trellish

@@ -23,7 +23,8 @@ end
 Trellish.configure(
   trello_api_key: config_file['trello_api_key'],
   trello_oauth_secret: config_file['trello_oauth_secret'],
-  trello_oauth_token: config_file['trello_oauth_token'])
+  trello_oauth_token: config_file['trello_oauth_token'],
+  github_oauth_token: config_file['github_oauth_token'])
 
 card = Trellish::Card.new(ARGV[0])
 card.finish

data/lib/trellish.rb

@@ -10,7 +10,8 @@ module Trellish
   @config = {
     trello_api_key: 'TRELLO_API_KEY',
     trello_oauth_secret: 'TRELLO_OAUTH_SECRET',
-    trello_oauth_token: 'TRELLO_OAUTH_TOKEN'
+    trello_oauth_token: 'TRELLO_OAUTH_TOKEN',
+    github_oauth_token: 'GITHUB_OAUTH_TOKEN'
   }
 
   @valid_config_keys = @config.keys

data/lib/trellish/card.rb

@@ -10,23 +10,13 @@ module Trellish
       @card = Trello::Card.find(parse_card_id(card_id_or_url))
     end
 
-    def add_branch_link
-      @card.add_comment(github_branch_url)
-    end
-
-    def add_merge_to_master_item
-      checklist = @card.checklists.first
-      if checklist.nil?
-        new_checklist = Checklist.create(name: 'Checklist', board_id: @card.board_id)
-        @card.add_checklist(new_checklist)
-        checklist = @card.refresh!.checklists.first
-      end
-      checklist.add_item('Merge to master')
+    def add_pull_request_link
+      @card.description = "[Pull Request] (#{github_pull_request_url})\n\n#{@card.description}"
+      @card.save
     end
 
     def finish
-      add_branch_link
-      add_merge_to_master_item
+      add_pull_request_link
       remove_all
       move_to_qa
     end

data/lib/trellish/git.rb

@@ -1,3 +1,5 @@
+require 'faraday'
+
 module Trellish
   module Git
 
@@ -5,24 +7,44 @@ module Trellish
       @current_git_branch ||= `cat .git/head`.split('/').last
     end
 
-    def github_branch_url
-      @github_branch_url ||= "https://github.com/#{git_repository_owner}/#{git_repository_name}/tree/#{current_git_branch}"
+    def github_pull_request_url
+      return @github_pull_request_url if @github_pull_request_url
+      conn = Faraday.new(:url => 'https://api.github.com', :ssl => {:ca_file => '/System/Library/OpenSSL/certs/ca-certificates.crt'}) do |faraday|
+        faraday.request :url_encoded
+        faraday.adapter ::Faraday.default_adapter
+      end
+      response = conn.post do |req|
+        req.url "/repos/#{git_repository_owner}/#{git_repository_name}/pulls"
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['Authorization'] = "token #{Trellish.config[:github_oauth_token]}"
+        req.body = %Q|{
+          "title": "#{pull_request_title}",
+          "base": "master",
+          "head": "#{git_repository_owner}:#{current_git_branch}"
+        }|.gsub(/\s/, '')
+        true
+      end
+      @github_pull_request_url = JSON.parse(response.body)["html_url"]
     end
 
-    def remote_url
-      @remote_url ||= `git config remote.origin.url`
+    def git_repository_name
+      @git_repository_name ||= matches[2]
+    end
+
+    def git_repository_owner
+      @git_repository_owner ||= matches[1]
     end
 
     def matches
       @matches ||= matches = remote_url.match(%r|^git@github.com:([^/]*)\/([^\.]*)\.git$|)
     end
 
-    def git_repository_owner
-      @git_repository_owner ||= matches[1]
+    def pull_request_title
+      @pull_request_title ||= `git show -s --format=%s head`
     end
 
-    def git_repository_name
-      @git_repository_name ||= matches[2]
+    def remote_url
+      @remote_url ||= `git config remote.origin.url`
     end
 
   end

data/lib/trellish/version.rb

@@ -1,3 +1,3 @@
 module Trellish
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/trellish.example.yml

@@ -1,7 +1,16 @@
 # Sign in to Trello and go here https://trello.com/1/appKey/generate.
 # Copy "Key" from that page to tello_api_key.
 trello_api_key: numbers_and_letters_and_stuff
+
 # Copy "Secret (for OAuth signing)" from that page to tello_oauth_secret.
 trello_oauth_secret: numbers_and_letters_and_stuff
-# Visit http://trello.com/1/connect?key=TRELLO_API_KEY_FROM_ABOVE&name=Trellish&response_type=token&scope=read,write&expiration=never and copy the token to trello_oauth_token.
+
+# Visit
+#   http://trello.com/1/connect?key=TRELLO_API_KEY_FROM_ABOVE&name=Trellish&response_type=token&scope=read,write&expiration=never
+# and copy the token to trello_oauth_token here.
 trello_oauth_token: numbers_and_letters_and_stuff
+
+# Run:
+#   curl -u 'username' -d '{"scopes":["repo"],"note":"Trellish"}' https://api.github.com/authorizations
+# and copy the token parameter from the response here.
+github_oauth_token: numbers_and_letters_and_stuff

data/trellish.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/trellish/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Wes Gibbs"]
   gem.email         = ["wesgibbs@gmail.com"]
-  gem.description   = %q{Annotate Trello cards with git branch, add 'Merge to master' checkbox, remove yourself and move the card to the QA list}
+  gem.description   = %q{Create a pull request, put link to it on the card, remove everyone and move the card to the QA list}
   gem.summary       = %q{Finish a Trello card}
   gem.homepage      = "http://rubygems.org/gems/trellish"
 
@@ -15,5 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Trellish::VERSION
 
+  gem.add_dependency 'oauth2', '>=0.7.0'
   gem.add_dependency 'ruby-trello-wgibbs', '>=0.4.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trellish
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: ruby-trello-wgibbs
   requirement: !ruby/object:Gem::Requirement
@@ -27,8 +43,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-description: Annotate Trello cards with git branch, add 'Merge to master' checkbox,
-  remove yourself and move the card to the QA list
+description: Create a pull request, put link to it on the card, remove everyone and
+  move the card to the QA list
 email:
 - wesgibbs@gmail.com
 executables: