mmtop 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ad6bf00dc4c1d535cb3285f3e6abcd136363a6
-  data.tar.gz: 5ee9498dd03444d4e4f3851e571a00ebc1153f43
+  metadata.gz: 5cfcb1f07b47fecbf593191304bff9f7cd599e8a
+  data.tar.gz: ddc820840fd231e0624da718b2b29b463f57bb3f
 SHA512:
-  metadata.gz: 67e8c1cf6d11276da68201686f4f0c53444313abab38496c5c7f95cbf9914f18d0ec623943c409f9d7f01473992b211e4de038f143e9b902a0a49c76172da987
-  data.tar.gz: 0e40313f469d62685129cce49b0921818e7db30ec74f37439000c49e5f5d40251c12af28a77249a5987b92fc57e6be99b35061caf6f48108b6451e81b408531c
+  metadata.gz: 7b8cc1b894133ff4247442b21bdf076f1e9f814866c665054c0800847f585125643667f683e853c65b4b6f7eea7d76f5499ff07af6b9160629118e40b98a783c
+  data.tar.gz: 832ab1e621328f561c68cdf2239a13583d91c800187afb6c5b9fccc69709c79b0f850aa5c97ad801803d3bc22db584b96423eae1f651acacda1222731969be6d

data/lib/mmtop/host.rb

@@ -53,7 +53,7 @@ module MMTop
           mark_dead!
           return []
         else
-          puts "Got error number " + e.error_number.to_s
+          puts "Got error number " + e.error_number.to_s + " querying #{@name}"
           raise e
         end
       end

data/lib/mmtop/string_colorize.rb

@@ -1,3 +1,42 @@
+require 'delegate'
+
+class ColorString < Delegator
+  OFF = "\e[0m"
+  def initialize(string, color)
+    @string = string
+
+    if color.is_a?(Array)
+      @color_offsets = color
+    else
+      @color_offsets = [ [0, string.size, color] ]
+    end
+  end
+
+  attr_reader :color_offsets
+
+  def __getobj__
+    @string
+  end
+
+  def to_s
+    @color_offsets.map { |o|
+      o.last + @string[o[0], o[1]] + OFF
+    }.join
+  end
+
+  def +(other)
+    res = @string + other
+    if other.is_a?(ColorString)
+      adjusted_offsets = other.color_offsets.map do |arr|
+        [arr[0] + @string.size, arr[1], arr[2]]
+      end
+      ColorString.new(res, @color_offsets + adjusted_offsets)
+    else
+      ColorString.new(res, @color_offsets + [[@string.size, other.size, OFF]])
+    end 
+  end
+end
+
 class String
   CODES = {
     :off       => "\e[0m",
@@ -33,8 +72,9 @@ class String
 
   def colorize(*args)
     color = args.map { |color| CODES[color] if color.is_a?(Symbol) }.join("")
-    "#{color}#{self}#{OFF}"
+    ColorString.new(self, color)
   end
+
   def colourise(*args); colorize(*args); end
 
   def red; colorize(:red); end
@@ -43,11 +83,4 @@ class String
   def black; colorize(:black); end
   def white; colorize(:white); end
   def dark_gray; colorize(:dark_gray); end
-
-  def size_uncolorized
-    self.gsub(/\e.*?m/, '').size_raw
-  end
-
-  alias :size_raw :size
-  alias :size :size_uncolorized
 end

data/lib/mmtop/term_printer.rb

@@ -59,8 +59,8 @@ module MMTop
       fill * sep.size
     end
 
-    def column_value_with_fill(index, str, fill, align)
-      fill_str = fill * (table_header_columns[index].size - str.size)
+    def column_value_with_fill(index, max_size, str, fill, align)
+      fill_str = fill * (max_size - str.size)
       if align == :left
         str + fill_str
       else
@@ -68,11 +68,15 @@ module MMTop
       end
     end
 
-    def column_value(index, str, fill=" ", align=:left)
-      if str.size < table_header_columns[index].size
-        column_value_with_fill(index, str, fill, align)
+    def column_value(indexes, str, fill=" ", align=:left)
+      indexes = Array(indexes)
+      max_size = indexes.inject(0) { |s, idx| s + table_header_columns[idx].size }
+      max_size += sep_fill.size * (indexes.size - 1)
+	
+      if str.size < max_size
+        column_value_with_fill(indexes.first, max_size, str, fill, align)
       else
-        str[0..table_header_columns[index].size - 1]
+        str[0..max_size - 1]
       end
     end
 
@@ -142,9 +146,13 @@ module MMTop
       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)
-      str += sep_fill + column_fill(1) + sep_fill + column_fill(2)
+      if info.host.dead?
+        display_name = (display_name + "!").red 
+      end
+
+      str = pipe + " " + column_value([0, 1, 2], display_name + " ", "-".dark_gray)
+    
+      #str += sep_fill + column_fill(1) + sep_fill + column_fill(2)
       str += info_sep + column_value(3, info.connections.size.to_s)
       str += info_sep + column_value(4, format_slave_status(info.slave_status))
       str += info_sep + column_value(5, format_slave_delay(info.slave_status))

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: mmtop
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: getopt-declare
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yaggy
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql_isolated_server
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -102,6 +102,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/mmtop
+- lib/mmtop.rb
 - lib/mmtop/command.rb
 - lib/mmtop/commands/basic.rb
 - lib/mmtop/commands/filters.rb
@@ -118,8 +120,6 @@ files:
 - lib/mmtop/string_colorize.rb
 - lib/mmtop/term_input.rb
 - lib/mmtop/term_printer.rb
-- lib/mmtop.rb
-- bin/mmtop
 homepage: http://github.com/osheroff/mmtop
 licenses: []
 metadata: {}
@@ -129,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A mytop-ish variant that can watch many mysql servers