poolboy 0.0.2 → 0.1.0

data/.gitignore

@@ -17,7 +17,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-
+poolboy/
 # YARD artifacts
 .yardoc
 _yardoc

data/README.md

@@ -1,10 +1,11 @@
 # Poolboy
 
 
-host: 127.0.0.1
-user: root
-pass: pass
-refresh: 5
+:host: 127.0.0.1
+:username: root
+:password: kraken123
+:refresh: 5
+:force: false
 
 
 TODO: Write a gem description

data/lib/poolboy/mysql.rb

@@ -17,8 +17,8 @@ class MysqlConnection
   end
 
   def percona
-    xtra = query("show variables like 'innodb_import_table_from_xtrabackup'")
-    return xtra.count >= 1 ? true : false
+    xtra = query("show variables like 'version_comment'")
+    return (xtra.first[:Value].include? "Percona") ? true : false
     exit
   end
 

data/lib/poolboy/version.rb

@@ -1,3 +1,3 @@
 module Poolboy
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/poolboy.rb

@@ -1,4 +1,5 @@
 require 'poolboy/screen'
+require 'poolboy/version'
 require 'poolboy/mysql'
 require 'poolboy/five_five'
 require 'poolboy/five_one'
@@ -9,39 +10,50 @@ require 'curses'
 module Poolboy
 
   def Poolboy.execute
-
     options = YAML.load(File.read(ENV['HOME']+'/.poolboy.yaml')) rescue {}
 
     o = OptionParser.new do |opts|
-      opts.on("-h HOST") do |h|
+      opts.banner = "Poolboy helps you inspect your buffer pool\n\nUsage: poolboy [options]"
+      opts.on("-h HOST", "MySQL hostname") do |h|
         options[:host] = h
       end
-      opts.on("-u USER") do |u|
+      opts.on("-u USER", "MySQL username") do |u|
         options[:username] = u
       end
-      opts.on("-p PASSWORD") do |p|
+      opts.on("-p PASSWORD", "MySQL password") do |p|
         options[:password] = p
       end
-      opts.on("-r REFRESH", Integer) do |r|
+      opts.on("-r REFRESH", Integer, "Refresh interval") do |r|
         options[:refresh] = r >= 1 ? r : 1
       end
-      if not options.has_key?(:refresh)
-        options[:refresh] = 5
+      options[:refresh] = options.has_key?(:refresh) ? options[:refresh] : 5
+      opts.on("-f", "Force skipping of Percona Server check") do |r|
+        options[:force] = true
+      end
+      options[:force] = options.has_key?(:force) ? options[:force] : false
+      opts.on_tail("--help", "Show this message") do
+        puts opts
+        exit
+      end
+      opts.on_tail("--version", "Show version") do
+        puts VERSION
+        exit
       end
     end
 
     begin o.parse!
-      rescue OptionParser::InvalidOption => e
+      rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
         puts e
         puts o
         exit 128
     end
 
     connection = MysqlConnection.new(options)
-    connection.percona
-    percona = connection.percona ? connection.percona : version_exit
+    if not options[:force]
+      connection.percona
+      percona = connection.percona ? connection.percona : version_exit
+    end
     version = connection.version
-
     case version[0,3] 
       when '5.1'
         mysql_map = FiveOne

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poolboy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors: