flare-tools 0.1.0 → 0.1.1

data/lib/flare/tools.rb

@@ -16,5 +16,5 @@ require 'net/dns/resolver'
 require 'tools/core'
 
 module FlareTools
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/flare/tools/cli/partition_setting.rb

@@ -11,29 +11,22 @@ module FlareTools
 class PartitionSetting < Core
   # {{{ constractor
   def initialize()
-    super
     @partition = 0
     @run_flag = true
-    self.option_parse
+    super
   end
   # }}}
-  # {{{ opt_parse
-  def option_parse
+  # {{{ option_on
+  def option_on
     super
     @option.on("-n",        '--dry-run',                          "dry run") {@run_flag = false}
     @option.on(             '--partition=partition',              "partition") {|v| @partition = v.to_i}
-    begin
-      @option.parse!(ARGV)
-    rescue OptionParser::ParseError => err
-      puts err.message
-      puts @option.to_s
-      exit 1
-    end
-    self.param_check
+    @option.on(             '--index-server=[HOSTNAME]',          "index server hostname(default:#{@index_server_hostname})") {|v| @index_server_hostname = v}
+    @option.on(             '--index-server-port=[PORT]',         "index server port(default:#{@index_server_port})") {|v| @index_server_port = v.to_i}
   end
   # }}}
-  # {{{ pram_check
-  def param_check
+  # {{{ option_param_check
+  def option_param_check
     flag = false
     if @partition == 0
       self.error "specifies the number of partitions"

data/lib/flare/tools/cli/stats.rb

@@ -11,19 +11,63 @@ module FlareTools
 class Stats < Core
   # {{{ constractor
   def initialize()
+	# {{{ @format
+    @format = "%20.20s:%5.5s"   # hostname:port
+    @format += " %6s"           # state
+    @format += " %6s"           # role
+    @format += " %9s"           # partition
+    @format += " %7s"           # balance
+    @format += " %8.8s"         # items
+    @format += " %4s"           # connection
+    @format += " %6.6s"         # behind
+    @format += " %3.3s"         # hit
+    @format += " %4.4s"         # size
+    @format += " %6.6s"         # uptime
+    @format += " %7s"           # version
+    @format += "\n"
+	# }}}
+
+    # {{{ @label
+    @label = @format % [
+      "hostname",
+      "port",
+      "state",
+      "role",
+      "partition",
+      "balance",
+      "items",
+      "conn",
+      "behind",
+      "hit",
+      "size",
+      "uptime",
+      "version",
+    ]
+	# }}}
     super
-    self.option_parse
+  end
+  # }}}
+  # {{{ option_on
+  def option_on
+    super
+    @option.on(             '--index-server=[HOSTNAME]',          "index server hostname(default:#{@index_server_hostname})") {|v| @index_server_hostname = v}
+    @option.on(             '--index-server-port=[PORT]',         "index server port(default:#{@index_server_port})") {|v| @index_server_port = v.to_i}
   end
   # }}}
   # {{{ sort_node
   def sort_node(nodes)
-    res = {}
+    # sort hostname
+    i = 0
+    nodes = nodes.sort_by{|key, val| [key, i += 1]}
+
     # sort role
-    res = nodes.sort_by{|key, val| val['role']}
+    i = 0
+    nodes = nodes.sort_by{|key, val| [val['role'], i += 1]}
 
     # sort partition
-    res = nodes.sort_by{|key, val| val['partition']}
-    res
+    i = 0
+    nodes = nodes.sort_by{|key, val| [val['partition'], i += 1]}
+    nodes
   end
   # }}}
   # {{{ str_date
@@ -55,53 +99,11 @@ class Stats < Core
     "#{date}d"
   end
   # }}}
-  # {{{ opt_parse
-  def option_parse
-    super
-    begin
-      @option.parse!(ARGV)
-    rescue OptionParser::ParseError => err
-      puts err.message
-      puts @option.to_s
-      exit 1
-    end
-  end
-  # }}}
   # {{{ execute
   def execute
-    format = "%20.20s:%5.5s"   # hostname:port
-    format += " %6s"           # state
-    format += " %6s"           # role
-    format += " %9s"           # partition
-    format += " %7s"           # balance
-    format += " %8.8s"         # items
-    format += " %4s"           # connection
-    format += " %6.6s"         # behind
-    format += " %3.3s"         # hit
-    format += " %4.4s"         # size
-    format += " %6.6s"         # uptime
-    format += " %7s"           # version
-    format += "\n"
-
-    label = format % [
-      "hostname",
-      "port",
-      "state",
-      "role",
-      "partition",
-      "balance",
-      "items",
-      "conn",
-      "behind",
-      "hit",
-      "size",
-      "uptime",
-      "version",
-     ]
     str = ""
-    nodes = self.get_stats_nodes
+    nodes = self.get_stats_nodes.sort_node(nodes)
     threads  = self.get_stats_threads
-    nodes = self.sort_node(nodes)
     nodes.each do |hostname_port,data|
       ipaddr, port = hostname_port.split(":", 2)
       if @dns.search(ipaddr).answer[0].methods.include?("ptr")
@@ -115,7 +117,7 @@ class Stats < Core
       uptime = self.str_date(stats['uptime'])
       hit_rate = stats['cmd_get'] == "0" ?  "-" : (stats['get_hits'].to_f / stats['cmd_get'].to_f * 100.0).round
       size =  stats['bytes'] == "0" ? "-" : (stats['bytes'].to_i / 1024 / 1024 / 1024)
-      str += format % [
+      str += @format % [
         hostname,
         port,
         data['state'],
@@ -128,10 +130,10 @@ class Stats < Core
         hit_rate,
         size,
         uptime,
-        stats["version"]
+        stats["version"],
       ]
     end
-    puts label + str
+    puts @label + str
   end
   # }}}
 end

data/lib/flare/tools/core.rb

@@ -14,19 +14,34 @@ module FlareTools
       @index_server_port = 12120
       @run_flag = true
       @timeout = 10
-      @option = OptionParser.new
       @dns = Net::DNS::Resolver.new
+      @option = OptionParser.new
+      self.option_on
+      self.option_parse
+      self.option_param_check
     end
     # }}}
-    # {{{ option_parse
-    def option_parse
+    # {{{ option_on
+    def option_on
       @option.on('-h',        '--help',                             "this message show") {puts @option.help; exit 1}
       @option.on('-d',        '--debug',                            "debug mode on") {$DEBUG = true}
       @option.on("-w",        '--warn',                             "turn warnings on for this script") {$-w = true}
-      @option.on(             '--index-server=[HOSTNAME]',          "index server hostname(default:#{@index_server_hostname})") {|v| @index_server_hostname = v}
-      @option.on(             '--index-server-port=[PORT]',         "index server port(default:#{@index_server_port})") {|v| @index_server_port = v.to_i}
     end
     # }}}
+    # {{{ option_parse
+    def option_parse
+      begin
+        @option.parse!(ARGV)
+      rescue OptionParser::ParseError => err
+        puts err.message
+        puts @option.to_s
+        exit 1
+      end
+    end
+    # }}}
+    # {{{ option_param_check
+    def option_param_check ; end
+    # }}}
     # {{{ info
     def info(msg)
       puts "[INFO] #{msg}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flare-tools
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - kgws
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +09:00
+date: 2010-11-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency