mmtop 0.9.10 → 1.0.0.rc1

data/bin/mmtop

@@ -10,7 +10,6 @@ spec = <<-EOL
   -c, --config <FILE>         Where to find mmtop_config
   -p, --password <pass>       The password used to connect to all DBs
   -u, --user <user>           The user used to connect to all DBs
-  -o, --ops                   David's funky ops mode
   -q, --quick                 Display the stats once and exist.
 EOL
 

data/lib/mmtop/commands/kill.rb

@@ -37,7 +37,7 @@ module MMTop
         puts "nothing, ok."
       else
         indexes = parse_kill_selection(line)
-        indexes.each { |i|
+        indexes && indexes.each { |i|
           if i == "*"
             queries.each(&:kill!)
           elsif queries[i]

data/lib/mmtop/host.rb

@@ -15,7 +15,13 @@ module MMTop
       @display_name = @name
       @comment = options['comment']
       @last_queries = nil
+      puts options
+      @hide_if_empty = options['hide_if_empty']
 
+      initialize_mysql2_cx(m2opts)
+    end
+
+    def initialize_mysql2_cx(m2opts)
       begin
         @mysql = Mysql2::Client.new(m2opts)
       rescue Mysql2::Error => e
@@ -27,12 +33,14 @@ module MMTop
           sleep(1)
         end
       end
-
-      # rescue connection errors or sumpin
     end
 
     attr_accessor :display_name, :name, :comment, :options, :ip
 
+    def hide_if_empty?
+      !!@hide_if_empty
+    end
+
     def query(q)
       return [] if dead?
 
@@ -103,16 +111,15 @@ module MMTop
   class HostInfo
     def initialize(host, processlist, slave_status, stats)
       @host = host
-      @processlist = processlist
       @connections = processlist.clone
       @slave_status = slave_status
       @stats = stats
+      @processlist = processlist
     end
 
-    attr_reader :host, :processlist, :slave_status, :stats
-
-    def connections
-      @connections
+    def processlist
+      @processlist.select { |p| !p.status.nil? && !p.status.empty? }
     end
+    attr_reader :host, :slave_status, :stats, :connections
   end
 end

data/lib/mmtop/mmconfig.rb

@@ -9,14 +9,13 @@ module MMTop
         raise "Please configure the 'hosts' section of mmtop_config"
       end
 
-      user = cmdline['-u']
-      pass = cmdline['-p']
+      cmdline_user = cmdline['-u']
+      cmdline_pass = cmdline['-p']
       @hosts = config['hosts'].map do |h|
         h = {'host' => h} if h.is_a?(String)
 
-        h['user'] ||= (user || config['user'])
-        h['password'] ||= (pass || config['password'])
-        h['wedge_monitor'] ||= config['wedge_monitor']
+        defaults = {'user' => (cmdline_user || config['user']), 'password' => (cmdline_pass || config['password'])}
+        h = defaults.merge(h)
 
         Host.new(h['host'], h['user'], h['password'], h)
       end.compact.uniq { |h| h.name }

data/lib/mmtop/term_printer.rb

@@ -129,7 +129,6 @@ module MMTop
     end
 
     def print_process(p)
-      return if p.status.nil? || p.status.empty?
       str = pipe + " " + column_value(0, p.client, ' ', :right)
       str += info_sep + column_value(1, p.id ? p.id.to_s : '')
       str += info_sep + column_value(2, format_time(p.time))
@@ -140,6 +139,8 @@ module MMTop
     end
 
     def print_host(info)
+      return if info.processlist.empty? && info.host.hide_if_empty?
+
       display_name = info.host.display_name
       display_name = (display_name + "!").red if info.host.dead?
       str = pipe + " " + column_value(0, display_name + " ", "-".dark_gray)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mmtop
 version: !ruby/object:Gem::Version
-  version: 0.9.10
-  prerelease: 
+  version: 1.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -116,8 +116,7 @@ files:
 - lib/mmtop/term_input.rb
 - lib/mmtop/term_printer.rb
 - lib/mmtop.rb
-- !binary |-
-  YmluL21tdG9w
+- bin/mmtop
 homepage: http://github.com/osheroff/mmtop
 licenses: []
 post_install_message: 
@@ -130,18 +129,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -870775084710735139
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -870775084710735139
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24