git-pulls-updated 0.3.5

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Scott Chacon
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/git-pulls

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'git-pulls'
+
+GitPulls.start(ARGV)

data/lib/git-pulls.rb

@@ -0,0 +1,300 @@
+require 'json'
+require 'launchy'
+require 'octokit'
+
+class GitPulls
+
+  PULLS_CACHE_FILE = '.git/pulls_cache.json'
+
+  def initialize(args)
+    @command = args.shift
+    @user, @repo = repo_info
+    @args = args
+  end
+
+  def self.start(args)
+    GitPulls.new(args).run
+  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
+      # 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
+  end
+
+  ## COMMANDS ##
+
+  def help
+    puts "No command: #{@command}"
+    puts "Try: update, list, show, merge, browse"
+    puts "or call with '-h' 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
+    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']
+      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."
+        puts "You can manually patch your repo by running:"
+        puts
+        puts "  curl #{purl} | 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
+  end
+
+  def show
+    num = @args.shift
+    option = @args.shift
+    if p = pull_num(num)
+      puts "Number   : #{p['number']}"
+      puts "Label    : #{p['head']['label']}"
+      puts "Created  : #{p['created_at']}"
+      puts "Votes    : #{p['votes']}"
+      puts "Comments : #{p['comments']}"
+      puts
+      puts "Title    : #{p['title']}"
+      puts "Body     :"
+      puts
+      puts p['body']
+      puts
+      puts '------------'
+      puts
+      if option == '--full'
+        exec "git diff --color=always HEAD...#{p['head']['sha']}"
+      else
+        puts "cmd: git diff HEAD...#{p['head']['sha']}"
+        puts git("diff --stat --color=always HEAD...#{p['head']['sha']}")
+      end
+    else
+      puts "No such number"
+    end
+  end
+
+  def browse
+    num = @args.shift
+    if p = pull_num(num)
+      Launchy.open(p['html_url'])
+    else
+      puts "No such number"
+    end
+  end
+
+  def list
+    option = @args.shift
+    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)
+      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)
+      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
+    puts "Updating #{@user}/#{@repo}"
+    cache_pull_info
+    fetch_stale_forks
+    list
+  end
+
+  def fetch_stale_forks
+    puts "Checking for forks in need of fetching"
+    pulls = get_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}"
+        repos[repo] = true
+      end
+    end
+    repos.each do |repo, bool|
+      puts "  fetching #{repo}"
+      git("fetch #{github_endpoint}/#{repo}.git +refs/heads/*:refs/pr/#{repo}/*")
+    end
+  end
+
+  def has_sha(sha)
+    git("show #{sha} 2>&1")
+    $?.exitstatus == 0
+  end
+
+  def not_merged?(sha)
+    commits = git("rev-list #{sha} ^HEAD 2>&1")
+    commits.split("\n").size > 0
+  end
+
+  # DISPLAY HELPER FUNCTIONS #
+
+  def l(info, size)
+    clean(info)[0, size].ljust(size)
+  end
+
+  def r(info, size)
+    clean(info)[0, size].rjust(size)
+  end
+
+  def clean(info)
+    info.to_s.gsub("\n", ' ')
+  end
+
+  # PRIVATE REPOSITORIES ACCESS
+
+  def configure
+    Octokit.configure do |config|
+      config.login = github_login
+      config.web_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_login.empty?
+      return false
+    end
+    true
+  end
+
+  def get_pull_info
+    get_data(PULLS_CACHE_FILE)['pulls']
+  end
+
+  def get_data(file)
+    data = JSON.parse(File.read(file))
+  end
+
+  def cache_pull_info
+    response = Octokit.pull_requests("#{@user}/#{@repo}")
+    save_data({'pulls' => response}, PULLS_CACHE_FILE)
+  end
+
+  def save_data(data, file)
+    File.open(file, "w+") do |f|
+      f.puts data.to_json
+    end
+  end
+
+  def pull_num(num)
+    data = get_pull_info
+    data.select { |p| p['number'].to_s == num.to_s }.first
+  end
+
+  def github_insteadof_matching(c, u)
+    first = c.collect {|k,v| [v, /url\.(.*github\.com.*)\.insteadof/.match(k)]}.
+              find {|v,m| u.index(v) and m != nil}
+    if first
+      return first[0], first[1][1]
+    end
+    return nil, nil
+  end
+
+  def github_user_and_proj(u)
+    # Trouble getting optional ".git" at end to work, so put that logic below
+    m = /github\.com.(.*?)\/(.*)/.match(u)
+    if m
+      return m[1], m[2].sub(/\.git\Z/, "")
+    end
+    return nil, nil
+  end
+
+  def repo_info
+    c = {}
+    config = git('config --list')
+    config.split("\n").each do |line|
+      k, v = line.split('=')
+      c[k] = v
+    end
+    u = c['remote.origin.url']
+
+    user, proj = github_user_and_proj(u)
+    if !(user and proj)
+      short, base = github_insteadof_matching(c, u)
+      if short and base
+        u = u.sub(short, base)
+        user, proj = github_user_and_proj(u)
+      end
+    end
+    [user, proj]
+  end
+
+  def git(command)
+    `git #{command}`.chomp
+  end
+end

metadata

@@ -0,0 +1,96 @@
+--- !ruby/object:Gem::Specification
+name: git-pulls-updated
+version: !ruby/object:Gem::Version
+  version: 0.3.5
+  prerelease: 
+platform: ruby
+authors:
+- Adrien Giboire
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-11-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: git-pulls facilitates github pull requests.
+email: adrien.giboire@gmail.com
+executables:
+- git-pulls
+extensions: []
+extra_rdoc_files: []
+files:
+- LICENSE
+- lib/git-pulls.rb
+- bin/git-pulls
+homepage: http://github.com/adriengiboire/git-pulls
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.24
+signing_key: 
+specification_version: 3
+summary: facilitates github pull requests
+test_files: []