git-hub 1.0.0 → 1.0.1

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 1.0.1 (2010-03-05)
+
+* Bugfix: `hub remote -f name`
+
 ## 1.0.0 (2010-03-03)
 
 * `hub browse` with no arguments uses the current repo.

data/README.md

@@ -8,22 +8,16 @@ It can used on its own or as a `git` wrapper.
 Normal:
 
     $ hub clone rtomayko/tilt
-    Initialized empty Git repository in /Users/chris/sandbox/tilt/.git/
-    remote: Counting objects: 307, done.
-    remote: Compressing objects: 100% (219/219), done.
-    remote: Total 307 (delta 175), reused 85 (delta 45)
-    Receiving objects: 100% (307/307), 48.91 KiB, done.
-    Resolving deltas: 100% (175/175), done.
+
+    Expands to:
+    $ git clone git://github.com/rtomayko/tilt.git
 
 Wrapping `git`:
 
     $ git clone rack/rack
-    Initialized empty Git repository in /Users/chris/sandbox/rack/.git/
-    remote: Counting objects: 4005, done.
-    remote: Compressing objects: 100% (1738/1738), done.
-    remote: Total 4005 (delta 2505), reused 3620 (delta 2208)
-    Receiving objects: 100% (4005/4005), 785.82 KiB | 129 KiB/s, done.
-    Resolving deltas: 100% (2505/2505), done.
+
+    Expands to:
+    $ git clone git://github.com/rack/rack.git
 
 hub requires you have `git` installed and in your `$PATH`. It also
 requires Ruby 1.8.6+ or Ruby 1.9.1+. No other libraries necessary.
@@ -43,7 +37,7 @@ Assuming `~/bin/` is in your `$PATH`, you're ready to roll:
 
     $ hub version
     git version 1.6.4.2
-    hub version 0.2.0
+    hub version 0.3.2
 
 ### Homebrew
 

data/lib/hub/args.rb

@@ -7,7 +7,7 @@ module Hub
   # instance when instantiated.
   class Args < Array
     attr_accessor :executable
-    
+
     def initialize(*args)
       super
       @executable = ENV["GIT"] || "git"
@@ -39,11 +39,29 @@ 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
+
+    # All the words (as opposed to flags) contained in this argument
+    # list.
+    #
+    # args = Args.new([ 'remote', 'add', '-f', 'tekkub' ])
+    # args.words == [ 'remote', 'add', 'tekkub' ]
+    def words
+      reject { |arg| arg =~ /^-/ }
+    end
+
+    # All the flags (as opposed to words) contained in this argument
+    # list.
+    #
+    # args = Args.new([ 'remote', 'add', '-f', 'tekkub' ])
+    # args.flags == [ '-f' ]
+    def flags
+      self - words
+    end
   end
 end

data/lib/hub/commands.rb

@@ -117,7 +117,7 @@ module Hub
         # user/repo
         user, repo = $1, $2
 
-        if args[-2] == args[1]
+        if args.words[-2] == args.words[1]
           # rtomayko/tilt => rtomayko
           args[-1] = user
         else
@@ -290,10 +290,13 @@ module Hub
     # $ hub help
     # (print improved help text)
     def help(args)
-      if args[1] == 'hub'
+      command = args.grep(/^[^-]/)[1]
+
+      if command == 'hub'
         puts hub_manpage
         exit
-      elsif args.size == 1
+      elsif command.nil?
+        ENV['GIT_PAGER'] = '' if args.grep(/^-{1,2}p/).empty? # Use `cat`.
         puts improved_help_text
         exit
       end

data/lib/hub/runner.rb

@@ -11,7 +11,7 @@ module Hub
       @args = Args.new(args)
 
       # Hack to emulate git-style
-      @args[0] = 'help' if @args.empty?
+      @args.unshift 'help' if @args.grep(/^[^-]|version/).empty?
 
       if Commands.respond_to?(@args[0])
         Commands.send(@args[0], @args)

data/lib/hub/version.rb

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

data/test/helper.rb

@@ -48,7 +48,7 @@ class Test::Unit::TestCase
   # Should in turn execute this:
   #   $ git clone git://github.com/git/hub.git
   def assert_command(input, expected)
-    assert_equal expected, Hub(input).command
+    assert_equal expected, Hub(input).command, "$ git #{input}"
   end
 
   # Asserts that `hub` will show a specific alias command for a

data/test/hub_test.rb

@@ -123,6 +123,12 @@ class HubTest < Test::Unit::TestCase
     assert_command input, command
   end
 
+  def test_named_public_remote_f
+    input   = "remote add -f origin rtomayko"
+    command = "git remote add -f 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"
@@ -135,6 +141,12 @@ class HubTest < Test::Unit::TestCase
     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"
+    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"
@@ -169,7 +181,7 @@ class HubTest < Test::Unit::TestCase
 
   def test_version
     out = hub('--version')
-    assert_includes "git version 1.6", out
+    assert_includes "git version", out
     assert_includes "hub version #{Hub::Version}", out
   end
 
@@ -181,6 +193,10 @@ class HubTest < Test::Unit::TestCase
     assert_equal Hub::Commands.improved_help_text, hub("")
   end
 
+  def test_help_with_pager
+    assert_equal Hub::Commands.improved_help_text, hub("-p")
+  end
+
   def test_help_hub
     help_manpage = hub("help hub")
     assert_includes "git + hub = github", help_manpage

metadata

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