mysqlknife 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 908368a2c5033abda558ba4f74647dd6747b2079
-  data.tar.gz: ac49c5dc2fbee643650c0a9ceee2d95661a6ef23
+  metadata.gz: 25443019cabb513694fcf76763b3b860ccd9d95c
+  data.tar.gz: 1992048e1cf07e0d4c99ca470684612268f7a9a0
 SHA512:
-  metadata.gz: 910c5d6d5ebd883cc74ff82a3462a0c88845d4c844bd8a833c3374453ed2cc2fcdbbf56c87dbb93dc7c0533f7b9aea6afad337c4fe75f09d6b3a17efe3095275
-  data.tar.gz: e8cd314855836d1977a76d7a87bfa1458f751b4506bacc6622fb722cdc29805a77b28e9cc65986db5cf92c103129a961542257e765151f071a79b53a0a586608
+  metadata.gz: a3d01a02e30700addf8ae75cfaadfa6eb18e4103208cf9035d378a09a28538ec0c5aa72e2cfa3910f92641bfec26ae54d7c72d85240e105f187dbf0b7a3b5e94
+  data.tar.gz: a18069ce4652f9402a31b18103b3082932dc4dab8f13080ea350b9e392e42c2f7d3c913538f1040d4915046f2e6c037654c6b6571c7e90853df2d004bbb4f8a7

data/README.md

@@ -16,9 +16,13 @@ Install this tool executing the following command:
 $ gem install mysqlknife
 ```
 
-## Configurarion
+## Configuration:
 
+```shell
 vim ~/.db.yml
+```
+
+Configuration file example:
 
 ```
 ssh:

data/lib/mysqlknife/cli.rb

@@ -128,17 +128,6 @@ module Mysqlknife
     end
 
     desc 'skip [CONFIG] [HOST]', 'Skipping the current replication error in Amazon RDS.'
-    long_desc <<-LONGDESC
-      Syntax:
-
-        mysqlknife skip --behind -120
-      LONGDESC
-    option :behind,
-           default: 120,
-           desc: 'Set Seconds Behind Master',
-           required: true,
-           type: :numeric,
-           aliases:  :b
     def skip(conn = nil, host = nil)
       @parameters.connection = conn
       @parameters.host       = host
@@ -149,8 +138,7 @@ module Mysqlknife
         @config.settings(conn)
         @config.mysql_host = @parameters.host
 
-        @replica        = Mysql::Replica.new
-        @replica.behind = options[:behind]
+        @replica = Mysql::Replica.new
         @replica.skip
       end
     end

data/lib/mysqlknife/configs.rb

@@ -5,7 +5,7 @@ module Mysqlknife
     include Singleton
 
     attr_writer :mysql_host,
-                :mysql_databases
+                :mysql_database
     attr_reader :path,
                 :ssh_host,
                 :ssh_port,
@@ -21,7 +21,7 @@ module Mysqlknife
                 :mysql_username,
                 :mysql_password,
                 :mysql_port,
-                :mysql_databases
+                :mysql_database
 
     def initialize
       # Define path for config file:

data/lib/mysqlknife/mysql/replica.rb

@@ -3,20 +3,20 @@
 module Mysqlknife
   module Mysql
     class Replica
-      attr_writer :behind
-
       def initialize
         @mysql     = MySQL.new
         @mysql_cmd = Mysql::Command.new
         @mysql_sql = Mysql::SQL.new
+
+        @status    = slave_status
       end
 
-      def check_status_negative(behind)
-        @behind < 0 && behind < 0 && behind <= @behind && behind != 0
+      def sql_running?
+        @status['Slave_SQL_Running'] == 'Yes'
       end
 
       def rds?
-        ! @mysql.execute(@mysql_sql.show_procedure('rds_skip_repl_error')).first
+        ! @mysql.execute(@mysql_sql.show_procedure('mysql.rds_skip_repl_error')).first
       end
 
       def slave_status
@@ -24,10 +24,8 @@ module Mysqlknife
       end
 
       def skip
-        status = slave_status
-
-        if check_status_negative(status['Seconds_Behind_Master'])
-          Mysqlknife::Log.new.skip_repl_error(status)
+        unless sql_running?
+          Mysqlknife::Log.new.skip_repl_error(@status)
 
           if rds?
             @mysql.execute(@mysql_sql.rds_skip_repl_error)

data/lib/mysqlknife/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysqlknife
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Nicola Strappazzon C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: MySQL and RDS tools for checksum, kill process, swap and resume replication