git-pulls 0.3.5 → 0.3.6

data/lib/git-pulls.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'date'
 require 'launchy'
 require 'octokit'
 
@@ -134,7 +135,7 @@ Usage: git pulls update
       line << l(Date.parse(pull['created_at']).strftime("%m/%d"), 5)
       line << l(pull['comments'], 2)
       line << l(pull['title'], 35)
-      line << l(pull['head']['label'], 20)
+      line << l(pull['head']['label'], 50)
       sha = pull['head']['sha']
       if not_merged?(sha)
         puts line.join ' '
@@ -167,9 +168,14 @@ Usage: git pulls update
         repos[repo] = true
       end
     end
+    if github_credentials_provided?
+      endpoint = "git@github.com:"
+    else
+      endpoint = github_endpoint + "/"
+    end
     repos.each do |repo, bool|
       puts "  fetching #{repo}"
-      git("fetch #{github_endpoint}/#{repo}.git +refs/heads/*:refs/pr/#{repo}/*")
+      git("fetch #{endpoint}#{repo}.git +refs/heads/*:refs/pr/#{repo}/*")
     end
   end
 
@@ -201,8 +207,10 @@ Usage: git pulls update
 
   def configure
     Octokit.configure do |config|
-      config.login = github_login
+      config.login        = github_login if github_login and not github_login.empty?
       config.web_endpoint = github_endpoint
+      config.oauth_token  = github_token if github_token and not github_token.empty?
+      config.proxy        = github_proxy if github_proxy and not github_proxy.empty?
     end
   end
 
@@ -223,6 +231,10 @@ Usage: git pulls update
     end
   end
 
+  def github_proxy
+    git("config --get-all http.proxy")
+  end
+
   # API/DATA HELPER FUNCTIONS #
 
   def github_credentials_provided?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-pulls
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json