hub 1.10.4 → 1.10.5

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 1.10.5 (2013-03-02)
+
+* helpful `pull-request` error message when base project is invalid
+* fix `compare` for ranges containing "owner:branch" notation
+* enable `--name` argument for `submodule add`
+
 ## 1.10.4 (2012-12-29)
 
 * fixes for Windows

data/README.md

@@ -332,8 +332,8 @@ superpowers:
     $ hub submodule add -p wycats/bundler vendor/bundler
     > git submodule add git@github.com:wycats/bundler.git vendor/bundler
 
-    $ hub submodule add -b ryppl ryppl/pip vendor/pip
-    > git submodule add -b ryppl git://github.com/ryppl/pip.git vendor/pip
+    $ hub submodule add -b ryppl --name pip ryppl/pip vendor/pip
+    > git submodule add -b ryppl --name pip git://github.com/ryppl/pip.git vendor/pip
 
 
 ### git help

data/Rakefile

@@ -152,12 +152,12 @@ task :homebrew do
     sh 'git pull -q origin master'
 
     formula_file = 'Library/Formula/hub.rb'
-    md5 = `curl -#L https://github.com/defunkt/hub/tarball/v#{Hub::VERSION} | md5`.chomp
-    abort unless $?.success? and md5.length == 32
+    sha = `curl -#L https://github.com/defunkt/hub/tarball/v#{Hub::VERSION} | shasum`.split(/\s+/).first
+    abort unless $?.success? and sha.length == 40
 
     formula = File.read formula_file
     formula.sub! /\bv\d+(\.\d+)*/, "v#{Hub::VERSION}"
-    formula.sub! /\b[0-9a-f]{32}\b/, md5
+    formula.sub! /\b[0-9a-f]{40}\b/, sha
     File.open(formula_file, 'w') {|f| f << formula }
 
     branch = "hub-v#{Hub::VERSION}"

data/lib/hub/commands.rb

@@ -185,7 +185,12 @@ module Hub
       args.executable = 'echo'
       args.replace [pull['html_url']]
     rescue GitHubAPI::Exceptions
-      display_api_exception("creating pull request", $!.response)
+      response = $!.response
+      display_api_exception("creating pull request", response)
+      if 404 == response.status
+        base_url = base_project.web_url.split('://', 2).last
+        warn "Are you sure that #{base_url} exists?"
+      end
       exit 1
     end
 
@@ -202,7 +207,7 @@ module Hub
     # > git clone git@github.com:YOUR_LOGIN/hemingway.git
     def clone(args)
       ssh = args.delete('-p')
-      has_values = /^(--(upload-pack|template|depth|origin|branch|reference)|-[ubo])$/
+      has_values = /^(--(upload-pack|template|depth|origin|branch|reference|name)|-[ubo])$/
 
       idx = 1
       while idx < args.length
@@ -231,23 +236,13 @@ module Hub
     # $ hub submodule add -p wycats/bundler vendor/bundler
     # > git submodule add git@github.com:wycats/bundler.git vendor/bundler
     #
-    # $ hub submodule add -b ryppl ryppl/pip vendor/bundler
-    # > git submodule add -b ryppl git://github.com/ryppl/pip.git vendor/pip
+    # $ hub submodule add -b ryppl --name pip ryppl/pip vendor/pip
+    # > git submodule add -b ryppl --name pip git://github.com/ryppl/pip.git vendor/pip
     def submodule(args)
       return unless index = args.index('add')
       args.delete_at index
 
-      branch = args.index('-b') || args.index('--branch')
-      if branch
-        args.delete_at branch
-        branch_name = args.delete_at branch
-      end
-
       clone(args)
-
-      if branch_name
-        args.insert branch, '-b', branch_name
-      end
       args.insert index, 'add'
     end
 
@@ -635,7 +630,7 @@ module Hub
             abort "Usage: hub compare [USER] [<START>...]<END>"
           end
         else
-          sha_or_tag = /(\w{1,2}|\w[\w.-]+\w)/
+          sha_or_tag = /((?:#{OWNER_RE}:)?\w[\w.-]+\w)/
           # replaces two dots with three: "sha1...sha2"
           range = args.pop.sub(/^#{sha_or_tag}\.\.#{sha_or_tag}$/, '\1...\2')
           project = if owner = args.pop then github_project(nil, owner)

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.10.4'
+  Version = VERSION = '1.10.5'
 end

data/man/hub.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HUB" "1" "November 2012" "DEFUNKT" "Git Manual"
+.TH "HUB" "1" "March 2013" "DEFUNKT" "Git Manual"
 .
 .SH "NAME"
 \fBhub\fR \- git + hub = github
@@ -425,8 +425,8 @@ $ hub submodule add wycats/bundler vendor/bundler
 $ hub submodule add \-p wycats/bundler vendor/bundler
 > git submodule add git@github\.com:wycats/bundler\.git vendor/bundler
 
-$ hub submodule add \-b ryppl ryppl/pip vendor/pip
-> git submodule add \-b ryppl git://github\.com/ryppl/pip\.git vendor/pip
+$ hub submodule add \-b ryppl \-\-name pip ryppl/pip vendor/pip
+> git submodule add \-b ryppl \-\-name pip git://github\.com/ryppl/pip\.git vendor/pip
 .
 .fi
 .

data/man/hub.1.html

@@ -411,8 +411,8 @@ $ git compare other-user patch
 $ hub submodule add -p wycats/bundler vendor/bundler
 > git submodule add git@github.com:wycats/bundler.git vendor/bundler
 
-$ hub submodule add -b ryppl ryppl/pip vendor/pip
-> git submodule add -b ryppl git://github.com/ryppl/pip.git vendor/pip
+$ hub submodule add -b ryppl --name pip ryppl/pip vendor/pip
+> git submodule add -b ryppl --name pip git://github.com/ryppl/pip.git vendor/pip
 </code></pre>
 
 <h3 id="git-help">git help</h3>
@@ -440,7 +440,7 @@ $ git help hub
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>DEFUNKT</li>
-    <li class='tc'>November 2012</li>
+    <li class='tc'>March 2013</li>
     <li class='tr'>hub(1)</li>
   </ol>
 

data/test/hub_test.rb

@@ -525,66 +525,6 @@ class HubTest < Test::Unit::TestCase
     assert_includes 'This file is generated code', hub("hub standalone")
   end
 
-  def test_hub_compare
-    assert_command "compare refactor",
-      "open https://github.com/defunkt/hub/compare/refactor"
-  end
-
-  def test_hub_compare_nothing
-    expected = "Usage: hub compare [USER] [<START>...]<END>\n"
-    assert_equal expected, hub("compare")
-  end
-
-  def test_hub_compare_tracking_nothing
-    stub_tracking_nothing
-    expected = "Usage: hub compare [USER] [<START>...]<END>\n"
-    assert_equal expected, hub("compare")
-  end
-
-  def test_hub_compare_tracking_branch
-    stub_branch('refs/heads/feature')
-    stub_tracking('feature', 'mislav', 'experimental')
-
-    assert_command "compare",
-      "open https://github.com/mislav/hub/compare/experimental"
-  end
-
-  def test_hub_compare_range
-    assert_command "compare 1.0...fix",
-      "open https://github.com/defunkt/hub/compare/1.0...fix"
-  end
-
-  def test_hub_compare_range_fixes_two_dots_for_tags
-    assert_command "compare 1.0..fix",
-      "open https://github.com/defunkt/hub/compare/1.0...fix"
-  end
-
-  def test_hub_compare_range_fixes_two_dots_for_shas
-    assert_command "compare 1234abc..3456cde",
-      "open https://github.com/defunkt/hub/compare/1234abc...3456cde"
-  end
-
-  def test_hub_compare_range_ignores_two_dots_for_complex_ranges
-    assert_command "compare @{a..b}..@{c..d}",
-      "open https://github.com/defunkt/hub/compare/@{a..b}..@{c..d}"
-  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"
-  end
-
-  def test_hub_compare_url
-    assert_command "compare -u 1.0...1.1",
-      "echo https://github.com/defunkt/hub/compare/1.0...1.1"
-  end
-
   def test_hub_browse_no_repo
     stub_repo_url(nil)
     assert_equal "Usage: hub browse [<USER>/]<REPOSITORY>\n", hub("browse")

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.10.4
   prerelease: 
+  version: 1.10.5
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,35 +10,35 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,4 +110,3 @@ signing_key:
 specification_version: 3
 summary: Command-line wrapper for git and GitHub
 test_files: []
-has_rdoc: