git-hub 0.3.2 → 1.0.0

data/CONTRIBUTORS

@@ -1,5 +1,7 @@
 * Chris Wanstrath
 * Stephen Celis
+* Rob Ares
+* Mislav Marohnić
 * Ryan Tomayko
 * Caio Chassot
 * Joshua Peek

data/HISTORY.md

@@ -1,6 +1,9 @@
-## 1.0.0 (2010-??-??)
+## 1.0.0 (2010-03-03)
 
-*
+* `hub browse` with no arguments uses the current repo.
+* `hub submodule add user/repo directory
+* `hub remote add rtomayko/tilt`
+* `remote add -p origin rtomayko/tilt`
 
 ## 0.3.2 (2010-02-17)
 

data/README.md

@@ -146,6 +146,9 @@ superpowers:
 
 ### git browse
 
+    $ git browse
+    > open http://github.com/CURRENT_REPO
+
     $ git browse schacon/ticgit
     > open http://github.com/schacon/ticgit
 

data/lib/hub/args.rb

@@ -6,6 +6,14 @@ module Hub
   # The ARGV array is converted into an Args instance by the Hub
   # instance when instantiated.
   class Args < Array
+    attr_accessor :executable
+    
+    def initialize(*args)
+      super
+      @executable = ENV["GIT"] || "git"
+      @after = nil
+    end
+
     # With no arguments, returns the `after` callback.
     #
     # With a single argument, sets the `after` callback.
@@ -31,5 +39,11 @@ module Hub
     def after?
       !!@after
     end
+    
+    # Array of `executable` followed by all args suitable as arguments
+    # for `exec` or `system` calls.
+    def to_exec
+      [executable].concat self
+    end
   end
 end

data/lib/hub/commands.rb

@@ -42,9 +42,10 @@ module Hub
     # Set the repo name based on the current origin or, as a fallback,
     # the cwd.
     if ORIGIN =~ %r{\bgithub\.com[:/](.+)/(.+).git$}
-      REPO = $2
+      OWNER, REPO = $1, $2
     else
       REPO = File.basename(Dir.pwd)
+      OWNER = ''
     end
 
     # $ hub clone rtomayko/tilt
@@ -86,6 +87,18 @@ module Hub
       end
     end
 
+    # $ hub submodule add wycats/bundler vendor/bundler
+    # > git submodule add git://github.com/wycats/bundler.git vendor/bundler
+    #
+    # $ hub submodule add -p wycats/bundler vendor/bundler
+    # > git submodule add git@github.com:wycats/bundler.git vendor/bundler
+    def submodule(args)
+      return unless index = args.index('add')
+      args.delete_at index
+      clone(args)
+      args.insert index, 'add'
+    end
+
     # $ hub remote add pjhyett
     # > git remote add pjhyett git://github.com/pjhyett/THIS_REPO.git
     #
@@ -97,15 +110,39 @@ module Hub
     def remote(args)
       return unless args[1] == 'add'
 
-      # Assume GitHub usernames don't ever contain : or /, while URLs
-      # do.
-      if args[-1] !~ /:|\//
-        ssh  = args.delete('-p')
-        user = args.last
-        url  = ssh ? PRIVATE : PUBLIC
+      ssh = args.delete('-p')
+      url = ssh ? PRIVATE : PUBLIC
+
+      if args.last =~ /\b(\w+)\/(\w+)/
+        # user/repo
+        user, repo = $1, $2
+
+        if args[-2] == args[1]
+          # rtomayko/tilt => rtomayko
+          args[-1] = 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
 
-        # Origin special case.
-        user = github_user if args[2] == 'origin'
+        args << url % [ user, repo ]
+      elsif args.last !~ /:|\//
+        if args[2] == 'origin' && args[3].nil?
+          # Origin special case.
+          user = github_user
+        else
+          # Assume no : or / means GitHub user.
+          user = args.last
+        end
+
+        if args[-2] != args[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 ]
       end
@@ -142,6 +179,9 @@ module Hub
       args.after after
     end
 
+    # $ hub browse
+    # > open http://github.com/CURRENT_REPO
+    #
     # $ hub browse pjhyett/github-services
     # > open http://github.com/pjhyett/github-services
     #
@@ -154,19 +194,28 @@ module Hub
     # $ hub browse -p github-fi
     # > open https://github.com/YOUR_LOGIN/github-fi
     def browse(args)
+      args.shift
       protocol = args.delete('-p') ? 'https' : 'http'
-
-      if args.last.include? '/'
-        # $ hub browse pjhyett/github-services
-        user, repo = args.last.split('/')
+      dest = args.pop
+
+      if dest
+        if dest.include? '/'
+          # $ hub browse pjhyett/github-services
+          user, repo = dest.split('/')
+        else
+          # $ hub browse github-services
+          user, repo = github_user, dest
+        end
+      elsif !OWNER.empty?
+        # $ hub browse
+        user, repo = OWNER, REPO
       else
-        # $ hub browse github-services
-        user = github_user
-        repo = args.last
+        warn "Usage: hub browse [<USER>/]<REPOSITORY>"
+        exit(1)
       end
 
-      browser = ENV['BROWSER'] || "open"
-      exec "#{browser} #{protocol}://github.com/#{user}/#{repo}"
+      args.executable = ENV['BROWSER'] || 'open'
+      args.push "#{protocol}://github.com/#{user}/#{repo}"
     end
 
     # $ hub hub standalone
@@ -174,7 +223,7 @@ module Hub
     # installation sequence:
     #
     # $ gem install git-hub
-    # $ hub standalone > ~/bin/standalone
+    # $ hub hub standalone > ~/bin/hub && chmod 755 ~/bin/hub
     # $ gem uninstall git-hub
     def hub(args)
       return help(args) unless args[1] == 'standalone'

data/lib/hub/runner.rb

@@ -6,6 +6,7 @@ module Hub
   # augment a git command, is kept in the `Hub::Commands` module.
   class Runner
     attr_reader :args
+    
     def initialize(*args)
       @args = Args.new(args)
 
@@ -34,7 +35,7 @@ module Hub
     # A string representation of the git command we would run if
     # #execute were called.
     def command
-      "git #{args.join(' ')}"
+      args.to_exec.join(' ')
     end
 
     # Runs the target git command with an optional callback. Replaces
@@ -43,7 +44,7 @@ module Hub
       if args.after?
         execute_with_after_callback
       else
-        exec "git", *args
+        exec(*args.to_exec)
       end
     end
 
@@ -53,7 +54,7 @@ module Hub
     # callback.
     def execute_with_after_callback
       after = args.after
-      if system("git", *args)
+      if system(*args.to_exec)
         after.respond_to?(:call) ? after.call : exec(after)
         exit
       else

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = '0.3.2'
+  Version = '1.0.0'
 end

data/man/hub.1

@@ -1,7 +1,7 @@
 .\" generated with Ron/v0.3
 .\" http://github.com/rtomayko/ron/
 .
-.TH "HUB" "1" "February 2010" "DEFUNKT" "Git Manual"
+.TH "HUB" "1" "March 2010" "DEFUNKT" "Git Manual"
 .
 .SH "NAME"
 \fBhub\fR \-\- git + hub = github
@@ -27,6 +27,7 @@
 \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
 .
 .SH "DESCRIPTION"
 \fBhub\fR enhances various \fBgit\fR commands with GitHub remote expansion. The
@@ -65,10 +66,17 @@ 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
-page with https.
+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 
+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
+"git@github.com:\fIUSER\fR/\fIREPOSITORY\fR.git".
 .
 .TP
 \fBgit help\fR

data/man/hub.1.html

@@ -74,7 +74,7 @@
 <code>git clone</code> [<code>-p</code>] <var>OPTIONS</var> [<var>USER</var>/]<var>REPOSITORY</var> <var>DIRECTORY</var> <br>
 <code>git remote add</code> [<code>-p</code>] <var>OPTIONS</var> <var>USER</var>[/<var>REPOSITORY</var>] <br>
 <code>git browse</code> [<code>-p</code>] [<var>USER</var>/]<var>REPOSITORY</var> <br>
-</p>
+<code>git submodule add</code> [<code>-p</code>] <var>OPTIONS</var> [<var>USER</var>/]<var>REPOSITORY</var> <var>DIRECTORY</var></p>
 
 <h2>DESCRIPTION</h2>
 
@@ -122,11 +122,18 @@ then uses your GitHub login.</p></dd>
 <dd><p>Push <var>REF</var> to each of <var>REMOTE-1</var> through <var>REMOTE-N</var> by executing
 multiple <code>git push</code> commands.</p></dd>
 <dt>
-<code>git browse</code> [<code>-p</code>] [<var>USER</var><code>/</code>]<var>REPOSITORY</var>
-</dt>
+<code>git browse</code> [<code>-p</code>] [[<var>USER</var><code>/</code>]<var>REPOSITORY</var>]</dt>
 <dd><p>Open repository's GitHub page in the system's default web browser
 using <code>open(1)</code> or the <code>BROWSER</code> env variable. Use <code>-p</code> to open a
-page with https.</p></dd>
+page with https. If the repository isn't specified, <code>browse</code> opens
+the page of the repository found in the current directory.</p></dd>
+<dt>
+<code>git submodule add</code> [<code>-p</code>] <var>OPTIONS</var> [<var>USER</var>/]<var>REPOSITORY</var> <var>DIRECTORY</var>
+</dt>
+<dd><p>Submodule repository "git://github.com/<var>USER</var>/<var>REPOSITORY</var>.git" into
+<var>DIRECTORY</var> as with git-submodule(1). When <var>USER</var>/ is omitted, assumes
+your GitHub login. With <code>-p</code>, use private remote
+"git@github.com:<var>USER</var>/<var>REPOSITORY</var>.git".</p></dd>
 <dt><code>git help</code></dt>
 <dd><p>Display enhanced git-help(1).</p></dd>
 </dl>
@@ -236,7 +243,7 @@ $ git help hub
 
 <ol class='foot man'>
   <li class='tl'>DEFUNKT</li>
-  <li class='tc'>February 2010</li>
+  <li class='tc'>March 2010</li>
   <li class='tr'>hub(1)</li>
 </ol>
 

data/man/hub.1.ron

@@ -10,6 +10,7 @@ hub(1) -- git + hub = github
 `git clone` [`-p`] <OPTIONS> [<USER>/]<REPOSITORY> <DIRECTORY>   
 `git remote add` [`-p`] <OPTIONS> <USER>[/<REPOSITORY>]   
 `git browse` [`-p`] [<USER>/]<REPOSITORY>   
+`git submodule add` [`-p`] <OPTIONS> [<USER>/]<REPOSITORY> <DIRECTORY>
 
 ## DESCRIPTION
 
@@ -46,10 +47,17 @@ After configuring the alias, the following commands have superpowers:
     Push <REF> to each of <REMOTE-1> through <REMOTE-N> by executing
     multiple `git push` commands.
 
-  * `git browse` [`-p`] [<USER>`/`]<REPOSITORY>:
+  * `git browse` [`-p`] [[<USER>`/`]<REPOSITORY>]:
     Open repository's GitHub page in the system's default web browser
     using `open(1)` or the `BROWSER` env variable. Use `-p` to open a
-    page with https.
+    page with https. If the repository isn't specified, `browse` opens
+    the page of the repository found in the current directory.
+
+  * `git submodule add` [`-p`] <OPTIONS> [<USER>/]<REPOSITORY> <DIRECTORY>:
+    Submodule repository "git://github.com/<USER>/<REPOSITORY>.git" into
+    <DIRECTORY> as with git-submodule(1). When <USER>/ is omitted, assumes
+    your GitHub login. With `-p`, use private remote
+    "git@github.com:<USER>/<REPOSITORY>.git".
 
   * `git help`:
     Display enhanced git-help(1).

data/test/hub_test.rb

@@ -3,7 +3,9 @@ require 'helper'
 
 class HubTest < Test::Unit::TestCase
   def setup
+    Hub::Commands::REPO.replace("hub")
     Hub::Commands::USER.replace("tpw")
+    Hub::Commands::OWNER.replace("defunkt")
   end
 
   def test_private_clone
@@ -88,6 +90,21 @@ class HubTest < Test::Unit::TestCase
     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"
+  end
+
+  def test_private_submodule
+    input   = "submodule add -p grit vendor/grit"
+    command = "git submodule add git@github.com:tpw/grit.git"
+  end
+
+  def test_submodule_with_args
+    input   = "submodule -q add --bare -- grit grit"
+    command = "git submodule -q add --bare -- git://github.com/tpw/grit.git grit"
+  end
+
   def test_private_remote
     input   = "remote add -p rtomayko"
     command = "git remote add rtomayko git@github.com:rtomayko/hub.git"
@@ -100,6 +117,30 @@ class HubTest < Test::Unit::TestCase
     assert_command input, command
   end
 
+  def test_named_public_remote
+    input   = "remote add origin rtomayko"
+    command = "git remote add origin git://github.com/rtomayko/hub.git"
+    assert_command input, command
+  end
+
+  def test_private_remote_with_repo
+    input   = "remote add -p rtomayko/tilt"
+    command = "git remote add rtomayko git@github.com:rtomayko/tilt.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"
+    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"
+    assert_command input, command
+  end
+
   def test_init
     h = Hub("init -g")
     assert_equal "git init", h.command
@@ -153,6 +194,7 @@ config
   def test_help_hub_no_groff
     help_manpage = hub("help hub") do
       Hub::Commands.class_eval do
+        remove_method :groff?
         def groff?; false end
       end
     end
@@ -165,26 +207,32 @@ config
   end
 
   def test_hub_open
-    input   = "browse mojombo/bert"
-    command = "http://github.com/mojombo/bert\n"
-    assert_equal command, hub(input) { ENV['BROWSER'] = 'echo' }
+    assert_command "browse mojombo/bert", "open http://github.com/mojombo/bert"
   end
 
   def test_hub_open_private
-    input   = "browse -p bmizerany/sinatra"
-    command = "https://github.com/bmizerany/sinatra\n"
-    assert_equal command, hub(input) { ENV['BROWSER'] = 'echo' }
+    assert_command "browse -p bmizerany/sinatra", "open https://github.com/bmizerany/sinatra"
   end
 
   def test_hub_open_self
-    input   = "browse resque"
-    command = "http://github.com/tpw/resque\n"
-    assert_equal command, hub(input) { ENV['BROWSER'] = 'echo' }
+    assert_command "browse resque", "open http://github.com/tpw/resque"
   end
 
   def test_hub_open_self_private
-    input   = "browse -p github"
-    command = "https://github.com/tpw/github\n"
-    assert_equal command, hub(input) { ENV['BROWSER'] = 'echo' }
+    assert_command "browse -p github", "open https://github.com/tpw/github"
+  end
+
+  def test_hub_open_current
+    assert_command "browse", "open http://github.com/defunkt/hub"
+  end
+
+  def test_hub_open_current_private
+    assert_command "browse -p", "open https://github.com/defunkt/hub"
+  end
+
+  def test_hub_open_no_repo
+    Hub::Commands::OWNER.replace("")
+    input = "browse"
+    assert_equal "Usage: hub browse [<USER>/]<REPOSITORY>\n", hub(input)
   end
 end

metadata

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