mysqlknife 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81305d66b9c0ae4b1c9c271d28e8032498f3f512
-  data.tar.gz: 7f52e158f028daef61d7203a767b377e015d09e8
+  metadata.gz: d8a227c29e05ee08b25b08ee67a49d8aa2847476
+  data.tar.gz: f7c3d9d1d50f42bf270f804f6d96490a4135ea82
 SHA512:
-  metadata.gz: 6828dc4d711aab05bb6a033e820d7691fb9b862c6bb496c4d4690071b29d882a2b48abdd234d39606850731e11fdaff411654fda9053a33ff973211b48bb3a6d
-  data.tar.gz: a9a2f5646b9da7af657a85e046de47f280b5bc18c18597e38b7cbf2f384f0daf4c5c9d0ad3d2f5e8e84f19ca5cb21e619e0486a4f5f8a93aca402aa4b0ce1203
+  metadata.gz: 7347d4ae6a745b67794a5d572f653e9009a3a9b5ff22bc8d6020291551823ccecee0bb81a27939233d3bd289e6f7108c7e83b26fb7ea2ecfbb1cee14de2043c1
+  data.tar.gz: 31b9577b70192c5c82b826f81f7faf88e8c587ecd83b3240cd7f8852f02597dc009dfa6ef01e2206758c17a2cd3359b0b3813cdb5c3e7a8fe12ed06237545e0f

data/README.md

@@ -1,28 +1,33 @@
-# Mysqlknife
+# 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 colors. 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 tasks in MySQL Administration
+is easily for normal installation (MySQL) or in Amazon RDS. You can:
 
-- Configure many connections to access and run any commands.
+- Connections bookmark.
+- Run command on connection.
 - Skip error is slave.
 - Kill process.
 
+![mysqlknife](https://github.com/nicola51980/mysqlknife/blob/master/assets/mysqlknife.gif)
+
 ## Installation
 
 Install this tool executing the following command:
 
-```Shell
+```bash
 $ gem install mysqlknife
 ```
 
 ## Configuration:
 
-```shell
-vim ~/.db.yml
+Create this file in yours home directory:
+
+```bash
+$ vim ~/.db.yml
 ```
 
-Configuration file example:
+Put this lines into file:
 
 ```
 ssh:

data/lib/mysqlknife.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'rubygems'
 require 'logger'
 require 'mysql2'
 require 'resolv'

data/lib/mysqlknife/cli.rb

@@ -23,19 +23,19 @@ module Mysqlknife
       @parameters.connection_details
     end
 
-    desc 'console [CONFIG] [HOST] [DATABASE]', 'Connect to specific CONNECTION.'
+    desc 'console [CONFIG] [DATABASE]', 'Connect to specific CONNECTION.'
     option :execute,
            desc: 'Execute query.',
            type: :string,
            aliases: :e
-    def console(conn = nil, host = nil, database = nil)
+    def console(conn = nil, database = nil)
       @parameters.connection = conn
-      @parameters.host       = host
+      @parameters.database   = database
       @parameters.connections
       @parameters.hosts
 
       if @parameters.host_selected
-        @config.settings(conn)
+        @config.connection(conn)
         @config.mysql_host     = @parameters.host
         @config.mysql_database = database
 
@@ -43,7 +43,7 @@ module Mysqlknife
       end
     end
 
-    desc 'lag [CONFIG] [HOST]', 'Show replica lag status.'
+    desc 'lag [CONFIG]', 'Show replica lag status.'
     def lag(conn = nil, host = nil)
       @parameters.connection = conn
       @parameters.host       = host
@@ -51,14 +51,14 @@ module Mysqlknife
       @parameters.slaves
 
       if @parameters.slave_selected
-        @config.settings(conn)
+        @config.connection(conn)
         @config.mysql_host = @parameters.host
 
         @command.execute(@mysql_cmd.console(@mysql_sql.replica_lag))
       end
     end
 
-    desc 'describe [CONFIG] [HOST] [DATABASE] [TABLE]', 'Describe database, table, keys details.'
+    desc 'describe [CONFIG] [DATABASE] [TABLE]', 'Describe database, table, keys details.'
     def describe(conn = nil, host = nil, database = nil, table = nil)
       @parameters.connection = conn
       @parameters.host       = host
@@ -66,36 +66,34 @@ module Mysqlknife
       @parameters.hosts
 
       if @parameters.host_selected
-        @config.settings(conn)
+        @config.connection(conn)
         @config.mysql_host = @parameters.host
 
         @command.execute(@mysql_cmd.describe(database, table))
       end
     end
 
-    desc 'command [CONFIG] [HOST] [TOOL]', 'Execute specific command line.'
-    def command(conn = nil, host = nil, tool = nil)
+    desc 'command [CONFIG] [TOOL]', 'Execute specific command line.'
+    def command(conn = nil, tool = nil)
       @parameters.connection = conn
-      @parameters.host       = host
       @parameters.tool       = tool
       @parameters.connections
-      @parameters.hosts
       @parameters.tools
 
       if @parameters.tool_selected
-        @config.settings(conn)
+        @config.connection(conn)
         @config.mysql_host = @parameters.host
 
         @command.execute(@mysql_cmd.parse(@parameters.tool))
       end
     end
 
-    desc 'kill [CONFIG] [HOST]', 'Kill process in MySQL or RDS'
+    desc 'kill [CONFIG]', 'Kill process in MySQL or RDS'
     long_desc <<-LONGDESC
       Syntax:
         This action no bypass to ssh.
 
-        mysqlknife kill [CONFIG] [HOST] --where "user = 'foo' AND time >= 28800"
+        mysqlknife kill [CONFIG] --where "user = 'foo' AND time >= 28800"
       LONGDESC
     option :where,
            default:  'time >= 28800',
@@ -113,7 +111,7 @@ module Mysqlknife
       @parameters.hosts
 
       if @parameters.host_selected
-        @config.settings(conn)
+        @config.connection(conn)
         @config.mysql_host = @parameters.host
 
         @kill       = Mysql::Kill.new
@@ -127,7 +125,7 @@ module Mysqlknife
       end
     end
 
-    desc 'skip [CONFIG] [HOST]', 'Skipping the current replication error in Amazon RDS.'
+    desc 'skip [CONFIG]', 'Skipping the current replication error in Amazon RDS.'
     def skip(conn = nil, host = nil)
       @parameters.connection = conn
       @parameters.host       = host
@@ -135,7 +133,7 @@ module Mysqlknife
       @parameters.slaves
 
       if @parameters.slave_selected
-        @config.settings(conn)
+        @config.connection(conn)
         @config.mysql_host = @parameters.host
 
         @replica = Mysql::Replica.new

data/lib/mysqlknife/command.rb

@@ -9,6 +9,10 @@ module Mysqlknife
     end
 
     def execute(cmd)
+      if cmd.nil?
+        exit 1
+      end
+
       @iterm.color(@cnf.ssh_color)
       @iterm.name(@cnf.name)
 

data/lib/mysqlknife/configs.rb

@@ -21,7 +21,8 @@ module Mysqlknife
                 :mysql_username,
                 :mysql_password,
                 :mysql_port,
-                :mysql_database
+                :mysql_database,
+                :mysql_slave
 
     def initialize
       # Define path for config file:
@@ -35,7 +36,7 @@ module Mysqlknife
       @configs = YAML.load_file(path) if File.exist?(path)
 
       if @configs.nil?
-        puts "Not exist config file in #{path}."
+        puts "Not exist config file in #{path}"
         exit 1
       end
 
@@ -64,30 +65,15 @@ module Mysqlknife
       end
     end
 
-    def settings(name)
+    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)
-    end
-
-    def slaves(name)
-      slaves = db_slaves(name)
-
-      if slaves.nil?
-        []
-      else
-        slaves
-      end
-    end
-
-    def hosts(name)
-      hosts = []
-      hosts << db_host(name)
-      hosts.concat(slaves(name))
-      hosts.sort
+      @mysql_slave    = db_slave(name)
     end
 
     def show(name)
@@ -95,11 +81,10 @@ module Mysqlknife
       port     = db_port(name)
       username = db_username(name)
       password = db_password(name)
-      slaves   = db_slaves(name)
-      slaves   = slaves.join(', ') unless slaves.nil?
+      slave    = db_slave(name)
 
       %W[Master:\ #{host}
-         Slaves:\ #{slaves}
+         Slaves:\ #{slave}
          Port:\ #{port}
          Username:\ #{username}
          Password:\ #{password}].join("\n")
@@ -114,9 +99,9 @@ module Mysqlknife
       end
     end
 
-    def tool(name, tool)
-      unless db_tools(name).nil?
-        db_tools(name).select { |command| /#{tool}/.match(command.to_s) }.first
+    def tool(tool)
+      unless db_tools(@name).nil?
+        db_tools(@name).select { |command| /#{tool}/.match(command.to_s) }.first
       end
     end
   end

data/lib/mysqlknife/log.rb

@@ -30,5 +30,9 @@ module Mysqlknife
       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

@@ -7,15 +7,20 @@ module Mysqlknife
     end
 
     def execute(sql)
-      conn = Mysql2::Client.new(host: @cnf.mysql_host,
-                                port: @cnf.mysql_port,
-                                username: @cnf.mysql_username,
-                                password: @cnf.mysql_password,
-                                database: @cnf.mysql_database)
+      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)
 
-      Mysqlknife::Log.new.sql(sql)
+        Mysqlknife::Log.new.sql(sql)
 
-      return conn.query(sql)
+        return conn.query(sql)
+      else
+        Mysqlknife::Log.new.message("Can't to connect by direct connection, this host use SSH.")
+        exit(1)
+      end
     rescue Mysql2::Error => error
       Mysqlknife::Log.new.sql_error(error, sql)
       exit(1)

data/lib/mysqlknife/mysql/command.rb

@@ -7,9 +7,26 @@ module Mysqlknife
         @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
-        find_executable('mysql')
-        find_executable('mysqlshow')
+        command?('mysql')
+        command?('mysqlshow')
+      end
+
+      def purge(string)
+        string.squeeze(' ').strip
       end
 
       def parse(command)
@@ -17,8 +34,8 @@ module Mysqlknife
         port     = @cnf.mysql_port
         username = @cnf.mysql_username
         password = password(@cnf.mysql_password)
-
-        eval("\"#{command}\"")
+        command  = eval("\"#{command}\"")
+        purge(command)
       end
 
       def prompt
@@ -30,33 +47,35 @@ module Mysqlknife
       end
 
       def execute(sentence)
-        "--execute='#{sentence}'" unless sentence.nil?
+        "--execute='#{sentence}'" unless sentence.nil? || sentence.empty?
       end
 
       def password(password)
-        "-p#{password}" unless password.nil?
+        "-p#{password}" unless password.nil? || password.empty?
       end
 
       def console(sentence = nil)
-        %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(' ')
+        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)
-        %W[mysqlshow
-           -h #{@cnf.mysql_host}
-           -P #{@cnf.mysql_port}
-           -u #{@cnf.mysql_username}
-           #{password(@cnf.mysql_password)}
-           --keys
-           #{args.join(' ')}].join(' ')
+        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

data/lib/mysqlknife/mysql/kill.rb

@@ -11,10 +11,12 @@ module Mysqlknife
       end
 
       def clear
-        list.each do |process|
-          kill(process['id'])
-
-          Mysqlknife::Log.new.kill(process)
+        if check_privileges
+          list.each do |process|
+            kill(process)
+          end
+        else
+          Mysqlknife::Log.new.message("Don't have privileges to kill process")
         end
       end
 
@@ -27,7 +29,7 @@ module Mysqlknife
 
       def check_grants
         sql    = @mysql_sql.current_user_grants
-        result = @mysql.execute(sql).first.values.to_s =~ /PROCESS/
+        result = @mysql.execute(sql).first.values.to_s =~ /(PROCESS)|(ALL PRIVILEGES)/
 
         return true if result
       end
@@ -59,14 +61,14 @@ module Mysqlknife
         ! @mysql.execute(@mysql_sql.show_procedure('rds_kill')).first
       end
 
-      def kill(id)
-        if check_privileges
-          if rds?
-            @mysql.execute(@mysql_sql.mysql_kill(id))
-          else
-            @mysql.execute(@mysql_sql.rds_kill(id))
-          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

data/lib/mysqlknife/mysql/sql.rb

@@ -39,7 +39,7 @@ module Mysqlknife
       end
 
       def mysql_kill(pid)
-        "kill #{pid};"
+        "KILL #{pid};"
       end
 
       def slave_status
@@ -55,4 +55,4 @@ module Mysqlknife
       end
     end
   end
-end
+end

data/lib/mysqlknife/parameters.rb

@@ -2,8 +2,8 @@
 
 module Mysqlknife
   class Parameters
-    attr_writer :connection, :host, :tool
-    attr_reader :host, :tool
+    attr_writer :connection, :tool, :database
+    attr_reader :command, :database
 
     def initialize
       @cnf = Configs.instance
@@ -21,64 +21,11 @@ module Mysqlknife
       end
     end
 
-    def hosts
-      if @connection.nil? == false &&
-         @host.nil?       == true
-        puts @cnf.hosts(@connection)
-      end
-    end
-
-    def slaves
-      if @connection.nil? == false &&
-         @host.nil?       == true
-        puts @cnf.slaves(@connection)
-      end
-    end
-
     def tools
       if @connection.nil? == false &&
-         @host.nil?       == false &&
          @tool.nil?       == true
         puts @cnf.tools(@connection)
       end
     end
-
-    def host_selected
-      if @connection.nil? == false &&
-         @host.nil?       == false
-        @cnf.hosts(@connection).each do |host|
-          return @host = host if host.include?(@host)
-        end
-
-        false
-      end
-    end
-
-    def slave_selected
-      if @connection.nil? == false &&
-         @host.nil?       == false
-        @cnf.slaves(@connection).each do |host|
-          return @host = host if host.include?(@host)
-        end
-
-        false
-      end
-    end
-
-    def tool_selected
-      if @connection.nil? == false &&
-         @host.nil?       == false &&
-         @tool.nil?       == false &&
-         @cnf.tools(@connection).include?(@tool)
-        @cnf.hosts(@connection).each do |host|
-          if host.include?(@host)
-            @host = host
-            @tool = @cnf.tool(@connection, @tool)
-
-            return @tool
-          end
-        end
-      end
-    end
   end
-end
+end

data/lib/mysqlknife/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysqlknife
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Nicola Strappazzon C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -53,19 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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
@@ -77,24 +105,24 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.txt
-- README.md
 - bin/mysqlknife
-- lib/mysqlknife.rb
 - lib/mysqlknife/cli.rb
 - lib/mysqlknife/command.rb
 - lib/mysqlknife/configs.rb
 - lib/mysqlknife/iterm.rb
 - lib/mysqlknife/log.rb
-- lib/mysqlknife/mysql.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/ssh.rb
 - lib/mysqlknife/version.rb
-homepage: https://github.com/nicola51980/mysqlknife
+- lib/mysqlknife.rb
+- LICENSE.txt
+- README.md
+homepage: https://github.com/swapbytes/mysqlknife
 licenses:
 - MIT
 metadata: {}
@@ -106,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -114,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: MySQL and RDS tools for checksum, kill process, swap and resume replication