tplot 0.0.2 → 0.0.3

data/lib/tplot/bar_chart.rb

@@ -1,59 +1,5 @@
 module Tplot
-  class BarChart
-    include Curses
-
-    COLORS = [COLOR_BLUE,
-              COLOR_GREEN,
-              COLOR_RED,
-              COLOR_CYAN,
-              COLOR_MAGENTA,
-              COLOR_YELLOW,
-              COLOR_WHITE]
-
-    attr_accessor :labels
-    attr_accessor :limit
-
-    def initialize
-      @labels = []
-      @datas ||= []
-      @limit = 800
-    end
-
-    def add(values)
-      @datas.push(values)
-      @datas.shift if @datas.size > limit
-      draw
-    end
-
-    def update(values)
-      @datas.pop
-      @datas.push(values)
-      draw
-    end
-
-    def draw
-      pre_draw
-
-      draw_frame_pre
-      draw_line
-      draw_frame_post
-      
-      setpos(0, 0)
-      refresh
-    end
-
-    def pre_draw
-      clear
-      start_color
-      init_colors
-
-      @min_value = (@datas.flatten.min < 0) ? @datas.flatten.min : 0
-      @max_value = (@datas.flatten.max < 0) ? 1 : @datas.flatten.max
-
-      @height = lines - 1
-      @width = cols - 1
-    end
-
+  class BarChart < LineChart
     def draw_line
       tmp_data = @datas.dup
       (-@width..0).map(&:abs).each do |col|
@@ -72,70 +18,11 @@ module Tplot
           (min..max).each do |line|
             setpos(line, col)
             attron(color_pair(COLORS[idx % COLORS.size])|A_NORMAL) do
-              addstr(" ")
+              addstr("*")
             end
           end
         end
       end
     end
-
-    def print_char(v)
-      if v.even?
-        return "_"
-      else
-        return "-"
-      end
-    end
-
-    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
-
-    def draw_frame_pre
-      setpos(calc_position(@max_value), 0)
-      addstr(print_char(calc_mapping_value(@max_value)) * (@width + 1))
-
-      setpos(calc_position(0), 0)
-      addstr(print_char(calc_mapping_value(0)) * (@width + 1))
-
-      setpos(calc_position(@min_value), 0)
-      addstr(print_char(calc_mapping_value(@min_value)) * (@width + 1))
-    end
-
-    def draw_frame_post
-      setpos(calc_position(@max_value), 0)
-      addstr(@max_value.to_s)
-
-      setpos(calc_position(0), 0)
-      addstr(0.to_s)
-
-      setpos(calc_position(@min_value), 0)
-      addstr(@min_value.to_s)
-
-      labels.each_with_index do |label, idx|
-        setpos(idx + 2, 2)
-        attron(color_pair(COLORS[idx % COLORS.size])|A_NORMAL) do
-          addstr(label)
-        end
-      end
-
-    end
-
-    def init_colors
-      COLORS.each_with_index do |col,idx|
-        init_pair(col, COLOR_BLACK, col)
-      end
-    end
   end
 end

data/lib/tplot/line_chart.rb

@@ -22,13 +22,11 @@ module Tplot
     def add(values)
       @datas.push(values)
       @datas.shift if @datas.size > limit
-      draw
     end
 
     def update(values)
       @datas.pop
       @datas.push(values)
-      draw
     end
 
     def draw
@@ -61,43 +59,29 @@ module Tplot
         break unless data
         data.each_with_index do |value, idx|
           setpos(calc_position(value), col)
-          v = calc_mapping_value(value)
           attron(color_pair(COLORS[idx % COLORS.size])|A_NORMAL) do
-            addstr(print_char(v))
+            addstr("*")
           end
         end
       end
     end
 
-    def print_char(v)
-      if v.even?
-        return "_"
-      else
-        return "-"
-      end
-    end
-
-    def calc_mapping_value(value)
-      range = (@max_value - @min_value).abs
-      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
       (@height * (1 - ratio)).to_i
     end
 
     def draw_frame_pre
       setpos(calc_position(@max_value), 0)
-      addstr(print_char(calc_mapping_value(@max_value)) * (@width + 1))
+      addstr("-" * (@width + 1))
 
       setpos(calc_position(0), 0)
-      addstr(print_char(calc_mapping_value(0)) * (@width + 1))
+      addstr("-" * (@width + 1))
 
       setpos(calc_position(@min_value), 0)
-      addstr(print_char(calc_mapping_value(@min_value)) * (@width + 1))
+      addstr("-" * (@width + 1))
     end
 
     def draw_frame_post

data/lib/tplot/version.rb

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

data/plugins/csv.rb

@@ -0,0 +1,42 @@
+class Tplot::Csv < Tplot::Plugin
+
+  def initialize
+    require 'csv'
+    @options = {
+      chart_type: Tplot::BarChart,
+      delay: 1,
+      use_header: false
+    }
+  end
+
+  def parser
+    OptionParser.new do |opt|
+      opt.banner = "Usage: tplot csv csv_file [options]\n"
+      opt.on('-l', '--line','line chart.') do
+        @options[:chart_type] = Tplot::LineChart
+      end
+      opt.on('-h', '--header','set header first row') do
+        @options[:use_header] = true
+      end
+    end
+  end
+
+  def execute
+    parser.parse!(ARGV)
+    file_name = ARGV.shift
+
+    chart = @options[:chart_type].new
+    CSV.foreach(file_name) do |csv|
+      if @options[:use_header]
+        chart.labels = ["hoge","moge"]
+        @options[:use_header] = false
+        next
+      end
+      chart.add(csv.map(&:to_f))
+    end
+    chart.draw
+  end
+
+  description "plot csv file"
+  help self.new.parser.to_s
+end

data/plugins/free.rb

@@ -7,6 +7,7 @@ class Tplot::Free < Tplot::Plugin
     while true
       uptime = `free | grep Mem`.gsub(/^Mem:/, "").split(" ").map{|v| v.strip.to_f}
       chart.add(uptime[0..1])
+      chart.draw
       sleep 1
     end
   end

data/plugins/help.rb

@@ -1,7 +1,5 @@
 class Tplot::Help < Tplot::Plugin
 
-  description "print plugins help."
-
   def execute
     plugin_name = ARGV.shift
     if File.exists?("#{PLUGIN_DIR}/#{plugin_name}.rb")
@@ -12,6 +10,7 @@ class Tplot::Help < Tplot::Plugin
       print_help("#{PLUGIN_DIR}/#{plugin_name}.rb", USER_PLUGIN_DIR)
       exit 0
     end    
+    puts "#{plugin_name} is not installed."
   end
 
   def print_help(plugin_path, dir)
@@ -21,4 +20,10 @@ class Tplot::Help < Tplot::Plugin
     return puts plugin_class.help.call if plugin_class.help.is_a? Proc
     return puts plugin_class.help
   end
+
+  description "print plugins help."
+  help <<-END
+Usage: tplot help [plugin_name]
+print plugin's help.
+END
 end

data/plugins/list.rb

@@ -1,7 +1,5 @@
 class Tplot::List < Tplot::Plugin
 
-  description "list installed plugins."
-
   def execute
     # builtin plugin.
     puts "-- builtin plugins --"
@@ -22,4 +20,10 @@ class Tplot::List < Tplot::Plugin
     plugin_class = Tplot.const_get(name.capitalize)
     puts "tplot #{name}\t: #{plugin_class.description}"
   end
+
+  description "list installed plugins."
+  help <<-END
+Usage: tplot list
+list installed plugins.
+END
 end

data/plugins/network.rb

@@ -9,6 +9,7 @@ class Tplot::Network < Tplot::Plugin
       inoctet ||= values.first
       outoctet ||= values.last
       chart.add([values.first - inoctet, values.last - outoctet])
+      chart.draw
       inoctet, outoctet = values.first, values.last
       sleep 1
     end

data/plugins/uptime.rb

@@ -29,6 +29,7 @@ class Tplot::Uptime < Tplot::Plugin
     while true
       uptime = `uptime`.gsub(/^.*load average: /, "").split(",").map{|v| v.strip.to_f}
       chart.add(uptime)
+      chart.draw
       sleep @options[:delay]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tplot
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies: []
 description: Tplot is text base graph plot tool.
 email:
@@ -31,6 +31,7 @@ files:
 - lib/tplot/line_chart.rb
 - lib/tplot/plugin.rb
 - lib/tplot/version.rb
+- plugins/csv.rb
 - plugins/free.rb
 - plugins/help.rb
 - plugins/list.rb