tpkg 2.1.0 → 2.1.1

data/Rakefile

@@ -5,7 +5,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('facter')
   s.add_dependency('net-ssh')
   s.add_dependency('ddao-kwalify')
-  s.version = '2.1.0'
+  s.version = '2.1.1'
   s.authors = ['Darren Dao', 'Jason Heiss']
   s.email = 'tpkg-users@lists.sourceforge.net'
   s.homepage = 'http://tpkg.sourceforge.net'

data/bin/tpkg

@@ -382,10 +382,16 @@ if @deploy
   @deploy_options["max-worker"] = @worker_count
   @deploy_options["abort-on-fail"] = false
 
-  # check to see if ssh-key is accessible
-  if @deploy_options["use-ssh-key"]
+  # Check to see if ssh-key is accessible
+  # Net::SSH doesn't warn the user about problems with the key file
+  # (i.e. if it doesn't exist or isn't readable), resulting in the user
+  # just getting a generic "Bad username/password combination" error
+  # message because authentication fails.  As such we do some of our own
+  # checking and warning here so that the user gets a more specific
+  # error message.
+  if @deploy_options["use-ssh-key"] && @deploy_options["ssh-key"]
     ssh_key = @deploy_options["ssh-key"]
-    if !File.readable?(ssh_key) && Process.euid == 0
+    if !File.readable?(ssh_key) && (Process.euid == 0 || !@sudo)
       raise "Unable to read ssh key from #{ssh_key}"
     elsif !File.readable?(ssh_key)
       warn "Warning: Unable to read ssh key from #{ssh_key}. Attempting to rerun tpkg with sudo."

data/lib/tpkg.rb

@@ -56,7 +56,7 @@ require 'kwalify'        # for validating yaml
 
 class Tpkg
   
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 
   GENERIC_ERR = 1  
   POSTINSTALL_ERR = 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Darren Dao
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -08:00
+date: 2011-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency