omnifocus-github 1.3.0 → 1.4.0

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.4.0 / 2012-11-23
+
+* 2 minor enhancements:
+
+  * Added support for github enterprise. (jfieber)
+  * Added support for oauth authentication. (jfieber)
+
 === 1.3.0 / 2011-11-18
 
 * 1 minor enhancement:

data/README.txt

@@ -7,6 +7,35 @@ rdoc :: http://seattlerb.rubyforge.org/omnifocus-github
 
 Plugin for omnifocus gem to provide github BTS synchronization.
 
+Support for Github Enterprise:
+
+In your git config, set the key omnifocus-github.accounts to a space
+separated list of github accounts. 
+
+    git config --global omnifocus-github.accounts "github myghe"
+
+For each account API end point and authentication information are
+should be stored in the git config under a key matching the
+account. For example:
+
+    git config --global github.user me
+    git config --global github.password mypassword
+    git config --global myghe.api https://ghe.mydomain.com/api/v3
+    git config --global myghe.token 1a2b3c4d5e6f7e8d
+
+For each account can you specify the following parameters:
+
+* api - specify an API endpoint other than
+  https://api.github.com. This is so you can point this at your Github
+  Enterprise endpoint.
+
+* user, password - A username and password pair for Basic http authentication.
+
+* token - An OAuth bearer token for OAuth workflows.
+
+If both a token and a username and password are supplied, the token
+is used.
+
 == FEATURES/PROBLEMS:
 
 * Provides github BTS synchronization.

data/lib/omnifocus/github.rb

@@ -2,27 +2,53 @@ require 'open-uri'
 require 'json'
 
 module OmniFocus::Github
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
   PREFIX  = "GH"
 
-  def populate_github_tasks
-    # curl -i -u "#{user}:#{pass}" "https://api.github.com/issues?page=1"
-
-    user = `git config --global github.user`.chomp
-    pass = `git config --global github.password`.chomp
+  GH_API_DEFAULT = "https://api.github.com"
 
-    body = fetch user, pass, 1
+  def populate_github_tasks
+    omnifocus_git_param(:accounts, "github").split(/\s+/).each do |account|
+      api = omnifocus_git_param(:api, GH_API_DEFAULT, account)
+      # Either token or user + password is required. If both
+      # are present, token is used.
+      auth = {
+        :user => omnifocus_git_param(:user, nil, account),
+        :password => omnifocus_git_param(:password, nil, account),
+        :token => omnifocus_git_param(:token, nil, account),
+      }
+      unless auth[:token] || (auth[:user] && auth[:password])
+        warn "Missing authentication parameters for account #{account}."
+        next
+      end
 
-    process body
+      # process will omit the account label if nil.
+      # Supply nil for the default "github" account for compatibility
+      # with previous versions.
+      account_label = account == "github" ? nil : account
 
-    (2..get_last(body)).each do |page|
-      process fetch user, pass, page
+      body = fetch(api, auth, 1)
+      process(account_label, body)
+      (2..get_last(body)).each do |page|
+        process(account_label, fetch(api, auth, page))
+      end
     end
   end
 
-  def fetch user, pass, page
-    uri = URI.parse "https://api.github.com/issues?page=#{page}"
-    uri.read :http_basic_authentication => [user, pass]
+  def omnifocus_git_param name, default = nil, prefix = "omnifocus-github"
+    param = `git config --global #{prefix}.#{name}`.chomp
+    param.empty? ? default : param
+  end
+
+  def fetch api, auth, page
+    uri = URI.parse "#{api}/issues?page=#{page}"
+    if auth[:token]
+      uri.read "Authorization" => "token #{auth[:token]}"
+    elsif auth[:user] && auth[:password]
+      uri.read :http_basic_authentication => [auth[:user], auth[:password]]
+    else
+      raise ArgumentError, "Missing authentication"
+    end
   end
 
   def get_last body
@@ -30,20 +56,22 @@ module OmniFocus::Github
     link and link[/page=(\d+).. rel=.last/, 1].to_i or 0
   end
 
-  def process body
+  def process account, body
     JSON.parse(body).each do |issue|
+      pr        = issue["pull_request"] && !issue["pull_request"]["diff_url"].nil?
       number    = issue["number"]
       url       = issue["html_url"]
-      project   = url.split(/\//)[-3]
+      project   = [account, url.split(/\//)[-3]].compact.join("-")
       ticket_id = "#{PREFIX}-#{project}##{number}"
-      title     = "#{ticket_id}: #{issue["title"]}"
+      title     = "#{ticket_id}: #{pr ? "[PR] " : ""}#{issue["title"]}"
+      note      = "#{url}\n\n#{issue["body"]}"
 
       if existing[ticket_id] then
         bug_db[existing[ticket_id]][ticket_id] = true
         next
       end
 
-      bug_db[project][ticket_id] = [title, url]
+      bug_db[project][ticket_id] = [title, note]
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omnifocus-github
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-11-19 00:00:00 Z
+date: 2012-11-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: omnifocus
@@ -70,22 +70,22 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 29
         segments: 
+        - 4
         - 3
-        - 9
-        version: "3.9"
+        version: "4.3"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: rdoc
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -94,9 +94,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
-        - 2
-        - 8
-        version: "2.8"
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -107,11 +107,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 1
         segments: 
-        - 2
-        - 12
-        version: "2.12"
+        - 3
+        - 3
+        version: "3.3"
   type: :development
   version_requirements: *id005
 description: Plugin for omnifocus gem to provide github BTS synchronization.
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Plugin for omnifocus gem to provide github BTS synchronization.