git-hub 1.1.0 → 1.3.0

data/test/hub_test.rb

@@ -5,22 +5,43 @@ require 'webmock/test_unit'
 class HubTest < Test::Unit::TestCase
   include WebMock
 
+  COMMANDS = []
+
+  Hub::Commands.class_eval do
+    remove_method :command?
+    define_method :command? do |name|
+      COMMANDS.include?(name)
+    end
+  end
+
   def setup
-    Hub::Commands::REPO.replace("hub")
-    Hub::Commands::USER.replace("tpw")
-    Hub::Commands::TOKEN.replace("abc123")
-    Hub::Commands::OWNER.replace("defunkt")
+    COMMANDS.replace %w[open groff]
+
+    @git = Hub::Context::GIT_CONFIG.replace(Hash.new { |h, k|
+      raise ArgumentError, "`git #{k}` not stubbed"
+    }).update(
+      'symbolic-ref -q HEAD' => 'refs/heads/master',
+      'config github.user'   => 'tpw',
+      'config github.token'  => 'abc123',
+      'config remote.origin.url'     => 'git://github.com/defunkt/hub.git',
+      'config remote.mislav.url'     => 'git://github.com/mislav/hub.git',
+      'config branch.master.remote'  => 'origin',
+      'config branch.master.merge'   => 'refs/heads/master',
+      'config branch.feature.remote' => 'mislav',
+      'config branch.feature.merge'  => 'refs/heads/experimental',
+      'config --bool hub.http-clone' => 'false'
+    )
   end
 
   def test_private_clone
-    input   = "clone -p rtomayko/ron"
-    command = "git clone git@github.com:rtomayko/ron.git"
+    input   = "clone -p rtomayko/ronn"
+    command = "git clone git@github.com:rtomayko/ronn.git"
     assert_command input, command
   end
 
   def test_public_clone
-    input   = "clone rtomayko/ron"
-    command = "git clone git://github.com/rtomayko/ron.git"
+    input   = "clone rtomayko/ronn"
+    command = "git clone git://github.com/rtomayko/ronn.git"
     assert_command input, command
   end
 
@@ -44,7 +65,7 @@ class HubTest < Test::Unit::TestCase
 
   def test_your_private_clone_fails_without_config
     out = hub("clone -p mustache") do
-      Hub::Commands::USER.replace("")
+      stub_github_user(nil)
     end
 
     assert_equal "** No GitHub user set. See http://github.com/guides/local-github-config\n", out
@@ -52,27 +73,27 @@ class HubTest < Test::Unit::TestCase
 
   def test_your_public_clone_fails_without_config
     out = hub("clone mustache") do
-      Hub::Commands::USER.replace("")
+      stub_github_user(nil)
     end
 
     assert_equal "** No GitHub user set. See http://github.com/guides/local-github-config\n", out
   end
 
   def test_private_clone_left_alone
-    input   = "clone git@github.com:rtomayko/ron.git"
-    command = "git clone git@github.com:rtomayko/ron.git"
+    input   = "clone git@github.com:rtomayko/ronn.git"
+    command = "git clone git@github.com:rtomayko/ronn.git"
     assert_command input, command
   end
 
   def test_public_clone_left_alone
-    input   = "clone git://github.com/rtomayko/ron.git"
-    command = "git clone git://github.com/rtomayko/ron.git"
+    input   = "clone git://github.com/rtomayko/ronn.git"
+    command = "git clone git://github.com/rtomayko/ronn.git"
     assert_command input, command
   end
 
   def test_normal_public_clone_with_path
-    input   = "clone git://github.com/rtomayko/ron.git ron-dev"
-    command = "git clone git://github.com/rtomayko/ron.git ron-dev"
+    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
   end
 
@@ -100,6 +121,18 @@ class HubTest < Test::Unit::TestCase
     assert_command input, command
   end
 
+  def test_remote_from_rel_path
+    input = "remote add origin ./path"
+    command = "git remote add origin ./path"
+    assert_command input, command
+  end
+
+  def test_remote_from_abs_path
+    input = "remote add origin /path"
+    command = "git remote add origin /path"
+    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"
@@ -108,17 +141,26 @@ class HubTest < Test::Unit::TestCase
 
   def test_public_submodule
     input   = "submodule add wycats/bundler vendor/bundler"
-    command = "git submodule add git://github.com/wycats.bundler.git"
+    command = "git submodule add git://github.com/wycats/bundler.git vendor/bundler"
+    assert_command input, command
   end
 
   def test_private_submodule
     input   = "submodule add -p grit vendor/grit"
-    command = "git submodule add git@github.com:tpw/grit.git"
+    command = "git submodule add git@github.com:tpw/grit.git vendor/grit"
+    assert_command input, command
+  end
+
+  def test_submodule_branch
+    input   = "submodule add -b ryppl ryppl/pip vendor/pip"
+    command = "git submodule add -b ryppl git://github.com/ryppl/pip.git vendor/pip"
+    assert_command input, command
   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"
+    assert_command input, command
   end
 
   def test_private_remote
@@ -183,7 +225,7 @@ class HubTest < Test::Unit::TestCase
 
   def test_init_no_login
     out = hub("init -g") do
-      Hub::Commands::USER.replace("")
+      stub_github_user(nil)
     end
 
     assert_equal "** No GitHub user set. See http://github.com/guides/local-github-config\n", out
@@ -234,7 +276,7 @@ class HubTest < Test::Unit::TestCase
 
   def test_version
     out = hub('--version')
-    assert_includes "git version", out
+    assert_includes "git version 1.7.0.4", out
     assert_includes "hub version #{Hub::Version}", out
   end
 
@@ -260,13 +302,8 @@ config
   end
 
   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
-    assert_equal "** Can't find groff(1)\n", help_manpage
+    stub_available_commands()
+    assert_equal "** Can't find groff(1)\n", hub("help hub")
   end
 
   def test_hub_standalone
@@ -274,34 +311,197 @@ config
     assert_equal Hub::Standalone.build, help_standalone
   end
 
-  def test_hub_open
+  def test_hub_compare
+    assert_command "compare refactor",
+      "open http://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')
+
+    assert_command "compare",
+      "open http://github.com/mislav/hub/compare/experimental"
+  end
+
+  def test_hub_compare_range
+    assert_command "compare 1.0...fix",
+      "open http://github.com/defunkt/hub/compare/1.0...fix"
+  end
+
+  def test_hub_compare_fork
+    assert_command "compare myfork feature",
+      "open http://github.com/myfork/hub/compare/feature"
+  end
+
+  def test_hub_compare_private
+    assert_command "compare -p myfork topsecret",
+      "open https://github.com/myfork/hub/compare/topsecret"
+  end
+
+  def test_hub_compare_url
+    assert_command "compare -u 1.0...1.1",
+      "echo http://github.com/defunkt/hub/compare/1.0...1.1"
+  end
+
+  def test_hub_browse
+    assert_command "browse mojombo/bert", "open http://github.com/mojombo/bert"
+  end
+
+  def test_hub_browse_tracking_nothing
+    stub_tracking_nothing
     assert_command "browse mojombo/bert", "open http://github.com/mojombo/bert"
   end
 
-  def test_hub_open_private
+  def test_hub_browse_url
+    assert_command "browse -u mojombo/bert", "echo http://github.com/mojombo/bert"
+  end
+
+  def test_hub_browse_private
     assert_command "browse -p bmizerany/sinatra",
       "open https://github.com/bmizerany/sinatra"
   end
 
-  def test_hub_open_self
+  def test_hub_browse_self
+    assert_command "browse resque", "open http://github.com/tpw/resque"
+  end
+
+  def test_hub_browse_subpage
+    assert_command "browse resque commits",
+      "open http://github.com/tpw/resque/commits/master"
+    assert_command "browse resque issues",
+      "open http://github.com/tpw/resque/issues"
+    assert_command "browse resque wiki",
+      "open http://wiki.github.com/tpw/resque/"
+  end
+
+  def test_hub_browse_on_branch
+    stub_branch('refs/heads/feature')
+
     assert_command "browse resque", "open http://github.com/tpw/resque"
+    assert_command "browse resque commits",
+      "open http://github.com/tpw/resque/commits/master"
+
+    assert_command "browse",
+      "open http://github.com/mislav/hub/tree/experimental"
+    assert_command "browse -- tree",
+      "open http://github.com/mislav/hub/tree/experimental"
+    assert_command "browse -- commits",
+      "open http://github.com/mislav/hub/commits/experimental"
   end
 
-  def test_hub_open_self_private
+  def test_hub_browse_self_private
     assert_command "browse -p github", "open https://github.com/tpw/github"
   end
 
-  def test_hub_open_current
+  def test_hub_browse_current
     assert_command "browse", "open http://github.com/defunkt/hub"
+    assert_command "browse --", "open http://github.com/defunkt/hub"
   end
 
-  def test_hub_open_current_private
+  def test_hub_browse_current_subpage
+    assert_command "browse -- network",
+      "open http://github.com/defunkt/hub/network"
+    assert_command "browse -- anything/everything",
+      "open http://github.com/defunkt/hub/anything/everything"
+  end
+
+  def test_hub_browse_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)
+  def test_hub_browse_no_repo
+    stub_repo_url(nil)
+    assert_equal "Usage: hub browse [<USER>/]<REPOSITORY>\n", hub("browse")
+  end
+
+  def test_custom_browser
+    with_browser_env("custom") do
+      assert_browser("custom")
+    end
   end
+
+  def test_linux_browser
+    stub_available_commands "open", "xdg-open", "cygstart"
+    with_browser_env(nil) do
+      with_ruby_platform("i686-linux") do
+        assert_browser("xdg-open")
+      end
+    end
+  end
+
+  def test_cygwin_browser
+    stub_available_commands "open", "cygstart"
+    with_browser_env(nil) do
+      with_ruby_platform("i686-linux") do
+        assert_browser("cygstart")
+      end
+    end
+  end
+
+  def test_no_browser
+    stub_available_commands()
+    expected = "Please set $BROWSER to a web launcher to use this command.\n"
+    with_browser_env(nil) do
+      with_ruby_platform("i686-linux") do
+        assert_equal expected, hub("browse")
+      end
+    end
+  end
+
+  protected
+
+    def stub_github_user(name)
+      @git['config github.user'] = name
+    end
+
+    def stub_repo_url(value)
+      @git['config remote.origin.url'] = value
+      Hub::Context::REMOTES.clear
+    end
+
+    def stub_branch(value)
+      @git['symbolic-ref -q HEAD'] = value
+    end
+
+    def stub_tracking_nothing
+      @git['config branch.master.remote'] = nil
+      @git['config branch.master.merge'] = nil
+    end
+
+    def stub_available_commands(*names)
+      COMMANDS.replace names
+    end
+
+    def with_browser_env(value)
+      browser, ENV['BROWSER'] = ENV['BROWSER'], value
+      yield
+    ensure
+      ENV['BROWSER'] = browser
+    end
+
+    def assert_browser(browser)
+      assert_command "browse", "#{browser} http://github.com/defunkt/hub"
+    end
+
+    def with_ruby_platform(value)
+      platform = RUBY_PLATFORM
+      Object.send(:remove_const, :RUBY_PLATFORM)
+      Object.const_set(:RUBY_PLATFORM, value)
+      yield
+    ensure
+      Object.send(:remove_const, :RUBY_PLATFORM)
+      Object.const_set(:RUBY_PLATFORM, platform)
+    end
+
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: git-hub
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,38 +14,36 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -07:00
-default_executable: hub
+date: 2010-04-29 00:00:00 -07:00
+default_executable: 
 dependencies: []
 
-description: hub introduces git to GitHub
+description: "  `hub` is a command line utility which adds GitHub knowledge to `git`.\n\n  It can used on its own or as a `git` wrapper.\n\n  Normal:\n\n      $ hub clone rtomayko/tilt\n\n      Expands to:\n      $ git clone git://github.com/rtomayko/tilt.git\n\n  Wrapping `git`:\n\n      $ git clone rack/rack\n\n      Expands to:\n      $ git clone git://github.com/rack/rack.git\n"
 email: chris@ozmm.org
 executables: 
 - hub
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- .kick
-- CONTRIBUTORS
-- HISTORY.md
-- LICENSE
 - README.md
 - Rakefile
-- bin/hub
-- lib/hub.rb
+- LICENSE
 - lib/hub/args.rb
 - lib/hub/commands.rb
+- lib/hub/context.rb
 - lib/hub/runner.rb
 - lib/hub/standalone.rb
 - lib/hub/version.rb
+- lib/hub.rb
+- bin/hub
 - man/hub.1
 - man/hub.1.html
-- man/hub.1.ron
+- man/hub.1.ronn
 - test/alias_test.rb
+- test/fakebin/git
+- test/fakebin/open
 - test/helper.rb
 - test/hub_test.rb
 - test/standalone_test.rb
@@ -68,31 +71,30 @@ post_install_message: |+
   
   ------------------------------------------------------------
   
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: hub introduces git to GitHub
-test_files: 
-- test/alias_test.rb
-- test/helper.rb
-- test/hub_test.rb
-- test/standalone_test.rb
+test_files: []
+

data/.gitignore

@@ -1,2 +0,0 @@
-*.swp
-*~

data/.kick

@@ -1,26 +0,0 @@
-# take control of the growl notifications
-module GrowlHacks
-  def growl(type, subject, body, *args, &block)
-    case type
-    when Kicker::GROWL_NOTIFICATIONS[:succeeded]
-      puts subject = "Success"
-      body = body.split("\n").last
-    when Kicker::GROWL_NOTIFICATIONS[:failed]
-      subject = "Failure"
-      puts body
-      body = body.split("\n").last
-    else
-      return nil
-    end
-    super(type, subject, body, *args, &block)
-  end
-end
-
-Kicker.send :extend, GrowlHacks
-
-# no logging
-Kicker::Utils.module_eval do
-  def log(message)
-    nil
-  end
-end

data/CONTRIBUTORS

@@ -1,11 +0,0 @@
-* Chris Wanstrath
-* Stephen Celis
-* Rob Ares
-* Mislav Marohnić
-* Ryan Tomayko
-* Caio Chassot
-* Joshua Peek
-* Nick Quaranto
-* Konstantin Haase
-* Scott Chacon
-* Alex Kahn

data/HISTORY.md

@@ -1,75 +0,0 @@
-## 1.1.0 (2010-04-07)
-
-* `hub fork` command - Thanks Mislav!
-
-## 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)
-* Bugfix: zsh quoting [thommay]
-
-## 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.
-* `hub submodule add user/repo directory
-* `hub remote add rtomayko/tilt`
-* `remote add -p origin rtomayko/tilt`
-
-## 0.3.2 (2010-02-17)
-
-* Fixed zshell git completion / aliasing - `hub alias zsh`.
-
-## 0.3.1 (2010-02-13)
-
-* Add `hub remote origin` shortcut. Assumes your GitHub login.
-
-## 0.3.0 (2010-01-23)
-
-* Add `hub browse` command for opening a repo in a browser.
-* Add `hub standalone` for installation of standalone via RubyGems
-* Bugfix: Don't run hub standalone in standalone mode
-* Bugfix: `git clone` flags are now passed through.
-* Bugfix: `git clone` with url and path works.
-* Bugfix: basename call
-* Bugfix: Check for local directories before cloning
-
-
-## 0.2.0 (2009-12-24)
-
-* Respected GIT_PAGER and core.pager
-* Aliased `--help` to `help`
-* Ruby 1.9 fixes
-* Respect git behavior when pager is empty string
-* `git push` multi-remote support
-* `hub.http-clone` configuration setting
-* Use the origin url to find the repo name
-
-## 0.1.3 (2009-12-11)
-
-* Homebrew!
-* Fix inaccuracy in man page
-* Better help arrangement
-* Bugfix: Path problems in standalone.rb
-* Bugfix: Standalone not loaded by default
-
-## 0.1.2 (2009-12-10)
-
-* Fixed README typos
-* Better standalone install line
-* Added man page
-* Added `hub help hub`
-
-## 0.1.1 (2009-12-08)
-
-* Fixed gem problems
-
-## 0.1.0 (2009-12-08)
-
-* First release