hub 1.12.0 → 1.12.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 31c0677c16aef1654f0bb45debbd4bb13711b80c
+  data.tar.gz: b05264bdc353d8ba0875402951cf5fcb869fe0bd
+SHA512:
+  metadata.gz: d5b0533962cce93062ca8e65b29d4c916008b7394d3cddcc700cec8b379e26e7f11fb0ab398cdadea7a6d905d81966f9637ecaa416320b2fdabea8db5e482a31
+  data.tar.gz: 87fce8fb1670724bcdb9c169df01998be68fbd260341529a2f8677d669575256e6f5df2a1af900e90f52b67a7172641e8554ece4d296a8111552757895eb9ab7

data/README.md

@@ -235,7 +235,7 @@ superpowers:
 ### git checkout
 
     $ git checkout https://github.com/defunkt/hub/pull/73
-    > git remote add -f -t feature git://github:com/mislav/hub.git
+    > git remote add -f -t feature mislav git://github.com/mislav/hub.git
     > git checkout --track -B mislav-feature mislav/feature
 
     $ git checkout https://github.com/defunkt/hub/pull/73 custom-branch-name

data/Rakefile

@@ -157,6 +157,7 @@ end
 desc "Publish to Homebrew"
 task :homebrew do
   require File.expand_path('../lib/hub/version', __FILE__)
+  ENV['RUBYOPT'] = ''
   Dir.chdir `brew --prefix`.chomp do
     sh 'git checkout -q master'
     sh 'git pull -q origin master'
@@ -172,9 +173,9 @@ task :homebrew do
 
     branch = "hub-v#{Hub::VERSION}"
     sh "git checkout -q -B #{branch}"
-    sh "git commit -m 'hub v#{Hub::VERSION}' -- #{formula_file}"
+    sh "git commit -m 'hub #{Hub::VERSION}' -- #{formula_file}"
     sh "git push -u mislav #{branch}"
-    sh "hub pull-request -m 'upgrade hub to v#{Hub::VERSION}'"
+    sh "hub pull-request -m 'hub #{Hub::VERSION}'"
 
     sh "git checkout -q master"
   end

data/bin/hub

@@ -3,5 +3,7 @@
 # hub(1)
 # alias git=hub
 
+Encoding.default_external = 'UTF-8' if defined?(Encoding)
+
 require 'hub'
 Hub::Runner.execute(*ARGV)

data/lib/hub/commands.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module Hub
   # The Commands module houses the git commands that hub
   # lovingly wraps. If a method exists here, it is expected to have a
@@ -220,7 +222,7 @@ module Hub
         when 0
           default_message = commit_summary = nil
         when 1
-          format = '%w(78,0,0)%s%n%+b'
+          format = '%s%n%+b'
           default_message = git_command "show -s --format='#{format}' #{commits.first}"
           commit_summary = nil
         else
@@ -230,14 +232,14 @@ module Hub
             [format, base_branch, remote_branch]
         end
 
-        options[:title], options[:body] = pullrequest_editmsg(commit_summary) { |msg, initial_message|
+        options[:title], options[:body] = pullrequest_editmsg(commit_summary) { |msg, initial_message, cc|
           initial_message ||= default_message
           msg.puts initial_message if initial_message
           msg.puts ""
-          msg.puts "# Requesting a pull to #{base_project.owner}:#{options[:base]} from #{options[:head]}"
-          msg.puts "#"
-          msg.puts "# Write a message for this pull request. The first block"
-          msg.puts "# of text is the title and the rest is description."
+          msg.puts "#{cc} Requesting a pull to #{base_project.owner}:#{options[:base]} from #{options[:head]}"
+          msg.puts "#{cc}"
+          msg.puts "#{cc} Write a message for this pull request. The first block"
+          msg.puts "#{cc} of text is the title and the rest is description."
         }
       end
 
@@ -443,8 +445,9 @@ module Hub
         user, branch = pull_data['head']['label'].split(':', 2)
         abort "Error: #{user}'s fork is not available anymore" unless pull_data['head']['repo']
 
-        url = github_project(url.project_name, user).git_url(:private => pull_data['head']['repo']['private'],
-                                                             :https => https_protocol?)
+        repo_name = pull_data['head']['repo']['name']
+        url = github_project(repo_name, user).git_url(:private => pull_data['head']['repo']['private'],
+                                                      :https => https_protocol?)
 
         merge_head = "#{user}/#{branch}"
         args.before ['fetch', url, "+refs/heads/#{branch}:refs/remotes/#{merge_head}"]
@@ -495,15 +498,19 @@ module Hub
     # ... downloads patch via API ...
     # > git am /tmp/55.patch
     def am(args)
-      if url = args.find { |a| a =~ %r{^https?://(gist\.)?github\.com/} }
-        idx = args.index(url)
-        if $1 == 'gist.'
-          path_parts = $'.sub(/#.*/, '').split('/')
-          gist_id = path_parts.last
+      gh_url = nil
+      idx = args.index { |arg|
+        gh_url = if arg =~ %r{^https?://gist\.github\.com/} then URI(arg)
+        else resolve_github_url(arg)
+        end
+      }
+
+      if gh_url
+        if "gist.github.com" == gh_url.host
+          gist_id = gh_url.path.split('/').last
           patch_name = "gist-#{gist_id}.txt"
           patch = api_client.gist_raw(gist_id)
         else
-          gh_url = resolve_github_url(url)
           case gh_url.project_path
           when /^pull\/(\d+)/
             pull_id = $1.to_i
@@ -518,7 +525,7 @@ module Hub
           end
         end
 
-        patch_file = File.join(tmp_dir, patch_name)
+        patch_file = Tempfile.new(patch_name).path
         File.open(patch_file, 'w') { |file| file.write(patch) }
         args[idx] = patch_file
       end
@@ -685,7 +692,7 @@ module Hub
           project = local_repo.main_project
         else
           # $ hub browse
-          prefer_upstream = current_branch.master?
+          prefer_upstream = current_branch && current_branch.master?
           branch, project = remote_branch_and_project(method(:github_user), prefer_upstream)
           branch ||= master_branch
         end
@@ -732,7 +739,7 @@ module Hub
           end
         end
 
-        path = '/compare/%s' % range.tr('/', ';')
+        path = '/compare/%s' % range
         project.web_url(path, api_client.config.method(:protocol))
       end
     end
@@ -807,7 +814,7 @@ module Hub
       command = args.words[1]
 
       if command == 'hub' || custom_command?(command)
-        puts hub_manpage
+        paginated_puts hub_manpage
         exit
       elsif command.nil?
         if args.has_flag?('-a', '--all')
@@ -815,8 +822,11 @@ module Hub
           args.after 'echo', ["\nhub custom commands\n"]
           args.after 'echo', CUSTOM_COMMANDS.map {|cmd| "  #{cmd}" }
         else
-          ENV['GIT_PAGER'] = '' unless args.has_flag?('-p', '--paginate') # Use `cat`.
-          puts improved_help_text
+          if args.has_flag?('-p', '--paginate')
+            paginated_puts improved_help_text
+          else
+            puts improved_help_text
+          end
           exit
         end
       end
@@ -861,14 +871,13 @@ module Hub
         pattern = /(git|hub) #{Regexp.escape args[0].gsub('-', '\-')}/
         hub_raw_manpage.each_line { |line|
           if line =~ pattern
-            $stderr.print "Usage: "
-            $stderr.puts line.gsub(/\\f./, '').gsub('\-', '-')
+            puts "Usage: " + line.gsub(/\\f./, '').gsub('\-', '-')
             abort
           end
         }
         abort "Error: couldn't find usage help for #{args[0]}"
       when '--help'
-        puts hub_manpage
+        paginated_puts hub_manpage
         exit
       end
     end
@@ -1004,7 +1013,7 @@ help
     # in order to turn our raw roff (manpage markup) into something
     # readable on the terminal.
     def groff_command
-      cols = terminal_width
+      cols = [terminal_width - 1, 120].min
       "groff -Wall -mtty-char -mandoc -Tascii -rLL=#{cols}n -rLT=#{cols}n"
     end
 
@@ -1023,11 +1032,9 @@ help
       end
     end
 
-    # All calls to `puts` in after hooks or commands are paged,
-    # git-style.
-    def puts(*args)
+    def paginated_puts(*args)
       page_stdout
-      super
+      puts(*args)
     end
 
     # http://nex-3.com/posts/73-git-style-automatic-paging-in-ruby
@@ -1042,8 +1049,9 @@ help
         read.close
         write.close
 
-        # Don't page if the input is short enough
-        ENV['LESS'] = 'FSR'
+        # S: chop long lines
+        # R: support ANSI color escape sequences
+        ENV['LESS'] = 'SR'
 
         # Wait until we have input before we start the pager
         Kernel.select [STDIN]
@@ -1069,17 +1077,18 @@ help
 
     def pullrequest_editmsg(changes)
       message_file = pullrequest_editmsg_file
+      cc = git_commentchar
 
       if valid_editmsg_file?(message_file)
-        title, body = read_editmsg(message_file)
+        title, body = read_editmsg(message_file, cc)
         previous_message = [title, body].compact.join("\n\n") if title
       end
 
       File.open(message_file, 'w') { |msg|
-        yield msg, previous_message
+        yield msg, previous_message, cc
         if changes
-          msg.puts "#\n# Changes:\n#"
-          msg.puts changes.gsub(/^/, '# ').gsub(/ +$/, '')
+          msg.puts "#{cc}\n#{cc} Changes:\n#{cc}"
+          msg.puts changes.gsub(/^/, "#{cc} ").gsub(/ +$/, '')
         end
       }
 
@@ -1094,7 +1103,7 @@ help
         abort "error using text editor for pull request message"
       end
 
-      title, body = read_editmsg(message_file)
+      title, body = read_editmsg(message_file, cc)
       abort "Aborting due to empty pull request title" unless title
       [title, body]
     end
@@ -1115,11 +1124,11 @@ help
       File.join(git_dir, 'PULLREQ_EDITMSG')
     end
 
-    def read_editmsg(file)
+    def read_editmsg(file, commentchar)
       title, body = '', ''
       File.open(file, 'r') { |msg|
         msg.each_line do |line|
-          next if line.index('#') == 0
+          next if line.index(commentchar) == 0
           ((title.empty? and line =~ /\S/) ? title : body) << line
         end
       }

data/lib/hub/context.rb

@@ -504,6 +504,12 @@ module Hub
       end
     end
 
+    def git_commentchar
+      if str = git_config('core.commentchar') then str[0,1]
+      else '#'
+      end
+    end
+
     module System
       # Cross-platform web browser command; respects the value set in $BROWSER.
       # 
@@ -556,10 +562,6 @@ module Hub
         !which(name).nil?
       end
 
-      def tmp_dir
-        ENV['TMPDIR'] || ENV['TEMP'] || '/tmp'
-      end
-
       def terminal_width
         if unix?
           width = %x{stty size 2>#{NULL}}.split[1].to_i

data/lib/hub/github_api.rb

@@ -192,12 +192,33 @@ module Hub
             end
           end.compact if data['errors']
         end
+        def links
+          @links ||= self['link'].to_s.scan(/<(.+?)>; rel="(.+?)"/).inject({}) do |map, (url, rel)|
+            map.update(rel.to_sym => URI.parse(url))
+          end
+        end
+        def next_url() links[:next] end
       end
 
       def get url, &block
         perform_request url, :Get, &block
       end
 
+      def get_all url, &block
+        previous_res = nil
+        user = url.user
+        while url
+          res = get(url, &block)
+          if url = res.next_url
+            url = url.dup
+            url.user = user
+          end
+          res.data.unshift(*previous_res.data) if res.success? && previous_res
+          previous_res = res
+        end
+        res
+      end
+
       def post url, params = nil
         perform_request url, :Post do |req|
           if params
@@ -299,7 +320,7 @@ module Hub
 
     module OAuth
       def apply_authentication req, url
-        if req.path =~ %r{^(/api/v3)?/authorizations$}
+        if req.path =~ %r{^(/api/v3)?/authorizations\b}
           super
         else
           user = url.user ? CGI.unescape(url.user) : config.username(url.host)
@@ -317,7 +338,7 @@ module Hub
         post(auth_url) if !two_factor_code
 
         # first try to fetch existing authorization
-        res = get(auth_url) do |req|
+        res = get_all(auth_url) do |req|
           req['X-GitHub-OTP'] = two_factor_code if two_factor_code
         end
         unless res.success?

data/lib/hub/standalone.rb

@@ -25,6 +25,7 @@ preamble
     def build io
       io.puts "#!#{ruby_shebang}"
       io << PREAMBLE
+      io.puts "Encoding.default_external = 'UTF-8' if defined?(Encoding)"
 
       each_source_file do |filename|
         File.open(filename, 'r') do |source|
@@ -76,7 +77,7 @@ preamble
 
     def ruby_shebang
       ruby = ruby_executable
-      `#{ruby_executable} --disable-gems -e0 2>/dev/null`
+      `RUBYOPT= #{ruby_executable} --disable-gems -e0 2>/dev/null`
       if $?.success?
         "#{ruby} --disable-gems"
       else

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.12.0'
+  Version = VERSION = '1.12.2'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.12.0
-  prerelease: 
+  version: 1.12.2
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,22 +9,37 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-07-11 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: []