mmtop 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e09aabaa1c7521869f8c71ebcdf377ccef19aafd
-  data.tar.gz: c22ad8441828e01e33666721b19f925329344926
+  metadata.gz: 726bb7f95a803a865b5f6ecb0090e650853d603d
+  data.tar.gz: 0bddbf42784006cd7aa952cb36d26429ad2d793b
 SHA512:
-  metadata.gz: a6ce83931dc20eeeec853c65eaba81af6454f9095eb5346947cf4316171e8d3766d8d1db7f843819ce11fc43eac60644ca19f4c8dbeb70f88d25712ad8be32a0
-  data.tar.gz: aa329db7374794f7e2f2d586da596728bd8324b072e340d6a0507d5ab3cd1ac663979e1776b3afe520925facef293b5f9a5441ee73b9a6195021ab5848d2adc3
+  metadata.gz: 877f83c90dcb8ed235a7a79b99ddfc07cf7eebc92690a01235bd0453e1454bbb11baecf0b1f8b4a1a9040b69428617ea3d7cff83813ecaa6b4d6b3120a0f5d58
+  data.tar.gz: 860d4f2bfd070d81f87a547c60e8b08343699718d329a60a1c32889b627b5d1a26b73d5b98c5f3f52144cab847b891a44a93c2c6cc2b5b55e107ed9259ba2f38

data/lib/mmtop.rb

@@ -1,5 +1,6 @@
 require 'mysql2'
 require 'mmtop/mmconfig'
+require 'mmtop/version'
 require 'mmtop/host'
 require 'mmtop/process'
 require 'mmtop/term_printer'

data/lib/mmtop/commands/basic.rb

@@ -6,6 +6,8 @@ MMTop::Command.register do |c|
     MMTop::Command.commands.sort_by(&:usage).each do |c|
       puts "%-50s %s" % [c.usage, c.explain]
     end
+    puts "%-50s %s" % ["[p]",     "pause mmtop (how you got here)"]
+    puts "%-50s %s" % ["[enter]", "resume mmtop (how you leave here)"]
   end
 end
 

data/lib/mmtop/pid.rb

@@ -1,10 +1,42 @@
 module MMTop
   class PID
-    def self.get
-      @id += 1
+    @iteration = 0
+
+    def self.pid_array
+      @pid_array ||= []
+    end
+
+    def self.pid_hash
+      @pid_hash ||= {}
+    end
+
+    def self.get(host, real_id)
+      key = [host, real_id]
+
+      pid = pid_hash[key]
+      if !pid
+        pid = pid_array.index(nil) || pid_array.size
+      end 
+
+      pid_hash[key] = pid
+      pid_array[pid] = @iteration
+      pid
     end
+
     def self.reset
-      @id = 0
+      to_delete = pid_hash.map do |k, v|
+        # recycle pid after 2 loops
+        if pid_array[v] && pid_array[v] < @iteration - 1
+          k
+        end
+      end.compact
+
+      to_delete.each do |k|
+        idx = pid_hash.delete(k)
+        pid_array[idx] = nil
+      end
+
+      @iteration += 1
     end
   end
 end

data/lib/mmtop/process.rb

@@ -17,7 +17,7 @@ module MMTop
     alias :database :db
 
     def id
-      @id ||= MMTop::PID.get
+      @id ||= MMTop::PID.get(@host, @real_id)
     end
 
     def kill!

data/lib/mmtop/term_input.rb

@@ -21,8 +21,10 @@ module MMTop
     def control_mode(config)
       raw(false)
       while true
-        cmdline = Readline::readline('> ')
+        cmdline = Readline::readline('mmtop> ')
         exit if cmdline.nil?
+
+        cmdline.strip!
         Readline::HISTORY.push(cmdline)
         return if cmdline.empty?
         c = find_command(cmdline)

data/lib/mmtop/term_printer.rb

@@ -44,7 +44,10 @@ module MMTop
     end
 
     def print_footer
-      puts corner + edge * (@x - 2) + corner
+      footer_banner = (" mmtop version #{MMTop::VERSION} ".dark_gray) + "...".dark_gray + " press \"p\" to pause ".dark_gray
+      left_border_size = (@x - 2 - footer_banner.size) / 2 
+      right_border_size = @x - 2 - footer_banner.size - left_border_size
+      puts corner + (edge * left_border_size) + footer_banner + (edge * right_border_size) + corner
     end
 
     def table_header_columns

data/lib/mmtop/version.rb

@@ -0,0 +1,3 @@
+module MMTop
+  VERSION="1.2.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmtop
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -106,6 +106,7 @@ files:
 - lib/mmtop/string_colorize.rb
 - lib/mmtop/term_input.rb
 - lib/mmtop/term_printer.rb
+- lib/mmtop/version.rb
 homepage: http://github.com/osheroff/mmtop
 licenses: []
 metadata: {}