git-pulls 0.4.11 → 0.4.12

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjMwOTk4MWI4MTFlNzc5NzIwMDgxM2QxMzM1MGJjYzYwYmNhMjFhMA==
-  data.tar.gz: !binary |-
-    ZmFmNWE4YmMwZDZlMDZjNzFlZjUzNzRhOTMyZjQ1YTcwZDQ2MDc3Yg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NWI0NmNmYzJhMzI3ZTAxNzI3ZjBlN2U2ZDRmNzYxNjgzZGE5MGZjNjRlNTIy
-    MTgyMzYxNTNiOTAwOTFlNTBjZTI3ZWE0Mjg2YWM5YzIxMjQzZTZjYzBmNTZk
-    MmM1ODA4N2MxOTQxNDhhY2MzMWMxMTY4ZDJkYjZiNTRkZWY3OWU=
-  data.tar.gz: !binary |-
-    ZjQxNmM4YjM2MmEwN2Y5OGYxNTNlZGFlMDgwZWU0MDg1NTZhOTRlOTQzZWRm
-    MWNkODI2NTA1ZWE5ODk1NzExOWY1ZDcwODQ2MTk3ZWExM2Y2OWI0ZTZjZGI4
-    MTRhMzJjNTBkN2E5NTdmNWM3NWE5ZTc3ZGIxMDUyZGY3ZmExMDM=
+SHA1:
+  metadata.gz: f35d8b240687ef48fd376f27c17aa41c29c72b41
+  data.tar.gz: 3f53f4db3eed289af7aaebbf13a8c4ffd240bb2f
+SHA512:
+  metadata.gz: 9d85547f20bd78a3cf3b2ed674296a9610cae1e0181f8e9be3ab88ff0da72821cd85b1651df1d8cd162e4659e7492e581280d773c094da7417e5c175ea55052c
+  data.tar.gz: 1149f22240e3e3df7954a18a4dc347dca2cd6112f314380206754e5d0d3b948c7e921c9ea01fee96fd87cb12fee8c9ff2b087d8fb08aceea2202e477dad3af66

data/lib/git-pulls.rb

@@ -3,11 +3,13 @@ require 'json'
 require 'date'
 require 'launchy'
 require 'octokit'
+require 'psych'
 
 class GitPulls
 
+  GIT_REMOTE = ENV['GIT_REMOTE'] || 'origin'
   GIT_PATH = lambda { return `git rev-parse --git-dir`.chomp }
-  PULLS_CACHE_FILE = "#{GIT_PATH.call}/pulls_cache.json"
+  PULLS_CACHE_FILE = "#{GIT_PATH.call}/pulls_cache.yml"
 
   def initialize(args)
     @command = args.shift
@@ -63,33 +65,39 @@ Usage: git pulls update
   def merge
     num = @args.shift
     option = @args.shift
-    if p = pull_num(num)
-      if p['head']['repository']
-        o = p['head']['repository']['owner']
-        r = p['head']['repository']['name']
+    if pull = pull_num(num)
+      head = pull[:head].to_hash
+      user = pull[:user].to_hash
+
+      if repo = head[:repo] && head[:repo].to_hash
+        owner     = repo[:owner].to_hash
+        repo_name = repo[:name]
+
+        sha = head[:sha]
+
+        message = "Merge pull request ##{num} from #{owner[:login]}/#{repo_name}\n\n---\n\n"
+        message += pull[:body].gsub("'", '')
+        cmd = ''
+        if option == '--log'
+          message += "\n\n---\n\nMerge Log:\n"
+          puts cmd = "git merge --no-ff --log -m '#{message}' #{sha}"
+        else
+          puts cmd = "git merge --no-ff -m '#{message}' #{sha}"
+        end
+        exec(cmd)
+
       else # they deleted the source repo
-        o = p['head']['user']['login']
-        purl = p['patch_url']
-        puts "Sorry, #{o} deleted the source repository, git-pulls doesn't support this."
+        owner     = head[:user].to_hash[:login]
+        patch_url = "#{pull[:_links].to_hash[:html].to_hash[:href]}.patch"
+
+        puts "Sorry, #{owner} deleted the source repository, git-pulls doesn't support this."
         puts "You can manually patch your repo by running:"
         puts
-        puts "  curl #{purl} | git am"
+        puts "  curl #{patch_url} | git am"
         puts
         puts "Tell the contributor not to do this."
         return false
       end
-      s = p['head']['sha']
-
-      message = "Merge pull request ##{num} from #{o}/#{r}\n\n---\n\n"
-      message += p['body'].gsub("'", '')
-      cmd = ''
-      if option == '--log'
-        message += "\n\n---\n\nMerge Log:\n"
-        puts cmd = "git merge --no-ff --log -m '#{message}' #{s}"
-      else
-        puts cmd = "git merge --no-ff -m '#{message}' #{s}"
-      end
-      exec(cmd)
     else
       puts "No such number"
     end
@@ -99,40 +107,47 @@ Usage: git pulls update
     num = @args.shift
     optiona = @args.shift
     optionb = @args.shift
-    if p = pull_num(num)
+
+    if pull = pull_num(num)
+      head = pull[:head].to_hash
+      repo = head[:repo].to_hash
+      user = pull[:user].to_hash
+
       comments = []
       if optiona == '--comments' || optionb == '--comments'
-        i_comments = Octokit.issue_comments("#{@user}/#{@repo}", num)
-        p_comments = Octokit.pull_request_comments("#{@user}/#{@repo}", num)
-        c_comments = Octokit.commit_comments(p['head']['repo']['full_name'], p['head']['sha'])
-        comments = (i_comments | p_comments | c_comments).sort_by {|i| i['created_at']}
+        i_comments = Octokit.issue_comments("#{@user}/#{@repo}", num).map(&:to_hash)
+        p_comments = Octokit.pull_request_comments("#{@user}/#{@repo}", num).map(&:to_hash)
+        c_comments = Octokit.commit_comments(repo[:full_name], head[:sha])
+        comments = (i_comments | p_comments | c_comments).sort_by {|i| i[:created_at]}
       end
-      puts "Number   : #{p['number']}"
-      puts "Label    : #{p['head']['label']}"
-      puts "Creator  : #{p['user']['login']}"
-      puts "Created  : #{p['created_at']}"
+      puts "Number   : #{pull[:number]}"
+      puts "Label    : #{head[:label]}"
+      puts "Creator  : #{user[:login]}"
+      puts "Created  : #{pull[:created_at]}"
       puts
-      puts "Title    : #{p['title']}"
+      puts "Title    : #{pull[:title]}"
       puts
-      puts p['body']
+      puts pull[:body]
       puts
       puts '------------'
       puts
-      comments.each do |c|
-        puts "Comment  : #{c['user']['login']}"
-        puts "Created  : #{c['created_at']}"
-        puts "File     : #{c['path']}:L#{c['line'] || c['position'] || c['original_position']}" unless c['path'].nil?
+      comments.each do |comment|
+        user = comment[:user]
+
+        puts "Comment  : #{user[:login]}"
+        puts "Created  : #{comment[:created_at]}"
+        puts "File     : #{comment[:path]}:L#{comment[:line] || comment[:position] || comment[:original_position]}" unless comment[:path].nil?
         puts
-        puts c['body']
+        puts comment[:body]
         puts
         puts '------------'
         puts
       end
       if optiona == '--full' || optionb == '--full'
-        exec "git diff --color=always HEAD...#{p['head']['sha']}"
+        exec "git diff --color=always HEAD...#{head[:sha]}"
       else
-        puts "cmd: git diff HEAD...#{p['head']['sha']}"
-        puts git("diff --stat --color=always HEAD...#{p['head']['sha']}")
+        puts "cmd: git diff HEAD...#{head[:sha]}"
+        puts git("diff --stat --color=always HEAD...#{head[:sha]}")
       end
     else
       puts "No such number"
@@ -141,8 +156,8 @@ Usage: git pulls update
 
   def browse
     num = @args.shift
-    if p = pull_num(num)
-      Launchy.open(p['html_url'])
+    if pull = pull_num(num)
+      Launchy.open(pull[:_links].to_hash[:html].to_hash[:href])
     else
       puts "No such number"
     end
@@ -162,21 +177,19 @@ Usage: git pulls update
     pulls = state == 'open' ? get_open_pull_info : get_closed_pull_info
     pulls.reverse! if option == '--reverse'
 
-    count = 0
     pulls.each do |pull|
+      pull = pull.to_hash
+      head = pull[:head].to_hash
+
       line = []
-      line << l(pull['number'], 4)
-      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'], 50)
-      sha = pull['head']['sha']
-      if not_merged?(sha)
-        puts line.join ' '
-        count += 1
-      end
+      line << l(pull[:number], 4)
+      line << l(Date.parse(pull[:created_at].to_s).strftime("%m/%d"), 5)
+      line << l(pull[:title], 35)
+      line << l(head[:label], 50)
+
+      puts line.join ' '
     end
-    if count == 0
+    if pulls.count == 0
       puts ' -- no ' + state + ' pull requests --'
     end
   end
@@ -185,9 +198,11 @@ Usage: git pulls update
     puts "Checking out all open pull requests for #{@user}/#{@repo}"
     pulls = get_open_pull_info
     pulls.each do |pull|
-      branch_ref = pull['head']['ref']
+      head        = pull[:head].to_hash
+      branch_ref  = head[:ref]
+
       puts "> #{branch_ref} into pull-#{branch_ref}"
-      git("branch --track #{@args.join(' ')} pull-#{branch_ref} origin/#{branch_ref}")
+      git("branch --track #{@args.join(' ')} pull-#{branch_ref} #{GIT_REMOTE}/#{branch_ref}")
     end
   end
 
@@ -200,15 +215,22 @@ Usage: git pulls update
 
   def fetch_stale_forks
     puts "Checking for forks in need of fetching"
+
     pulls = get_open_pull_info | get_closed_pull_info
     repos = {}
     pulls.each do |pull|
-      next if pull['head']['repository'].nil? # Fork has been deleted
-      o = pull['head']['repository']['owner']
-      r = pull['head']['repository']['name']
-      s = pull['head']['sha']
-      if !has_sha(s)
-        repo = "#{o}/#{r}"
+      head = pull[:head].to_hash
+
+      unless repo = head[:repo] && head[:repo].to_hash
+        next # Fork has been deleted
+      end
+
+      owner     = repo[:owner].to_hash
+      repo_name = repo[:name]
+      sha       = head[:sha]
+
+      unless has_sha?(sha)
+        repo        = "#{owner[:login]}/#{repo_name}"
         repos[repo] = true
       end
     end
@@ -223,7 +245,7 @@ Usage: git pulls update
     end
   end
 
-  def has_sha(sha)
+  def has_sha?(sha)
     git("show #{sha} 2>&1")
     $?.exitstatus == 0
   end
@@ -254,7 +276,7 @@ Usage: git pulls update
 
       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.access_token = github_token if github_token and not github_token.empty?
       config.proxy        = github_proxy if github_proxy and not github_proxy.empty?
       config.api_endpoint = github_api_endpoint if (github_api_endpoint and \
                                                 not github_api_endpoint.empty?)
@@ -301,32 +323,32 @@ Usage: git pulls update
   end
 
   def get_closed_pull_info
-    get_data(PULLS_CACHE_FILE)['closed']
+    get_data(PULLS_CACHE_FILE)['closed'].map(&:to_hash)
   end
 
   def get_open_pull_info
-    get_data(PULLS_CACHE_FILE)['open']
+    get_data(PULLS_CACHE_FILE)['open'].map(&:to_hash)
   end
 
   def get_data(file)
-    data = JSON.parse(File.read(file))
+    ::Psych.load_file(file)
   end
 
   def cache_pull_info
-    response_o = Octokit.pull_requests("#{@user}/#{@repo}")
+    response_o = Octokit.pull_requests("#{@user}/#{@repo}", 'open')
     response_c = Octokit.pull_requests("#{@user}/#{@repo}", 'closed')
     save_data({'open' => response_o, 'closed' => response_c}, PULLS_CACHE_FILE)
   end
 
   def save_data(data, file)
     File.open(file, "w+") do |f|
-      f.puts data.to_json
+      f.puts Psych.dump(data)
     end
   end
 
   def pull_num(num)
-    pull = get_open_pull_info.select { |p| p['number'].to_s == num.to_s }.first
-    pull ||= get_closed_pull_info.select { |p| p['number'].to_s == num.to_s }.first
+    pull = get_open_pull_info.select { |p| p[:number].to_s == num.to_s }.first
+    pull ||= get_closed_pull_info.select { |p| p[:number].to_s == num.to_s }.first
     pull
   end
 
@@ -370,7 +392,7 @@ Usage: git pulls update
       k, v = line.split('=')
       c[k] = v
     end
-    u = c['remote.origin.url']
+    u = c["remote.#{GIT_REMOTE}.url"]
 
     user, proj = github_user_and_proj(u)
     if !(user and proj)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-pulls
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Adrien Giboire
@@ -9,48 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   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: launchy
   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: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.1
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: git-pulls facilitates github pull requests.
@@ -72,12 +100,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []