ztk 1.6.2 → 1.6.3

data/lib/ztk/ssh/file.rb

@@ -30,7 +30,7 @@ module ZTK
         tempfile = Tempfile.new("tempfile")
 
         local_tempfile = tempfile.path
-        remote_tempfile = ::File.join("/", "tmp", ::File.basename(local_tempfile))
+        remote_tempfile = ::File.join(ZTK::Locator.root, "tmp", ::File.basename(local_tempfile))
 
         ::File.open(local_tempfile, 'w') do |file|
           yield(file)

data/lib/ztk/ssh/private.rb

@@ -0,0 +1,67 @@
+module ZTK
+  class SSH
+
+    # SSH Private Functionality
+    module Private
+
+      # Builds our SSH options hash.
+      def ssh_options
+        options = {}
+
+        # These are plainly documented on the Net::SSH config class.
+        options.merge!(:encryption => config.encryption) if config.encryption
+        options.merge!(:compression => config.compression) if config.compression
+        options.merge!(:compression_level => config.compression_level) if config.compression_level
+        options.merge!(:timeout => config.timeout) if config.timeout
+        options.merge!(:forward_agent => config.forward_agent) if config.forward_agent
+        options.merge!(:global_known_hosts_file => config.global_known_hosts_file) if config.global_known_hosts_file
+        options.merge!(:auth_methods => config.auth_methods) if config.auth_methods
+        options.merge!(:host_key => config.host_key) if config.host_key
+        options.merge!(:host_key_alias => config.host_key_alias) if config.host_key_alias
+        options.merge!(:host_name => config.host_name) if config.host_name
+        options.merge!(:keys => config.keys) if config.keys
+        options.merge!(:keys_only => config.keys_only) if config.keys_only
+        options.merge!(:hmac => config.hmac) if config.hmac
+        options.merge!(:port => config.port) if config.port
+        options.merge!(:proxy => Net::SSH::Proxy::Command.new(proxy_command)) if config.proxy_host_name
+        options.merge!(:rekey_limit => config.rekey_limit) if config.rekey_limit
+        options.merge!(:user => config.user) if config.user
+        options.merge!(:user_known_hosts_file => config.user_known_hosts_file) if config.user_known_hosts_file
+
+        # This is not plainly documented on the Net::SSH config class.
+        options.merge!(:password => config.password) if config.password
+
+        config.ui.logger.debug { "ssh_options(#{options.inspect})" }
+        options
+      end
+
+      # Builds a human readable tag about our connection.  Used for internal
+      # logging purposes.
+      def tag
+        tags = Array.new
+
+        if config.proxy_host_name
+          proxy_user_host = "#{config.proxy_user}@#{config.proxy_host_name}"
+          proxy_port = (config.proxy_port ? ":#{config.proxy_port}" : nil)
+          tags << [proxy_user_host, proxy_port].compact.join
+          tags << " >>> "
+        end
+
+        user_host = "#{config.user}@#{config.host_name}"
+        port = (config.port ? ":#{config.port}" : nil)
+        tags << [user_host, port].compact.join
+
+        tags.join.strip
+      end
+
+      def log_header(what)
+        count = 8
+        sep = ("=" * count)
+        header = [sep, "[ #{what} ]", sep, "[ #{tag} ]", sep, "[ #{what} ]", sep].join
+        "#{header}\n"
+      end
+
+    end
+
+  end
+end

data/lib/ztk/ssh/upload.rb

@@ -13,8 +13,8 @@ module ZTK
       #     config.user = ENV["USER"]
       #     config.host_name = "127.0.0.1"
       #   end
-      #   local = File.expand_path(File.join(ENV["HOME"], ".ssh", "id_rsa.pub"))
-      #   remote = File.expand_path(File.join("/tmp", "id_rsa.pub"))
+      #   local = File.expand_path(File.join(Dir.home, ".ssh", "id_rsa.pub"))
+      #   remote = File.expand_path(File.join(ZTK::Locator.root, "tmp", "id_rsa.pub"))
       #   ssh.upload(local, remote)
       #
       # @param [String] local The local file/path you wish to upload from.

data/lib/ztk/ui.rb

@@ -17,6 +17,9 @@ module ZTK
 
     attr_accessor :stdout, :stderr, :stdin, :logger
 
+    attr_accessor :verbose
+    attr_accessor :quiet
+
     def initialize(configuration={})
       defined?(Rails) and (rails_logger = Rails.logger)
       null_logger = (::ZTK::Logger.new("/dev/null") rescue ::Logger.new("/dev/null"))
@@ -30,6 +33,17 @@ module ZTK
       (@stderr && @stderr.respond_to?(:sync=)) and @stderr.sync = true
       (@stdin  && @stdin.respond_to?(:sync=))  and @stdin.sync  = true
       (@logger && @logger.respond_to?(:sync=)) and @logger.sync = true
+
+      @verbose = (configuration[:verbose] || false)
+      @quiet   = (configuration[:quiet]   || false)
+    end
+
+    def verbose?
+      (@verbose == true)
+    end
+
+    def quiet?
+      (@quiet == true)
     end
 
   end

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 
 end

data/spec/ztk/logger_spec.rb

@@ -31,7 +31,7 @@ describe ZTK::Logger do
       :error => "This is a test error message",
       :fatal => "This is a test fatal message"
     }
-    @logfile = File.join("/tmp", "logger.log")
+    @logfile = File.join(ZTK::Locator.root, "tmp", "logger.log")
   end
 
   before(:each) do

data/spec/ztk/ssh_spec.rb

@@ -241,10 +241,10 @@ describe ZTK::SSH do
 
         data = "Hello World @ #{Time.now.utc}"
 
-        remote_file = File.join("/tmp", "ssh-upload-remote")
+        remote_file = File.join(ZTK::Locator.root, "tmp", "ssh-upload-remote")
         File.exists?(remote_file) && File.delete(remote_file)
 
-        local_file = File.join("/tmp", "ssh-upload-local")
+        local_file = File.join(ZTK::Locator.root, "tmp", "ssh-upload-local")
         if RUBY_VERSION < "1.9.3"
           File.open(local_file, 'w') do |file|
             file.puts(data)
@@ -275,10 +275,10 @@ describe ZTK::SSH do
 
         data = "Hello World @ #{Time.now.utc}"
 
-        local_file = File.join("/tmp", "ssh-download-local")
+        local_file = File.join(ZTK::Locator.root, "tmp", "ssh-download-local")
         File.exists?(local_file) && File.delete(local_file)
 
-        remote_file = File.join("/tmp", "ssh-download-remote")
+        remote_file = File.join(ZTK::Locator.root, "tmp", "ssh-download-remote")
         if RUBY_VERSION < "1.9.3"
           File.open(remote_file, 'w') do |file|
             file.puts(data)
@@ -523,10 +523,10 @@ describe ZTK::SSH do
 
         data = "Hello World @ #{Time.now.utc}"
 
-        remote_file = File.join("/tmp", "ssh-upload-remote")
+        remote_file = File.join(ZTK::Locator.root, "tmp", "ssh-upload-remote")
         File.exists?(remote_file) && File.delete(remote_file)
 
-        local_file = File.join("/tmp", "ssh-upload-local")
+        local_file = File.join(ZTK::Locator.root, "tmp", "ssh-upload-local")
         if RUBY_VERSION < "1.9.3"
           File.open(local_file, 'w') do |file|
             file.puts(data)
@@ -559,10 +559,10 @@ describe ZTK::SSH do
 
         data = "Hello World @ #{Time.now.utc}"
 
-        local_file = File.join("/tmp", "ssh-download-local")
+        local_file = File.join(ZTK::Locator.root, "tmp", "ssh-download-local")
         File.exists?(local_file) && File.delete(local_file)
 
-        remote_file = File.join("/tmp", "ssh-download-remote")
+        remote_file = File.join(ZTK::Locator.root, "tmp", "ssh-download-remote")
         if RUBY_VERSION < "1.9.3"
           File.open(remote_file, 'w') do |file|
             file.puts(data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -196,6 +196,10 @@ files:
 - lib/ztk/base.rb
 - lib/ztk/benchmark.rb
 - lib/ztk/command.rb
+- lib/ztk/command/download.rb
+- lib/ztk/command/exec.rb
+- lib/ztk/command/private.rb
+- lib/ztk/command/upload.rb
 - lib/ztk/config.rb
 - lib/ztk/dsl.rb
 - lib/ztk/dsl/base.rb
@@ -215,14 +219,20 @@ files:
 - lib/ztk/parallel.rb
 - lib/ztk/pty.rb
 - lib/ztk/report.rb
+- lib/ztk/report/list.rb
+- lib/ztk/report/private.rb
+- lib/ztk/report/spreadsheet.rb
 - lib/ztk/rescue_retry.rb
 - lib/ztk/spinner.rb
 - lib/ztk/ssh.rb
 - lib/ztk/ssh/bootstrap.rb
 - lib/ztk/ssh/command.rb
+- lib/ztk/ssh/console.rb
+- lib/ztk/ssh/core.rb
 - lib/ztk/ssh/download.rb
 - lib/ztk/ssh/exec.rb
 - lib/ztk/ssh/file.rb
+- lib/ztk/ssh/private.rb
 - lib/ztk/ssh/upload.rb
 - lib/ztk/tcp_socket_check.rb
 - lib/ztk/template.rb
@@ -263,12 +273,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2265396699828621560
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2265396699828621560
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25