hub 1.11.1 → 1.11.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 33425262679ba4de3ce4878fc66c286f6d25ef3b
+  data.tar.gz: 521fb0f37a0ee0d416952ced4d411b6b59812283
+SHA512:
+  metadata.gz: 57892fa9c30df8535ad45f3add227a01ceb5914b6886b77562ec7a3fd4e876885f0fb4e2087659673017c7cfa0fec2675c23fd873c7152f2991b243474b5bfb1
+  data.tar.gz: 372b734e8ad6ea150dde927387fda9d3d3b0957574e50800c2806d5b1f58c2385734efd97d5170c280ecf231325d596c9f1de0206b32a0da0ef012d09a51251a

data/Rakefile

@@ -115,6 +115,7 @@ task :install => "hub" do
     FileUtils.cp 'hub', bindir
   else
     prefix = ENV['PREFIX'] || ENV['prefix'] || '/usr/local'
+    prefix = File.join(ENV["DESTDIR"], prefix) if ENV["DESTDIR"]
 
     FileUtils.mkdir_p "#{prefix}/bin"
     FileUtils.cp "hub", "#{prefix}/bin", :preserve => true

data/lib/hub/commands.rb

@@ -556,8 +556,10 @@ module Hub
       if args.include?('--no-remote')
         exit
       else
+        origin_url = project.remote.github_url
         url = forked_project.git_url(:private => true, :https => https_protocol?)
-        args.replace %W"remote add -f #{forked_project.owner} #{url}"
+        args.replace %W"remote add -f #{forked_project.owner} #{origin_url}"
+        args.after %W"remote set-url #{forked_project.owner} #{url}"
         args.after 'echo', ['new remote:', forked_project.owner]
       end
     rescue GitHubAPI::Exceptions
@@ -662,22 +664,27 @@ module Hub
       browse_command(args) do
         dest = args.shift
         dest = nil if dest == '--'
+        # $ hub browse -- wiki
+        subpage = args.shift
 
         if dest
           # $ hub browse pjhyett/github-services
           # $ hub browse github-services
           project = github_project dest
           branch = master_branch
+        elsif subpage && !%w[commits tree blob settings].include?(subpage)
+          branch = master_branch
+          project = local_repo.main_project
         else
           # $ hub browse
-          branch, project = remote_branch_and_project(method(:github_user))
+          prefer_upstream = current_branch.master?
+          branch, project = remote_branch_and_project(method(:github_user), prefer_upstream)
           branch ||= master_branch
         end
 
         abort "Usage: hub browse [<USER>/]<REPOSITORY>" unless project
 
-        # $ hub browse -- wiki
-        path = case subpage = args.shift
+        path = case subpage
         when 'commits'
           "/commits/#{branch_in_url(branch)}"
         when 'tree', NilClass
@@ -717,7 +724,7 @@ module Hub
           end
         end
 
-        project.web_url "/compare/#{range}"
+        project.web_url "/compare/#{range.tr('/', ';')}"
       end
     end
 
@@ -998,7 +1005,7 @@ help
     # included after the __END__ of the file so we can grab it using
     # DATA.
     def hub_raw_manpage
-      if File.exists? file = File.dirname(__FILE__) + '/../../man/hub.1'
+      if File.exist? file = File.dirname(__FILE__) + '/../../man/hub.1'
         File.read(file)
       else
         DATA.read
@@ -1085,7 +1092,7 @@ help
     # the pullrequest_editmsg_file, which newer hub would pick up and
     # misinterpret as a message which should be reused after a failed PR.
     def valid_editmsg_file?(message_file)
-      File.exists?(message_file) &&
+      File.exist?(message_file) &&
         File.mtime(message_file) > File.mtime(__FILE__)
     end
 
@@ -1102,7 +1109,7 @@ help
       File.open(file, 'r') { |msg|
         msg.each_line do |line|
           next if line.index('#') == 0
-          ((body.empty? and line =~ /\S/) ? title : body) << line
+          ((title.empty? and line =~ /\S/) ? title : body) << line
         end
       }
       title.tr!("\n", ' ')

data/lib/hub/context.rb

@@ -152,10 +152,10 @@ module Hub
         remote = origin_remote and remote.project
       end
 
-      def remote_branch_and_project(username_fetcher)
+      def remote_branch_and_project(username_fetcher, prefer_upstream = false)
         project = main_project
         if project and branch = current_branch
-          branch = branch.push_target(username_fetcher.call(project.host))
+          branch = branch.push_target(username_fetcher.call(project.host), prefer_upstream)
           project = remote_by_name(branch.remote_name).project if branch && branch.remote?
         end
         [branch, project]
@@ -219,7 +219,7 @@ module Hub
       end
 
       def origin_remote
-        remotes.first
+        remotes.detect {|r| r.urls.any? }
       end
 
       def remote_by_name(remote_name)
@@ -356,7 +356,7 @@ module Hub
         end
       end
 
-      def push_target(owner_name)
+      def push_target(owner_name, prefer_upstream = false)
         push_default = local_repo.git_config('push.default')
         if %w[upstream tracking].include?(push_default)
           upstream
@@ -365,6 +365,7 @@ module Hub
           refs = local_repo.remotes_for_publish(owner_name).map { |remote|
             "refs/remotes/#{remote}/#{short}"
           }
+          refs.reverse! if prefer_upstream
           if branch = refs.detect {|ref| local_repo.file_exist?(ref) }
             Branch.new(local_repo, branch)
           end
@@ -397,6 +398,10 @@ module Hub
         nil
       end
 
+      def github_url
+        urls.detect {|url| local_repo.known_host?(url.host) }
+      end
+
       def urls
         @urls ||= raw_urls.map do |url|
           with_normalized_url(url) do |normalized|
@@ -405,7 +410,7 @@ module Hub
             rescue URI::InvalidURIError
             end
           end
-        end
+        end.compact
       end
 
       def with_normalized_url(url)

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.11.1'
+  Version = VERSION = '1.11.2'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,22 +9,37 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies: []
-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"
+description: |2
+    `hub` is a command line utility which adds GitHub knowledge to `git`.
+
+    It can used on its own or as a `git` wrapper.
+
+    Normal:
+
+        $ hub clone rtomayko/tilt
+
+        Expands to:
+        $ git clone git://github.com/rtomayko/tilt.git
+
+    Wrapping `git`:
+
+        $ git clone rack/rack
+
+        Expands to:
+        $ git clone git://github.com/rack/rack.git
 email: mislav.marohnic@gmail.com
 executables:
 - hub
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - Rakefile
-- LICENSE
+- bin/hub
+- lib/hub.rb
 - lib/hub/args.rb
 - lib/hub/commands.rb
 - lib/hub/context.rb
@@ -36,39 +50,50 @@ files:
 - lib/hub/ssh_config.rb
 - lib/hub/standalone.rb
 - lib/hub/version.rb
-- lib/hub.rb
-- bin/hub
 - man/hub.1
 - man/hub.1.html
 - man/hub.1.ronn
 homepage: http://hub.github.com/
 licenses:
 - MIT
-post_install_message: ! "\n------------------------------------------------------------\n\n
-  \                 You there! Wait, I say!\n                  =======================\n\n
-  \      If you are a heavy user of `git` on the command\n       line  you  may  want
-  \ to  install `hub` the old\n       fashioned way.  Faster  startup  time,  you
-  see.\n\n       Check  out  the  installation  instructions  at\n       https://github.com/github/hub#readme
-  \ under the\n       \"Standalone\" section.\n\n       Cheers,\n       defunkt\n\n------------------------------------------------------------\n\n"
+metadata: {}
+post_install_message: |2+
+
+  ------------------------------------------------------------
+
+                    You there! Wait, I say!
+                    =======================
+
+         If you are a heavy user of `git` on the command
+         line  you  may  want  to  install `hub` the old
+         fashioned way.  Faster  startup  time,  you see.
+
+         Check  out  the  installation  instructions  at
+         https://github.com/github/hub#readme  under the
+         "Standalone" section.
+
+         Cheers,
+         defunkt
+
+  ------------------------------------------------------------
+
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Command-line wrapper for git and GitHub
 test_files: []