riquedafreak-github 0.3.1 → 0.3.4

data/Manifest

@@ -1,19 +1,23 @@
-LICENSE
-Manifest
-README
-bin/gh
-bin/github
-commands/commands.rb
-commands/helpers.rb
+setup.rb
 github-gem.gemspec
+lib/github.rb
+lib/commands/commands.rb
+lib/commands/helpers.rb
+lib/commands/network.rb
+lib/github/helper.rb
 lib/github/command.rb
 lib/github/extensions.rb
-lib/github/helper.rb
-lib/github.rb
-spec/command_spec.rb
+bin/gh
+bin/github
 spec/extensions_spec.rb
+spec/spec_helper.rb
 spec/github_spec.rb
+spec/command_spec.rb
 spec/helper_spec.rb
-spec/spec_helper.rb
 spec/ui_spec.rb
 spec/windoze_spec.rb
+Manifest
+Rakefile
+History.txt
+README
+LICENSE

data/README

@@ -22,7 +22,7 @@ Pulling Upstream Changes
 
 Let's say you just forked `github-gem` on GitHub from defunkt.
 
-  $ github clone git://github.com/YOU/github-gem.git
+  $ github clone YOU/github-gem
   $ cd github-gem
   $ github pull defunkt
 

data/bin/gh

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/github'
+lib_dir = File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift lib_dir if File.directory?(lib_dir)
+
+require 'github'
 
 GitHub.activate ARGV

data/bin/github

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/github'
+lib_dir = File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift lib_dir if File.directory?(lib_dir)
+
+require 'github'
 
 GitHub.activate ARGV

data/github-gem.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "github"
-  s.version = "0.3.1"
+  s.version = "0.3.4"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = %q{chris@ozmm.org}
   s.executables = ["github", "gh"]
   s.extra_rdoc_files = ["bin/github", "bin/gh", "lib/github/extensions.rb", "lib/github/command.rb", "lib/github/helper.rb", "lib/github.rb", "LICENSE", "README"]
-  s.files = ["bin/github", "commands/commands.rb", "commands/helpers.rb", "lib/github/extensions.rb", "lib/github/command.rb", "lib/github/helper.rb", "lib/github.rb", "LICENSE", "Manifest", "README", "spec/command_spec.rb", "spec/extensions_spec.rb", "spec/github_spec.rb", "spec/helper_spec.rb", "spec/spec_helper.rb", "spec/ui_spec.rb", "spec/windoze_spec.rb", "github-gem.gemspec"]
+  s.files = ["bin/github", "lib/commands/network.rb", "lib/commands/commands.rb", "lib/commands/helpers.rb", "lib/github/extensions.rb", "lib/github/command.rb", "lib/github/helper.rb", "lib/github.rb", "LICENSE", "Manifest", "README", "spec/command_spec.rb", "spec/extensions_spec.rb", "spec/github_spec.rb", "spec/helper_spec.rb", "spec/spec_helper.rb", "spec/ui_spec.rb", "spec/windoze_spec.rb", "github-gem.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Github", "--main", "README"]
@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   s.summary = %q{The official `github` command line helper for simplifying your GitHub experience.}
 
   # s.add_dependency(%q<launchy>, [">= 0"])
-  s.add_dependency('json', [">= 0"])
+  s.add_dependency('json_pure', [">= 0"])
 end

data/lib/commands/commands.rb

@@ -0,0 +1,206 @@
+desc "Open this repo's master branch in a web browser."
+command :home do |user|
+  if helper.project
+    helper.open helper.homepage_for(user || helper.owner, 'master')
+  end
+end
+
+desc "Automatically set configuration info, or pass args to specify."
+usage "github config [my_username] [my_repo_name]"
+command :config do |user, repo|
+  user ||= ENV['USER']
+  repo ||= File.basename(FileUtils.pwd)
+  git "config --global github.user #{user}"
+  git "config github.repo #{repo}"
+  puts "Configured with github.user #{user}, github.repo #{repo}"
+end
+
+desc "Open this repo in a web browser."
+usage "github browse [user] [branch]"
+command :browse do |user, branch|
+  if helper.project
+    # if one arg given, treat it as a branch name
+    # unless it maches user/branch, then split it
+    # if two args given, treat as user branch
+    # if no args given, use defaults
+    user, branch = user.split("/", 2) if branch.nil? unless user.nil?
+    branch = user and user = nil if branch.nil?
+    user ||= helper.branch_user
+    branch ||= helper.branch_name
+    helper.open helper.homepage_for(user, branch)
+  end
+end
+
+
+desc "Info about this project."
+command :info do
+  puts "== Info for #{helper.project}"
+  puts "You are #{helper.owner}"
+  puts "Currently tracking:"
+  helper.tracking.sort { |(a,),(b,)| a == helper.origin ? -1 : b == helper.origin ? 1 : a.to_s <=> b.to_s }.each do |(name,user_or_url)|
+    puts " - #{user_or_url} (as #{name})"
+  end
+end
+
+desc "Track another user's repository."
+usage "github track remote [user]"
+usage "github track remote [user/repo]"
+usage "github track [user]"
+usage "github track [user/repo]"
+flags :private => "Use git@github.com: instead of git://github.com/."
+flags :ssh => 'Equivalent to --private'
+command :track do |remote, user|
+  # track remote user
+  # track remote user/repo
+  # track user
+  # track user/repo
+  user, remote = remote, nil if user.nil?
+  die "Specify a user to track" if user.nil?
+  user, repo = user.split("/", 2)
+  die "Already tracking #{user}" if helper.tracking?(user)
+  repo = @helper.project if repo.nil?
+  repo.chomp!(".git")
+  remote ||= user
+
+  if options[:private] || options[:ssh]
+    git "remote add #{remote} #{helper.private_url_for_user_and_repo(user, repo)}"
+  else
+    git "remote add #{remote} #{helper.public_url_for_user_and_repo(user, repo)}"
+  end
+end
+
+desc "Fetch all refs from a user"
+command :fetch_all do |user|
+  GitHub.invoke(:track, user) unless helper.tracking?(user)
+  git "fetch #{user}"
+end
+
+desc "Fetch from a remote to a local branch."
+command :fetch do |user, branch|
+  die "Specify a user to pull from" if user.nil?
+  user, branch = user.split("/", 2) if branch.nil?
+  branch ||= 'master'
+  GitHub.invoke(:track, user) unless helper.tracking?(user)
+
+  die "Unknown branch (#{branch}) specified" unless helper.remote_branch?(user, branch)
+  die "Unable to switch branches, your current branch has uncommitted changes" if helper.branch_dirty?
+
+  puts "Fetching #{user}/#{branch}"
+  git "fetch #{user} #{branch}:refs/remotes/#{user}/#{branch}"
+  git "update-ref refs/heads/#{user}/#{branch} refs/remotes/#{user}/#{branch}"
+  git_exec "checkout #{user}/#{branch}"
+end
+
+desc "Pull from a remote."
+usage "github pull [user] [branch]"
+flags :merge => "Automatically merge remote's changes into your master."
+command :pull do |user, branch|
+  die "Specify a user to pull from" if user.nil?
+  user, branch = user.split("/", 2) if branch.nil?
+
+  if !helper.network_members.include?(user)
+    git_exec "#{helper.argv.join(' ')}".strip
+  end
+
+  branch ||= 'master'
+  GitHub.invoke(:track, user) unless helper.tracking?(user)
+
+  if options[:merge]
+    git_exec "pull #{user} #{branch}"
+  else
+    puts "Switching to #{user}-#{branch}"
+    git "fetch #{user}"
+    git_exec "checkout -b #{user}/#{branch} #{user}/#{branch}"
+  end
+end
+
+desc "Clone a repo. Uses ssh if current user is "
+usage "github clone [user] [repo] [dir]"
+flags :ssh => "Clone using the git@github.com style url."
+command :clone do |user, repo, dir|
+  die "Specify a user to pull from" if user.nil?
+  if user.include?('/') && !user.include?('@') && !user.include?(':')
+    die "Expected user/repo dir, given extra argument" if dir
+    (user, repo), dir = [user.split('/', 2), repo]
+  end
+
+  if options[:ssh] || current_user?(user)
+    git_exec "clone git@github.com:#{user}/#{repo}.git" + (dir ? " #{dir}" : "")
+  elsif repo
+    git_exec "clone git://github.com/#{user}/#{repo}.git" + (dir ? " #{dir}" : "")
+  else
+    git_exec "#{helper.argv.join(' ')}".strip
+  end
+end
+
+desc "Generate the text for a pull request."
+usage "github pull-request [user] [branch]"
+command 'pull-request' do |user, branch|
+  if helper.project
+    die "Specify a user for the pull request" if user.nil?
+    user, branch = user.split('/', 2) if branch.nil?
+    branch ||= 'master'
+    GitHub.invoke(:track, user) unless helper.tracking?(user)
+
+    git_exec "request-pull #{user}/#{branch} #{helper.origin}"
+  end
+end
+
+desc "Create a new, empty GitHub repository"
+usage "github create [repo]"
+flags :markdown => 'Create README.markdown'
+flags :mdown => 'Create README.mdown'
+flags :textile => 'Create README.textile'
+flags :rdoc => 'Create README.rdoc'
+flags :rst => 'Create README.rst'
+flags :private => 'Create private repository'
+command :create do |repo|
+  sh "curl -F 'repository[name]=#{repo}' -F 'repository[public]=#{!options[:private]}' -F 'login=#{github_user}' -F 'token=#{github_token}' http://github.com/repositories"
+  mkdir repo
+  cd repo
+  git "init"
+  extension = options.keys.first
+  touch extension ? "README.#{extension}" : "README"
+  git "add *"
+  git "commit -m 'First commit!'"
+  git "remote add origin git@github.com:#{github_user}/#{repo}.git"
+  git_exec "push origin master"
+end
+
+desc "Forks a GitHub repository"
+usage "github fork"
+usage "github fork [user]/[repo]"
+command :fork do |user, repo|
+  if repo.nil?
+    if user
+      user, repo = user.split('/')
+    else
+      is_repo = true
+      user = helper.owner
+      repo = helper.project
+    end
+  end
+
+  sh "curl -F 'login=#{github_user}' -F 'token=#{github_token}' http://github.com/#{user}/#{repo}/fork"
+
+  url = "git@github.com:#{github_user}/#{repo}.git"
+  if is_repo
+    git "config remote.origin.url #{url}"
+    puts "#{user}/#{repo} forked"
+  else
+    puts "Giving GitHub a moment to create the fork..."
+    sleep 3
+    git_exec "clone #{url}"
+  end
+end
+
+desc "Create a new GitHub repository from the current local repository"
+command 'create-from-local' do
+  cwd = sh "pwd"
+  repo = File.basename(cwd)
+  is_repo = !git("status").match(/fatal/)
+  raise "Not a git repository. Use gh create instead" unless is_repo
+  sh "curl -F 'repository[name]=#{repo}' -F 'login=#{github_user}' -F 'token=#{github_token}' http://github.com/repositories"
+  git "remote add origin git@github.com:#{github_user}/#{repo}.git"
+  git_exec "push origin master"
+end

data/{commands → lib/commands}/helpers.rb

@@ -1,3 +1,5 @@
+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('/')
@@ -17,10 +19,16 @@ 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)
+  repo = repo_for(origin)
   if repo.nil?
-    if url_for(:origin) == ""
+    if url_for(origin) == ""
       STDERR.puts "Error: missing remote 'origin'"
     else
       STDERR.puts "Error: remote 'origin' is not a github URL"
@@ -39,7 +47,7 @@ helper :local_heads do
 end
 
 helper :has_commit? do |sha|
-  `git show #{sha} >/dev/null 2>/dev/null`
+  `git show #{sha} >#{DEV_NULL} 2>#{DEV_NULL}`
   $?.exitstatus == 0
 end
 
@@ -135,7 +143,7 @@ helper :print_commits do |our_commits, options|
 end
 
 helper :applies_cleanly do |sha|
-  `git diff ...#{sha} | git apply --check >/dev/null 2>/dev/null`
+  `git diff ...#{sha} | git apply --check >#{DEV_NULL} 2>#{DEV_NULL}`
   $?.exitstatus == 0
 end
 
@@ -150,7 +158,7 @@ helper :remotes do
 end
 
 helper :remote_branches_for do |user|
-  `git ls-remote -h #{user} 2> /dev/null`.split(/\n/).inject({}) do |memo, line|
+  `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?
@@ -167,7 +175,7 @@ helper :branch_dirty? do
   # 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"))
+  !(system("git diff --quiet 2>#{DEV_NULL}") or !system("git diff --cached --quiet 2>#{DEV_NULL}"))
 end
 
 helper :tracking do
@@ -186,7 +194,7 @@ helper :tracking? do |user|
 end
 
 helper :owner do
-  user_for(:origin)
+  user_for(origin)
 end
 
 helper :current_branch do
@@ -239,6 +247,9 @@ 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
@@ -290,9 +301,9 @@ 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 'git cherry-pick [SHA]' to apply a single patch
-* You can run 'git merge user/branch' to merge a commit and all the '~N' variants.
-* You can ignore all of a projects commits with 'github ignore ..user/branch'
+* 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'
 =========================================================================================
 
 "
@@ -303,9 +314,7 @@ helper :argv do
 end
 
 helper :network_members do
-  get_network_data(owner, {})['users'].map do |hash|
-    hash['name']
-  end
+  get_network_members(owner, {}).map {|member| member['owner']['login'] }
 end
 
 
@@ -314,12 +323,24 @@ helper :get_network_data do |user, options|
     return get_cache
   end
   if cache_network_data(options)
-    return cache_data(user)
+    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)

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.rb

@@ -2,6 +2,7 @@ $:.unshift File.dirname(__FILE__)
 require 'github/extensions'
 require 'github/command'
 require 'github/helper'
+require 'fileutils'
 require 'rubygems'
 require 'open-uri'
 require 'json'
@@ -16,22 +17,25 @@ require 'yaml'
 #     whatever
 #   end
 #
-# We'll probably want to use the `choice` gem for concise, tasty DSL
-# arg parsing action.
-#
 
 module GitHub
   extend self
 
-  BasePath = File.expand_path(File.dirname(__FILE__) + '/..')
+  BasePath = File.expand_path(File.dirname(__FILE__))
 
-  def command(command, &block)
+  def command(command, options = {}, &block)
+    command = command.to_s
     debug "Registered `#{command}`"
     descriptions[command] = @next_description if @next_description
     @next_description = nil
     flag_descriptions[command].update @next_flags if @next_flags
+    usage_descriptions[command] = @next_usage if @next_usage
     @next_flags = nil
-    commands[command.to_s] = Command.new(block)
+    @next_usage = []
+    commands[command] = Command.new(block)
+    Array(options[:alias] || options[:aliases]).each do |command_alias|
+      commands[command_alias.to_s] = commands[command.to_s]
+    end
   end
 
   def desc(str)
@@ -43,6 +47,11 @@ module GitHub
     @next_flags.update hash
   end
 
+  def usage(string)
+    @next_usage ||= []
+    @next_usage << string
+  end
+
   def helper(command, &block)
     debug "Helper'd `#{command}`"
     Helper.send :define_method, command, &block
@@ -51,9 +60,11 @@ module GitHub
   def activate(args)
     @@original_args = args.clone
     @options = parse_options(args)
-    @debug = @options[:debug]
-    load 'helpers.rb'
-    load 'commands.rb'
+    @debug = @options.delete(:debug)
+    @learn = @options.delete(:learn)
+    Dir[BasePath + '/commands/*.rb'].each do |command|
+      load command
+    end
     invoke(args.shift, *args)
   end
 
@@ -80,6 +91,10 @@ module GitHub
     @flagdescs ||= Hash.new { |h, k| h[k] = {} }
   end
 
+  def usage_descriptions
+    @usage_descriptions ||= Hash.new { |h, k| h[k] = [] }
+  end
+
   def options
     @options
   end
@@ -108,29 +123,47 @@ module GitHub
     end
   end
 
-  def load(file)
-    file[0] == ?/ ? path = file : path = BasePath + "/commands/#{file}"
-    data = File.read(path)
-    GitHub.module_eval data, path
-  end
-
   def debug(*messages)
     puts *messages.map { |m| "== #{m}" } if debug?
   end
 
+  def learn(message)
+    if learn?
+      puts "== " + Color.yellow(message)
+    else
+      debug(message)
+    end
+  end
+
+  def learn?
+    !!@learn
+  end
+
   def debug?
     !!@debug
   end
+
+  def load(file)
+    file[0] =~ /^\// ? path = file : path = BasePath + "/commands/#{File.basename(file)}"
+    data = File.read(path)
+    GitHub.module_eval data, path
+  end
 end
 
-GitHub.command :default do
+GitHub.command :default, :aliases => ['', '-h', 'help', '-help', '--help'] do
   puts "Usage: github command <space separated arguments>", ''
   puts "Available commands:", ''
   longest = GitHub.descriptions.map { |d,| d.to_s.size }.max
-  GitHub.descriptions.each do |command, desc|
+  GitHub.descriptions.sort {|a,b| a.to_s <=> b.to_s }.each do |command, desc|
     cmdstr = "%-#{longest}s" % command
     puts "  #{cmdstr} => #{desc}"
     flongest = GitHub.flag_descriptions[command].map { |d,| "--#{d}".size }.max
+    GitHub.usage_descriptions[command].each do |usage_descriptions|
+      usage_descriptions.each do |usage|
+        usage_str = "#{" " * longest}      %% %-#{flongest}s" % usage
+        puts usage_str
+      end
+    end
     GitHub.flag_descriptions[command].each do |flag, fdesc|
       flagstr = "#{" " * longest}  %-#{flongest}s" % "--#{flag}"
       puts "  #{flagstr}: #{fdesc}"
@@ -138,9 +171,3 @@ GitHub.command :default do
   end
   puts
 end
-
-GitHub.commands[''] = GitHub.commands['default']
-GitHub.commands['-h'] = GitHub.commands['default']
-GitHub.commands['--help'] = GitHub.commands['default']
-GitHub.commands['-help'] = GitHub.commands['default']
-GitHub.commands['help'] = GitHub.commands['default']

data/lib/github/command.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 if RUBY_PLATFORM =~ /mswin|mingw/
   begin
     require 'win32/open3'
@@ -11,6 +13,8 @@ end
 
 module GitHub
   class Command
+    include FileUtils
+
     def initialize(block)
       (class << self;self end).send :define_method, :command, &block
     end
@@ -33,25 +37,51 @@ module GitHub
       puts git(*command)
     end
 
-    def git(*command)
-      sh ['git', command].flatten.join(' ')
+    def git(command)
+      run :sh, command
+    end
+
+    def git_exec(command)
+      run :exec, command
     end
 
-    def git_exec(*command)
-      cmdstr = ['git', command].flatten.join(' ')
-      GitHub.debug "exec: #{cmdstr}"
-      exec cmdstr
+    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
@@ -93,7 +123,7 @@ module GitHub
     end
 
     def command(*args)
-      git_exec *[ @name, args ]
+      git_exec [ @name, args ]
     end
   end
 end

data/lib/github/extensions.rb

@@ -26,3 +26,14 @@ class Object
     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/spec/github_spec.rb

@@ -62,4 +62,24 @@ describe "GitHub.parse_options" do
     GitHub.activate(['default', '--debug'])
     GitHub.should be_debug
   end
+
+  it "should allow for an alias on a commad" do
+    GitHub.command 'some-command', :aliases => 'an-alias' do
+    end
+    GitHub.commands['an-alias'].should_not be_nil
+    GitHub.commands['an-alias'].should_not == GitHub.commands['non-existant-command']
+    GitHub.commands['an-alias'].should == GitHub.commands['some-command']
+  end
+
+  it "should allow for an array of aliases on a commad" do
+    GitHub.command 'another-command', :aliases => ['some-alias-1', 'some-alias-2'] do
+    end
+    GitHub.commands['some-alias-1'].should_not be_nil
+    GitHub.commands['some-alias-1'].should_not == GitHub.commands['non-existant-command']
+    GitHub.commands['some-alias-1'].should_not be_nil
+    GitHub.commands['some-alias-1'].should_not == GitHub.commands['non-existant-command']
+    GitHub.commands['some-alias-1'].should == GitHub.commands['another-command']
+    GitHub.commands['some-alias-2'].should == GitHub.commands['another-command']
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riquedafreak-github
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors: 
 - Chris Wanstrath, Kevin Ballard, Scott Chacon
@@ -13,7 +13,8 @@ date: 2008-05-18 00:00:00 -07:00
 default_executable: gh
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: json_pure
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -39,8 +40,9 @@ extra_rdoc_files:
 - README
 files: 
 - bin/github
-- commands/commands.rb
-- commands/helpers.rb
+- lib/commands/network.rb
+- lib/commands/commands.rb
+- lib/commands/helpers.rb
 - lib/github/extensions.rb
 - lib/github/command.rb
 - lib/github/helper.rb

data/commands/commands.rb

@@ -1,242 +0,0 @@
-desc "Open this repo's master branch in a web browser."
-command :home do |user|
-  if helper.project
-    helper.open helper.homepage_for(user || helper.owner, 'master')
-  end
-end
-
-desc "Open this repo in a web browser."
-command :browse do |user, branch|
-  if helper.project
-    # if one arg given, treat it as a branch name
-    # unless it maches user/branch, then split it
-    # if two args given, treat as user branch
-    # if no args given, use defaults
-    user, branch = user.split("/", 2) if branch.nil? unless user.nil?
-    branch = user and user = nil if branch.nil?
-    user ||= helper.branch_user
-    branch ||= helper.branch_name
-    helper.open helper.homepage_for(user, branch)
-  end
-end
-
-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'
-    data = helper.get_network_data(user, options)
-    data['users'].each do |hsh|
-      puts [ hsh['name'].ljust(20), hsh['heads'].map {|a| a['name']}.uniq.join(', ') ].join(' ')
-    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
-
-desc "Info about this project."
-command :info do
-  puts "== Info for #{helper.project}"
-  puts "You are #{helper.owner}"
-  puts "Currently tracking:"
-  helper.tracking.sort { |(a,),(b,)| a == :origin ? -1 : b == :origin ? 1 : a.to_s <=> b.to_s }.each do |(name,user_or_url)|
-    puts " - #{user_or_url} (as #{name})"
-  end
-end
-
-desc "Track another user's repository."
-flags :private => "Use git@github.com: instead of git://github.com/."
-flags :ssh => 'Equivalent to --private'
-command :track do |remote, user|
-  # track remote user
-  # track remote user/repo
-  # track user
-  # track user/repo
-  user, remote = remote, nil if user.nil?
-  die "Specify a user to track" if user.nil?
-  user, repo = user.split("/", 2)
-  die "Already tracking #{user}" if helper.tracking?(user)
-  repo = @helper.project if repo.nil?
-  repo.chomp!(".git")
-  remote ||= user
-
-  if options[:private] || options[:ssh]
-    git "remote add #{remote} #{helper.private_url_for_user_and_repo(user, repo)}"
-  else
-    git "remote add #{remote} #{helper.public_url_for_user_and_repo(user, repo)}"
-  end
-end
-
-desc "Fetch all refs from a user"
-command :fetch_all do |user|
-  GitHub.invoke(:track, user) unless helper.tracking?(user)
-  git "fetch #{user}"
-end
-
-desc "Fetch from a remote to a local branch."
-command :fetch do |user, branch|
-  die "Specify a user to pull from" if user.nil?
-  user, branch = user.split("/", 2) if branch.nil?
-  branch ||= 'master'
-  GitHub.invoke(:track, user) unless helper.tracking?(user)
-  
-  die "Unknown branch (#{branch}) specified" unless helper.remote_branch?(user, branch)
-  die "Unable to switch branches, your current branch has uncommitted changes" if helper.branch_dirty?
-
-  puts "Fetching #{user}/#{branch}"
-  git "fetch #{user} #{branch}:refs/remotes/#{user}/#{branch}"
-  git "update-ref refs/heads/#{user}/#{branch} refs/remotes/#{user}/#{branch}"
-  git_exec "checkout #{user}/#{branch}"
-end
-
-desc "Pull from a remote."
-flags :merge => "Automatically merge remote's changes into your master."
-command :pull do |user, branch|
-  die "Specify a user to pull from" if user.nil?
-  user, branch = user.split("/", 2) if branch.nil?
-
-  if !helper.network_members.include?(user)
-    git_exec "#{helper.argv.join(' ')}".strip
-  end
-
-  branch ||= 'master'
-  GitHub.invoke(:track, user) unless helper.tracking?(user)
-
-  if options[:merge]
-    git_exec "pull #{user} #{branch}"
-  else
-    puts "Switching to #{user}/#{branch}"
-    git "update-ref refs/heads/#{user}/#{branch} HEAD"
-    git "checkout #{user}/#{branch}"
-  end
-end
-
-desc "Clone a repo."
-flags :ssh => "Clone using the git@github.com style url."
-command :clone do |user, repo, dir|
-  die "Specify a user to pull from" if user.nil?
-  if user.include?('/') && !user.include?('@') && !user.include?(':')
-    die "Expected user/repo dir, given extra argument" if dir
-    (user, repo), dir = [user.split('/', 2), repo]
-  end
-
-  if options[:ssh]
-    git_exec "clone git@github.com:#{user}/#{repo}.git" + (dir ? " #{dir}" : "")
-  elsif repo
-    git_exec "clone git://github.com/#{user}/#{repo}.git" + (dir ? " #{dir}" : "")
-  else
-    git_exec "#{helper.argv.join(' ')}".strip
-  end
-end
-
-desc "Generate the text for a pull request."
-command :'pull-request' do |user, branch|
-  if helper.project
-    die "Specify a user for the pull request" if user.nil?
-    user, branch = user.split('/', 2) if branch.nil?
-    branch ||= 'master'
-    GitHub.invoke(:track, user) unless helper.tracking?(user)
-
-    git_exec "request-pull #{user}/#{branch} origin"
-  end
-end