tplot 0.0.1 → 0.0.2

data/.gitignore

@@ -1,4 +1,5 @@
 *~
+log/*
 *.gem
 *.rbc
 .bundle

data/bin/tplot

@@ -6,7 +6,14 @@ trap(:INT) do
 end
 
 BASE_DIR = File.expand_path(__FILE__.gsub(%r{/[^/]+\z},'') + "/../")
-plugin_name = ARGV.first.nil? ? "list" : ARGV.first
+plugin_name = ARGV.shift
+plugin_name ||= "list"
+
+PLUGIN_DIR      = "#{BASE_DIR}/plugins"
+USER_PLUGIN_DIR = "#{ENV['HOME']}/.tplot/plugins"
+
+require 'fileutils'
+FileUtils.mkdir_p(USER_PLUGIN_DIR)
 
 # debug setting
 require 'logger'
@@ -18,13 +25,15 @@ else
 end
 
 # plugin check
-unless File.exists?("#{BASE_DIR}/plugins/#{plugin_name}.rb")
+if(!File.exists?("#{PLUGIN_DIR}/#{plugin_name}.rb") and
+   !File.exists?("#{USER_PLUGIN_DIR}/#{plugin_name}.rb"))
   puts "#{plugin_name} plugin is not found."
   puts
   plugin_name = "list"
 end
 
 # load basic module
+require 'optparse'
 require 'curses'
 require "#{BASE_DIR}/lib/tplot"
 require "#{BASE_DIR}/lib/tplot/plugin"
@@ -34,4 +43,4 @@ require "#{BASE_DIR}/lib/tplot/bar_chart"
 # execute plugin
 require "#{BASE_DIR}/plugins/#{plugin_name}"
 plugin_class = Tplot.const_get(plugin_name.capitalize)
-plugin_class.new(ARGV.shift).execute
+plugin_class.new.execute

data/lib/tplot/bar_chart.rb

@@ -89,13 +89,16 @@ module Tplot
 
     def calc_mapping_value(value)
       range = (@max_value - @min_value).abs
+      return 0 if range == 0
       ratio = (value - @min_value).abs.to_f / range.to_f
       (@height * ratio * 2).to_i
     end
 
     def calc_position(value)
       range = (@max_value - @min_value).abs
+      return 0 if range == 0
       ratio = (value - @min_value).abs.to_f / range.to_f
+      LOGGER.debug "#{range}:#{ratio}"
       (@height * (1 - ratio)).to_i
     end
 

data/lib/tplot/plugin.rb

@@ -1,8 +1,4 @@
 class Tplot::Plugin
-  def initialize(args = [])
-    @args = args
-  end
-
   def self.description(description = "")
     @@descriptions ||= {}
     @@descriptions[self] = description if !description.nil? and !description.empty?

data/lib/tplot/version.rb

@@ -1,3 +1,3 @@
 module Tplot
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/tplot.rb

@@ -1,4 +1,4 @@
-require "tplot/version"
+require_relative "tplot/version"
 
 module Tplot
   # noop

data/plugins/free.rb

@@ -1,10 +1,8 @@
 class Tplot::Free < Tplot::Plugin
 
-  description "plot free commands result"
-
   def execute
     chart = Tplot::BarChart.new
-    chart.labels = %w(total used free shared buffers cached)
+    chart.labels = [" total ", " used  "]
     
     while true
       uptime = `free | grep Mem`.gsub(/^Mem:/, "").split(" ").map{|v| v.strip.to_f}
@@ -12,4 +10,7 @@ class Tplot::Free < Tplot::Plugin
       sleep 1
     end
   end
+
+  description "plot free commands result"
+  help "Usage: tplot free"
 end

data/plugins/help.rb

@@ -0,0 +1,24 @@
+class Tplot::Help < Tplot::Plugin
+
+  description "print plugins help."
+
+  def execute
+    plugin_name = ARGV.shift
+    if File.exists?("#{PLUGIN_DIR}/#{plugin_name}.rb")
+      print_help("#{PLUGIN_DIR}/#{plugin_name}.rb", PLUGIN_DIR)
+      exit 0
+    end    
+    if File.exists?("#{USER_PLUGIN_DIR}/#{plugin_name}.rb")
+      print_help("#{PLUGIN_DIR}/#{plugin_name}.rb", USER_PLUGIN_DIR)
+      exit 0
+    end    
+  end
+
+  def print_help(plugin_path, dir)
+    require plugin_path
+    name = plugin_path.gsub("#{dir}/", '').gsub(".rb", '')
+    plugin_class = Tplot.const_get(name.capitalize)
+    return puts plugin_class.help.call if plugin_class.help.is_a? Proc
+    return puts plugin_class.help
+  end
+end

data/plugins/list.rb

@@ -3,12 +3,23 @@ class Tplot::List < Tplot::Plugin
   description "list installed plugins."
 
   def execute
-    puts "-- installed plugins --"
-    Dir.glob("#{BASE_DIR}/plugins/*.rb").each do |plugin|
-      require plugin
-      name = plugin.gsub("#{BASE_DIR}/plugins/", '').gsub(".rb", '')
-      plugin_class = Tplot.const_get(name.capitalize)
-      puts "tplot #{name}\t: #{plugin_class.description}"
+    # builtin plugin.
+    puts "-- builtin plugins --"
+    Dir.glob("#{PLUGIN_DIR}/*.rb").each do |plugin|
+      puts_description(plugin, PLUGIN_DIR)
     end
+
+    # user plugin.
+    puts "\n-- user plugins --" unless Dir.glob("#{USER_PLUGIN_DIR}/*.rb").empty?
+    Dir.glob("#{USER_PLUGIN_DIR}/*.rb").each do |plugin|
+      puts_description(plugin, USER_PLUGIN_DIR)
+    end
+  end
+
+  def puts_description(plugin, dir)
+    require plugin
+    name = plugin.gsub("#{dir}/", '').gsub(".rb", '')
+    plugin_class = Tplot.const_get(name.capitalize)
+    puts "tplot #{name}\t: #{plugin_class.description}"
   end
 end

data/plugins/network.rb

@@ -0,0 +1,19 @@
+class Tplot::Network < Tplot::Plugin
+
+  def execute
+    chart = Tplot::BarChart.new
+    chart.labels = %w(InOctets OutOctets)
+    
+    while true
+      values = `cat /proc/net/netstat | tail -n 1 | cut -d" " -f8,9`.split(" ").map{|v| v.strip.to_f}
+      inoctet ||= values.first
+      outoctet ||= values.last
+      chart.add([values.first - inoctet, values.last - outoctet])
+      inoctet, outoctet = values.first, values.last
+      sleep 1
+    end
+  end
+
+  description "plot InOctets/OutOctets"
+  help "Usage: tplot network"
+end

data/plugins/uptime.rb

@@ -1,15 +1,38 @@
+# -*- coding: utf-8 -*-
 class Tplot::Uptime < Tplot::Plugin
 
-  description "plot uptime commands result"
+  def initialize
+    @options = {
+      chart_type: Tplot::BarChart,
+      delay: 1
+    }
+  end
+
+  def parser
+    OptionParser.new do |opt|
+      opt.banner = "Usage: tplot uptime [options]\n"
+      opt.on('-l', '--line','line chart.') do
+        @options[:chart_type] = Tplot::LineChart
+      end
+      opt.on('-n N', '--delay=N', 'set interval.') do |n|
+        @options[:delay] = n.to_i
+      end
+    end
+  end
 
   def execute
-    chart = Tplot::BarChart.new
-    chart.labels = %w(1min 5min 15min)
+    parser.parse!(ARGV)
+
+    chart = @options[:chart_type].new
+    chart.labels = ["  1min  ", "  5min  ", " 15min  "]
     
     while true
       uptime = `uptime`.gsub(/^.*load average: /, "").split(",").map{|v| v.strip.to_f}
       chart.add(uptime)
-      sleep 1
+      sleep @options[:delay]
     end
   end
+
+  description "plot uptime commands result"
+  help self.new.parser.to_s
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tplot
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -31,9 +31,10 @@ files:
 - lib/tplot/line_chart.rb
 - lib/tplot/plugin.rb
 - lib/tplot/version.rb
-- log/debug.log
 - plugins/free.rb
+- plugins/help.rb
 - plugins/list.rb
+- plugins/network.rb
 - plugins/uptime.rb
 - tplot.gemspec
 homepage: https://github.com/mitoma/tplot