poolboy 0.0.1 → 0.0.2

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Sam
+Copyright (c) 2013 Sam Lambert
 
 MIT License
 

data/README.md

@@ -1,5 +1,12 @@
 # Poolboy
 
+
+host: 127.0.0.1
+user: root
+pass: pass
+refresh: 5
+
+
 TODO: Write a gem description
 
 ## Installation

data/bin/poolboy

@@ -2,4 +2,6 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'poolboy'
+require 'poolboy'
+
+Poolboy.execute

data/lib/poolboy/mysql.rb

@@ -1,32 +1,37 @@
 require 'mysql2'
 
-class Mysql
+class MysqlConnection
 
-  def initialize(host, user, pass)
+  def initialize(options)
     begin
-      @mysql = Mysql2::Client.new(:host => host, :username => user, :password => pass, :database => 'information_schema', :connect_timeout => 2, :symbolize_keys => true)
+      @mysql = Mysql2::Client.new(options.merge({:database => 'information_schema', :connect_timeout => 2, :symbolize_keys => true}))
     rescue Mysql2::Error => e
       puts e
-      exit
+      exit 1
     end
   end
 
   def version
-    version = @mysql.query("SHOW VARIABLES LIKE 'version'")
+    version = query("SHOW VARIABLES LIKE 'version'")
     return version.first[:Value]
   end
 
+  def percona
+    xtra = query("show variables like 'innodb_import_table_from_xtrabackup'")
+    return xtra.count >= 1 ? true : false
+    exit
+  end
+
   def query(query)
     begin
-      results = @mysql.query(query)
-      return results
+      @mysql.query(query)
     rescue Mysql2::Error => e
       puts e
-      exit
+      exit 1
     end
   end
 
-  def disconnect()
+  def disconnect
     @mysql.close
   end
 end

data/lib/poolboy/screen.rb

@@ -1,8 +1,13 @@
-require 'curses'
 
   class Screen
 
-    def self.show_message(message)
+    def initialize(window)
+      @win = window
+      @width = @win.maxx
+      @hight = @win.maxy
+    end
+
+    def show_message(message)
       @win.setpos(0, 0)
       message['stats'].each do |s|
         pool_size = (s.fetch(:pages_misc).to_i + s.fetch(:pages_data).to_i * s.fetch(:page_size).to_i / 1024 / 1024)
@@ -34,9 +39,4 @@ require 'curses'
       @win.refresh
     end
 
-    def self.open_screen()
-      @win = Curses::Window.new(0,0,0,0)
-      @width = @win.maxx
-      @hight = @win.maxy
-    end
   end

data/lib/poolboy/version.rb

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

data/lib/poolboy.rb

@@ -1,62 +1,74 @@
 require 'poolboy/screen'
 require 'poolboy/mysql'
-require 'poolboy/55'
-require 'poolboy/51'
+require 'poolboy/five_five'
+require 'poolboy/five_one'
 require 'optparse'
 require 'yaml'
+require 'curses'
 
 module Poolboy
 
-  options = {}
-  OptionParser.new do |opts|
-    opts.on("-h HOST") do |h|
-      options[:host] = h
+  def Poolboy.execute
+
+    options = YAML.load(File.read(ENV['HOME']+'/.poolboy.yaml')) rescue {}
+
+    o = OptionParser.new do |opts|
+      opts.on("-h HOST") do |h|
+        options[:host] = h
+      end
+      opts.on("-u USER") do |u|
+        options[:username] = u
+      end
+      opts.on("-p PASSWORD") do |p|
+        options[:password] = p
+      end
+      opts.on("-r REFRESH", Integer) do |r|
+        options[:refresh] = r >= 1 ? r : 1
+      end
+      if not options.has_key?(:refresh)
+        options[:refresh] = 5
+      end
     end
-    opts.on("-u USER") do |u|
-      options[:user] = u
+
+    begin o.parse!
+      rescue OptionParser::InvalidOption => e
+        puts e
+        puts o
+        exit 128
     end
-    opts.on("-p PASSWORD") do |p|
-      options[:pass] = p
+
+    connection = MysqlConnection.new(options)
+    connection.percona
+    percona = connection.percona ? connection.percona : version_exit
+    version = connection.version
+
+    case version[0,3] 
+      when '5.1'
+        mysql_map = FiveOne
+      when '5.5'
+        mysql_map = FiveFive
+      else
+        version_exit
     end
-  end.parse!
 
-  if options.length < 3
+    window = Curses::Window.new(0,0,0,0)
+    screen = Screen.new(window)
+
     begin
-      config_file = YAML.parse_file(ENV['HOME']+'/.poolboy.yaml').to_ruby
-      if not options.has_key?(:host)
-        options[:host] = config_file["host"]
-      end
-      if not options.has_key?(:user)
-        options[:user] = config_file["user"]
+      while true
+        results = mysql_map.get_stats(connection)
+        screen.show_message(results)
+        sleep(options[:refresh])
       end
-      if not options.has_key?(:pass)
-        options[:pass] = config_file["pass"]
-      end
-    rescue Errno::ENOENT
+    rescue SystemExit, Interrupt
+      connection.disconnect
+      exit
     end
   end
 
-  my_con = Mysql.new(options[:host], options[:user], options[:pass])
-  version = my_con::version
-  if version[0,3] == '5.1'
-    mysql_map = FiveOne
-  elsif version[0,3] == '5.5'
-    mysql_map = FiveFive
-  else
-    puts "Incompatible MySQL version. Poolboy is only compatable with Percona Server."
-    exit
-  end
-  screen = Screen
-  screen::open_screen()
-
-  begin
-    while true
-      results = mysql_map::get_stats(my_con)
-      screen::show_message(results)
-      sleep(1)
-    end
-  rescue SystemExit, Interrupt
-    exit
+  def Poolboy.version_exit
+    puts "Incompatible MySQL version! Poolboy is only compatible with Percona Server 5.1 and 5.5"
+    exit 1
   end
 
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: poolboy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Sam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -67,8 +74,8 @@ files:
 - Rakefile
 - bin/poolboy
 - lib/poolboy.rb
-- lib/poolboy/51.rb
-- lib/poolboy/55.rb
+- lib/poolboy/five_five.rb
+- lib/poolboy/five_one.rb
 - lib/poolboy/mysql.rb
 - lib/poolboy/screen.rb
 - lib/poolboy/version.rb
@@ -76,25 +83,26 @@ files:
 homepage: http://www.samlambert.com
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Poolboy lets you view the data in your buffer pool
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjIwZTBhYWMyNGNjODJiNzg0YzlkYTAxNzdkMTFlNGI4ZTg2YWMzZA==
-  data.tar.gz: !binary |-
-    NDJhYTcyNTE3NzFlNzUyYjAxOTA2ZmIwZGQ4Yzc1MzRjYzEwZjQ4YQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NjQwMWJmNjJmNjUwMTk1ODkzMWQ0NGJkMTdmNGIwZjQ2MzNlMmE3NDAxY2U5
-    MGMxNmMzNGQ0OWE4MDUyYTkzYTFhZGI4MWU2Y2VjNzQ1N2E3MTcxM2U4OGY5
-    ODcyNTNhODFiZWE2MjU2YmU1ODQ2ZDAyMWY1NzcwNzE2M2M2MzM=
-  data.tar.gz: !binary |-
-    ODE4MmFhYjEwOWI0MWJjZTBlOTYzODRhMmViNzcxMDk3NGUwZjY2MGRkODlj
-    YTRmMGY0MWY4NTA0ZTc5ODRkYWNkMGE3NThhYTY0MmFiM2UxMWNiNDVmM2E3
-    NTY3ZDRiZDI2ZDk0ZDA1NzdhNzYzYzRmNDYwYmUzYjk0OWQzMGQ=