git-pulls 0.2.1 → 0.3.0

data/lib/git-pulls.rb

@@ -1,8 +1,6 @@
-require 'rubygems'
 require 'json'
-require 'httparty'
 require 'launchy'
-require 'pp'
+require 'octokit'
 
 class GitPulls
 
@@ -19,6 +17,7 @@ class GitPulls
   end
 
   def run
+    configure
     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
@@ -34,7 +33,7 @@ class GitPulls
   end
 
   ## COMMANDS ##
- 
+
   def help
     puts "No command: #{@command}"
     puts "Try: update, list, show, merge, browse"
@@ -113,7 +112,7 @@ Usage: git pulls update
 
   def list
     option = @args.shift
-    puts "Open Pull Requests for #{@user}/#{@repo}" 
+    puts "Open Pull Requests for #{@user}/#{@repo}"
     pulls = get_pull_info
     pulls.reverse! if option == '--reverse'
     count = 0
@@ -136,20 +135,15 @@ Usage: git pulls update
   end
 
   def update
-    puts "Updating #{@user}/#{@repo}" 
+    puts "Updating #{@user}/#{@repo}"
     cache_pull_info
     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']
@@ -162,16 +156,18 @@ Usage: git pulls update
     end
     repos.each do |repo, bool|
       puts "  fetching #{repo}"
-      git("fetch #{protocol(is_private)}#{github_url}/#{repo}.git +refs/heads/*:refs/pr/#{repo}/*")
+      git("fetch #{protocol(get_repo_visibility)}#{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'
+  def protocol(is_private)
+    is_private ? "ssh://git@" : "git://"
+  end
+
+  def get_repo_visibility
+    # This would fail if the repository was private and user did not provide github token
+    if github_credentials_provided?
+      Octokit.repository("#{repo_info[0]}/#{repo_info[1]}").private
     end
   end
 
@@ -185,7 +181,6 @@ Usage: git pulls update
     commits.split("\n").size > 0
   end
 
-
   # DISPLAY HELPER FUNCTIONS #
 
   def l(info, size)
@@ -200,55 +195,53 @@ Usage: git pulls update
     info.to_s.gsub("\n", ' ')
   end
 
-
   # PRIVATE REPOSITORIES ACCESS
-  
-  def github_username
+
+  def configure
+    Octokit.configure do |config|
+      config.login = github_login
+      config.token = github_token
+      config.endpoint = github_endpoint
+    end
+  end
+
+  def github_login
     git("config --get-all github.user")
   end
-  
+
   def github_token
     git("config --get-all github.token")
   end
 
+  def github_endpoint
+    host = git("config --get-all github.host")
+    if host.size > 0
+      host
+    else
+      'https://github.com/'
+    end
+  end
+
   # API/DATA HELPER FUNCTIONS #
-  
+
   def github_credentials_provided?
-    if github_token.empty? && github_username.empty?
+    if github_token.empty? && github_login.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
+  def get_data(file)
+    data = JSON.parse(File.read(file))
   end
 
   def cache_pull_info
-    path = "/pulls/#{@user}/#{@repo}/open"
-    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
-
-  def get_data(file)
-    data = JSON.parse(File.read(file))
+    response = Octokit.pull_requests("#{@user}/#{@repo}")
+    save_data({'pulls' => response}, PULLS_CACHE_FILE)
   end
 
   def save_data(data, file)
@@ -262,16 +255,15 @@ Usage: git pulls update
     data.select { |p| p['number'].to_s == num.to_s }.first
   end
 
-
   def repo_info
     c = {}
     config = git('config --list')
-    config.split("\n").each do |line| 
+    config.split("\n").each do |line|
       k, v = line.split('=')
       c[k] = v
     end
     u = c['remote.origin.url']
-    if m = /github\.com.(.*?)\/(.*?)\.git/.match(u)
+    if m = /github\.com.(.*?)\/(.*)\.git/.match(u)
       user = m[1]
       proj = m[2]
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-pulls
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Scott Chacon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -05:00
+date: 2011-02-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: launchy
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +47,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: launchy
+  name: octokit
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,7 +60,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-description: "  git-pulls facilitates github pull requests.\n"
+description: git-pulls facilitates github pull requests.
 email: schacon@gmail.com
 executables: 
 - git-pulls