ztk 1.0.8 → 1.0.9

data/README.md

@@ -24,7 +24,7 @@ Documentation:
 
 ZTK - Zachary's (DevOp) Tool Kit
 
-* Author: Zachary Patten <zachary@jovelabs.net>
+* Author: Zachary Patten <zachary@jovelabs.com> [![endorse](http://api.coderwall.com/zpatten/endorsecount.png)](http://coderwall.com/zpatten)
 * Copyright: Copyright (c) Zachary Patten
 * License: Apache License, Version 2.0
 

data/lib/ztk/command.rb

@@ -179,7 +179,7 @@ module ZTK
     # Returns a string in the format of "user@hostname" for the current
     #   shell.
     def tag
-      @hostname ||= %x(hostname -f).chomp
+      @@hostname ||= %x(hostname).chomp
       "#{ENV['USER']}@#{@hostname}"
     end
 

data/lib/ztk/ssh.rb

@@ -181,6 +181,7 @@ module ZTK
       config.ui.logger.debug { "config=#{config.send(:table).inspect}" }
       config.ui.logger.info { "console(#{console_command.inspect})" }
 
+      config.ui.logger.fatal { "REPLACING CURRENT PROCESS - GOODBYE!" }
       Kernel.exec(console_command)
     end
 
@@ -389,18 +390,21 @@ module ZTK
 
     # Builds our SSH console command.
     def console_command
-      command = [ "ssh" ]
+      command = [ "/usr/bin/env ssh" ]
       command << [ "-q" ]
-      command << [ "-A" ]
+      command << [ "-4" ]
+      command << [ "-x" ]
+      command << [ "-a" ]
       command << [ "-o", "UserKnownHostsFile=/dev/null" ]
       command << [ "-o", "StrictHostKeyChecking=no" ]
       command << [ "-o", "KeepAlive=yes" ]
       command << [ "-o", "ServerAliveInterval=60" ]
+      command << [ "-o", %(ProxyCommand="#{proxy_command}") ] if config.proxy_host_name
       command << [ "-i", config.keys ] if config.keys
       command << [ "-p", config.port ] if config.port
-      command << [ "-o", %(ProxyCommand="#{proxy_command}") ] if config.proxy_host_name
+      # command << [ "-vv" ]
       command << "#{config.user}@#{config.host_name}"
-      command = command.flatten.compact.join(" ")
+      command = command.flatten.compact.join(' ')
       config.ui.logger.debug { "console_command(#{command.inspect})" }
       command
     end
@@ -410,18 +414,21 @@ module ZTK
       !config.proxy_user and log_and_raise(SSHError, "You must specify an proxy user in order to SSH proxy.")
       !config.proxy_host_name and log_and_raise(SSHError, "You must specify an proxy host_name in order to SSH proxy.")
 
-      command = ["ssh"]
+      command = ["/usr/bin/env ssh"]
       command << [ "-q" ]
-      command << [ "-A" ]
+      command << [ "-4" ]
+      command << [ "-x" ]
+      command << [ "-a" ]
       command << [ "-o", "UserKnownHostsFile=/dev/null" ]
       command << [ "-o", "StrictHostKeyChecking=no" ]
       command << [ "-o", "KeepAlive=yes" ]
       command << [ "-o", "ServerAliveInterval=60" ]
       command << [ "-i", config.proxy_keys ] if config.proxy_keys
       command << [ "-p", config.proxy_port ] if config.proxy_port
+      # command << [ "-vv" ]
       command << "#{config.proxy_user}@#{config.proxy_host_name}"
-      command << "nc %h %p"
-      command = command.flatten.compact.join(" ")
+      command << "'/usr/bin/env nc %h %p'"
+      command = command.flatten.compact.join(' ')
       config.ui.logger.debug { "proxy_command(#{command.inspect})" }
       command
     end

data/lib/ztk/version.rb

@@ -21,6 +21,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 
 end

data/ztk.gemspec

@@ -24,7 +24,7 @@ require 'ztk/version'
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Zachary Patten"]
-  gem.email         = ["zachary@jovelabs.net"]
+  gem.email         = ["zachary@jovelabs.com"]
   gem.description   = %q{Zachary's (DevOp) Tool Kit}
   gem.summary       = %q{Contains various classes and utilities I find I regularly need.}
   gem.homepage      = "https://github.com/zpatten/ztk"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -173,7 +173,7 @@ dependencies:
         version: '0'
 description: Zachary's (DevOp) Tool Kit
 email:
-- zachary@jovelabs.net
+- zachary@jovelabs.com
 executables:
 - ztk
 extensions: []
@@ -250,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -656321979388275144
+      hash: -955411107059050686
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -656321979388275144
+      hash: -955411107059050686
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24