hub 1.10.1 → 1.10.2

data/HISTORY.md

@@ -1,5 +1,19 @@
-## master
+## 1.10.2 (2012-07-24)
 
+* fix pushing multiple refs to multiple remotes
+* support ssh.github.com
+* security: mode for ~/.config/hub is 0600
+* fix integration with GitHub Enterprise API
+* fix cloning repos that start with a period
+
+## 1.10.1 (2012-05-28)
+
+* don't choke on empty config file
+* fix `browse` when not in git repo
+
+## 1.10.0 (2012-05-08)
+
+* improve improved help text
 * fix GitHub username prompt in `create` command
 * make `fetch` command work with private repos too
 * add `merge` command to merge pull requests

data/README.md

@@ -75,7 +75,8 @@ You can also install from source:
 
 ~~~ sh
 $ git clone git://github.com/defunkt/hub.git
-$ cd hub && rake install prefix=/usr/local
+$ cd hub
+$ rake install prefix=/usr/local
 ~~~
 
 ### Help! It's Slow!
@@ -333,11 +334,13 @@ $ git clone defunkt/repl
 Contributing
 ------------
 
-These instructions assume that you already have hub installed and aliased as
+These instructions assume that _you already have hub installed_ and aliased as
 `git` (see "Aliasing").
 
 1. Clone hub:  
     `git clone defunkt/hub && cd hub`
+1. Ensure Bundler is installed:  
+    `which bundle || gem install bundler`
 1. Install development dependencies:  
     `bundle install`
 2. Verify that existing tests pass:  

data/Rakefile

@@ -115,6 +115,12 @@ task :install => "hub" do
   FileUtils.cp "man/hub.1", "#{prefix}/share/man/man1"
 end
 
+#
+# Release
+#
+
+task :release => [:pages, :gem_release, :homebrew]
+
 desc "Copy files to gh-pages branch, but don't publish"
 task :gh_pages => [:check_dirty, "hub", "man/hub.1.html"] do
   cp "man/hub.1.html", "html"
@@ -133,3 +139,33 @@ task :pages => :gh_pages do
   sh "git checkout master"
   puts "Done."
 end
+
+task :gem_release do
+  sh "gem release -t"
+end
+
+desc "Publish to Homebrew"
+task :homebrew do
+  require File.expand_path('../lib/hub/version', __FILE__)
+  Dir.chdir `brew --prefix`.chomp do
+    sh 'git checkout -q master'
+    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
+
+    formula = File.read formula_file
+    formula.sub! /\bv\d+(\.\d+)*/, "v#{Hub::VERSION}"
+    formula.sub! /\b[0-9a-f]{32}\b/, md5
+    File.open(formula_file, 'w') {|f| f << formula }
+
+    branch = "hub-v#{Hub::VERSION}"
+    sh "git checkout -q -B #{branch}"
+    sh "git commit -m 'upgrade hub to v#{Hub::VERSION}' -- #{formula_file}"
+    sh "git push -u mislav #{branch}"
+    sh "hub pull-request 'upgrade hub to v#{Hub::VERSION}'"
+
+    sh "git checkout -q master"
+  end
+end

data/lib/hub/commands.rb

@@ -34,7 +34,7 @@ module Hub
     # provides git interrogation methods
     extend Context
 
-    NAME_RE = /\w[\w.-]*/
+    NAME_RE = /[\w.][\w.-]*/
     OWNER_RE = /[a-zA-Z0-9-]+/
     NAME_WITH_OWNER_RE = /^(?:#{NAME_RE}|#{OWNER_RE}\/#{NAME_RE})$/
 
@@ -544,12 +544,18 @@ module Hub
     def push(args)
       return if args[1].nil? || !args[1].index(',')
 
-      branch  = (args[2] ||= current_branch.short_name)
+      refs    = args.words[2..-1]
       remotes = args[1].split(',')
       args[1] = remotes.shift
 
+      if refs.empty?
+        # add current branch as explicit ref when there are no refs specified
+        refs = [current_branch.short_name]
+        args.concat refs
+      end
+
       remotes.each do |name|
-        args.after ['push', name, branch]
+        args.after ['push', name, *refs]
       end
     end
 
@@ -989,7 +995,7 @@ help
     end
 
     def display_api_exception(action, response)
-      $stderr.puts "Error #{action}: #{response.message} (HTTP #{response.status})"
+      $stderr.puts "Error #{action}: #{response.message.strip} (HTTP #{response.status})"
       if 422 == response.status and response.error_message?
         # display validation errors
         msg = response.error_message

data/lib/hub/context.rb

@@ -185,7 +185,11 @@ module Hub
       end
 
       def known_hosts
-        git_config('hub.host', :all).to_s.split("\n") + [default_host]
+        hosts = git_config('hub.host', :all).to_s.split("\n")
+        hosts << default_host
+        # support ssh.github.com
+        # https://help.github.com/articles/using-ssh-over-the-https-port
+        hosts << "ssh.#{default_host}"
       end
 
       def self.default_host
@@ -217,6 +221,7 @@ module Hub
       def initialize(*args)
         super
         self.host ||= (local_repo || LocalRepo).default_host
+        self.host = host.sub(/^ssh\./i, '') if 'ssh.github.com' == host.downcase
       end
 
       def private?

data/lib/hub/github_api.rb

@@ -154,7 +154,7 @@ module Hub
         url = URI.parse url unless url.respond_to? :host
 
         require 'net/https'
-        req = Net::HTTP.const_get(type).new(url.request_uri)
+        req = Net::HTTP.const_get(type).new request_uri(url)
         # TODO: better naming?
         http = configure_connection(req, url) do |host_url|
           create_connection host_url
@@ -169,6 +169,12 @@ module Hub
         raise Context::FatalError, "error with #{type.to_s.upcase} #{url} (#{err.message})"
       end
 
+      def request_uri url
+        str = url.request_uri
+        str = '/api/v3' << str if url.host != 'api.github.com'
+        str
+      end
+
       def configure_connection req, url
         if ENV['HUB_TEST_HOST']
           req['Host'] = url.host
@@ -211,7 +217,7 @@ module Hub
 
     module OAuth
       def apply_authentication req, url
-        if req.path.index('/authorizations') == 0
+        if (req.path =~ /\/authorizations$/)
           super
         else
           user = url.user || config.username(url.host)
@@ -286,12 +292,12 @@ module Hub
 
       def load
         existing_data = File.read(@filename)
-        @data.update YAML.load existing_data unless existing_data.strip.empty?
+        @data.update YAML.load(existing_data) unless existing_data.strip.empty?
       end
 
       def save
         FileUtils.mkdir_p File.dirname(@filename)
-        File.open(@filename, 'w') {|f| f << YAML.dump(@data) }
+        File.open(@filename, 'w', 0600) {|f| f << YAML.dump(@data) }
       end
     end
 
@@ -359,7 +365,7 @@ module Hub
         tty_state = `stty -g`
         system 'stty raw -echo -icanon isig' if $?.success?
         pass = ''
-        while char = $stdin.getbyte and not (char == 13 or char == 10)
+        while char = $stdin.getbyte and !(char == 13 or char == 10)
           if char == 127 or char == 8
             pass[-1,1] = '' unless pass.empty?
           else

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.10.1'
+  Version = VERSION = '1.10.2'
 end

data/test/hub_test.rb

@@ -4,6 +4,7 @@ require 'rbconfig'
 require 'yaml'
 require 'forwardable'
 require 'fileutils'
+require 'tempfile'
 
 WebMock::BodyPattern.class_eval do
   undef normalize_hash
@@ -244,6 +245,12 @@ class HubTest < Test::Unit::TestCase
                     "push origin,staging,qa cool-feature"
   end
 
+  def test_push_multiple_refs
+    assert_commands "git push origin master new-feature",
+                    "git push staging master new-feature",
+                    "push origin,staging master new-feature"
+  end
+
   def test_pullrequest
     expected = "Aborted: head branch is the same as base (\"master\")\n" <<
       "(use `-h <branch>` to specify an explicit pull request head)\n"
@@ -315,11 +322,11 @@ class HubTest < Test::Unit::TestCase
       data['git.my.org'] = [{'user'=>'myfiname', 'oauth_token' => 'FITOKEN'}]
     end
 
-    stub_request(:post, "https://git.my.org/repos/defunkt/hub/pulls").
+    stub_request(:post, "https://git.my.org/api/v3/repos/defunkt/hub/pulls").
       with(:body => {'base' => "master", 'head' => "myfiname:feature", 'title' => "hereyougo" }).
-      to_return(:body => mock_pullreq_response(1, 'defunkt/hub', 'git.my.org'))
+      to_return(:body => mock_pullreq_response(1, 'api/v3/defunkt/hub', 'git.my.org'))
 
-    expected = "https://git.my.org/defunkt/hub/pull/1\n"
+    expected = "https://git.my.org/api/v3/defunkt/hub/pull/1\n"
     assert_output expected, "pull-request hereyougo -f"
   end
 
@@ -578,12 +585,19 @@ class HubTest < Test::Unit::TestCase
   end
 
   def test_hub_browse_ssh_alias
-    with_ssh_config do
+    with_ssh_config "Host gh\n User git\n HostName github.com" do
       stub_repo_url "gh:singingwolfboy/sekrit.git"
       assert_command "browse", "open https://github.com/singingwolfboy/sekrit"
     end
   end
 
+  def test_hub_browse_ssh_github_alias
+    with_ssh_config "Host github.com\n HostName ssh.github.com" do
+      stub_repo_url "git@github.com:suan/git-sanity.git"
+      assert_command "browse", "open https://github.com/suan/git-sanity"
+    end
+  end
+
   def test_custom_browser
     with_browser_env("custom") do
       assert_browser("custom")
@@ -748,10 +762,17 @@ class HubTest < Test::Unit::TestCase
       Hub::Commands.send :improved_help_text
     end
 
-    def with_ssh_config
-      config_file = File.expand_path '../ssh_config', __FILE__
-      Hub::SshConfig::CONFIG_FILES.replace [config_file]
-      yield
+    def with_ssh_config content
+      config_file = Tempfile.open 'ssh_config'
+      config_file << content
+      config_file.close
+
+      begin
+        Hub::SshConfig::CONFIG_FILES.replace [config_file.path]
+        yield
+      ensure
+        config_file.unlink
+      end
     end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -78,7 +78,6 @@ files:
 - test/fakebin/open
 - test/helper.rb
 - test/hub_test.rb
-- test/ssh_config
 - test/standalone_test.rb
 homepage: http://defunkt.io/hub/
 licenses: []

data/test/ssh_config

@@ -1,3 +0,0 @@
-Host gh
-  User git
-  HostName github.com