mmtop 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7202089cd59af312556434bc4f7f769706210f2b
-  data.tar.gz: 096c4a0138bf7a1dbcb8b6c046d8b02d2aa0dc8e
+  metadata.gz: 7c77d53f05e5d2b75090ab37c8a5008ec9f8d31e
+  data.tar.gz: aa11864d9175f6bad1b189329889b1dffbcb8b18
 SHA512:
-  metadata.gz: 445308ce09fca660c9d394cbc735f9864b384a435c95364848d3981b8ea027aa9746b3e0bcf5092e8652085c41e66f3dca317e8ebe65bfdbee71b850a303f012
-  data.tar.gz: 196a5b6afe5ae7081812fe09e21eed141760b89b95ca5b5f7369f7b2e0b7ebaa05dfce3272da3248d52c4d40f984129a33b7a61fddbc8aea51c339245873b77e
+  metadata.gz: 62610dc63a6b3b9c292c90624aa31b5823ed8055fe22cc36c692bd0c267c59c3e829dbe6f0686a87bf5027aa54d95ab486820cbaee98a50683b3f066a7187e78
+  data.tar.gz: 920420531c2b71f30f2def59baf9f735cf0fa47c105624af20d3419ce9397b4abcbe10a3ffe07822800a31f5a1e519e9c5e6c98fa2c20111068f85a1616d83fb

data/lib/mmtop/commands/basic.rb

@@ -18,19 +18,35 @@ MMTop::Command.register do |c|
   end
 end
 
-    
+
 MMTop::Command.register do |c|
   c.regexp /^[x|(?:examine)]\s+(\d+)/
   c.usage "x PID"
   c.explain "Show full query"
+
+  cols = ["status", "time", "client", "src_port", "server", "database"]
+  print_ps = lambda do |ps|
+    h = {}
+    headers = ""
+    data = ""
+    cols.each { |c|
+      val = ps.send(c)
+      size = [val.size, c.size].max + 2
+      headers += "%-#{size}s" % [c]
+      data += "%-#{size}s" % [val]
+    }
+
+    puts headers
+    puts data
+    puts ps.sql
+  end
+
   c.command do |cmd, config|
     cmd =~ c.regexp
     pid = $1.to_i
     ps = config.find_pid(pid)
     if ps
-      puts "%-20s%-6s%-20s%-20s%-20s" % ["status","time","client", "server", "database"]
-      puts "%-20s%-6s%-20s%-20s%-20s" % [ps.status, ps.time, ps.client, ps.host.name, ps.db]
-      puts ps.sql
+      print_ps.call(ps)
     else
       puts "No such pid #{p}"
     end
@@ -94,3 +110,30 @@ MMTop::Command.register do |c|
     config.options['sleep'] = sleep
   end
 end
+
+MMTop::Command.register do |c|
+  c.regexp /^shell (.*)/
+  c.usage   "shell HOST|PID"
+  c.explain "open up a mysql command-line client on HOST or on the database that PID is on"
+  c.command do |cmd, config|
+    cmd =~ c.regexp
+    match = $1
+
+    if match =~ /^\d+$/
+      ps = config.find_pid(match.to_i)
+      if !ps
+        break puts "No such PID: #{match}"
+      end
+
+      host = ps.host
+    else
+      server = config.find_server(match)
+      if !server
+        break puts "No such host: #{server}"
+      end
+      host = server.host
+    end
+    opt = host.options
+    system("mysql --user='#{opt['user']}' --host='#{opt['host']}' --password='#{opt['password']}'")
+  end
+end

data/lib/mmtop/process.rb

@@ -14,6 +14,7 @@ module MMTop
     end
 
     attr_accessor :query, :status, :time, :client, :host, :db
+    alias :database :db
 
     def id
       @id ||= MMTop::PID.get
@@ -33,6 +34,13 @@ module MMTop
       end
     end
 
+    def server
+      @host.name
+    end
+
+    def src_port
+      @client_port
+    end
 
     def sql
       @query

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmtop
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2