git-hub 1.0.2 → 1.0.3

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 1.0.3 (2010-03-10)
+
+* Bugfix: `hub remote` for repos with -, /, etc
+
 ## 1.0.2 (2010-03-07)
 
 * Bugfix: `hub remote -f name` (for real this time)

data/Rakefile

@@ -24,12 +24,12 @@ task :standalone => :load_hub do
 end
 
 desc "Build hub manual"
-task :build_man do
+task "man:build" do
   sh "ron -br5 --organization=DEFUNKT --manual='Git Manual' man/*.ron"
 end
 
 desc "Show hub manual"
-task :man => :build_man do
+task :man => "man:build" do
   exec "man man/hub.1"
 end
 
@@ -109,16 +109,16 @@ task :publish => [ :test, :gemspec, :build ] do
 end
 
 desc "Publish to GitHub Pages"
-task :pages => [ :build_man, :check_dirty, :standalone ] do
+task :pages => [ "man:build", :check_dirty, :standalone ] do
   cp "man/hub.1.html", "html"
-  `git checkout gh-pages`
-  `mv hub standalone`
-  `git add standalone*`
-  `mv html hub.1.html`
-  `git add hub.1.html`
-  `git commit -m "update standalone"`
-  `git push origin gh-pages`
-  `git checkout master`
+  sh "git checkout gh-pages"
+  sh "mv hub standalone"
+  sh "git add standalone*"
+  sh "mv html hub.1.html"
+  sh "git add hub.1.html"
+  sh "git commit -m 'update standalone'"
+  sh "git push origin gh-pages"
+  sh "git checkout master"
   puts :done
 end
 

data/lib/hub/commands.rb

@@ -108,46 +108,31 @@ module Hub
     # $ hub remote add origin
     # > git remote add origin git://github.com/YOUR_LOGIN/THIS_REPO.git
     def remote(args)
-      return unless args[1] == 'add'
+      return if args[1] != 'add' or args.last =~ %r{.+?://|.+?@}
 
       ssh = args.delete('-p')
       url = ssh ? PRIVATE : PUBLIC
-
-      if args.last =~ /\b(\w+)\/(\w+)/
-        # user/repo
-        user, repo = $1, $2
-
-        if args.words[-2] == args.words[1]
-          # rtomayko/tilt => rtomayko
-          # Make sure you dance around flags.
-          idx = args.index( args.words[-1] )
-          args[idx] = user
-        else
-          # They're specifying the remote name manually (e.g.
-          # git remote add blah rtomayko/tilt), so just drop the last
-          # argument.
-          args.replace args[0...-1]
-        end
-
-        args << url % [ user, repo ]
-      elsif args.last !~ /:|\//
-        if args.words[2] == 'origin' && args.words[3].nil?
-          # Origin special case.
-          user = github_user
-        else
-          # Assume no : or / means GitHub user.
-          user = args.last
-        end
-
-        if args.words[-2] != args.words[1]
-          # They're specifying the remote name manually (e.g.
-          # git remote add blah rtomayko), so just drop the last
-          # argument.
-          args.replace args[0...-1]
-        end
-
-        args << url % [ user, REPO ]
+      
+      # user/repo
+      args.last =~ /\b(.+?)(?:\/(.+))?$/
+      user, repo = $1, $2 || REPO
+
+      if args.words[2] == 'origin' && args.words[3].nil?
+        # Origin special case.
+        user = github_user
+      elsif args.words[-2] == args.words[1]
+        # rtomayko/tilt => rtomayko
+        # Make sure you dance around flags.
+        idx = args.index( args.words[-1] )
+        args[idx] = user
+      else
+        # They're specifying the remote name manually (e.g.
+        # git remote add blah rtomayko/tilt), so just drop the last
+        # argument.
+        args.replace args[0...-1]
       end
+
+      args << url % [ user, repo ]
     end
 
     # $ hub init -g

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = '1.0.2'
+  Version = '1.0.3'
 end

data/man/hub.1

@@ -10,53 +10,53 @@
 \fBhub\fR \fICOMMAND\fR \fIOPTIONS\fR 
 .
 .br
-\fBhub alias\fR [\fB\-s\fR] \fISHELL\fR 
+\fBhub alias\fR [\fB-s\fR] \fISHELL\fR 
 .
 .br
 .
 .P
-\fBgit init \-g\fR \fIOPTIONS\fR 
+\fBgit init -g\fR \fIOPTIONS\fR 
 .
 .br
-\fBgit clone\fR [\fB\-p\fR] \fIOPTIONS\fR [\fIUSER\fR/]\fIREPOSITORY\fR \fIDIRECTORY\fR 
+\fBgit clone\fR [\fB-p\fR] \fIOPTIONS\fR [\fIUSER\fR/]\fIREPOSITORY\fR \fIDIRECTORY\fR 
 .
 .br
-\fBgit remote add\fR [\fB\-p\fR] \fIOPTIONS\fR \fIUSER\fR[/\fIREPOSITORY\fR] 
+\fBgit remote add\fR [\fB-p\fR] \fIOPTIONS\fR \fIUSER\fR[/\fIREPOSITORY\fR] 
 .
 .br
-\fBgit browse\fR [\fB\-p\fR] [\fIUSER\fR/]\fIREPOSITORY\fR 
+\fBgit browse\fR [\fB-p\fR] [\fIUSER\fR/]\fIREPOSITORY\fR 
 .
 .br
-\fBgit submodule add\fR [\fB\-p\fR] \fIOPTIONS\fR [\fIUSER\fR/]\fIREPOSITORY\fR \fIDIRECTORY\fR
+\fBgit submodule add\fR [\fB-p\fR] \fIOPTIONS\fR [\fIUSER\fR/]\fIREPOSITORY\fR \fIDIRECTORY\fR
 .
 .SH "DESCRIPTION"
 \fBhub\fR enhances various \fBgit\fR commands with GitHub remote expansion. The
 alias command displays information on configuring your environment:
 .
 .TP
-\fBhub alias\fR [\fB\-s\fR] \fISHELL\fR 
-Writes shell aliasing code for \fISHELL\fR (\fBbash\fR, \fBsh\fR, \fBzsh\fR, \fBcsh\fR) to standard output. With the \fB\-s\fR option, the output of
-this command can be evaluated directly within the shell: \fBeval $(hub alias \-s bash)\fR 
+\fBhub alias\fR [\fB-s\fR] \fISHELL\fR 
+Writes shell aliasing code for \fISHELL\fR (\fBbash\fR, \fBsh\fR, \fBzsh\fR, \fBcsh\fR) to standard output. With the \fB-s\fR option, the output of
+this command can be evaluated directly within the shell: \fBeval $(hub alias -s bash)\fR 
 .
 .P
 After configuring the alias, the following commands have superpowers:
 .
 .TP
-\fBgit init\fR \fB\-g\fR \fIOPTIONS\fR 
+\fBgit init\fR \fB-g\fR \fIOPTIONS\fR 
 Create a git repository as with git\-init(1) and add remote \fBorigin\fR at
 "git@github.com:\fIUSER\fR/\fIREPOSITORY\fR.git"; \fIUSER\fR is your GitHub username and \fIREPOSITORY\fR is the current working directory's basename.
 .
 .TP
-\fBgit clone\fR [\fB\-p\fR] \fIOPTIONS\fR [\fIUSER\fR\fB/\fR]\fIREPOSITORY\fR \fIDIRECTORY\fR 
+\fBgit clone\fR [\fB-p\fR] \fIOPTIONS\fR [\fIUSER\fR\fB/\fR]\fIREPOSITORY\fR \fIDIRECTORY\fR 
 Clone repository "git://github.com/\fIUSER\fR/\fIREPOSITORY\fR.git" into \fIDIRECTORY\fR as with git\-clone(1). When \fIUSER\fR/ is omitted, assumes
-your GitHub login. With \fB\-p\fR, use private remote
+your GitHub login. With \fB-p\fR, use private remote
 "git@github.com:\fIUSER\fR/\fIREPOSITORY\fR.git".
 .
 .TP
-\fBgit remote add\fR [\fB\-p\fR] \fIOPTIONS\fR \fIUSER\fR[\fB/\fR\fIREPOSITORY\fR]
+\fBgit remote add\fR [\fB-p\fR] \fIOPTIONS\fR \fIUSER\fR[\fB/\fR\fIREPOSITORY\fR]
 Add remote "git://github.com/\fIUSER\fR/\fIREPOSITORY\fR.git" as with
 git\-remote(1). When /\fIREPOSITORY\fR is omitted, the basename of the
-current working directory is used. With \fB\-p\fR, use private remote
+current working directory is used. With \fB-p\fR, use private remote
 "git@github.com:\fIUSER\fR/\fIREPOSITORY\fR.git". If \fIUSER\fR is "origin"
 then uses your GitHub login.
 .
@@ -66,16 +66,16 @@ Push \fIREF\fR to each of \fIREMOTE\-1\fR through \fIREMOTE\-N\fR by executing
 multiple \fBgit push\fR commands.
 .
 .TP
-\fBgit browse\fR [\fB\-p\fR] [[\fIUSER\fR\fB/\fR]\fIREPOSITORY\fR]
+\fBgit browse\fR [\fB-p\fR] [[\fIUSER\fR\fB/\fR]\fIREPOSITORY\fR]
 Open repository's GitHub page in the system's default web browser
-using \fBopen(1)\fR or the \fBBROWSER\fR env variable. Use \fB\-p\fR to open a
+using \fBopen(1)\fR or the \fBBROWSER\fR env variable. Use \fB-p\fR to open a
 page with https. If the repository isn't specified, \fBbrowse\fR opens
 the page of the repository found in the current directory.
 .
 .TP
-\fBgit submodule add\fR [\fB\-p\fR] \fIOPTIONS\fR [\fIUSER\fR/]\fIREPOSITORY\fR \fIDIRECTORY\fR 
+\fBgit submodule add\fR [\fB-p\fR] \fIOPTIONS\fR [\fIUSER\fR/]\fIREPOSITORY\fR \fIDIRECTORY\fR 
 Submodule repository "git://github.com/\fIUSER\fR/\fIREPOSITORY\fR.git" into \fIDIRECTORY\fR as with git\-submodule(1). When \fIUSER\fR/ is omitted, assumes
-your GitHub login. With \fB\-p\fR, use private remote
+your GitHub login. With \fB-p\fR, use private remote
 "git@github.com:\fIUSER\fR/\fIREPOSITORY\fR.git".
 .
 .TP
@@ -89,7 +89,7 @@ Use git\-config(1) to display the currently configured GitHub username:
 .
 .nf
 
-$ git config \-\-global github.user 
+\fB$ git config --global github.user \fR
 .
 .fi
 .
@@ -102,7 +102,7 @@ Or, set the GitHub username with:
 .
 .nf
 
-$ git config \-\-global github.user <username> 
+\fB$ git config --global github.user <username> \fR
 .
 .fi
 .
@@ -120,7 +120,7 @@ cloning:
 .
 .nf
 
-$ git config \-\-global \-\-add hub.http\-clone yes 
+\fB$ git config --global --add hub.http-clone yes \fR
 .
 .fi
 .
@@ -132,16 +132,17 @@ $ git config \-\-global \-\-add hub.http\-clone yes
 .
 .nf
 
-$ git clone schacon/ticgit
+\fB$ git clone schacon/ticgit
 > git clone git://github.com/schacon/ticgit.git 
-$ git clone \-p schacon/ticgit
+$ git clone -p schacon/ticgit
 > git clone git@github.com:schacon/ticgit.git
 
 $ git clone resque
 > git clone git://github.com/YOUR_USER/resque.git
 
-$ git clone \-p resque
+$ git clone -p resque
 > git clone git@github.com:YOUR_USER/resque.git
+\fR
 .
 .fi
 .
@@ -149,13 +150,14 @@ $ git clone \-p resque
 .
 .nf
 
-$ git remote add rtomayko
+\fB$ git remote add rtomayko
 > git remote add rtomayko git://github.com/rtomayko/CURRENT_REPO.git 
-$ git remote add \-p rtomayko
+$ git remote add -p rtomayko
 > git remote add rtomayko git@github.com:rtomayko/CURRENT_REPO.git
 
 $ git remote add origin
 > git remote add origin git://github.com/YOUR_USER/CURRENT_REPO.git
+\fR
 .
 .fi
 .
@@ -163,9 +165,9 @@ $ git remote add origin
 .
 .nf
 
-$ git init \-g
+\fB$ git init -g
 > git init
-> git remote add origin git@github.com:YOUR_USER/REPO.git 
+> git remote add origin git@github.com:YOUR_USER/REPO.git \fR
 .
 .fi
 .
@@ -173,10 +175,10 @@ $ git init \-g
 .
 .nf
 
-$ git push origin,staging,qa bert_timeout
+\fB$ git push origin,staging,qa bert_timeout
 > git push origin bert_timeout
 > git push staging bert_timeout
-> git push qa bert_timeout 
+> git push qa bert_timeout \fR
 .
 .fi
 .
@@ -184,16 +186,17 @@ $ git push origin,staging,qa bert_timeout
 .
 .nf
 
-$ git browse schacon/ticgit
+\fB$ git browse schacon/ticgit
 > open http://github.com/schacon/ticgit 
-$ git browse \-p schacon/ticgit
+$ git browse -p schacon/ticgit
 > open http://github.com/schacon/ticgit
 
 $ git browse resque
 > open http://github.com/YOUR_USER/resque
 
-$ git browse \-p resque
+$ git browse -p resque
 > open https://github.com:YOUR_USER/resque
+\fR
 .
 .fi
 .
@@ -201,10 +204,10 @@ $ git browse \-p resque
 .
 .nf
 
-$ git help
+\fB$ git help
 > (improved git help)
 $ git help hub
-> (hub man page) 
+> (hub man page) \fR
 .
 .fi
 .

data/test/hub_test.rb

@@ -90,6 +90,18 @@ class HubTest < Test::Unit::TestCase
     assert_command input, command
   end
 
+  def test_public_remote_origin_as_normal
+    input   = "remote add origin http://github.com/defunkt/resque.git"
+    command = "git remote add origin http://github.com/defunkt/resque.git"
+    assert_command input, command
+  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
+  end
+
   def test_public_submodule
     input   = "submodule add wycats/bundler vendor/bundler"
     command = "git submodule add git://github.com/wycats.bundler.git"
@@ -136,26 +148,26 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_private_remote_with_repo
-    input   = "remote add -p rtomayko/tilt"
-    command = "git remote add rtomayko git@github.com:rtomayko/tilt.git"
+    input   = "remote add -p jashkenas/coffee-script"
+    command = "git remote add jashkenas git@github.com:jashkenas/coffee-script.git"
     assert_command input, command
   end
 
   def test_public_remote_with_repo
-    input   = "remote add rtomayko/tilt"
-    command = "git remote add rtomayko git://github.com/rtomayko/tilt.git"
+    input   = "remote add jashkenas/coffee-script"
+    command = "git remote add jashkenas git://github.com/jashkenas/coffee-script.git"
     assert_command input, command
   end
 
   def test_public_remote_f_with_repo
-    input   = "remote add -f rtomayko/tilt"
-    command = "git remote add -f rtomayko git://github.com/rtomayko/tilt.git"
+    input   = "remote add -f jashkenas/coffee-script"
+    command = "git remote add -f jashkenas git://github.com/jashkenas/coffee-script.git"
     assert_command input, command
   end
 
   def test_named_private_remote_with_repo
-    input   = "remote add -p origin rtomayko/tilt"
-    command = "git remote add origin git@github.com:rtomayko/tilt.git"
+    input   = "remote add -p origin jashkenas/coffee-script"
+    command = "git remote add origin git@github.com:jashkenas/coffee-script.git"
     assert_command input, command
   end
 
@@ -206,7 +218,6 @@ class HubTest < Test::Unit::TestCase
   def test_help_hub
     help_manpage = hub("help hub")
     assert_includes "git + hub = github", help_manpage
-    assert_includes "$ git clone schacon/ticgit", help_manpage
     assert_includes "Chris Wanstrath :: chris@ozmm.org", help_manpage
     assert_includes <<-config, help_manpage
 Use git-config(1) to display the currently configured GitHub username:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: git-hub
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 -08:00
+date: 2010-03-10 00:00:00 -08:00
 default_executable: hub
 dependencies: []