hub 1.10.3 → 1.10.4

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 1.10.4 (2012-12-29)
+
+* fixes for Windows
+* display more validation errors on GitHub API failures
+* persist correctly capitalized GitHub login name
+
 ## 1.10.3 (2012-11-22)
 
 * fix `browse` on Windows

data/README.md

@@ -48,6 +48,15 @@ git version 1.7.6
 hub version 1.8.3
 ~~~
 
+#### On Windows
+
+If you have mysysgit, open "Git Bash" and follow the steps above but put the
+`hub` executable in `/bin` instead of `~/bin`.
+
+Avoid aliasing hub as `git` due to the fact that mysysgit automatically
+configures your prompt to include git information, and you want to avoid slowing
+that down. See [Is your shell prompt slow?](#is-your-shell-prompt-slow)
+
 ### RubyGems
 
 Though not recommended, hub can also be installed as a RubyGem:

data/lib/hub/args.rb

@@ -11,7 +11,6 @@ module Hub
     def initialize(*args)
       super
       @executable = ENV["GIT"] || "git"
-      @after = nil
       @skip = @noop = false
       @original_args = args.first
       @chain = [nil]

data/lib/hub/commands.rb

@@ -434,7 +434,8 @@ module Hub
         url = url.sub(%r{(/pull/\d+)/\w*$}, '\1') unless gist
         ext = gist ? '.txt' : '.patch'
         url += ext unless File.extname(url) == ext
-        patch_file = File.join(ENV['TMPDIR'] || '/tmp', "#{gist ? 'gist-' : ''}#{File.basename(url)}")
+        patch_file = File.join(tmp_dir, "#{gist ? 'gist-' : ''}#{File.basename(url)}")
+        # TODO: remove dependency on curl
         args.before 'curl', ['-#LA', "hub #{Hub::Version}", url, '-o', patch_file]
         args[idx] = patch_file
       end

data/lib/hub/context.rb

@@ -433,7 +433,10 @@ module Hub
       editor = git_command 'var GIT_EDITOR'
       editor = ENV[$1] if editor =~ /^\$(\w+)$/
       editor = File.expand_path editor if (editor =~ /^[~.]/ or editor.index('/')) and editor !~ /["']/
-      editor.shellsplit
+      # avoid shellsplitting "C:\Program Files"
+      if File.exist? editor then [editor]
+      else editor.shellsplit
+      end
     end
 
     module System
@@ -482,6 +485,10 @@ module Hub
       def command?(name)
         !which(name).nil?
       end
+
+      def tmp_dir
+        ENV['TMPDIR'] || ENV['TEMP'] || '/tmp'
+      end
     end
 
     include System

data/lib/hub/github_api.rb

@@ -66,7 +66,7 @@ module Hub
 
     # Public: Create a new project.
     def create_repo project, options = {}
-      is_org = project.owner != config.username(api_host(project.host))
+      is_org = project.owner.downcase != config.username(api_host(project.host)).downcase
       params = { :name => project.name, :private => !!options[:private] }
       params[:description] = options[:description] if options[:description]
       params[:homepage]    = options[:homepage]    if options[:homepage]
@@ -115,6 +115,7 @@ module Hub
     # Requires access to a `config` object that implements:
     # - proxy_uri(with_ssl)
     # - username(host)
+    # - update_username(host, old_username, new_username)
     # - password(host, user)
     module HttpMethods
       # Decorator for Net::HTTPResponse
@@ -129,7 +130,12 @@ module Hub
           data['errors'].map do |err|
             case err['code']
             when 'custom'        then err['message']
-            when 'missing_field' then "field '%s' is missing" % err['field']
+            when 'missing_field'
+              %(Missing field: "%s") % err['field']
+            when 'invalid'
+              %(Invalid value for "%s": "%s") % [ err['field'], err['value'] ]
+            when 'unauthorized'
+              %(Not allowed to change field "%s") % err['field']
             end
           end.compact if data['errors']
         end
@@ -234,10 +240,18 @@ module Hub
         if (req.path =~ /\/authorizations$/)
           super
         else
+          refresh = false
           user = url.user || config.username(url.host)
           token = config.oauth_token(url.host, user) {
+            refresh = true
             obtain_oauth_token url.host, user
           }
+          if refresh
+            # get current user info user to persist correctly capitalized login name
+            res = get "https://#{url.host}/user"
+            res.error! unless res.success?
+            config.update_username(url.host, user, res.data['login'])
+          end
           req['Authorization'] = "token #{token}"
         end
       end
@@ -339,6 +353,12 @@ module Hub
         end
       end
 
+      def update_username host, old_username, new_username
+        entry = @data.entry_for_user(normalize_host(host), old_username)
+        entry['user'] = new_username
+        @data.save
+      end
+
       def api_token host, user
         host = normalize_host host
         @data.fetch_value host, user, :api_token do
@@ -376,9 +396,11 @@ module Hub
         end
       end
 
-      # FIXME: probably not cross-platform
+      NULL = defined?(File::NULL) ? File::NULL :
+               File.exist?('/dev/null') ? '/dev/null' : 'NUL'
+
       def askpass
-        tty_state = `stty -g`
+        tty_state = `stty -g 2>#{NULL}`
         system 'stty raw -echo -icanon isig' if $?.success?
         pass = ''
         while char = $stdin.getbyte and !(char == 13 or char == 10)

data/lib/hub/runner.rb

@@ -48,17 +48,12 @@ module Hub
       if args.noop?
         puts commands
       elsif not args.skip?
-        if args.chained?
-          execute_command_chain
-        else
-          exec(*args.to_exec)
-        end
+        execute_command_chain args.commands
       end
     end
 
     # Runs multiple commands in succession; exits at first failure.
-    def execute_command_chain
-      commands = args.commands
+    def execute_command_chain commands
       commands.each_with_index do |cmd, i|
         if cmd.respond_to?(:call) then cmd.call
         elsif i == commands.length - 1
@@ -69,5 +64,14 @@ module Hub
         end
       end
     end
+
+    # Special-case `echo` for Windows
+    def exec *args
+      if args.first == 'echo' && Context::windows?
+        puts args[1..-1].join(' ')
+      else
+        super
+      end
+    end
   end
 end

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.10.3'
+  Version = VERSION = '1.10.4'
 end

data/test/helper.rb

@@ -9,7 +9,8 @@ fakebin_dir = File.expand_path('../fakebin', __FILE__)
 ENV['PATH'] = "#{fakebin_dir}:#{ENV['PATH']}"
 
 # Use an isolated config file in testing
-ENV['HUB_CONFIG'] = File.join(ENV['TMPDIR'] || '/tmp', 'hub-test-config')
+tmp_dir = ENV['TMPDIR'] || ENV['TEMP'] || '/tmp'
+ENV['HUB_CONFIG'] = File.join(tmp_dir, 'hub-test-config')
 
 # Disable `abort` and `exit` in the main test process, but allow it in
 # subprocesses where we need to test does a command properly bail out.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,7 +80,8 @@ files:
 - test/hub_test.rb
 - test/standalone_test.rb
 homepage: http://defunkt.io/hub/
-licenses: []
+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