jqr-github 0.3.4

data/lib/commands/helpers.rb

@@ -0,0 +1,397 @@
+DEV_NULL = File.exist?("/dev/null") ? "/dev/null" : "nul:"
+
+helper :user_and_repo_from do |url|
+  case url
+  when %r|^git://github\.com/([^/]+/[^/]+)$|: $1.split('/')
+  when %r|^(?:ssh://)?(?:git@)?github\.com:([^/]+/[^/]+)$|: $1.split('/')
+  end
+end
+
+helper :user_and_repo_for do |remote|
+  user_and_repo_from(url_for(remote))
+end
+
+helper :user_for do |remote|
+  user_and_repo_for(remote).try.first
+end
+
+helper :repo_for do |remote|
+  user_and_repo_for(remote).try.last
+end
+
+helper :origin do
+  orig = `git config --get github.origin`.chomp
+  orig = nil if orig.empty?
+  orig || 'origin'
+end
+
+helper :project do
+  repo = repo_for(origin)
+  if repo.nil?
+    if url_for(origin) == ""
+      STDERR.puts "Error: missing remote 'origin'"
+    else
+      STDERR.puts "Error: remote 'origin' is not a github URL"
+    end
+    exit 1
+  end
+  repo.chomp('.git')
+end
+
+helper :url_for do |remote|
+  `git config --get remote.#{remote}.url`.chomp
+end
+
+helper :local_heads do
+  `git show-ref --heads --hash`.split("\n")
+end
+
+helper :has_commit? do |sha|
+  `git show #{sha} >#{DEV_NULL} 2>#{DEV_NULL}`
+  $?.exitstatus == 0
+end
+
+helper :resolve_commits do |treeish|
+  if treeish
+    if treeish.match(/\.\./)
+      commits = `git rev-list #{treeish}`.split("\n")
+    else
+      commits = `git rev-parse #{treeish}`.split("\n")
+    end
+  else
+    # standard in
+    puts 'reading from stdin...'
+    commits = $stdin.read.split("\n")
+  end
+  commits.select { |a| a.size == 40 } # only the shas, not the ^SHAs
+end
+
+helper :ignore_file_path do
+  dir = `git rev-parse --git-dir`.chomp
+  File.join(dir, 'ignore-shas')
+end
+
+helper :ignore_sha_array do
+  File.open( ignore_file_path ) { |yf| YAML::load( yf ) } rescue {}
+end
+
+helper :remove_ignored do |array, ignore_array|
+  array.reject { |id| ignore_array[id] }
+end
+
+helper :ignore_shas do |shas|
+  ignores = ignore_sha_array
+  shas.each do |sha|
+    puts 'ignoring ' + sha
+    ignores[sha] = true
+  end
+  File.open( ignore_file_path, 'w' ) do |out|
+    YAML.dump( ignores, out )
+  end
+end
+
+helper :get_commits do |rev_array|
+  list = rev_array.select { |a| has_commit?(a) }.join(' ')
+  `git log --pretty=format:"%H::%ae::%s::%ar::%ad" --no-merges #{list}`.split("\n").map { |a| a.split('::') }
+end
+
+helper :get_cherry do |branch|
+  `git cherry HEAD #{branch} | git name-rev --stdin`.split("\n").map { |a| a.split(' ') }
+end
+
+helper :get_common do |branch|
+  `git rev-list ..#{branch} --boundary | tail -1 | git name-rev --stdin`.split(' ')[1] rescue 'unknown'
+end
+
+helper :print_commits do |our_commits, options|
+  ignores = ignore_sha_array
+
+  case options[:sort]
+  when 'branch'
+    our_commits.sort! { |a, b| a[0][2] <=> b[0][2] }
+  when 'author'
+    our_commits.sort! { |a, b| a[1][1] <=> b[1][1] }
+  else
+    our_commits.sort! { |a, b| Date.parse(a[1][4]) <=> Date.parse(b[1][4]) } rescue 'cant parse dates'
+  end
+
+  shown_commits = {}
+  before = Date.parse(options[:before]) if options[:before] rescue puts 'cant parse before date'
+  after = Date.parse(options[:after]) if options[:after] rescue puts 'cant parse after date'
+  our_commits.each do |cherry, commit|
+    status, sha, ref_name = cherry
+    next if shown_commits[sha] || ignores[sha]
+    next if options[:project] && !ref_name.match(Regexp.new(options[:project]))
+    ref_name = ref_name.gsub('remotes/', '')
+    if status == '+' && commit
+      next if options[:author] && !commit[1].match(Regexp.new(options[:author]))
+      next if options[:before] && before && (before < Date.parse(commit[4]))  rescue false
+      next if options[:after] && after && (after > Date.parse(commit[4])) rescue false
+      applies = applies_cleanly(sha)
+      next if options[:applies] && !applies
+      next if options[:noapply] && applies
+      if options[:shas]
+        puts sha
+      else
+        common = options[:common] ? get_common(sha) : ''
+        puts [sha[0,6], ref_name.ljust(25), commit[1][0,20].ljust(21),
+            commit[2][0, 36].ljust(38), commit[3][0,15], common].join(" ")
+      end
+    end
+    shown_commits[sha] = true
+  end
+end
+
+helper :applies_cleanly do |sha|
+  `git diff ...#{sha} | git apply --check >#{DEV_NULL} 2>#{DEV_NULL}`
+  $?.exitstatus == 0
+end
+
+helper :remotes do
+  regexp = '^remote\.(.+)\.url$'
+  `git config --get-regexp '#{regexp}'`.split("\n").inject({}) do |memo, line|
+    name_string, url = line.split(/ /, 2)
+    m, name = *name_string.match(/#{regexp}/)
+    memo[name.to_sym] = url
+    memo
+  end
+end
+
+helper :remote_branches_for do |user|
+  `git ls-remote -h #{user} 2> #{DEV_NULL}`.split(/\n/).inject({}) do |memo, line|
+    hash, head = line.split(/\t/, 2)
+    head = head[%r{refs/heads/(.+)$},1] unless head.nil?
+    memo[head] = hash unless head.nil?
+    memo
+  end if !(user.nil? || user.strip.empty?)
+end
+
+helper :remote_branch? do |user, branch|
+  remote_branches_for(user).key?(branch)
+end
+
+helper :branch_dirty? do
+  # see if there are any cached or tracked files that have been modified
+  # originally, we were going to use git-ls-files but that could only
+  # report modified track files...not files that have been staged
+  # for committal
+  !(system("git diff --quiet 2>#{DEV_NULL}") or !system("git diff --cached --quiet 2>#{DEV_NULL}"))
+end
+
+helper :tracking do
+  remotes.inject({}) do |memo, (name, url)|
+    if ur = user_and_repo_from(url)
+      memo[name] = ur.first
+    else
+      memo[name] = url
+    end
+    memo
+  end
+end
+
+helper :tracking? do |user|
+  tracking.values.include?(user)
+end
+
+helper :owner do
+  user_for(origin)
+end
+
+helper :current_branch do
+  `git rev-parse --symbolic-full-name HEAD`.chomp.sub(/^refs\/heads\//, '')
+end
+
+helper :user_and_branch do
+  raw_branch = current_branch
+  user, branch = raw_branch.split(/\//, 2)
+  if branch
+    [user, branch]
+  else
+    [owner, user]
+  end
+end
+
+helper :branch_user do
+  user_and_branch.first
+end
+
+helper :branch_name do
+  user_and_branch.last
+end
+
+helper :public_url_for_user_and_repo do |user, repo|
+  "git://github.com/#{user}/#{repo}.git"
+end
+
+helper :private_url_for_user_and_repo do |user, repo|
+  "git@github.com:#{user}/#{repo}.git"
+end
+
+helper :public_url_for do |user|
+  public_url_for_user_and_repo user, project
+end
+
+helper :private_url_for do |user|
+  private_url_for_user_and_repo user, project
+end
+
+helper :homepage_for do |user, branch|
+  "https://github.com/#{user}/#{project}/tree/#{branch}"
+end
+
+helper :network_page_for do |user|
+  "https://github.com/#{user}/#{project}/network"
+end
+
+helper :network_meta_for do |user|
+  "http://github.com/#{user}/#{project}/network_meta"
+end
+
+helper :network_members_for do |user|
+  "http://github.com/#{user}/#{project}/network/members.json"
+end
+
+helper :has_launchy? do |blk|
+  begin
+    gem 'launchy'
+    require 'launchy'
+    blk.call
+  rescue Gem::LoadError
+    STDERR.puts "Sorry, you need to install launchy: `gem install launchy`"
+  end
+end
+
+helper :open do |url|
+  has_launchy? proc {
+    Launchy::Browser.new.visit url
+  }
+end
+
+helper :print_network_help do
+  puts "
+You have to provide a command :
+
+    web [user]     - opens your web browser to the network graph page for this
+                     project, or for the graph page for [user] if provided
+
+    list           - shows the projects in your network that have commits
+                     that you have not pulled in yet, and branch names
+
+    fetch          - adds all projects in your network as remotes and fetches
+                     any objects from them that you don't have yet
+
+    commits        - will show you a list of all commits in your network that
+                     you have not ignored or have not merged or cherry-picked.
+                     This will automatically fetch objects you don't have yet.
+
+      --project (user/branch)  - only show projects that match string
+      --author (email)         - only show projects that match string
+      --after (date)           - only show commits after date
+      --before (date)          - only show commits before date
+      --shas                   - only print shas (can pipe through 'github ignore')
+      --applies                - filter to patches that still apply cleanly
+      --sort                   - how to sort the commits (date, branch, author)
+"
+end
+
+helper :print_network_cherry_help do
+  $stderr.puts "
+=========================================================================================
+These are all the commits that other people have pushed that you have not
+applied or ignored yet (see 'github ignore'). Some things you might want to do:
+
+* You can run 'github fetch user/branch' (sans '~N') to pull into a local branch for testing
+* You can run 'github cherry-pick [SHA]' to apply a single patch
+* You can run 'github merge user/branch' to merge a commit and all the '~N' variants.
+* You can ignore all commits from a branch with 'github ignore ..user/branch'
+=========================================================================================
+
+"
+end
+
+helper :argv do
+  GitHub.original_args
+end
+
+helper :network_members do
+  get_network_members(owner, {}).map {|member| member['owner']['login'] }
+end
+
+
+helper :get_network_data do |user, options|
+  if options[:cache] && has_cache?
+    return get_cache
+  end
+  if cache_network_data(options)
+    begin
+      return cache_data(user)
+    rescue SocketError
+      STDERR.puts "*** Warning: There was a problem accessing the network."
+      rv = get_cache
+      STDERR.puts "Using cached data."
+      rv
+    end
+  else
+    return get_cache
+  end
+end
+
+helper :get_network_members do |user, options|
+  json = Kernel.open(network_members_for(user)).read
+  JSON.parse(json)["users"]
+end
+
+helper :cache_commits do |commits|
+  File.open( commits_cache_path, 'w' ) do |out|
+    out.write(commits.to_yaml)
+  end
+end
+
+helper :commits_cache do
+  YAML.load(File.open(commits_cache_path))
+end
+
+helper :cache_commits_data do |options|
+  cache_expired? || options[:nocache] || !has_commits_cache?
+end
+
+helper :cache_network_data do |options|
+  cache_expired? || options[:nocache] || !has_cache?
+end
+
+helper :network_cache_path do
+  dir = `git rev-parse --git-dir`.chomp
+  File.join(dir, 'network-cache')
+end
+
+helper :commits_cache_path do
+  dir = `git rev-parse --git-dir`.chomp
+  File.join(dir, 'commits-cache')
+end
+
+helper :cache_data do |user|
+  raw_data = Kernel.open(network_meta_for(user)).read
+  File.open( network_cache_path, 'w' ) do |out|
+    out.write(raw_data)
+  end
+  data = JSON.parse(raw_data)
+end
+
+helper :cache_expired? do
+  return true if !has_cache?
+  age = Time.now - File.stat(network_cache_path).mtime
+  return true if age > (60 * 60) # 1 hour
+  false
+end
+
+helper :has_cache? do
+  File.file?(network_cache_path)
+end
+
+helper :has_commits_cache? do
+  File.file?(commits_cache_path)
+end
+
+helper :get_cache do
+  JSON.parse(File.read(network_cache_path))
+end

data/lib/commands/network.rb

@@ -0,0 +1,113 @@
+desc "Project network tools - sub-commands : web [user], list, fetch, commits"
+flags :after => "Only show commits after a certain date"
+flags :before => "Only show commits before a certain date"
+flags :shas => "Only show shas"
+flags :project => "Filter commits on a certain project"
+flags :author => "Filter commits on a email address of author"
+flags :applies => "Filter commits to patches that apply cleanly"
+flags :noapply => "Filter commits to patches that do not apply cleanly"
+flags :nocache => "Do not use the cached network data"
+flags :cache => "Use the network data even if it's expired"
+flags :sort => "How to sort : date(*), branch, author"
+flags :common => "Show common branch point"
+flags :thisbranch => "Look at branches that match the current one"
+flags :limit => "Only look through the first X heads - useful for really large projects"
+command :network do |command, user|
+  return if !helper.project
+  user ||= helper.owner
+
+  case command
+  when 'web'
+    helper.open helper.network_page_for(user)
+  when 'list'
+    members = helper.get_network_members(user, options)
+    members.each do |hsh|
+      puts hsh["owner"]["login"]
+    end
+  when 'fetch'
+    # fetch each remote we don't have
+    data = helper.get_network_data(user, options)
+    data['users'].each do |hsh|
+      u = hsh['name']
+      GitHub.invoke(:track, u) unless helper.tracking?(u)
+      puts "fetching #{u}"
+      GitHub.invoke(:fetch_all, u)
+    end
+  when 'commits'
+    # show commits we don't have yet
+
+    $stderr.puts 'gathering heads'
+    cherry = []
+
+    if helper.cache_commits_data(options)
+      ids = []
+      data = helper.get_network_data(user, options)
+      data['users'].each do |hsh|
+        u = hsh['name']
+        if options[:thisbranch]
+          user_ids = hsh['heads'].map { |a| a['id'] if a['name'] == helper.current_branch }.compact
+        else
+          user_ids = hsh['heads'].map { |a| a['id'] }
+        end
+        user_ids.each do |id|
+          if !helper.has_commit?(id) && helper.cache_expired?
+            GitHub.invoke(:track, u) unless helper.tracking?(u)
+            puts "fetching #{u}"
+            GitHub.invoke(:fetch_all, u)
+          end
+        end
+        ids += user_ids
+      end
+      ids.uniq!
+
+      $stderr.puts 'has heads'
+
+      # check that we have all these shas locally
+      local_heads = helper.local_heads
+      local_heads_not = local_heads.map { |a| "^#{a}"}
+      looking_for = (ids - local_heads) + local_heads_not
+      commits = helper.get_commits(looking_for)
+
+      $stderr.puts 'ID SIZE:' + ids.size.to_s
+
+      ignores = helper.ignore_sha_array
+
+      ids.each do |id|
+        next if ignores[id] || !commits.assoc(id)
+        cherries = helper.get_cherry(id)
+        cherries = helper.remove_ignored(cherries, ignores)
+        cherry += cherries
+        helper.ignore_shas([id]) if cherries.size == 0
+        $stderr.puts "checking head #{id} : #{cherry.size.to_s}"
+        break if options[:limit] && cherry.size > options[:limit].to_i
+      end
+    end
+
+    if cherry.size > 0 || !helper.cache_commits_data(options)
+      helper.print_network_cherry_help if !options[:shas]
+
+      if helper.cache_commits_data(options)
+        $stderr.puts "caching..."
+        $stderr.puts "commits: " + cherry.size.to_s
+        our_commits = cherry.map { |item| c = commits.assoc(item[1]); [item, c] if c }
+        our_commits.delete_if { |item| item == nil }
+        helper.cache_commits(our_commits)
+      else
+        $stderr.puts "using cached..."
+        our_commits = helper.commits_cache
+      end
+
+      helper.print_commits(our_commits, options)
+    else
+      puts "no unapplied commits"
+    end
+  else
+    helper.print_network_help
+  end
+end
+
+desc "Ignore a SHA (from 'github network commits')"
+command :ignore do |sha|
+  commits = helper.resolve_commits(sha)
+  helper.ignore_shas(commits)             # add to .git/ignore-shas file
+end

data/lib/github/command.rb

@@ -0,0 +1,129 @@
+require 'fileutils'
+
+if RUBY_PLATFORM =~ /mswin|mingw/
+  begin
+    require 'win32/open3'
+  rescue LoadError
+    warn "You must 'gem install win32-open3' to use the github command on Windows"
+    exit 1
+  end
+else
+  require 'open3'
+end
+
+module GitHub
+  class Command
+    include FileUtils
+
+    def initialize(block)
+      (class << self;self end).send :define_method, :command, &block
+    end
+
+    def call(*args)
+      arity = method(:command).arity
+      args << nil while args.size < arity
+      send :command, *args
+    end
+
+    def helper
+      @helper ||= Helper.new
+    end
+
+    def options
+      GitHub.options
+    end
+
+    def pgit(*command)
+      puts git(*command)
+    end
+
+    def git(command)
+      run :sh, command
+    end
+
+    def git_exec(command)
+      run :exec, command
+    end
+
+    def run(method, command)
+      if command.is_a? Array
+        command = [ 'git', command ].flatten
+        GitHub.learn command.join(' ')
+      else
+        command = 'git ' + command
+        GitHub.learn command
+      end
+
+      send method, *command
+    end
+
+    def sh(*command)
+      Shell.new(*command).run
+    end
+
+    def die(message)
+      puts "=> #{message}"
+      exit!
+    end
+
+    def github_user
+      git("config --get github.user")
+    end
+
+    def github_token
+      git("config --get github.token")
+    end
+
+    def shell_user
+      ENV['USER']
+    end
+
+    def current_user?(user)
+      user == github_user || user == shell_user
+    end
+
+    class Shell < String
+      attr_reader :error
+      attr_reader :out
+
+      def initialize(*command)
+        @command = command
+      end
+
+      def run
+        GitHub.debug "sh: #{command}"
+        _, out, err = Open3.popen3(*@command)
+
+        out = out.read.strip
+        err = err.read.strip
+
+        replace @error = err if err.any?
+        replace @out = out if out.any?
+
+        self
+      end
+
+      def command
+        @command.join(' ')
+      end
+
+      def error?
+        !!@error
+      end
+
+      def out?
+        !!@out
+      end
+    end
+  end
+
+  class GitCommand < Command
+    def initialize(name)
+      @name = name
+    end
+
+    def command(*args)
+      git_exec [ @name, args ]
+    end
+  end
+end

data/lib/github/extensions.rb

@@ -0,0 +1,39 @@
+# define #try
+class Object
+  def try
+    self
+  end
+end
+
+class NilClass
+  klass = Class.new
+  klass.class_eval do
+    instance_methods.each { |meth| undef_method meth.to_sym unless meth =~ /^__(id|send)__$/ }
+    def method_missing(*args)
+      self
+    end
+  end
+  NilProxy = klass.new
+  def try
+    NilProxy
+  end
+end
+
+# define #tap
+class Object
+  def tap(&block)
+    block.call(self)
+    self
+  end
+end
+
+# cute
+module Color
+  COLORS = { :clear => 0, :red => 31, :green => 32, :yellow => 33 }
+  def self.method_missing(color_name, *args)
+    color(color_name) + args.first + color(:clear)
+  end
+  def self.color(color)
+    "\e[#{COLORS[color.to_sym]}m"
+  end
+end

data/lib/github/helper.rb

@@ -0,0 +1,4 @@
+module GitHub
+  class Helper
+  end
+end