hub 1.10.5 → 1.10.6

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 1.10.6 (2013-04-25)
+
+* compensate for new GitHub API enforcement
+* fix asking for password on Ruby <= 1.8.6
+* fix `fetch` for forks where username contains a dash
+
 ## 1.10.5 (2013-03-02)
 
 * helpful `pull-request` error message when base project is invalid

data/lib/hub/commands.rb

@@ -35,7 +35,7 @@ module Hub
     extend Context
 
     NAME_RE = /[\w.][\w.-]*/
-    OWNER_RE = /[a-zA-Z0-9-]+/
+    OWNER_RE = /[a-zA-Z0-9][a-zA-Z0-9-]*/
     NAME_WITH_OWNER_RE = /^(?:#{NAME_RE}|#{OWNER_RE}\/#{NAME_RE})$/
 
     CUSTOM_COMMANDS = %w[alias create browse compare fork pull-request]
@@ -81,6 +81,10 @@ module Hub
       base_project = local_repo.main_project
       head_project = local_repo.current_project
 
+      unless current_branch
+        abort "Aborted: not currently on any branch."
+      end
+
       unless base_project
         abort "Aborted: the origin remote doesn't point to a GitHub repository."
       end
@@ -312,7 +316,7 @@ module Hub
       end
 
       projects = names.map { |name|
-        unless name =~ /\W/ or remotes.include?(name) or remotes_group(name)
+        unless name !~ /^#{OWNER_RE}$/ or remotes.include?(name) or remotes_group(name)
           project = github_project(nil, name)
           repo_info = api_client.repo_info(project)
           if repo_info.success?

data/lib/hub/github_api.rb

@@ -177,6 +177,7 @@ module Hub
           create_connection host_url
         end
 
+        req['User-Agent'] = "Hub #{Hub::VERSION}"
         apply_authentication(req, url)
         yield req if block_given?
 
@@ -403,7 +404,7 @@ module Hub
         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)
+        while char = getbyte($stdin) and !(char == 13 or char == 10)
           if char == 127 or char == 8
             pass[-1,1] = '' unless pass.empty?
           else
@@ -415,6 +416,15 @@ module Hub
         system "stty #{tty_state}" unless tty_state.empty?
       end
 
+      def getbyte(io)
+        if io.respond_to?(:getbyte)
+          io.getbyte
+        else
+          # In Ruby <= 1.8.6, getc behaved the same
+          io.getc
+        end
+      end
+
       def proxy_uri(with_ssl)
         env_name = "HTTP#{with_ssl ? 'S' : ''}_PROXY"
         if proxy = ENV[env_name] || ENV[env_name.downcase] and !proxy.empty?

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.10.5'
+  Version = VERSION = '1.10.6'
 end

metadata

@@ -2,7 +2,7 @@
 name: hub
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.10.5
+  version: 1.10.6
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false