open-pull-request 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf1ae049db699da91eba631f34074fb7f31fa8b8
-  data.tar.gz: fcab0d3c30f78e8dcc38c72edd08af0e506777d5
+  metadata.gz: de6584c8cdb9b19bfed8f76fa0aaa991ae355844
+  data.tar.gz: c34eace200a5c187386ecfe54f770f807bdefebc
 SHA512:
-  metadata.gz: cf36027fbbb0049b53ec361b060d3cfebbd5f8f0a712857f3ae9cf3cea6996c8ab06d2eb58e46e01bb745fbf510625927663f648a20a8bd0d30b503796187aff
-  data.tar.gz: 7f6a4f696a2a419b53cf371832462d18f372f048bd8e035cf69ffa9041ea3e174ceea4f0fc888d01df8e8264271a321e7278d57814163d7e7f1b5615039af9e0
+  metadata.gz: 99d19d4cf73294355601bb9f3fd7b94da9702a6d794c00a06722841610881c9991b6947354e602f4b77bd757e0d899e67e8e4e811898e1813cf720b4f2383dcc
+  data.tar.gz: f2fafe6225d10d145d686622cbf9060868f553f731bcdc739630ce92b96a6d0ea4bc8b43406c292c7194aaaa0239662d59dabacfc6f8834ad2afd3ffcbcdc16e

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in git-pull-request.gemspec
 gemspec

data/README.md

@@ -5,24 +5,24 @@ For the moment all pull requests will be made against master branch.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+`$ gem install open-pull-request`
 
-    gem 'open-pull-request'
+Optional:
+Set-up the following in git config if you want Trello integration:
+  * `git config trello.developer-public-key`
+  * `git config trello.member-token`
 
-And then execute:
 
-    $ bundle
 
-Or install it yourself as:
-
-    $ gem install open-pull-request
 
 ## Usage
 
 To use it go to a git repository on a separate branch than master and type
 `git pr`
-This will open a internet browser window with the comparison betwwen the branch you are currently on and master.
 
+This will open a internet browser window with the comparison between the branch you are currently on and master.
+
+If you want to populate the body of the pull-request with the Trello details, pass a `-t CARD_ID` parameter, with CARD_ID being the id of the Trello card
 
 ## Contributing
 

data/bin/git-pr

@@ -4,6 +4,6 @@
 require 'rubygems'
 require 'cgi'
 require 'open3'
-require 'open-pull-request'
+require_relative '../lib/open-pull-request'
 
-Open::PullRequest.request!
+Open::PullRequest.new.request!

data/lib/open-pull-request.rb

@@ -1,18 +1,37 @@
-require "open-pull-request/version"
+require_relative "open-pull-request/version"
+require_relative "open-pull-request/trello_details"
 require 'cgi'
+require 'optparse'
+require 'ostruct'
+require 'pry'
 
 module Open
-  module PullRequest
-    extend self
+  class PullRequest
+    attr_reader :options
+    def initialize
+      @options = OpenStruct.new
+    end
+
     def request!
+      option_parser.parse!(ARGV)
       branch = get_branch_name
       abort unless $?.success?
-      
+      pr_description = "Please give a description"
+      if options.trello_card_id
+        developer_public_key = `git config trello.developer-public-key`.strip
+        member_token = `git config trello.member-token`.strip
+        trello_details = TrelloDetails.new(
+          options.trello_card_id,
+          developer_public_key,
+          member_token
+        )
+        pr_description = trello_details.pull_request_description
+      end
       root_url = "https://www.github.com/#{repo_url}/compare/"
       compared_branches = "master...#{CGI.escape(branch.strip)}"
       options = [
         ["pull_request[title]", pr_title], 
-        ["pull_request[body]", "Please give a description"]
+        ["pull_request[body]", pr_description]
       ].map{|pair| 
           pair.map{ |el| CGI.escape(el) }.join("=") 
         }.join("&")
@@ -35,5 +54,15 @@ module Open
       get_branch_name.gsub(/[^\w]+/, " ").strip.capitalize
     end
 
+    def option_parser
+      @option_parser ||= OptionParser.new do |op|
+        
+        op.on("-t", "--trello CARD_ID", "Trello card id to pull info from") do |v|
+          options.trello_card_id = v
+        end
+
+      end
+    end
+
   end
 end

data/lib/open-pull-request/trello_details.rb

@@ -0,0 +1,45 @@
+require 'trello'
+require 'active_support/core_ext/string'
+require 'term/ansicolor'
+
+class TrelloDetails
+  def initialize(card_id, developer_public_key, member_token)
+  	@trello_client = ::Trello::Client.new(
+  	  developer_public_key: developer_public_key,
+  	  member_token: member_token
+  	)
+  	@card = @trello_client.find(:card, card_id)
+  end
+
+  def pull_request_description
+  	log "Finding your project and story "
+  	desc = "##### Trello card\n"
+  	desc << "**#{@card.name}** - #{@card.url}\n"
+  	log "."
+  	desc << "#{@card.desc}\n"
+  	log "."
+  	desc << "\n"
+  	desc << "##### Members\n"
+  	log "."
+    desc << @card.members.map{ |m| "- #{m.full_name}" }.join("\n")
+    desc << "\n\n"
+    log "."
+  	@card.checklists.each do |checklist|
+  	  desc << build_checklist_description(checklist)
+  	  log "."
+  	  desc << "\n"
+    end
+    desc
+  end
+
+  private
+  def build_checklist_description(checklist)
+  	desc = "##### #{checklist.name}\n"
+  	desc << checklist.check_items.map{|c|"- #{c["name"]}"}.join("\n")
+  end
+
+  def log(msg)
+  	m = Term::ANSIColor.green(msg)
+  	print m
+  end
+end

data/lib/open-pull-request/version.rb

@@ -1,5 +1,5 @@
 module Open
-	module PullRequest
-		VERSION = "0.0.1"
+	class PullRequest
+		VERSION = "0.0.3"
 	end
-end
+end

data/open-pull-request.gemspec

@@ -20,4 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
+
+  spec.add_dependency 'ruby-trello'
+  spec.add_dependency 'term-ansicolor'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open-pull-request
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Dragos Miron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-trello
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - dragosmr@gmail.com
@@ -67,6 +95,7 @@ files:
 - Rakefile
 - bin/git-pr
 - lib/open-pull-request.rb
+- lib/open-pull-request/trello_details.rb
 - lib/open-pull-request/version.rb
 - open-pull-request.gemspec
 homepage: http://github.com/dragosmiron/git-pull-request