mmtop 1.0.0.rc3 → 1.0.0.rc4

data/lib/mmtop/host.rb

@@ -15,6 +15,7 @@ module MMTop
       @display_name = @name
       @comment = options['comment']
       @last_queries = nil
+      @port = options['port'] || 3306
       @hide_if_empty = options['hide_if_empty']
 
       initialize_mysql2_cx(m2opts)
@@ -35,6 +36,7 @@ module MMTop
     end
 
     attr_accessor :display_name, :name, :comment, :options, :ip
+    attr_reader :port
 
     def hide_if_empty?
       !!@hide_if_empty

data/lib/mmtop/mmconfig.rb

@@ -20,7 +20,7 @@ module MMTop
         h = defaults.merge(h)
 
         Host.new(h['host'], h['user'], h['password'], h)
-      end.compact.uniq { |h| h.name }
+      end.compact.uniq { |h| h.name + h.port.to_s }
 
       config['sleep'] ||= 5
 

data/lib/mmtop/process.rb

@@ -10,6 +10,7 @@ module MMTop
       @client_port ||= ""
       @db = result[:db]
       @host = host
+      clean_sql!
     end
 
     attr_accessor :query, :status, :time, :client, :host, :db
@@ -26,6 +27,13 @@ module MMTop
       end
     end
 
+    def clean_sql!
+      if @query && !@query.valid_encoding?
+        @query = @query.chars.select { |c| c.valid_encoding? }.join
+      end
+    end
+
+
     def sql
       @query
     end

data/lib/mmtop/term_printer.rb

@@ -151,7 +151,9 @@ module MMTop
       str += info_sep + column_value(6, info.stats[:qps].to_s)
       str += info_sep + column_value(7, info.host.comment || '')
       str += info_sep
-      str += "-".dark_gray * (@x - str.size - 1)
+
+      fill_count = (@x - str.size - 1)
+      str += "-".dark_gray * fill_count if fill_count > 0
       str += pipe
       puts str
       info.processlist.each do |p|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmtop
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql_isolated_server
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - ben@gimbo.net
@@ -116,8 +132,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: 
@@ -138,8 +153,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A mytop-ish variant that can watch many mysql servers
 test_files: []
+has_rdoc: