git-pulls 0.1.0 → 0.2.1

data/lib/git-pulls.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'json'
 require 'httparty'
+require 'launchy'
 require 'pp'
 
 class GitPulls
@@ -19,7 +20,14 @@ class GitPulls
 
   def run
     if @command && self.respond_to?(@command)
+      # If the cache file doesn't exist, make sure we run update
+      # before any other command. git-pulls will otherwise crash
+      # with an exception.
+      update unless File.exists?(PULLS_CACHE_FILE) || @command == 'update'
+
       self.send @command
+    elsif %w(-h --help).include?(@command)
+      usage
     else
       help
     end
@@ -30,6 +38,17 @@ class GitPulls
   def help
     puts "No command: #{@command}"
     puts "Try: update, list, show, merge, browse"
+    puts "or call with '--help' for usage information"
+  end
+
+  def usage
+    puts <<-USAGE
+Usage: git pulls update
+   or: git pulls list [--reverse]
+   or: git pulls show <number> [--full]
+   or: git pulls browse <number>
+   or: git pulls merge <number>
+    USAGE
   end
 
   def merge
@@ -86,7 +105,7 @@ class GitPulls
   def browse
     num = @args.shift
     if p = pull_num(num)
-      `open #{p['html_url']}`
+      Launchy.open(p['html_url'])
     else
       puts "No such number"
     end
@@ -97,6 +116,7 @@ class GitPulls
     puts "Open Pull Requests for #{@user}/#{@repo}" 
     pulls = get_pull_info
     pulls.reverse! if option == '--reverse'
+    count = 0
     pulls.each do |pull|
       line = []
       line << l(pull['number'], 4)
@@ -107,8 +127,12 @@ class GitPulls
       sha = pull['head']['sha']
       if not_merged?(sha)
         puts line.join ' '
+        count += 1
       end
     end
+    if count == 0
+      puts ' -- no open pull requests --'
+    end
   end
 
   def update
@@ -117,10 +141,15 @@ class GitPulls
     fetch_stale_forks
     list
   end
+  
+  def protocol(is_private)
+    is_private ? "ssh://git@" : "git://"
+  end
 
   def fetch_stale_forks
     puts "Checking for forks in need of fetching"
     pulls = get_pull_info
+    is_private = get_repo_visibility
     repos = {}
     pulls.each do |pull|
       o = pull['head']['repository']['owner']
@@ -133,7 +162,16 @@ class GitPulls
     end
     repos.each do |repo, bool|
       puts "  fetching #{repo}"
-      git("fetch git://github.com/#{repo}.git refs/heads/*:refs/pr/#{repo}/*")
+      git("fetch #{protocol(is_private)}#{github_url}/#{repo}.git +refs/heads/*:refs/pr/#{repo}/*")
+    end
+  end
+
+  def github_url
+    host = git("config --get-all github.host")
+    if host.size > 0
+      host
+    else
+      'github.com'
     end
   end
 
@@ -162,15 +200,50 @@ class GitPulls
     info.to_s.gsub("\n", ' ')
   end
 
+
+  # PRIVATE REPOSITORIES ACCESS
+  
+  def github_username
+    git("config --get-all github.user")
+  end
+  
+  def github_token
+    git("config --get-all github.token")
+  end
+
   # API/DATA HELPER FUNCTIONS #
+  
+  def github_credentials_provided?
+    if github_token.empty? && github_username.empty?
+      return false
+    end
+    true
+  end
+ 
+  def authentication_options    
+    if github_credentials_provided?
+      options = {:basic_auth => {:username => "#{github_username}/token:#{github_token}"}}
+    end
+    options || {}
+  end
  
   def get_pull_info
     get_data(PULLS_CACHE_FILE)['pulls']
   end
 
+  def get_repo_visibility
+    # This would fail if the repository was private and user did not provide github token
+    if github_credentials_provided?
+      repo_path = "/repos/show/#{repo_info[0]}/#{repo_info[1]}"
+      repo_response = HTTParty.get("https://#{github_url}/api/v2/json" << repo_path, authentication_options)
+      repo_response['repository']['private'] if repo_response['repository']
+    end
+  end
+
   def cache_pull_info
     path = "/pulls/#{@user}/#{@repo}/open"
-    response = HTTParty.get('https://github.com/api/v2/json' << path)
+    puts "https://#{github_url}/api/v2/json"
+    response = HTTParty.get("https://#{github_url}/api/v2/json" << path, authentication_options)
     save_data(response, PULLS_CACHE_FILE)
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-pulls
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 21
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Scott Chacon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 -08:00
+date: 2011-02-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: "  git-pulls facilitates github pull requests.\n"
 email: schacon@gmail.com
 executables: