mysqlknife 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64d3e0390cc156897b1ddcc00dcf504b4827efe6
-  data.tar.gz: 554659f79e7e4a77e36393642c86bf24202fb7c5
+  metadata.gz: a03ea9be5431114a2994d4555e8b180154bcfb9e
+  data.tar.gz: 123936c664b5f65e7ab9acbccbca92f5207ae916
 SHA512:
-  metadata.gz: 0110d55f6534595b8ffeaef109726bf05b493c24c4ce8aa49ab8afd44c916b9bae5691ae634de0524ad03649a8dfc6eac3a01f3c2e045bb5d1b2a755fa43f936
-  data.tar.gz: 99999f5252579a5be36d075bd9a89bfb885c206ea3c75f4e8507c47298c4486f3e4b67aa60cb231b4661a2eab05b0c9ca62482136f6ab0c2dbd801f199c07f30
+  metadata.gz: 09df895d047d11cd9381dcde799f1230075b9bb71fd1ca0b2ccc1b30c027b1dc3725094e8d6aad8d78af3ff9614b269060f49c2112664c35caa9d137f5787a9a
+  data.tar.gz: a53af626107070712aa14ed86a5a3ef4a684250f6cfb48f70defc5511785ff4ad9351bc0e10dfea4a9acb9265402154693a020e7ab49f8ee1f945972f13ee043

data/README.md

@@ -1,13 +1,12 @@
 # Mysqlknife [![Build Status](https://travis-ci.org/swapbytes/mysqlknife.svg?branch=newfeature%2F3)](https://travis-ci.org/swapbytes/mysqlknife)
 
 MySQL Knife is a Ruby Gem and command line tools, written for MAC OS because use
-iTerm2 to set tab colors on terminal. That allows many tasks in MySQL Administration
-is easily for normal installation (MySQL) or in Amazon RDS. You can:
+iTerm2 to set tab colors on terminal. That allows many connections bookmark and
+tasks for MySQL Administration. You can:
 
 - Connections bookmark.
-- Run command on connection.
-- Skip error is slave.
-- Kill process.
+- Connections over SSH.
+- Run command on active connection.
 
 ![mysqlknife](https://github.com/nicola51980/mysqlknife/blob/master/assets/mysqlknife.gif)
 
@@ -36,6 +35,12 @@ ssh:
   port: 22
   keys: '~/.ssh/default.pem'
 
+commands:
+  innotop:
+    'innotop -h #{host} -u #{username} #{password}'
+  lag:
+    'mysql -h #{host} -u #{username} #{password} --execute="SHOW SLAVE STATUS\G"'
+
 databases:
   localhost:
     ssh: false
@@ -55,8 +60,6 @@ databases:
     slaves:
       - devel-mysql-slave01.demo.com
       - devel-mysql-slave02.demo.com
-    tools:
-      - 'innotop -h #{@host} -u #{@username} #{@password}'
 
   prod:
     ssh: true

data/lib/mysqlknife.rb

@@ -2,10 +2,8 @@
 
 require 'rubygems'
 require 'logger'
-require 'mysql2'
 require 'resolv'
 require 'singleton'
-require 'terminal-table'
 require 'thor'
 require 'yaml'
 

data/lib/mysqlknife/cli.rb

@@ -2,143 +2,59 @@
 
 module Mysqlknife
   class CLI < Thor
-    class_option :verbose, :type => :boolean
+    class_option :debug, :type => :boolean
 
     def initialize(*args)
       super
 
-      @config     = Configs.instance
-      @mysql      = MySQL.new
-      @mysql_cmd  = Mysql::Command.new
-      @mysql_sql  = Mysql::SQL.new
-      @command    = Command.new
-      @parameters = Parameters.new
-      $DEBUG      = options[:verbose]
+      $DEBUG = options[:debug]
     end
 
     desc 'config [CONFIG]', 'Show connection details.'
     def config(conn = nil)
-      @parameters.connection = conn
-      @parameters.connections
-      @parameters.connection_details
+      config = Parameter::Config.new
+      config.connection = conn
+      config.connections
+      config.show
     end
 
-    desc 'console [CONFIG] [DATABASE]', 'Connect to specific CONNECTION.'
+    desc 'console [CONFIG] [HOST]', 'Connect to specific CONNECTION.'
     option :execute,
            desc: 'Execute query.',
            type: :string,
            aliases: :e
-    def console(conn = nil, database = nil)
-      @parameters.connection = conn
-      @parameters.database   = database
-      @parameters.connections
-      @parameters.hosts
-
-      if @parameters.host_selected
-        @config.connection(conn)
-        @config.mysql_host     = @parameters.host
-        @config.mysql_database = database
-
-        @command.execute(@mysql_cmd.console(options[:execute]))
-      end
-    end
-
-    desc 'lag [CONFIG]', 'Show replica lag status.'
-    def lag(conn = nil, host = nil)
-      @parameters.connection = conn
-      @parameters.host       = host
-      @parameters.connections
-      @parameters.slaves
-
-      if @parameters.slave_selected
-        @config.connection(conn)
-        @config.mysql_host = @parameters.host
-
-        @command.execute(@mysql_cmd.console(@mysql_sql.replica_lag))
-      end
+    def console(conn = nil, host = nil)
+      console = Parameter::Console.new
+      console.connection = conn
+      console.host       = host
+      console.execute    = options[:execute]
+      console.connections
+      console.hosts
+      console.connect
     end
 
-    desc 'describe [CONFIG] [DATABASE] [TABLE]', 'Describe database, table, keys details.'
+    desc 'describe [CONFIG] [HOST] [DATABASE] [TABLE]', 'Describe database, table, keys details.'
     def describe(conn = nil, host = nil, database = nil, table = nil)
-      @parameters.connection = conn
-      @parameters.host       = host
-      @parameters.connections
-      @parameters.hosts
-
-      if @parameters.host_selected
-        @config.connection(conn)
-        @config.mysql_host = @parameters.host
-
-        @command.execute(@mysql_cmd.describe(database, table))
-      end
-    end
-
-    desc 'command [CONFIG] [TOOL]', 'Execute specific command line.'
-    def command(conn = nil, tool = nil)
-      @parameters.connection = conn
-      @parameters.tool       = tool
-      @parameters.connections
-      @parameters.tools
-
-      if @parameters.tool_selected
-        @config.connection(conn)
-        @config.mysql_host = @parameters.host
-
-        @command.execute(@mysql_cmd.parse(@parameters.tool))
-      end
-    end
-
-    desc 'kill [CONFIG]', 'Kill process in MySQL or RDS'
-    long_desc <<-LONGDESC
-      Syntax:
-        This action no bypass to ssh.
-
-        mysqlknife kill [CONFIG] --where "user = 'foo' AND time >= 28800"
-      LONGDESC
-    option :where,
-           default:  'time >= 28800',
-           desc:     'Conditions to filter.',
-           required: true,
-           type:     :string,
-           aliases:  :w
-    option :kill,
-           desc: 'Execute kill statements.',
-           type: :boolean
-    def kill(conn = nil, host = nil)
-      @parameters.connection = conn
-      @parameters.host       = host
-      @parameters.connections
-      @parameters.hosts
-
-      if @parameters.host_selected
-        @config.connection(conn)
-        @config.mysql_host = @parameters.host
-
-        @kill       = Mysql::Kill.new
-        @kill.where = options[:where]
-
-        if options[:kill]
-          @kill.clear
-        else
-          @kill.show
-        end
-      end
+      describe = Parameter::Describe.new
+      describe.connection = conn
+      describe.host       = host
+      describe.database   = database
+      describe.table      = table
+      describe.connections
+      describe.hosts
+      describe.connect
     end
 
-    desc 'skip [CONFIG]', 'Skipping the current replication error in Amazon RDS.'
-    def skip(conn = nil, host = nil)
-      @parameters.connection = conn
-      @parameters.host       = host
-      @parameters.connections
-      @parameters.slaves
-
-      if @parameters.slave_selected
-        @config.connection(conn)
-        @config.mysql_host = @parameters.host
-
-        @replica = Mysql::Replica.new
-        @replica.skip
-      end
+    desc 'command [CONFIG] [HOST] [COMMAND]', 'Execute specific command line.'
+    def command(conn = nil, host = nil, cmd = nil)
+      command = Parameter::Command.new
+      command.connection = conn
+      command.host       = host
+      command.cmd        = cmd
+      command.connections
+      command.hosts
+      command.commands
+      command.connect
     end
 
     desc 'version', 'Show version number.'

data/lib/mysqlknife/command.rb

@@ -3,25 +3,23 @@
 module Mysqlknife
   class Command
     def initialize
-      @cnf   = Configs.instance
-      @ssh   = SSH.new
-      @iterm = Iterm.new
+      @config = Configs.instance
+      @ssh    = SSH.new
+      @iterm  = Iterm.new
     end
 
     def execute(cmd)
-      if cmd.nil?
-        exit 1
-      end
+      return false if cmd.nil?
 
-      @iterm.color(@cnf.ssh_color)
-      @iterm.name(@cnf.name)
+      @iterm.color(@config.color)
+      @iterm.name(@config.name)
 
-      if @cnf.ssh_use
+      if @config.ssh[:use]
         cmd = @ssh.execute(cmd)
       end
 
       Mysqlknife::Log.new.command(cmd)
-      system cmd
+      system(cmd)
     ensure
       @iterm.name
       @iterm.reset

data/lib/mysqlknife/configs.rb

@@ -4,25 +4,14 @@ module Mysqlknife
   class Configs
     include Singleton
 
-    attr_writer :mysql_host,
-                :mysql_database
-    attr_reader :path,
-                :ssh_host,
-                :ssh_port,
-                :ssh_user,
-                :ssh_password,
-                :ssh_key,
-                :ssh_color,
-                :ssh_use,
+    attr_writer :connection
+    attr_reader :mysql,
+                :ssh,
                 :connections,
-                :configs,
+                :color,
                 :name,
-                :mysql_host,
-                :mysql_username,
-                :mysql_password,
-                :mysql_port,
-                :mysql_database,
-                :mysql_slave
+                :host,
+                :commands
 
     def initialize
       # Define path for config file:
@@ -41,13 +30,16 @@ module Mysqlknife
       end
 
       # Define generic variables:
-      @path         = path
-      @ssh_host     = @configs['ssh']['host']
-      @ssh_port     = @configs['ssh']['port']
-      @ssh_user     = @configs['ssh']['user']
-      @ssh_password = @configs['ssh']['password']
-      @ssh_key      = @configs['ssh']['keys']
-      @connections  = @configs['databases'].keys.sort
+      @ssh   = {}
+      @mysql = {}
+
+      @ssh[:host]     = @configs['ssh']['host']
+      @ssh[:port]     = @configs['ssh']['port']
+      @ssh[:user]     = @configs['ssh']['user']
+      @ssh[:password] = @configs['ssh']['password']
+      @ssh[:key]      = @configs['ssh']['keys']
+      @connections    = @configs['connections'].keys.sort
+      @commands       = @configs['commands'].keys.sort
     end
 
     def method_missing(name, *args)
@@ -56,52 +48,42 @@ module Mysqlknife
         param = method[1]
         conn  = args[0]
 
-        if @configs['databases'].include?(conn)
-          @configs['databases'][conn][param]
-        else
-          puts "Not exist connecion name: #{conn}"
-          exit 1
+        if @configs['connections'].include?(conn)
+          @configs['connections'][conn][param]
         end
       end
     end
 
     def connection(name)
-      @name           = name
-      @ssh_color      = db_color(name)
-      @ssh_use        = db_ssh(name)
-      @mysql_host     = db_host(name)
-      @mysql_port     = db_port(name)
-      @mysql_username = db_username(name)
-      @mysql_password = db_password(name)
-      @mysql_slave    = db_slave(name)
+      @name             = name
+      @color            = db_color(@name)
+      @ssh[:use]        = db_ssh(@name)
+      @mysql[:host]     = db_host(@name)
+      @mysql[:port]     = db_port(@name)
+      @mysql[:username] = db_username(@name)
+      @mysql[:password] = db_password(@name)
+      @mysql[:slaves]   = db_slaves(@name)
     end
 
-    def show(name)
-      host     = db_host(name)
-      port     = db_port(name)
-      username = db_username(name)
-      password = db_password(name)
-      slave    = db_slave(name)
+    def hosts
+      (@mysql[:slaves] = []) if @mysql[:slaves].nil?
+      (@mysql[:host]   = '') if @mysql[:host].nil?
 
-      %W[Master:\ #{host}
-         Slaves:\ #{slave}
-         Port:\ #{port}
-         Username:\ #{username}
-         Password:\ #{password}].join("\n")
+      (@mysql[:host] + ',' + @mysql[:slaves].join(',')).split(',')
     end
 
-    def tools(name)
-      unless db_tools(name).nil?
-        db_tools(name).map {|tool| tool.split.first(1).first }
-      else
-        puts "Please, add custom tools in config file."
-        exit 1
+    def select(name)
+      if hosts.is_a?(Array)
+        hosts.each do |host|
+          return @host = host if host.include?(name)
+        end
       end
+      nil
     end
 
-    def tool(tool)
-      unless db_tools(@name).nil?
-        db_tools(@name).select { |command| /#{tool}/.match(command.to_s) }.first
+    def command(name)
+      if @configs['commands'].key?(name)
+        @configs['commands'][name]
       end
     end
   end

data/lib/mysqlknife/iterm.rb

@@ -2,9 +2,11 @@
 
 module Mysqlknife
   class Iterm
-    @@colors = { orange: [255,128,000],
+    def initialize
+      @color = { orange: [255,128,000],
                  green:  [000,255,000],
                  red:    [255,000,000] }
+    end
 
     def name(name = nil)
       print "\033]0;#{name}\007"
@@ -12,10 +14,9 @@ module Mysqlknife
 
     def color(name)
       name  = name.to_sym
-
-      red   = @@colors[name][0]
-      green = @@colors[name][1]
-      blue  = @@colors[name][2]
+      red   = @color[name][0]
+      green = @color[name][1]
+      blue  = @color[name][2]
 
       print "\033]6;1;bg;red;brightness;#{red}\a"
       print "\033]6;1;bg;green;brightness;#{green}\a"

data/lib/mysqlknife/log.rb

@@ -8,31 +8,8 @@ module Mysqlknife
       @log = Logger.new(STDOUT)
     end
 
-    def kill(process)
-      process = process.map { |k, v| "#{k}: #{v}" }.join(', ')
-      @log.info("Kill MySQL Process: #{process}")
-    end
-
-    def sql(statement)
-      @log.debug("SQL Statement: #{statement}") if $DEBUG
-    end
-
-    def sql_error(error, sql)
-      @log.debug("SQL Error: #{error}")
-      @log.debug("SQL Statement: #{sql}")
-    end
-
     def command(command)
       @log.debug("Bash Command: #{command}") if $DEBUG
     end
-
-    def skip_repl_error(status)
-      status = status.map { |k, v| "#{k}: #{v}" }.join(', ')
-      @log.info("MySQL Skip error replica: #{status}")
-    end
-
-    def message(text)
-      @log.info(text)
-    end
   end
 end

data/lib/mysqlknife/mysql.rb

@@ -1,29 +1,73 @@
 # encoding: utf-8
 
 module Mysqlknife
-  class MySQL
+  class Mysql
     def initialize
-      @cnf = Configs.instance
+      @config = Configs.instance
     end
 
-    def execute(sql)
-      if @cnf.ssh_use == false
-        conn = Mysql2::Client.new(host: @cnf.mysql_host,
-                                  port: @cnf.mysql_port,
-                                  username: @cnf.mysql_username,
-                                  password: @cnf.mysql_password,
-                                  database: @cnf.mysql_database)
+    def command?(name)
+      `which #{name}`
+      $?.success?
+    end
+
+    def check
+      command?('mysql')
+      command?('mysqlshow')
+    end
 
-        Mysqlknife::Log.new.sql(sql)
+    def purge(string)
+      string.squeeze(' ').strip
+    end
 
-        return conn.query(sql)
+    def parse(command)
+      host     = @config.host
+      port     = @config.mysql[:port]
+      username = @config.mysql[:username]
+      password = password(@config.mysql[:password])
+      command  = eval("\"#{command}\"")
+      purge(command)
+    end
+
+    def prompt
+      if !!(@config.host =~ Resolv::IPv4::Regex)
+        @config.name
       else
-        Mysqlknife::Log.new.message("Can't to connect by direct connection, this host use SSH.")
-        exit(1)
+        @config.host.partition('.').first
       end
-    rescue Mysql2::Error => error
-      Mysqlknife::Log.new.sql_error(error, sql)
-      exit(1)
+    end
+
+    def execute(sentence)
+      "--execute='#{sentence}'" unless sentence.nil? || sentence.empty?
+    end
+
+    def password(password)
+      "-p#{password}" unless password.nil? || password.empty?
+    end
+
+    def console(sentence = nil)
+      command = %W[mysql
+                   -h #{@config.host}
+                   -P #{@config.mysql[:port]}
+                   -u #{@config.mysql[:username]}
+                   #{password(@config.mysql[:password])}
+                   --prompt='#{prompt}[\\d]> '
+                   #{@config.mysql[:database]}
+                   #{execute(sentence)}
+                   2>/dev/null].join(' ')
+      purge(command)
+    end
+
+    def describe(*args)
+      command = %W[mysqlshow
+                   -h #{@config.host}
+                   -P #{@config.mysql[:port]}
+                   -u #{@config.mysql[:username]}
+                   #{password(@config.mysql[:password])}
+                   --keys
+                   #{args.join(' ')}
+                   2>/dev/null].join(' ')
+      purge(command)
     end
   end
 end

data/lib/mysqlknife/parameter/base.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+module Mysqlknife
+  module Parameter
+    class Base
+      attr_writer :connection, :host
+
+      def initialize
+        @command = Mysqlknife::Command.new
+        @config  = Mysqlknife::Configs.instance
+        @mysql   = Mysqlknife::Mysql.new
+      end
+
+      def connections
+        if @connection.nil?
+          puts "Connections:"
+          @config.connections.each do |conn|
+            puts " - #{conn}"
+          end
+        end
+      end
+
+      def hosts
+        if @connection.nil? == false &&
+           @host.nil?       == true
+          @config.connection(@connection)
+          puts "Hosts for connection: #{@connection}"
+          if @config.hosts.nil? == false &&
+             @config.hosts.count > 0 &&
+             @config.hosts.is_a?(Array)
+            @config.hosts.each do |host|
+              puts " - #{host}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mysqlknife/parameter/command.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+module Mysqlknife
+  module Parameter
+    class Command < Parameter::Base
+      attr_writer :cmd
+
+      def commands
+        if @connection.nil? == false &&
+           @host.nil?       == false &&
+           @cmd.nil?
+          puts "Commands:"
+          if @config.commands.nil? == false &&
+             @config.commands.count > 0 &&
+             @config.commands.is_a?(Array)
+            @config.commands.each do |command|
+              puts " - #{command}"
+            end
+          end
+        end
+      end
+
+      def connect
+        if @connection.nil? == false &&
+           @host.nil?       == false &&
+           @cmd.nil?        == false
+          @config.connection(@connection)
+          puts "Connecting to: #{@config.select(@host)}"
+          @command.execute(@mysql.parse(@config.command(@cmd)))
+        end
+      end
+    end
+  end
+end

data/lib/mysqlknife/parameter/config.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module Mysqlknife
+  module Parameter
+    class Config < Parameter::Base
+      def show
+        unless @connection.nil?
+          @config.connection(@connection)
+          puts "Connection: #{@connection}"
+          puts "  Hosts: #{@config.hosts.join(', ')}"
+          puts "  Port: #{@config.mysql[:port]}"
+          puts "  Username: #{@config.mysql[:username]}"
+          puts "  Password: #{@config.mysql[:password]}"
+        end
+      end
+    end
+  end
+end

data/lib/mysqlknife/parameter/console.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module Mysqlknife
+  module Parameter
+    class Console < Parameter::Base
+      attr_writer :execute
+
+      def connect
+        @config.connection(@connection)
+        if @connection.nil? == false &&
+           @host.nil?       == false
+          puts "Connecting to: #{@config.select(@host)}"
+          @command.execute(@mysql.console(@execute))
+        end
+      end
+    end
+  end
+end

data/lib/mysqlknife/parameter/describe.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module Mysqlknife
+  module Parameter
+    class Describe < Parameter::Base
+      attr_writer :database, :table
+
+      def connect
+        @config.connection(@connection)
+        if @connection.nil? == false &&
+           @host.nil?       == false
+          puts "Connecting to: #{@config.select(@host)}"
+          @command.execute(@mysql.describe(@database, @table))
+        end
+      end
+    end
+  end
+end

data/lib/mysqlknife/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Mysqlknife
-  VERSION = '2.0.5'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mysqlknife
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Nicola Strappazzon C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.18
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.18
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +24,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.19.1
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -95,11 +67,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.1'
 description: MySQL Knife is a Ruby Gem and command line tools, written for UNIX-like
-  operating systems. That allows many tasks in MySQL Administration is easily for
-  normal installation or in Amazon RDS. You can check two tables by checksum in two
-  servers (Master/Slave for example), Kill process with query, skipping the current
-  replication error.
-email: nicola51980@gmail.com
+  operating systems. That allows many connections bookmark and tasks for MySQL Administration.
+email: nicola@swapbytes.com
 executables:
 - mysqlknife
 extensions: []
@@ -111,12 +80,12 @@ files:
 - lib/mysqlknife/configs.rb
 - lib/mysqlknife/iterm.rb
 - lib/mysqlknife/log.rb
-- lib/mysqlknife/mysql/command.rb
-- lib/mysqlknife/mysql/kill.rb
-- lib/mysqlknife/mysql/replica.rb
-- lib/mysqlknife/mysql/sql.rb
 - lib/mysqlknife/mysql.rb
-- lib/mysqlknife/parameters.rb
+- lib/mysqlknife/parameter/base.rb
+- lib/mysqlknife/parameter/command.rb
+- lib/mysqlknife/parameter/config.rb
+- lib/mysqlknife/parameter/console.rb
+- lib/mysqlknife/parameter/describe.rb
 - lib/mysqlknife/ssh.rb
 - lib/mysqlknife/version.rb
 - lib/mysqlknife.rb
@@ -145,6 +114,5 @@ rubyforge_project:
 rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
-summary: MySQL and RDS tools for checksum, kill process, swap and resume replication
-  error.
+summary: MySQL Connections bookmark and tasks.
 test_files: []

data/lib/mysqlknife/mysql/command.rb

@@ -1,82 +0,0 @@
-# encoding: utf-8
-
-module Mysqlknife
-  module Mysql
-    class Command
-      def initialize
-        @cnf = Configs.instance
-      end
-
-      def connection(name)
-        @cnf.connection(name)
-      end
-
-      def host(host)
-        @cnf.mysql_host = host
-      end
-
-      def command?(name)
-        `which #{name}`
-        $?.success?
-      end
-
-      def check
-        command?('mysql')
-        command?('mysqlshow')
-      end
-
-      def purge(string)
-        string.squeeze(' ').strip
-      end
-
-      def parse(command)
-        host     = @cnf.mysql_host
-        port     = @cnf.mysql_port
-        username = @cnf.mysql_username
-        password = password(@cnf.mysql_password)
-        command  = eval("\"#{command}\"")
-        purge(command)
-      end
-
-      def prompt
-        if !!(@cnf.mysql_host =~ Resolv::IPv4::Regex)
-          @cnf.name
-        else
-          @cnf.mysql_host.partition('.').first
-        end
-      end
-
-      def execute(sentence)
-        "--execute='#{sentence}'" unless sentence.nil? || sentence.empty?
-      end
-
-      def password(password)
-        "-p#{password}" unless password.nil? || password.empty?
-      end
-
-      def console(sentence = nil)
-        command = %W[mysql
-                     -h #{@cnf.mysql_host}
-                     -P #{@cnf.mysql_port}
-                     -u #{@cnf.mysql_username}
-                     #{password(@cnf.mysql_password)}
-                     --prompt='#{prompt}[\\d]> '
-                     #{@cnf.mysql_database}
-                     #{execute(sentence)}
-                     ].join(' ')
-        purge(command)
-      end
-
-      def describe(*args)
-        command = %W[mysqlshow
-                     -h #{@cnf.mysql_host}
-                     -P #{@cnf.mysql_port}
-                     -u #{@cnf.mysql_username}
-                     #{password(@cnf.mysql_password)}
-                     --keys
-                     #{args.join(' ')}].join(' ')
-        purge(command)
-      end
-    end
-  end
-end

data/lib/mysqlknife/mysql/kill.rb

@@ -1,75 +0,0 @@
-# encoding: utf-8
-
-module Mysqlknife
-  module Mysql
-    class Kill
-      attr_writer :where
-
-      def initialize
-        @mysql     = MySQL.new
-        @mysql_sql = Mysql::SQL.new
-      end
-
-      def clear
-        if check_privileges
-          list.each do |process|
-            kill(process)
-          end
-        else
-          Mysqlknife::Log.new.message("Don't have privileges to kill process")
-        end
-      end
-
-      def check_user
-        sql    = @mysql_sql.current_user
-        result = @mysql.execute(sql).first['CURRENT_USER'] =~ /^root\@/
-
-        return true if result
-      end
-
-      def check_grants
-        sql    = @mysql_sql.current_user_grants
-        result = @mysql.execute(sql).first.values.to_s =~ /(PROCESS)|(ALL PRIVILEGES)/
-
-        return true if result
-      end
-
-      def check_privileges
-        check_user || check_grants
-      end
-
-      def list
-        @mysql.execute(@mysql_sql.show_processlist(@where))
-      end
-
-      def show
-        process = list
-
-        unless process.first.nil?
-          table = Terminal::Table.new do |t|
-            t.add_row(process.first.keys)
-            t.add_separator
-            process.each do |row|
-              t.add_row(row.values)
-            end
-          end
-          puts table
-        end
-      end
-
-      def rds?
-        ! @mysql.execute(@mysql_sql.show_procedure('rds_kill')).first
-      end
-
-      def kill(process)
-        if rds?
-          @mysql.execute(@mysql_sql.mysql_kill(process['id']))
-        else
-          @mysql.execute(@mysql_sql.rds_kill(process['id']))
-        end
-
-        Mysqlknife::Log.new.kill(process)
-      end
-    end
-  end
-end

data/lib/mysqlknife/mysql/replica.rb

@@ -1,39 +0,0 @@
-# encoding: utf-8
-
-module Mysqlknife
-  module Mysql
-    class Replica
-      def initialize
-        @mysql     = MySQL.new
-        @mysql_cmd = Mysql::Command.new
-        @mysql_sql = Mysql::SQL.new
-
-        @status    = slave_status
-      end
-
-      def sql_running?
-        @status['Slave_SQL_Running'] == 'Yes'
-      end
-
-      def rds?
-        ! @mysql.execute(@mysql_sql.show_procedure('mysql.rds_skip_repl_error')).first
-      end
-
-      def slave_status
-        @mysql.execute(@mysql_sql.slave_status).first
-      end
-
-      def skip
-        unless sql_running?
-          Mysqlknife::Log.new.skip_repl_error(@status)
-
-          if rds?
-            @mysql.execute(@mysql_sql.rds_skip_repl_error)
-          else
-            @mysql.execute(@mysql_sql.mysql_skip_repl_error)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/mysqlknife/mysql/sql.rb

@@ -1,58 +0,0 @@
-# encoding: utf-8
-
-module Mysqlknife
-  module Mysql
-    class SQL
-      def current_user
-        'SELECT CURRENT_USER;'
-      end
-
-      def current_user_grants
-        'SHOW GRANTS FOR CURRENT_USER;'
-      end
-
-      def replica_lag
-        'SHOW SLAVE STATUS\G'
-      end
-
-      def show_processlist(where = nil)
-        sql = %w(SELECT id, user, host, db, command, time, state, info
-                 FROM INFORMATION_SCHEMA.PROCESSLIST
-                 WHERE state NOT REGEXP '(slave|relay|event)'
-                 AND user NOT IN ('rdsadmin',
-                 'rdsrepladmin',
-                 'system user',
-                 'event_scheduler')
-                 AND id != CONNECTION_ID()
-                 AND command != 'Binlog Dump').join(' ')
-        sql << " AND #{where};" unless where.nil?
-      end
-
-      def show_procedure(name)
-        "SHOW PROCEDURE STATUS LIKE '#{name}';"
-      end
-
-      def mysql_skip_repl_error
-        %w(STOP SLAVE;
-           SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1;
-           START SLAVE;).join(' ')
-      end
-
-      def mysql_kill(pid)
-        "KILL #{pid};"
-      end
-
-      def slave_status
-        'SHOW SLAVE STATUS;'
-      end
-
-      def rds_kill(pid)
-        "CALL mysql.rds_kill(#{pid});"
-      end
-
-      def rds_skip_repl_error
-        'CALL mysql.rds_skip_repl_error;'
-      end
-    end
-  end
-end

data/lib/mysqlknife/parameters.rb

@@ -1,31 +0,0 @@
-# encoding: utf-8
-
-module Mysqlknife
-  class Parameters
-    attr_writer :connection, :tool, :database
-    attr_reader :command, :database
-
-    def initialize
-      @cnf = Configs.instance
-    end
-
-    def connections
-      if @connection.nil?
-        puts @cnf.connections
-      end
-    end
-
-    def connection_details
-      unless @connection.nil?
-        puts @cnf.show(@connection)
-      end
-    end
-
-    def tools
-      if @connection.nil? == false &&
-         @tool.nil?       == true
-        puts @cnf.tools(@connection)
-      end
-    end
-  end
-end