toolshed 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97f1edaf94718d33dd532dd486c88a9be34763ba
-  data.tar.gz: f916422d538d77d894a4474735fbd729e46e8030
+  metadata.gz: 215029306670114b410a3c8e153734c8b6d9ce3d
+  data.tar.gz: 27c11d5351604e6dcb24c3bd5f3c00a98f69c6fd
 SHA512:
-  metadata.gz: b31baee2db1a9feabfbd79455cd3946c91d2368ea0c53485f58c1bfb2d79e4e46bdf28188c90377695aa9f3ab3f2b8cace9b9954855a9e3ab0c0f2f323c45d20
-  data.tar.gz: ee8fd8db4073acbe54ac95f04c14641c618d106e3c93e011e912c57728311113e5787367a9db4341c25fbc903a761958881c2a8ac780ab3b5a271fb8b19cc67a
+  metadata.gz: f8fa73f9315ebae7f0d46d0cdb17a526a0593abf6b871f6a8c24857ca336e372efb8ce525f1e13f45013c50abbc814a1c739923e094a5507de940b401d13ffc7
+  data.tar.gz: 9251f783275043a902ba2b889a0e11e1f982d9f72c18faf2976be8f65f470069651022efa9f478bd779ac479fcff1f0745e7b6bc0e4ea7c60f20eaf927a11dff

data/lib/toolshed/base.rb

@@ -11,7 +11,7 @@ module Toolshed
       result = {}
       Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
         begin
-          Timeout.timeout(seconds) do
+          ::Timeout.timeout(seconds) do
             stdin.close  # make sure the subprocess is done
 
             a_stdout = []
@@ -27,7 +27,7 @@ module Toolshed
             exit_status = wait_thr.value # 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
+        rescue ::Timeout::Error
           Process.kill('KILL', wait_thr.pid)
           Toolshed.logger.fatal "Unable to perform the '#{command}' command in the allowed amount of time of #{seconds} seconds. Exiting." # rubocop:disable Metrics/LineLength
           Toolshed.die

data/lib/toolshed/cli.rb

@@ -19,9 +19,8 @@ module Toolshed
     end
 
     def load_config(command_class)
-      Toolshed::Client.load_credentials
       Toolshed.add_file_log_source(command_class.class.name)
-      Toolshed.logger.info "Credentials loaded from #{File.absolute_path(Toolshed::Client.instance.credentials_loaded_from)}" # rubocop:disable Metrics/LineLength
+      Toolshed.logger.info "Credentials loaded from #{File.absolute_path(Toolshed::Client.instance.toolshedrc_path)}" # rubocop:disable Metrics/LineLength
     rescue => e
       Toolshed.logger.fatal "Error loading your credentials: #{e.message}"
     end

data/lib/toolshed/client.rb

@@ -1,91 +1,55 @@
-require 'singleton'
+require 'toolshed/error'
+require 'toolshed/hash'
 require 'toolshed/version'
+
+require 'erb'
+require 'singleton'
 require 'yaml'
 
 module Toolshed
   # This is responsible for loading .toolshedrc file
-  class Client
+  class Client < Hash
     include Singleton
 
-    attr_accessor :debug,
-                  :git_quiet,
-                  :use_defaults,
-                  :github_username,
-                  :github_password,
-                  :github_token,
-                  :use_defaults,
-                  :pull_from_repository_user,
-                  :pull_from_repository_name,
-                  :pull_from_remote_name,
-                  :push_to_repository_user,
-                  :push_to_remote_name,
-                  :use_git_submodules,
-                  :git_tool,
-                  :pivotal_tracker_username,
-                  :pivotal_tracker_password,
-                  :default_pivotal_tracker_project_id,
-                  :ticket_tracker_username,
-                  :ticket_tracker_password,
-                  :default_ticket_tracker_project,
-                  :ticket_tracking_tool,
-                  :ticket_tracker_owner,
-                  :ticket_status_for_complete,
-                  :default_pull_request_title_format,
-                  :time_tracking_tool,
-                  :time_tracking_username,
-                  :time_tracking_password,
-                  :time_tracking_owner,
-                  :time_tracking_default_project_id,
-                  :load_credentials_if_necessary,
-                  :log_path,
-                  :credentials_loaded_from
-
     GITHUB_BASE_API_URL  = 'https://api.github.com/'
     PIVOTAL_TRACKER_BASE_API_URL = 'https://www.pivotaltracker.com/services/v5/'
 
-    class << self
-      def config_path
-        ENV['TOOLSHED_CONFIG'] || '~/.toolshedrc'
-      end
+    attr_reader :struct
 
-      def load_credentials # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        credentials = Client.read_credenials
-        instance.github_username ||= credentials['github_username']
-        instance.github_password ||= credentials['github_password']
-        instance.github_token ||= credentials['github_token']
-        instance.pivotal_tracker_username ||= credentials['pivotal_tracker_username']
-        instance.pivotal_tracker_password ||= credentials['pivotal_tracker_password']
-        instance.default_pivotal_tracker_project_id ||= credentials['default_pivotal_tracker_project_id'] # rubocop:disable Metrics/LineLength
-        instance.ticket_tracker_username ||= credentials['ticket_tracker_username']
-        instance.ticket_tracker_password ||= credentials['ticket_tracker_password']
-        instance.ticket_tracker_owner ||= credentials['ticket_tracker_owner']
-        instance.ticket_status_for_complete ||= credentials['ticket_status_for_complete']
-        instance.default_ticket_tracker_project ||= credentials['default_ticket_tracker_project'] # rubocop:disable Metrics/LineLength
-        instance.pull_from_remote_name ||= credentials['pull_from_remote_name']
-        instance.pull_from_repository_user ||= credentials['pull_from_repository_user']
-        instance.pull_from_repository_name ||= credentials['pull_from_repository_name']
-        instance.push_to_repository_user ||= credentials['push_to_repository_user']
-        instance.push_to_remote_name ||= credentials['push_to_remote_name']
-        instance.ticket_tracking_tool ||= credentials['ticket_tracking_tool'] # rubocop:disable Metrics/LineLength
-        instance.use_git_submodules ||= credentials['use_git_submodules']
-        instance.git_tool ||= credentials['git_tool']
-        instance.time_tracking_username ||= credentials['time_tracking_username']
-        instance.time_tracking_password ||= credentials['time_tracking_password']
-        instance.time_tracking_owner ||= credentials['time_tracking_owner']
-        instance.time_tracking_default_project_id ||= credentials['time_tracking_default_project_id'] # rubocop:disable Metrics/LineLength
-        instance.time_tracking_tool ||= credentials['time_tracking_tool']
-        instance.git_quiet ||= (credentials['git_quiet']) ? '&> /dev/null' : ''
-        instance.use_defaults ||= credentials['use_defaults']
-        instance.default_pull_request_title_format ||= credentials['default_pull_request_title_format'] # rubocop:disable Metrics/LineLength
-        instance.log_path ||= credentials['log_path']
-        instance.credentials_loaded_from ||= load_credentials_from
-      end
+    def initialize
+      load_toolshedrc_configuration
+      @struct = to_ostruct
+    end
 
-      def read_credenials
-        YAML.load_file(File.expand_path(load_credentials_from))
+    def load_toolshedrc_configuration
+      toolshedrc_configurations = YAML.load(ERB.new(File.read(toolshedrc_path)).result)
+      raise CorruptFileException, 'Toolshedrc file is not configured properly.' unless toolshedrc_configurations.is_a?(Hash)
+      self.merge!(toolshedrc_configurations)
+    end
+
+    def method_missing(*args)
+      begin
+        if args.first.to_s.end_with?('=')
+          val = args.last
+          my_h = self
+          args.each_with_index do |arg, index|
+            arg = arg.to_s.gsub('=', '')
+            next_arg_val = args[index + 1].to_s.gsub('=', '')
+            my_h = my_h[arg] unless next_arg_val == val.to_s
+            my_h[arg] = val if next_arg_val == val.to_s && !my_h[arg].nil?
+            my_h.merge!(arg => val) if next_arg_val == val.to_s && my_h[arg].nil?
+          end
+          @struct = to_ostruct
+        else
+          struct.send(args.first)
+        end
+      rescue NoMethodError => e
+        Toolshed.die(e.message)
       end
+    end
 
-      def load_credentials_from
+   def toolshedrc_path
+      @toolshedrc_path ||= begin
         dir = Dir.pwd
         while File.expand_path(dir) != '/'
           unless File.exist?("#{dir}/.toolshedrc")
@@ -95,7 +59,6 @@ module Toolshed
           credentials_loaded_from = "#{dir}/.toolshedrc"
           break
         end
-
         credentials_loaded_from
       end
     end

data/lib/toolshed/commands/base.rb

@@ -13,7 +13,7 @@ module Toolshed
         options_parser = OptionParser.new do |opts|
           opts.banner = cli_options[:banner] if cli_options[:banner]
           cli_options[:options].each do |option_name, option_variables|
-            letter_map = ('a'..'z').map { |letter| letter }
+            letter_map = ('a'..'z').map { |letter| letter }.delete_if { |letter| letter == 'h' }
             short_on = (option_variables[:short_on]) ? option_variables[:short_on] : letter_map[rand(letter_map.length)] # rubocop:disable Metrics/LineLength
             on = (option_variables[:on]) ? option_variables[:on] : "--#{option_name.to_s.split('_').join('-')} [ARG]" # rubocop:disable Metrics/LineLength
             opts.on(short_on, on) do |opt|
@@ -21,6 +21,10 @@ module Toolshed
               options.merge!(option_name => value)
             end
           end
+          opts.on_tail("-h", "--help", "Show this message") do
+            puts opts
+            exit
+          end
         end
         options_parser.order! if options_parser
         begin

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

@@ -0,0 +1,56 @@
+require 'toolshed/commands/base'
+require 'toolshed/databases/mysql/backup'
+
+module Toolshed
+  module Commands
+    module Mysql
+      # Responsible for handing backup of mysql database
+      class Backup < Toolshed::Commands::Base
+        def self.cli_options # rubocop:disable MethodLength
+          {
+            banner: 'Usage: mysql backup [options]',
+            options: {
+              local_host: {
+                short_on: '-l'
+              },
+              path: {
+                short_on: '-p'
+              },
+              username: {
+                short_on: '-u'
+              },
+              password: {
+                short_on: '-d'
+              },
+              name: {
+                short_on: '-n'
+              },
+              wait_time: {
+                short_on: '-w'
+              }
+            }
+          }
+        end
+
+        def execute(_args, options = nil)
+          options = options_with_defaults(options)
+          Toolshed.logger.info ''
+          Toolshed::Databases::Mysql::Backup.new(options).execute
+          Toolshed.logger.info ''
+          Toolshed.die
+        end
+
+        private
+
+        def options_with_defaults(options = nil)
+          options ||= {}
+          options[:local_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)
+          options
+        end
+      end
+    end
+  end
+end

data/lib/toolshed/commands/ssh.rb

@@ -36,6 +36,9 @@ module Toolshed
             },
             verbose_output: {
               short_on: '-v'
+            },
+            timeout_period: {
+              short_on: '-t'
             }
           }
         }

data/lib/toolshed/commands/update_ticket_status.rb

@@ -8,17 +8,17 @@ module Toolshed
       end
 
       def execute(args, options = {})
-        ticket_tracker_class =  Object.const_get("Toolshed::TicketTracking::#{Toolshed::Client.ticket_tracking_tool.camel_case}")
+        ticket_tracker_class =  Object.const_get("Toolshed::TicketTracking::#{Toolshed::Client.instance.ticket_tracking_tool.camel_case}")
 
         use_project_id = Object.const_get("#{ticket_tracker_class}::USE_PROJECT_ID") rescue false
         if use_project_id
-          ticket_tracker_project_id = read_user_input_project("Project ID (Default: #{Toolshed::Client.default_pivotal_tracker_project_id}):", options.merge!({ default: Toolshed::Client.default_pivotal_tracker_project_id }))
+          ticket_tracker_project_id = read_user_input_project("Project ID (Default: #{Toolshed::Client.instance.default_pivotal_tracker_project_id}):", options.merge!({ default: Toolshed::Client.instance.default_pivotal_tracker_project_id }))
           options.merge!({ project_id: ticket_tracker_project_id })
         end
 
         use_project_name = Object.const_get("#{ticket_tracker_class}::USE_PROJECT_NAME") rescue false
         if use_project_name
-          ticket_tracker_project_name = read_user_input_project("Project Name (Default: #{Toolshed::Client.default_ticket_tracker_project}):", options.merge!({ default: Toolshed::Client.default_ticket_tracker_project }))
+          ticket_tracker_project_name = read_user_input_project("Project Name (Default: #{Toolshed::Client.instance.default_ticket_tracker_project}):", options.merge!({ default: Toolshed::Client.instance.default_ticket_tracker_project }))
           options.merge!({ project: ticket_tracker_project_name })
         end
 

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

@@ -0,0 +1,39 @@
+require 'toolshed/error'
+require 'toolshed/password'
+
+module Toolshed
+  module Databases
+    module Mysql
+      class Backup
+        include Toolshed::Password
+
+        attr_reader :local_host, :name, :path, :password, :username, :wait_time
+
+        def initialize(options = nil)
+          options ||= {}
+          @local_host = options[:local_host]
+          @name = options[:name]
+          @path = options[:path]
+          @password = options[:password]
+          @username = options[:username]
+          @wait_time = options[:wait_time] || 120
+        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 'mysqldump has completed.'
+        end
+
+        def password_param
+          password.nil? || password.empty?  ? '' : "-p #{password_from_config(password)}"
+        end
+
+        def hidden_password_param
+          password_param.empty? ? '' : '-p *******'
+        end
+      end
+    end
+  end
+end

data/lib/toolshed/entry_point.rb

@@ -21,22 +21,22 @@ class EntryPoint
       # @TODO - clean this up as it should really be part of the command it's being used in not globally.
       global = OptionParser.new do |opts|
         opts.on("-u", "--github-username [ARG]") do |username|
-          Toolshed::Client.github_username = username
+          Toolshed::Client.instance.github_username = username
         end
         opts.on("-p", "--github-password [ARG]") do |password|
-          Toolshed::Client.github_password = password
+          Toolshed::Client.instance.github_password = password
         end
         opts.on("-t", "--github-token [ARG]") do |token|
-          Toolshed::Client.github_token = token
+          Toolshed::Client.instance.github_token = token
         end
         opts.on("-u", "--pivotal-tracker-username [ARG]") do |username|
-          Toolshed::Client.pivotal_tracker_username = username
+          Toolshed::Client.instance.pivotal_tracker_username = username
         end
         opts.on("-p", "--pivotal-tracker-password [ARG]") do |password|
-          Toolshed::Client.pivotal_tracker_password = password
+          Toolshed::Client.instance.pivotal_tracker_password = password
         end
         opts.on("-d", "--debug [ARG]") do
-          Toolshed::Client.debug = true
+          Toolshed::Client.instance.debug = true
         end
         opts.on('-v', '--version', 'Version') do
           Toolshed::Version.banner
@@ -108,9 +108,11 @@ Available Commands:
   toolshed delete_branch
   toolshed get_daily_time_update
   toolshed list_branches
+  toolshed mysql backup
   toolshed push_branch
   toolshed rename_branch
   toolshed scp download
+  toolshed scp upload
   toolshed ssh
   toolshed ticket_information
   toolshed update_pivotal_tracker_story_status

data/lib/toolshed/error.rb

@@ -1,13 +1,8 @@
 module Toolshed
-  class Error < StandardError
-  end
-
-  class RecordExists < Error
-  end
-
-  class RecordNotFoundError < Error
-  end
-
-  class AuthenticationFailed < Error
-  end
+  class Error < StandardError; end
+  class RecordExists < Error; end
+  class RecordNotFoundError < Error; end
+  class AuthenticationFailed < Error; end
+  class SSHResponseException < Error; end
+  class CorruptFileException < StandardError; end
 end

data/lib/toolshed/hash.rb

@@ -0,0 +1,36 @@
+require 'ostruct'
+
+class Hash
+  # Recursively converts a <tt>Hash</tt> and all nested <tt>Hash</tt>es to
+  # <tt>OpenStruct</tt>s. Especially useful for parsing YAML.
+  #     yaml=<<EOY
+  #     subject: Programming Languages
+  #     languages:
+  #       - name        : Ruby
+  #         creator     : Matz
+  #       - name        : Python
+  #         creator     : Guido van Rossum
+  #       - name        : Perl
+  #         creator     : Larry Wall
+  #     EOY
+  #     struct = YAML.load(yaml).to_ostruct
+  #     struct.subject
+  #     #=> "Programming Languages"
+  #     struct.languages.first
+  #     #=> #<OpenStruct name="Ruby", creator="Matz">
+  #     struct.languages.first.creator
+  #     #=> "Matz"
+  def to_ostruct
+    arr = map do |k, v|
+      case v
+      when Hash
+        [k, v.to_ostruct]
+      when Array
+        [k, v.map { |el| el.respond_to?(:to_ostruct) ? el.to_ostruct : el }]
+      else
+        [k, v]
+      end
+    end
+    OpenStruct.new(Hash[arr])
+  end
+end

data/lib/toolshed/password.rb

@@ -1,23 +1,23 @@
+require 'toolshed'
 require 'toolshed/client'
 
 module Toolshed
+  # Password module looks up password from configuration file if its found
   module Password
     def password_from_config(password)
       return '' if password.nil? || password.empty?
 
-      begin
-        credentials = Toolshed::Client.read_credenials
-        password_parts = password.split(':')
-        password_parts.each do |password_part|
-          return password if credentials[password_part].nil?
-          credentials = credentials[password_part]
-        end
-      rescue => e
-        Toolshed::Logger.instance.fatal e.message
-        Toolshed::Logger.instance.fatal e.inspect
-        return password
+      translated_password = Toolshed.configuration
+      password_parts = password.split(':')
+      password_parts.each do |password_part|
+        return password if translated_password[password_part].nil?
+        translated_password = translated_password[password_part]
       end
-      credentials
+      return translated_password
+    rescue => e
+      Toolshed::Logger.instance.fatal e.message
+      Toolshed::Logger.instance.fatal e.inspect
+      return password
     end
   end
 end

data/lib/toolshed/server_administration/ssh.rb

@@ -1,4 +1,6 @@
+require 'toolshed/error'
 require 'toolshed/password'
+require 'toolshed/timeout'
 
 require 'net/ssh'
 
@@ -9,7 +11,7 @@ module Toolshed
       include Toolshed::Password
 
       attr_accessor :channel, :commands, :data, :host, :keys, :password, :ssh_options, :sudo_password, :user # rubocop:disable LineLength
-      attr_reader :silent
+      attr_reader :silent, :timeout
 
       def initialize(options = nil) # rubocop:disable AbcSize, CyclomaticComplexity, PerceivedComplexity, LineLength
         options ||= {}
@@ -23,18 +25,27 @@ module Toolshed
         @password = options[:password] || ''
         @data = []
         @silent = options[:silent] || false
+        timeout_period = options[:timeout_period].to_i || 30
+        @timeout = Toolshed::Timeout.new(timeout_period: timeout_period)
 
         set_ssh_options
       end
 
       def execute
-        Net::SSH.start(host, user, ssh_options) do |ssh|
-          ssh.open_channel do |channel|
-            self.channel = channel
-            request_pty
-            run_commands
+        begin
+          timeout.start do
+            Net::SSH.start(host, user, ssh_options) do |ssh|
+              ssh.open_channel do |channel|
+                self.channel = channel
+                request_pty
+                run_commands
+              end
+              ssh.loop
+            end
           end
-          ssh.loop
+        rescue Toolshed::Timeout::Error => e
+          Toolshed.logger.fatal e.message
+          raise SSHResponseException, "Unable to handle response for #{data.last}"
         end
         data
       end
@@ -55,6 +66,7 @@ module Toolshed
 
         def request_pty
           channel.request_pty do |_ch, success|
+            timeout.reset_start_time
             unless silent
               message = (success) ? 'Successfully obtained pty' : 'Could not obtain pty'
               puts message
@@ -70,6 +82,7 @@ module Toolshed
 
         def on_extended_data
           channel.on_extended_data do |_ch, _type, data|
+            timeout.reset_start_time
             puts "stderr: #{data}" unless silent
           end
         end
@@ -78,13 +91,13 @@ module Toolshed
           channel.on_data do |_ch, data|
             puts "#{data}" unless silent
             self.data << data
+            timeout.reset_start_time
             send_data(data)
           end
         end
 
         def send_data(data)
           send_password_data if data =~ /password/
-          # send_yes_no_data if data =~ /Do you want to continue \[Y\/n\]?/
           send_yes_no_data if data =~ %r{Do you want to continue [Y/n]?}
         end
 

data/lib/toolshed/ticket_tracking/pivotal_tracker.rb

@@ -24,7 +24,6 @@ module Toolshed
         end
 
         self.token = ::PivotalTracker::Client.token(username, password)
-
         self.project_id = (options[:project_id].nil?) ? Toolshed::Client.instance.default_pivotal_tracker_project_id : options[:project_id]
         @pt_project = ::PivotalTracker::Project.find(self.project_id)
         self.story = @pt_project.stories.find(options[:ticket_id])

data/lib/toolshed/timeout.rb

@@ -0,0 +1,95 @@
+require 'time'
+
+module Toolshed
+  THIS_FILE = /\A#{Regexp.quote(__FILE__)}:/o
+  CALLER_OFFSET = ((c = caller[0]) && THIS_FILE =~ c) ? 1 : 0
+  private_constant :THIS_FILE, :CALLER_OFFSET
+
+  # https://github.com/ruby/ruby/blob/trunk/lib/timeout.rb
+  # This code had to be modified so the timeout could be extended instead of just being a fixnum.
+  # This is import for the SSH client as we want it to keep running for an unlimited time period as
+  # long as we are getting output from the client. When that stops then the timeout needs to kick in
+  # just in case the server is no longer responding or a connection got lost. Too bad ruby core doesn't
+  # already support something like this.
+  class Timeout
+    attr_accessor :start_time
+    attr_reader :timeout_period
+
+    def initialize(options = nil)
+      options ||= {}
+      @timeout_period = options[:timeout_period] || 30
+      @start_time = options[:start_time] || Time.now.utc.to_i
+    end
+
+    def reset_start_time
+      @start_time = Time.now.utc.to_i
+    end
+
+    def start(klass = nil)   #:yield: +sec+
+      return yield(timeout_period) if timeout_period == nil or timeout_period.zero?
+      message = "execution expired in #{timeout_period} seconds".freeze
+      e = Error
+      bl = proc do |exception|
+        begin
+          x = Thread.current
+          y = Thread.start {
+            begin
+              sleep(1) until timed_out?
+            rescue => e
+              x.raise e
+            else
+              x.raise exception, message
+            end
+          }
+          return yield(timeout_period)
+        ensure
+          if y
+            y.kill
+            y.join # make sure y is dead.
+          end
+        end
+      end
+      if klass
+        begin
+          bl.call(klass)
+        rescue klass => e
+          bt = e.backtrace
+        end
+      else
+        bt = Error.catch(message, &bl)
+      end
+      level = -caller(CALLER_OFFSET).size-2
+      while THIS_FILE =~ bt[level]
+        bt.delete_at(level)
+      end
+      raise(e, message, bt)
+    end
+
+    def timed_out?
+      Time.now.utc.to_i - start_time > timeout_period
+    end
+
+    # Raised by Timeout#timeout when the block times out.
+    class Error < RuntimeError
+      attr_reader :thread
+
+      def self.catch(*args)
+        exc = new(*args)
+        exc.instance_variable_set(:@thread, Thread.current)
+        ::Kernel.catch(exc) {yield exc}
+      end
+
+      def exception(*)
+        # TODO: use Fiber.current to see if self can be thrown
+        if self.thread == Thread.current
+          bt = caller
+          begin
+            throw(self, bt)
+          rescue UncaughtThrowError
+          end
+        end
+        self
+      end
+    end
+  end
+end

data/lib/toolshed/version.rb

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

data/lib/toolshed.rb

@@ -15,7 +15,7 @@ module Toolshed
 
   class << self
     def add_file_log_source(command_name = '')
-      log_path = Toolshed::Client.instance.log_path
+      log_path = Toolshed.configuration.log_path
       return if log_path.nil? || log_path.empty?
 
       FileUtils.mkdir_p(log_path)
@@ -27,6 +27,10 @@ module Toolshed
       logger.add_log_source(file)
     end
 
+    def configuration
+      Toolshed::Client.instance
+    end
+
     def deprecate(message = nil)
       message ||= 'You are using deprecated behavior which will be removed from the next major or minor release.' # rubocop:disable Metrics/LineLength
       warn("DEPRECATION WARNING: #{message}")

data/test/.toolshedrc

@@ -1 +1,3 @@
 server_password: "tester1234"
+use_git_submodules: false
+git_quiet: ''

data/test/commands/create_pull_request_test.rb

@@ -103,26 +103,18 @@ class CreatePullRequestTest < Test::Unit::TestCase
     pivotal_tracker_mock = mock('PivotalTracker::Client')
     pivotal_tracker_mock.stubs(:id => '1')
 
-    PivotalTracker::Project.expects(:find).
-    with(Toolshed::Client.instance.default_pivotal_tracker_project_id).
-    returns(pivotal_tracker_mock)
+    PivotalTracker::Project.expects(:find).with(Toolshed::Client.instance.default_pivotal_tracker_project_id).returns(pivotal_tracker_mock)
 
     # mock up the story information
     pivotal_tracker_story_mock = mock('PivotalTracker::Story')
     pivotal_tracker_story_mock.stubs(:url => 'http://www.example.com', :id => '1', :name => "Test Title")
 
-    pivotal_tracker_mock.expects(:stories).
-    returns(pivotal_tracker_story_mock)
+    pivotal_tracker_mock.expects(:stories).returns(pivotal_tracker_story_mock)
 
-    pivotal_tracker_story_mock.expects(:find).
-    with('1').
-    returns(pivotal_tracker_story_mock)
+    pivotal_tracker_story_mock.expects(:find).with('1').returns(pivotal_tracker_story_mock)
 
-    Toolshed::TicketTracking::PivotalTracker.any_instance.expects(:title).
-    returns("Sample")
-
-    Toolshed::TicketTracking::PivotalTracker.any_instance.expects(:url).
-    returns("github.com/pulls/1")
+    Toolshed::TicketTracking::PivotalTracker.any_instance.expects(:title).returns("Sample")
+    Toolshed::TicketTracking::PivotalTracker.any_instance.expects(:url).returns("github.com/pulls/1")
 
     # stub the possible input
     Toolshed::Commands::CreatePullRequest.any_instance.stubs(:read_user_input_ticket_tracker_ticket_id).returns('1')

data/test/commands/mysql/backup_test.rb

@@ -0,0 +1,38 @@
+require 'commands/commands_helper'
+require 'toolshed/commands/mysql/backup'
+
+module Test
+  module Commands
+    module Mysql
+      class BackupTest < Test::Unit::TestCase
+        def setup
+          Toolshed::Logger.instance.instance_variable_set(:@logs, { debug: [], fatal: [], info: [], warn: [] })
+          Toolshed.expects(:die).at_least(0).returns('Exiting')
+        end
+
+        def teardown
+          Toolshed::Logger.instance.instance_variable_set(:@logs, { debug: [], fatal: [], info: [], warn: [] })
+        end
+
+        def test_execute
+          Toolshed::Base.expects(:wait_for_command).returns(true)
+
+          path = '/tmp/testing/test.sql'
+          username = 'test'
+          password = 'test'
+          name = 'localdb'
+
+          mysql_backup_command = Toolshed::Commands::Mysql::Backup.new
+          mysql_backup_command.execute({}, path: path, username: username, password: password, name: name)
+
+          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.')
+        end
+
+        def test_cli_options
+          assert 'Usage: mysql backup [options]', Toolshed::Commands::Mysql::Backup.cli_options[:banner]
+        end
+      end
+    end
+  end
+end

data/test/databases/mysql/backup_test.rb

@@ -0,0 +1,45 @@
+require 'commands/commands_helper'
+require 'toolshed/databases/mysql/backup'
+
+module Test
+  module Databases
+    module Mysql
+      class BackupTest < Test::Unit::TestCase
+        def setup
+          Toolshed::Logger.instance.instance_variable_set(:@logs, { debug: [], fatal: [], info: [], warn: [] })
+          Toolshed.expects(:die).at_least(0).returns('Exiting')
+        end
+
+        def teardown
+          Toolshed::Logger.instance.instance_variable_set(:@logs, { debug: [], fatal: [], info: [], warn: [] })
+        end
+
+        def test_execute
+          Toolshed::Base.expects(:wait_for_command).returns(true)
+
+          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
+
+          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.')
+        end
+
+        def test_raises_type_error_if_wait_time_is_not_a_fixnum
+          path = '/tmp/testing/test.sql'
+          username = 'test'
+          password = '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
+          end
+          assert_equal 'Wait time passed in is not a number bla', ex.message
+        end
+      end
+    end
+  end
+end

data/test/helper.rb

@@ -21,9 +21,7 @@ require 'toolshed'
 require 'toolshed/logger'
 
 Test::Unit.at_start do
-  Toolshed::Client.instance.use_git_submodules = false
   #Toolshed::Client.git_quiet = '&> /dev/null' unless ENV['RUNNING_ON_CI']
-  Toolshed::Client.instance.git_quiet = ''
 
   I18n.config.enforce_available_locales = true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toolshed
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Jake Waller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -349,6 +349,7 @@ files:
 - lib/toolshed/commands/delete_branch.rb
 - lib/toolshed/commands/get_daily_time_update.rb
 - lib/toolshed/commands/list_branches.rb
+- lib/toolshed/commands/mysql/backup.rb
 - lib/toolshed/commands/push_branch.rb
 - lib/toolshed/commands/rename_branch.rb
 - lib/toolshed/commands/scp/download.rb
@@ -358,6 +359,7 @@ files:
 - lib/toolshed/commands/ticket_information.rb
 - lib/toolshed/commands/update_pivotal_tracker_story_status.rb
 - lib/toolshed/commands/update_ticket_status.rb
+- lib/toolshed/databases/mysql/backup.rb
 - lib/toolshed/entry_point.rb
 - lib/toolshed/error.rb
 - lib/toolshed/exceptions.rb
@@ -365,6 +367,7 @@ files:
 - lib/toolshed/git/branch.rb
 - lib/toolshed/git/github.rb
 - lib/toolshed/git/validator.rb
+- lib/toolshed/hash.rb
 - lib/toolshed/logger.rb
 - lib/toolshed/password.rb
 - lib/toolshed/server_administration/scp.rb
@@ -374,6 +377,7 @@ files:
 - lib/toolshed/ticket_tracking/ticket_tracking.rb
 - lib/toolshed/time_tracking/harvest.rb
 - lib/toolshed/time_tracking/time_tracking.rb
+- lib/toolshed/timeout.rb
 - lib/toolshed/version.rb
 - test/.toolshedrc
 - test/commands/checkout_branch_test.rb
@@ -382,11 +386,13 @@ files:
 - test/commands/create_pull_request_test.rb
 - test/commands/delete_branch_test.rb
 - test/commands/get_daily_time_update_test.rb
+- test/commands/mysql/backup_test.rb
 - test/commands/push_branch_test.rb
 - test/commands/rename_branch_test.rb
 - test/commands/scp/download_test.rb
 - test/commands/scp/upload_test.rb
 - test/config.rb
+- test/databases/mysql/backup_test.rb
 - test/git/git_helper.rb
 - test/git/git_test.rb
 - test/git/github_test.rb
@@ -430,11 +436,13 @@ test_files:
 - test/commands/create_pull_request_test.rb
 - test/commands/delete_branch_test.rb
 - test/commands/get_daily_time_update_test.rb
+- test/commands/mysql/backup_test.rb
 - test/commands/push_branch_test.rb
 - test/commands/rename_branch_test.rb
 - test/commands/scp/download_test.rb
 - test/commands/scp/upload_test.rb
 - test/config.rb
+- test/databases/mysql/backup_test.rb
 - test/git/git_helper.rb
 - test/git/git_test.rb
 - test/git/github_test.rb