git-hub 1.5.0 → 1.5.1

data/lib/hub/commands.rb

@@ -41,6 +41,22 @@ module Hub
     API_FORK   = 'http://github.com/api/v2/yaml/repos/fork/%s/%s'
     API_CREATE = 'http://github.com/api/v2/yaml/repos/create'
 
+    def run(args)
+      # Hack to emulate git-style
+      args.unshift 'help' if args.grep(/^[^-]|version|exec-path$|html-path/).empty?
+
+      cmd = args[0]
+      expanded_args = expand_alias(cmd)
+      cmd = expanded_args[0] if expanded_args
+
+      # git commands can have dashes
+      cmd = cmd.sub(/(\w)-/, '\1_')
+      if method_defined?(cmd) and cmd != 'run'
+        args[0, 1] = expanded_args if expanded_args
+        send(cmd, args)
+      end
+    end
+
     # $ hub clone rtomayko/tilt
     # > git clone git://github.com/rtomayko/tilt.
     #
@@ -54,16 +70,14 @@ module Hub
     # > git clone git@github.com:YOUR_LOGIN/hemingway.git
     def clone(args)
       ssh = args.delete('-p')
-
-      last_args = args[1..-1].reject { |arg| arg == "--" }.last(3)
-      last_args.each do |arg|
-        if arg =~ /^-/
-          # Skip mandatory arguments.
-          last_args.shift if arg =~ /^(--(ref|o|br|u|t|d)[^=]+|-(o|b|u|d))$/
-          next
-        end
-
-        if arg =~ %r{.+?://|.+?@} || File.directory?(arg)
+      has_values = /^(--(upload-pack|template|depth|origin|branch|reference)|-[ubo])$/
+      
+      idx = 1
+      while idx < args.length
+        arg = args[idx]
+        if arg.index('-') == 0
+          idx += 1 if arg =~ has_values
+        elsif arg.index('://') or arg.index('@') or File.directory?(arg)
           # Bail out early for URLs and local paths.
           break
         elsif arg.scan('/').size <= 1 && !arg.include?(':')
@@ -72,6 +86,7 @@ module Hub
           args[args.index(arg)] = github_url(:repo => arg, :private => ssh)
           break
         end
+        idx += 1
       end
     end
 
@@ -218,10 +233,12 @@ module Hub
     # > curl https://github.com/defunkt/hub/pull/55.patch -o /tmp/55.patch
     # > git am /tmp/55.patch
     def am(args)
-      if url = args.find { |a| a =~ %r{^https?://github\.com/} }
+      if url = args.find { |a| a =~ %r{^https?://(gist\.)?github\.com/} }
         idx = args.index(url)
-        url += '.patch' unless File.extname(url) == '.patch'
-        patch_file = File.join(ENV['TMPDIR'], File.basename(url))
+        gist = $1 == 'gist.'
+        ext = gist ? '.txt' : '.patch'
+        url += ext unless File.extname(url) == ext
+        patch_file = File.join(ENV['TMPDIR'], "#{gist ? 'gist-' : ''}#{File.basename(url)}")
         args.before 'curl', ['-#LA', "hub #{Hub::Version}", url, '-o', patch_file]
         args[idx] = patch_file
       end
@@ -257,6 +274,10 @@ module Hub
           args.after { puts "new remote: #{github_user}" }
         end
       end
+    rescue Net::HTTPExceptions
+      response = $!.response
+      warn "error creating fork: #{response.message} (HTTP #{response.code})"
+      exit 1
     end
 
     # $ hub create
@@ -301,6 +322,10 @@ module Hub
 
         args.after { puts "#{action}: #{github_user}/#{repo_name}" }
       end
+    rescue Net::HTTPExceptions
+      response = $!.response
+      warn "error creating repository: #{response.message} (HTTP #{response.code})"
+      exit 1
     end
 
     # $ hub push origin,staging cool-feature
@@ -660,7 +685,8 @@ help
     # Returns nothing.
     def fork_repo
       url = API_FORK % [repo_owner, repo_name]
-      Net::HTTP.post_form(URI(url), 'login' => github_user, 'token' => github_token)
+      response = Net::HTTP.post_form(URI(url), 'login' => github_user, 'token' => github_token)
+      response.error! unless Net::HTTPSuccess === response
     end
 
     # Creates a new repo using the GitHub API.
@@ -673,7 +699,17 @@ help
       params['description'] = options[:description] if options[:description]
       params['homepage'] = options[:homepage] if options[:homepage]
 
-      Net::HTTP.post_form(URI(url), params)
+      response = Net::HTTP.post_form(URI(url), params)
+      response.error! unless Net::HTTPSuccess === response
+    end
+
+    def expand_alias(cmd)
+      if expanded = git_alias_for(cmd)
+        if expanded.index('!') != 0
+          require 'shellwords' unless expanded.respond_to? :shellsplit
+          expanded.shellsplit
+        end
+      end
     end
 
   end

data/lib/hub/context.rb

@@ -106,6 +106,10 @@ module Hub
       GIT_CONFIG['config --bool hub.http-clone'] == 'true'
     end
 
+    def git_alias_for(name)
+      GIT_CONFIG["config alias.#{name}"]
+    end
+
     # Core.repositoryformatversion should exist for all git
     # repositories, and be blank for all non-git repositories. If
     # there's a better config setting to check here, this can be
@@ -124,6 +128,14 @@ module Hub
       if options[:web]
         scheme = secure ? 'https:' : 'http:'
         path = options[:web] == true ? '' : options[:web].to_s
+        if repo =~ /\.wiki$/
+          repo = repo.sub(/\.wiki$/, '')
+          unless '/wiki' == path
+            path = '/wiki%s' % if path =~ %r{^/commits/} then '/_history'
+              else path.sub(/\w+/, '_\0')
+              end
+          end
+        end
         '%s//github.com/%s/%s%s' % [scheme, user, repo, path]
       else
         if secure

data/lib/hub/runner.rb

@@ -9,13 +9,7 @@ module Hub
     
     def initialize(*args)
       @args = Args.new(args)
-
-      # Hack to emulate git-style
-      @args.unshift 'help' if @args.grep(/^[^-]|version|exec-path$|html-path/).empty?
-
-      # git commands can have dashes
-      cmd = @args[0].sub(/(\w)-/, '\1_')
-      Commands.send(cmd, @args) if Commands.method_defined?(cmd)
+      Commands.run(@args)
     end
 
     # Shortcut
@@ -36,7 +30,8 @@ module Hub
     def commands
       args.commands.map do |cmd|
         if cmd.respond_to?(:join)
-          cmd.map { |c| c.index(' ') ? "'#{c}'" : c }.join(' ')
+          # a simplified `Shellwords.join` but it's OK since this is only used to inspect
+          cmd.map { |c| (c.index(' ') || c.empty?) ? "'#{c}'" : c }.join(' ')
         else
           cmd.to_s
         end

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.5.0'
+  Version = VERSION = '1.5.1'
 end

data/test/hub_test.rb

@@ -30,7 +30,9 @@ class HubTest < Test::Unit::TestCase
     Hub::Context::REMOTES.clear
 
     @git = Hub::Context::GIT_CONFIG.replace(Hash.new { |h, k|
-      raise ArgumentError, "`git #{k}` not stubbed"
+      unless k.index('config alias.') == 0
+        raise ArgumentError, "`git #{k}` not stubbed"
+      end
     }).update(
       'remote' => "mislav\norigin",
       'symbolic-ref -q HEAD' => 'refs/heads/master',
@@ -72,12 +74,16 @@ class HubTest < Test::Unit::TestCase
     assert_command input, command
   end
 
-  def test_clone_with_arguments_and_path
-    input   = "clone --bare -o master -- resque"
-    command = "git clone --bare -o master -- git://github.com/tpw/resque.git"
+  def test_clone_with_arguments
+    input   = "clone --bare -o master resque"
+    command = "git clone --bare -o master git://github.com/tpw/resque.git"
     assert_command input, command
   end
 
+  def test_clone_with_arguments_and_destination
+    assert_forwarded "clone --template=one/two git://github.com/tpw/resque.git --origin master resquetastic"
+  end
+
   def test_your_private_clone_fails_without_config
     out = hub("clone -p mustache") do
       stub_github_user(nil)
@@ -95,29 +101,40 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_private_clone_left_alone
-    input   = "clone git@github.com:rtomayko/ronn.git"
-    command = "git clone git@github.com:rtomayko/ronn.git"
-    assert_command input, command
+    assert_forwarded "clone git@github.com:rtomayko/ronn.git"
   end
 
   def test_public_clone_left_alone
-    input   = "clone git://github.com/rtomayko/ronn.git"
-    command = "git clone git://github.com/rtomayko/ronn.git"
-    assert_command input, command
+    assert_forwarded "clone git://github.com/rtomayko/ronn.git"
   end
 
   def test_normal_public_clone_with_path
-    input   = "clone git://github.com/rtomayko/ronn.git ronn-dev"
-    command = "git clone git://github.com/rtomayko/ronn.git ronn-dev"
-    assert_command input, command
+    assert_forwarded "clone git://github.com/rtomayko/ronn.git ronn-dev"
   end
 
   def test_normal_clone_from_path
-    input   = "clone ./test"
-    command = "git clone ./test"
+    assert_forwarded "clone ./test"
+  end
+
+  def test_alias_expand
+    stub_alias 'c', 'clone --bare'
+    input   = "c rtomayko/ronn"
+    command = "git clone --bare git://github.com/rtomayko/ronn.git"
     assert_command input, command
   end
 
+  def test_alias_expand_advanced
+    stub_alias 'c', 'clone --template="white space"'
+    input   = "c rtomayko/ronn"
+    command = "git clone '--template=white space' git://github.com/rtomayko/ronn.git"
+    assert_command input, command
+  end
+
+  def test_alias_doesnt_expand_for_unknown_commands
+    stub_alias 'c', 'compute --fast'
+    assert_forwarded "c rtomayko/ronn"
+  end
+
   def test_remote_origin
     input   = "remote add origin"
     command = "git remote add origin git://github.com/tpw/hub.git"
@@ -137,21 +154,15 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_remote_from_rel_path
-    input = "remote add origin ./path"
-    command = "git remote add origin ./path"
-    assert_command input, command
+    assert_forwarded "remote add origin ./path"
   end
 
   def test_remote_from_abs_path
-    input = "remote add origin /path"
-    command = "git remote add origin /path"
-    assert_command input, command
+    assert_forwarded "remote add origin /path"
   end
 
   def test_private_remote_origin_as_normal
-    input   = "remote add origin git@github.com:defunkt/resque.git"
-    command = "git remote add origin git@github.com:defunkt/resque.git"
-    assert_command input, command
+    assert_forwarded "remote add origin git@github.com:defunkt/resque.git"
   end
 
   def test_public_submodule
@@ -233,7 +244,7 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_fetch_existing_remote
-    assert_command "fetch mislav", "git fetch mislav"
+    assert_forwarded "fetch mislav"
   end
 
   def test_fetch_new_remote
@@ -362,6 +373,16 @@ class HubTest < Test::Unit::TestCase
     end
   end
 
+  def test_am_gist
+    with_tmpdir('/tmp/') do
+      url = 'https://gist.github.com/8da7fb575debd88c54cf'
+
+      assert_commands "curl -#LA 'hub #{Hub::Version}' #{url}.txt -o /tmp/gist-8da7fb575debd88c54cf.txt",
+                      "git am --signoff /tmp/gist-8da7fb575debd88c54cf.txt -p2",
+                      "am --signoff #{url} -p2"
+    end
+  end
+
   def test_init
     assert_commands "git init", "git remote add origin git@github.com:tpw/hub.git", "init -g"
   end
@@ -397,6 +418,16 @@ class HubTest < Test::Unit::TestCase
     assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
   end
 
+  def test_create_failed
+    stub_no_remotes
+    stub_nonexisting_fork('tpw')
+    stub_request(:post, "github.com/api/v2/yaml/repos/create").
+      to_return(:status => [401, "Your token is fail"])
+
+    expected = "error creating repository: Your token is fail (HTTP 401)\n"
+    assert_equal expected, hub("create") { ENV['GIT'] = 'echo' }
+  end
+
   def test_create_with_env_authentication
     stub_no_remotes
     stub_nonexisting_fork('mojombo')
@@ -484,6 +515,15 @@ class HubTest < Test::Unit::TestCase
     assert_equal expected, hub("fork") { ENV['GIT'] = 'echo' }
   end
 
+  def test_fork_failed
+    stub_nonexisting_fork('tpw')
+    stub_request(:post, "github.com/api/v2/yaml/repos/fork/defunkt/hub").
+      to_return(:status => [500, "Your fork is fail"])
+
+    expected = "error creating fork: Your fork is fail (HTTP 500)\n"
+    assert_equal expected, hub("fork") { ENV['GIT'] = 'echo' }
+  end
+
   def test_fork_no_remote
     stub_nonexisting_fork('tpw')
     stub_request(:post, "github.com/api/v2/yaml/repos/fork/defunkt/hub")
@@ -579,6 +619,12 @@ config
       "open https://github.com/defunkt/hub/compare/1.0...fix"
   end
 
+  def test_hub_compare_on_wiki
+    stub_repo_url 'git://github.com/defunkt/hub.wiki.git'
+    assert_command "compare 1.0...fix",
+      "open https://github.com/defunkt/hub/wiki/_compare/1.0...fix"
+  end
+
   def test_hub_compare_fork
     assert_command "compare myfork feature",
       "open https://github.com/myfork/hub/compare/feature"
@@ -635,6 +681,15 @@ config
     assert_command "browse --", "open https://github.com/defunkt/hub"
   end
 
+  def test_hub_browse_current_wiki
+    stub_repo_url 'git://github.com/defunkt/hub.wiki.git'
+
+    assert_command "browse", "open https://github.com/defunkt/hub/wiki"
+    assert_command "browse -- wiki", "open https://github.com/defunkt/hub/wiki"
+    assert_command "browse -- commits", "open https://github.com/defunkt/hub/wiki/_history"
+    assert_command "browse -- pages", "open https://github.com/defunkt/hub/wiki/_pages"
+  end
+
   def test_hub_browse_current_subpage
     assert_command "browse -- network",
       "open https://github.com/defunkt/hub/network"
@@ -688,7 +743,7 @@ config
   end
 
   def test_context_method_doesnt_hijack_git_command
-    assert_command 'remotes', 'git remotes'
+    assert_forwarded 'remotes'
   end
 
   def test_not_choking_on_ruby_methods
@@ -737,6 +792,10 @@ config
       @git.replace({})
     end
 
+    def stub_alias(name, value)
+      @git["config alias.#{name}"] = value
+    end
+
     def stub_existing_fork(user)
       stub_fork(user, 200)
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-hub
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 +01:00
+date: 2011-03-18 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -52,9 +53,26 @@ has_rdoc: true
 homepage: http://github.com/defunkt/hub
 licenses: []
 
-post_install_message: "\n\
-  ------------------------------------------------------------\n\n                  You there! Wait, I say!\n                  =======================\n\n       If you are a heavy user of `git` on the command\n       line  you  may  want  to  install `hub` the old\n       fashioned way.  Faster  startup  time,  you see.\n\n       Check  out  the  installation  instructions  at\n       http://github.com/defunkt/hub#readme  under the\n       \"Standalone\" section.\n\n       Cheers,\n       defunkt\n\n\
-  ------------------------------------------------------------\n\n"
+post_install_message: |+
+  
+  ------------------------------------------------------------
+  
+                    You there! Wait, I say!
+                    =======================
+  
+         If you are a heavy user of `git` on the command
+         line  you  may  want  to  install `hub` the old
+         fashioned way.  Faster  startup  time,  you see.
+  
+         Check  out  the  installation  instructions  at
+         http://github.com/defunkt/hub#readme  under the
+         "Standalone" section.
+  
+         Cheers,
+         defunkt
+  
+  ------------------------------------------------------------
+  
 rdoc_options: []
 
 require_paths: 
@@ -64,6 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -72,13 +91,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: hub introduces git to GitHub