defunkt-github 0.2.1 → 0.3.0

data/Manifest

@@ -1,13 +1,15 @@
+LICENSE
+Manifest
+README
+bin/gh
 bin/github
 commands/commands.rb
 commands/helpers.rb
-lib/github/extensions.rb
+github-gem.gemspec
 lib/github/command.rb
+lib/github/extensions.rb
 lib/github/helper.rb
 lib/github.rb
-LICENSE
-Manifest
-README
 spec/command_spec.rb
 spec/extensions_spec.rb
 spec/github_spec.rb

data/README

@@ -22,7 +22,7 @@ Pulling Upstream Changes
 
 Let's say you just forked `github-gem` on GitHub from defunkt.
 
-  $ git clone git://github.com/YOU/github-gem.git
+  $ github clone git://github.com/YOU/github-gem.git
   $ cd github-gem
   $ github pull defunkt
 
@@ -36,8 +36,8 @@ checkout master` and then `git merge defunkt/master` to merge defunkt's changes
 into your own master branch.  In summary:
 
   $ github pull defunkt
-  $ git checkout master
-  $ git merge defunkt/master
+  $ github checkout master
+  $ github merge defunkt/master
 
 If you've already reviewed defunkt's changes and just want to merge them into your 
 master branch, use the `merge` flag:
@@ -67,12 +67,12 @@ Your local 'mojombo/master' branch is now at the exact same place as mojombo's
 If mojombo's changes are good, you'll want to merge your 'master' (or another
 branch) into those changes so you can retest post-integration:
 
-  $ git merge master
+  $ github merge master
   
 Test/analyze again and if everything is ok:
   
-  $ git checkout master
-  $ git merge mojombo/master
+  $ github checkout master
+  $ github merge mojombo/master
   
 The latter command will be a fast-forward merge since you already did the
 real merge previously.
@@ -111,12 +111,12 @@ which will show you something like this:
 These are all the commits that you don't have in your current branch that have been
 pushed to other forks of your project.  If you want to incorporate them, you can use:
 
-  $ git cherry-pick ee013a
+  $ github cherry-pick ee013a
 
 for example to apply that single patch to your branch.  You can also merge a branch, 
 if you want all the changes introduced in another branch:
 
-  $ git merge jchris/gist
+  $ github merge jchris/gist
 
 The next time you run the 'github network commits' command, you won't see any of the 
 patches you have cherry-picked or merged (or rebased).  If you want to ignore a 

data/bin/gh

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../lib/github'
+
+GitHub.activate ARGV

data/commands/commands.rb

@@ -39,13 +39,13 @@ command :network do |command, user|
   when 'web'
     helper.open helper.network_page_for(user)
   when 'list'
-    data = get_network_data(user, options)
+    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 = get_network_data(user, options)
+    data = helper.get_network_data(user, options)
     data['users'].each do |hsh|
       u = hsh['name']
       GitHub.invoke(:track, u) unless helper.tracking?(u)
@@ -55,7 +55,7 @@ command :network do |command, user|
   when 'commits'
     # show commits we don't have yet
     ids = []
-    data = get_network_data(user, options)
+    data = helper.get_network_data(user, options)
     data['users'].each do |hsh|
       u = hsh['name']
       user_ids = hsh['heads'].map { |a| a['id'] }
@@ -69,14 +69,14 @@ command :network do |command, user|
       ids += user_ids
     end
     ids.uniq!
-    
+
     # 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)
-        
+
     cherry = []
     ids.each do |id|
       cherry += helper.get_cherry(id)
@@ -143,9 +143,9 @@ command :fetch do |user, branch|
   user, branch = user.split("/", 2) if branch.nil?
   branch ||= 'master'
   GitHub.invoke(:track, user) unless helper.tracking?(user)
-  
+
   git "fetch #{user} #{branch}:refs/remotes/#{user}/#{branch}"
-  git_exec "checkout -b #{user}/#{branch} refs/remotes/#{user}/#{branch}" 
+  git_exec "checkout -b #{user}/#{branch} refs/remotes/#{user}/#{branch}"
 end
 
 desc "Pull from a remote."
@@ -153,9 +153,14 @@ 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
@@ -169,16 +174,17 @@ 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? ?/
+  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
-  die "Specify a repo to pull from" if repo.nil?
 
   if options[:ssh]
     git_exec "clone git@github.com:#{user}/#{repo}.git" + (dir ? " #{dir}" : "")
-  else
+  elsif repo
     git_exec "clone git://github.com/#{user}/#{repo}.git" + (dir ? " #{dir}" : "")
+  else
+    git_exec "#{helper.argv.join(' ')}".strip
   end
 end
 

data/commands/helpers.rb

@@ -53,7 +53,7 @@ helper :resolve_commits do |treeish|
   else
     # standard in
     puts 'reading from stdin...'
-    commits = $stdin.read.split("\n") 
+    commits = $stdin.read.split("\n")
   end
   commits.select { |a| a.size == 40 } # only the shas, not the ^SHAs
 end
@@ -94,7 +94,7 @@ end
 helper :print_commits do |cherries, commits, options|
   ignores = ignore_sha_array
   our_commits = cherries.map { |item| c = commits.assoc(item[1]); [item, c] if c }
-  
+
   case options[:sort]
   when 'branch'
     our_commits.sort! { |a, b| a[0][2] <=> b[0][2] }
@@ -103,7 +103,7 @@ helper :print_commits do |cherries, commits, options|
   else
     our_commits.sort! { |a, b| Date.parse(a[1][4]) <=> Date.parse(b[1][4]) }
   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'
@@ -114,14 +114,14 @@ helper :print_commits do |cherries, commits, options|
     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])) 
-      next if options[:after] && after && (after > Date.parse(commit[4])) 
+      next if options[:before] && before && (before < Date.parse(commit[4]))
+      next if options[:after] && after && (after > Date.parse(commit[4]))
       next if options[:applies] && !applies_cleanly(sha)
       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), 
+        puts [sha[0,6], ref_name.ljust(25), commit[1][0,20].ljust(21),
             commit[2][0, 36].ljust(38), commit[3], common].join(" ")
       end
     end
@@ -232,17 +232,17 @@ 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 
-                     
+                     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
@@ -268,3 +268,52 @@ applied or ignored yet (see 'github ignore'). Some things you might want to do:
 "
 end
 
+helper :get_network_data do |user, options|
+  if options[:cache] && has_cache?
+    return get_cache
+  end
+
+  if cache_expired? || options[:nocache] || !has_cache?
+    return cache_data(user)
+  else
+    return get_cache
+  end
+end
+
+helper :network_members do
+  get_network_data(owner, {})['users'].map do |hash|
+    hash['name']
+  end
+end
+
+helper :network_cache_path do
+  dir = `git rev-parse --git-dir`.chomp
+  File.join(dir, 'network-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 :get_cache do
+  JSON.parse(File.read(network_cache_path))
+end
+
+helper :argv do
+  GitHub.original_args
+end

data/github-gem.gemspec

@@ -1,17 +1,17 @@
 Gem::Specification.new do |s|
   s.name = %q{github}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Wanstrath, Kevin Ballard, Scott Chacon"]
   s.date = %q{2008-05-18}
-  s.default_executable = %q{github}
+  s.default_executable = %q{gh}
   s.description = %q{The official `github` command line helper for simplifying your GitHub experience.}
   s.email = %q{chris@ozmm.org}
-  s.executables = ["github"]
-  s.extra_rdoc_files = ["bin/github", "lib/github/extensions.rb", "lib/github/command.rb", "lib/github/helper.rb", "lib/github.rb", "LICENSE", "README"]
+  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.has_rdoc = true
   s.homepage = %q{http://github.com/}

data/lib/github/command.rb

@@ -20,7 +20,7 @@ module GitHub
       args << nil while args.size < arity
       send :command, *args
     end
-    
+
     def helper
       @helper ||= Helper.new
     end
@@ -47,45 +47,6 @@ module GitHub
       Shell.new(*command).run
     end
 
-    def get_network_data(user, options)
-      if options[:cache] && has_cache?
-        return get_cache
-      end
-      if cache_expired? || options[:nocache] || !has_cache?
-        return cache_data(user)
-      else
-        return get_cache
-      end
-    end
-    
-    def network_cache_path
-      dir = `git rev-parse --git-dir`.chomp
-      File.join(dir, 'network-cache')
-    end
-    
-    def cache_data(user)
-      raw_data = open(helper.network_meta_for(user)).read
-      File.open( network_cache_path, 'w' ) do |out|
-        out.write(raw_data)
-      end
-      data = JSON.parse(raw_data)
-    end
-    
-    def cache_expired?
-      return true if !has_cache?
-      age = Time.now - File.stat(network_cache_path).mtime
-      return true if age > (60 * 60) # 1 hour
-      false
-    end
-    
-    def has_cache?
-      File.file?(network_cache_path)
-    end
-    
-    def get_cache
-      JSON.parse(File.read(network_cache_path))
-    end
-    
     def die(message)
       puts "=> #{message}"
       exit!
@@ -99,7 +60,7 @@ module GitHub
       def run
         GitHub.debug "sh: #{command}"
         _, out, err = Open3.popen3(*@command)
-        
+
         out = out.read.strip
         err = err.read.strip
 
@@ -123,4 +84,14 @@ module GitHub
       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.rb

@@ -13,7 +13,7 @@ require 'yaml'
 # $ github <command> <args>
 #
 #   GitHub.command <command> do |*args|
-#     whatever 
+#     whatever
 #   end
 #
 # We'll probably want to use the `choice` gem for concise, tasty DSL
@@ -49,6 +49,7 @@ module GitHub
   end
 
   def activate(args)
+    @@original_args = args.clone
     @options = parse_options(args)
     @debug = @options[:debug]
     load 'helpers.rb'
@@ -57,11 +58,16 @@ module GitHub
   end
 
   def invoke(command, *args)
-    block = commands[command.to_s] || commands['default']
+    block = find_command(command)
     debug "Invoking `#{command}`"
     block.call(*args)
   end
 
+  def find_command(name)
+    name = name.to_s
+    commands[name] || GitCommand.new(name) || commands['default']
+  end
+
   def commands
     @commands ||= {}
   end
@@ -78,6 +84,10 @@ module GitHub
     @options
   end
 
+  def original_args
+    @@original_args ||= []
+  end
+
   def parse_options(args)
     idx = 0
     args.clone.inject({}) do |memo, arg|
@@ -128,3 +138,9 @@ 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/spec/ui_spec.rb

@@ -167,6 +167,7 @@ EOF
 
   specify "pull defunkt should start tracking defunkt if they're not already tracked" do
     running :pull, "defunkt" do
+      mock_members 'defunkt'
       setup_remote(:origin, :user => "user", :ssh => true)
       setup_remote(:external, :url => "home:/path/to/project.git")
       GitHub.should_receive(:invoke).with(:track, "defunkt").and_return { raise "Tracked" }
@@ -176,6 +177,7 @@ EOF
 
   specify "pull defunkt should create defunkt/master and pull from the defunkt remote" do
     running :pull, "defunkt" do
+      mock_members 'defunkt'
       setup_remote(:defunkt)
       @command.should_receive(:git).with("checkout -b defunkt/master").ordered.and_return do
         mock("checkout -b defunkt/master").tap { |m| m.stub!(:error?) }
@@ -187,6 +189,7 @@ EOF
 
   specify "pull defunkt should switch to pre-existing defunkt/master and pull from the defunkt remote" do
     running :pull, "defunkt" do
+      mock_members 'defunkt'
       setup_remote(:defunkt)
       @command.should_receive(:git).with("checkout -b defunkt/master").ordered.and_return do
         mock("checkout -b defunkt/master").tap { |m| m.should_receive(:error?) { true } }
@@ -199,6 +202,7 @@ EOF
 
   specify "pull defunkt wip should create defunkt/wip and pull from wip branch on defunkt remote" do
     running :pull, "defunkt", "wip" do
+      mock_members 'defunkt'
       setup_remote(:defunkt)
       @command.should_receive(:git).with("checkout -b defunkt/wip").ordered.and_return do
         mock("checkout -b defunkt/wip").tap { |m| m.stub!(:error?) }
@@ -210,6 +214,7 @@ EOF
 
   specify "pull defunkt/wip should switch to pre-existing defunkt/wip and pull from wip branch on defunkt remote" do
     running :pull, "defunkt/wip" do
+      mock_members 'defunkt'
       setup_remote(:defunkt)
       @command.should_receive(:git).with("checkout -b defunkt/wip").ordered.and_return do
         mock("checkout -b defunkt/wip").tap { |m| m.should_receive(:error?) { true } }
@@ -222,11 +227,26 @@ EOF
 
   specify "pull --merge defunkt should pull from defunkt remote into current branch" do
     running :pull, "--merge", "defunkt" do
+      mock_members 'defunkt'
       setup_remote(:defunkt)
       @command.should_receive(:git_exec).with("pull defunkt master")
     end
   end
 
+  specify "pull falls through for non-recognized commands" do
+    running :pull, 'remote' do
+      mock_members 'defunkt'
+      @command.should_receive(:git_exec).with("pull remote")
+    end
+  end
+
+  specify "pull passes along args when falling through" do
+    running :pull, 'remote', '--stat' do
+      mock_members 'defunkt'
+      @command.should_receive(:git_exec).with("pull remote --stat")
+    end
+  end
+
   # -- clone --
   specify "clone should die with no args" do
     running :clone do
@@ -235,10 +255,9 @@ EOF
     end
   end
 
-  specify "clone should die with just one arg" do
-    running :clone, "user" do
-      @command.should_receive(:die).with("Specify a repo to pull from").and_return { raise "Died" }
-      self.should raise_error("Died")
+  specify "clone should fall through with just one arg" do
+    running :clone, "git://git.kernel.org/linux.git" do
+      @command.should_receive(:git_exec).with("clone git://git.kernel.org/linux.git")
     end
   end
 
@@ -248,6 +267,12 @@ EOF
     end
   end
 
+  specify "clone defunkt/github-gem should clone the repo" do
+    running :clone, "defunkt/github-gem" do
+      @command.should_receive(:git_exec).with("clone git://github.com/defunkt/github-gem.git")
+    end
+  end
+
   specify "clone --ssh defunkt github-gem should clone the repo using the private URL" do
     running :clone, "--ssh", "defunkt", "github-gem" do
       @command.should_receive(:git_exec).with("clone git@github.com:defunkt/github-gem.git")
@@ -260,6 +285,12 @@ EOF
     end
   end
 
+  specify "clone defunkt/github-gem repo should clone the repo into the dir 'repo'" do
+    running :clone, "defunkt/github-gem", "repo" do
+      @command.should_receive(:git_exec).with("clone git://github.com/defunkt/github-gem.git repo")
+    end
+  end
+
   specify "clone --ssh defunkt github-gem repo should clone the repo using the private URL into the dir 'repo'" do
     running :clone, "--ssh", "defunkt", "github-gem", "repo" do
       @command.should_receive(:git_exec).with("clone git@github.com:defunkt/github-gem.git repo")
@@ -318,6 +349,19 @@ EOF
     end
   end
 
+  # -- fallthrough --
+  specify "should fall through to actual git commands" do
+    running :commit do
+      @command.should_receive(:git_exec).with("commit")
+    end
+  end
+
+  specify "should pass along arguments when falling through" do
+    running :commit, '-a', '-m', 'yo mama' do
+      @command.should_receive(:git_exec).with("commit -a -m 'yo mama'")
+    end
+  end
+
   # -- default --
   specify "should print the default message" do
     running :default do
@@ -357,7 +401,7 @@ EOF
 
     def initialize(parent, cmd, *args, &block)
       @cmd_name = cmd.to_s
-      @command = GitHub.commands[cmd.to_s]
+      @command = GitHub.find_command(cmd)
       @helper = @command.helper
       @args = args
       @block = block
@@ -409,6 +453,10 @@ EOF
       @helper.should_receive(:remotes).any_number_of_times.and_return(@remotes)
     end
 
+    def mock_members(members)
+      @helper.should_receive(:network_members).any_number_of_times.and_return(members)
+    end
+
     def should(result)
       @expected_result = [:should, result]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: defunkt-github
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Chris Wanstrath, Kevin Ballard, Scott Chacon
@@ -10,17 +10,19 @@ bindir: bin
 cert_chain: []
 
 date: 2008-05-18 00:00:00 -07:00
-default_executable: github
+default_executable: gh
 dependencies: []
 
 description: The official `github` command line helper for simplifying your GitHub experience.
 email: chris@ozmm.org
 executables: 
 - github
+- gh
 extensions: []
 
 extra_rdoc_files: 
 - bin/github
+- bin/gh
 - lib/github/extensions.rb
 - lib/github/command.rb
 - lib/github/helper.rb
@@ -46,6 +48,7 @@ files:
 - spec/ui_spec.rb
 - spec/windoze_spec.rb
 - github-gem.gemspec
+- bin/gh
 has_rdoc: true
 homepage: http://github.com/
 post_install_message: