toolshed 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 215029306670114b410a3c8e153734c8b6d9ce3d
-  data.tar.gz: 27c11d5351604e6dcb24c3bd5f3c00a98f69c6fd
+  metadata.gz: 03f1f1b3fbd050039f62bf6a6c1a3cbfeedd8bce
+  data.tar.gz: b83471543158bd0015e7ed86e24fdda070946f5e
 SHA512:
-  metadata.gz: f8fa73f9315ebae7f0d46d0cdb17a526a0593abf6b871f6a8c24857ca336e372efb8ce525f1e13f45013c50abbc814a1c739923e094a5507de940b401d13ffc7
-  data.tar.gz: 9251f783275043a902ba2b889a0e11e1f982d9f72c18faf2976be8f65f470069651022efa9f478bd779ac479fcff1f0745e7b6bc0e4ea7c60f20eaf927a11dff
+  metadata.gz: 3e3592c41d1e744f1f903eaadd6d45faec1f71781a0936f9f35173efb1f45fe75cda1c3451e48486d291fa65dd61010cbaa5d71c6bf795c2b5e8bc0015e2c3f7
+  data.tar.gz: 1b619b9bb06b8c9322245261baa2924003ff0ce67ba148f0bac73cc825cbc36e428c6d1459ef8cf03f809e95b584d4a5ca8d71796be41c2e628140a49ee966d5

data/lib/toolshed/base.rb

@@ -24,7 +24,7 @@ module Toolshed
             end
 
             all = a_stdout + a_stderr
-            exit_status = wait_thr.value # Process::Status object returned.
+            exit_status = wait_thr.value.to_s # Process::Status object returned.
             result.merge!(stdout: a_stdout, stderr: a_stderr, all: all, process_status: exit_status) # rubocop:disable Metrics/LineLength
           end
         rescue ::Timeout::Error

data/lib/toolshed/commands/mysql/backup.rb

@@ -10,7 +10,7 @@ module Toolshed
           {
             banner: 'Usage: mysql backup [options]',
             options: {
-              local_host: {
+              host: {
                 short_on: '-l'
               },
               path: {
@@ -44,7 +44,7 @@ module Toolshed
 
         def options_with_defaults(options = nil)
           options ||= {}
-          options[:local_host] ||= 'localhost'
+          options[:host] ||= 'localhost'
           options[:path] ||= read_user_input("Storage Path (/tmp/test/#{Time.now.utc.getlocal.strftime('%Y%m%d')}.sql) ?", required: true)
           options[:username] ||= read_user_input('Username?', required: true)
           options[:name] ||= read_user_input('Database Name?', required: true)

data/lib/toolshed/databases/mysql/backup.rb

@@ -1,17 +1,19 @@
 require 'toolshed/error'
 require 'toolshed/password'
 
+require 'fileutils'
+
 module Toolshed
   module Databases
     module Mysql
       class Backup
         include Toolshed::Password
 
-        attr_reader :local_host, :name, :path, :password, :username, :wait_time
+        attr_reader :host, :name, :path, :password, :username, :wait_time
 
         def initialize(options = nil)
           options ||= {}
-          @local_host = options[:local_host]
+          @host = options[:host]
           @name = options[:name]
           @path = options[:path]
           @password = options[:password]
@@ -19,15 +21,26 @@ module Toolshed
           @wait_time = options[:wait_time] || 120
         end
 
+        def create_path
+          FileUtils.mkdir_p(File.dirname(path))
+        end
+
         def execute
           raise TypeError, "Wait time passed in is not a number #{wait_time}" unless wait_time.is_a?(Fixnum)
-          Toolshed.logger.info "Starting execution of mysqldump -h #{local_host} -u #{username} #{hidden_password_param} #{name} > #{path}."
-          Toolshed::Base.wait_for_command("mysqldump -h #{local_host} -u #{username} #{password_param} #{name} > #{path}", wait_time)
+          Toolshed.logger.info "Starting execution of mysqldump -h #{host} -u #{username} #{hidden_password_param} #{name} > #{path}."
+          create_path
+          results = Toolshed::Base.wait_for_command("mysqldump -h #{host} -u #{username} #{password_param} #{name} > #{path}", wait_time)
+          unless results[:stderr].is_a?(NilClass)
+            error_message = results[:stderr].join(' ')
+            Toolshed.logger.fatal error_message
+            raise Toolshed::PermissionsException, error_message
+          end
+          Toolshed.logger.info results[:stdout].join(' ') unless results[:stdout].is_a?(NilClass)
           Toolshed.logger.info 'mysqldump has completed.'
         end
 
         def password_param
-          password.nil? || password.empty?  ? '' : "-p #{password_from_config(password)}"
+          password.nil? || password.empty?  ? '' : "-p#{password_from_config(password)}"
         end
 
         def hidden_password_param

data/lib/toolshed/password.rb

@@ -10,14 +10,17 @@ module Toolshed
       translated_password = Toolshed.configuration
       password_parts = password.split(':')
       password_parts.each do |password_part|
-        return password if translated_password[password_part].nil?
+        if translated_password[password_part].nil?
+          translated_password = password
+          break
+        end
         translated_password = translated_password[password_part]
       end
-      return translated_password
+      translated_password
     rescue => e
       Toolshed::Logger.instance.fatal e.message
       Toolshed::Logger.instance.fatal e.inspect
-      return password
+      password
     end
   end
 end

data/lib/toolshed/server_administration/scp.rb

@@ -10,28 +10,30 @@ module Toolshed
     class SCP
       include Toolshed::Password
 
-      attr_reader :local_path, :password, :remote_host, :remote_path, :username, :verbose_output # rubocop:disable LineLength
+      attr_reader :local_path, :password, :remote_host, :remote_path, :ssh_options, :username, :verbose_output # rubocop:disable LineLength
 
       def initialize(options = nil)
         options ||= {}
-
         @password = options[:password]
         @remote_host = options[:remote_host]
         @remote_path = options[:remote_path]
         @local_path = options[:local_path]
         @username = options[:username]
         @verbose_output = options[:verbose_output]
+        @ssh_options = options[:ssh_options]
+        @ssh_options ||= {}
+        @ssh_options.merge(password: password_from_config(password))
       end
 
       def download
         Toolshed.logger.info "Attempting to SCP from #{username}@#{remote_host}:#{remote_path} to #{local_path}." # rubocop:disable LineLength
-        Net::SCP.download!(remote_host, username, remote_path, local_path, ssh: { password: password_from_config(password) }, recursive: true) # rubocop:disable LineLength
+        Net::SCP.download!(remote_host, username, remote_path, local_path, ssh: ssh_options, recursive: true) # rubocop:disable LineLength
         on_complete
       end
 
       def upload
         Toolshed.logger.info "Attempting to SCP from #{local_path} to #{username}@#{remote_host}:#{remote_path}." # rubocop:disable LineLength
-        Net::SCP.upload!(remote_host, username, local_path, remote_path, ssh: { password: password_from_config(password) }, recursive: true) # rubocop:disable LineLength
+        Net::SCP.upload!(remote_host, username, local_path, remote_path, ssh: ssh_options, recursive: true) # rubocop:disable LineLength
         on_complete
       end
 

data/lib/toolshed/version.rb

@@ -2,7 +2,7 @@
 
 # Module for toolshed
 module Toolshed
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 
   # Display the version information with the toolshed banner
   class Version

data/test/commands/mysql/backup_test.rb

@@ -15,7 +15,7 @@ module Test
         end
 
         def test_execute
-          Toolshed::Base.expects(:wait_for_command).returns(true)
+          Toolshed::Base.expects(:wait_for_command).returns({})
 
           path = '/tmp/testing/test.sql'
           username = 'test'

data/test/databases/mysql/backup_test.rb

@@ -15,14 +15,14 @@ module Test
         end
 
         def test_execute
-          Toolshed::Base.expects(:wait_for_command).returns(true)
+          Toolshed::Base.expects(:wait_for_command).returns({})
 
           path = '/tmp/testing/test.sql'
           username = 'test'
           password = 'test'
           name = 'localdb'
 
-          Toolshed::Databases::Mysql::Backup.new(path: path, username: username, password: password, name: name, local_host: 'localhost').execute
+          Toolshed::Databases::Mysql::Backup.new(path: path, username: username, password: password, name: name, host: 'localhost').execute
 
           assert Toolshed::Logger.instance.logs[:info].include?("Starting execution of mysqldump -h localhost -u #{username} -p ******* #{name} > #{path}.")
           assert Toolshed::Logger.instance.logs[:info].include?('mysqldump has completed.')
@@ -35,7 +35,7 @@ module Test
           name = 'localdb'
 
           ex = assert_raises TypeError do
-            Toolshed::Databases::Mysql::Backup.new(path: path, username: username, password: password, name: name, local_host: 'localhost', wait_time: 'bla').execute
+            Toolshed::Databases::Mysql::Backup.new(path: path, username: username, password: password, name: name, host: 'localhost', wait_time: 'bla').execute
           end
           assert_equal 'Wait time passed in is not a number bla', ex.message
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toolshed
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Jake Waller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2016-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty