gfspark 0.1.2 → 0.2.0

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 vendor/
 .gfspark
+.ruby-version

data/README.md

@@ -20,7 +20,8 @@ Or install it yourself as:
 
 ## ScreenShots
 
-<img src='https://github.com/yuroyoro/gfspark/raw/master/images/gfspark_screenshot.png' width='600'/>
+<img src='https://github.com/yuroyoro/gfspark/raw/master/images/gfspark_screenshot1.png' width='600'/>
+<img src='https://github.com/yuroyoro/gfspark/raw/master/images/gfspark_screenshot2.png' width='600'/>
 
 ## Usage
 
@@ -37,13 +38,14 @@ Or install it yourself as:
             --url=VALUE                  Your GrowthForecast URL
         -u, --user=USER
         -p, --pass=PASS
-        -t=VALUE                         Range of Graph
+        -t, --type=VALUE                 Range of Graph
             --gmode=VALUE                graph mode: gauge or subtract (default is gauge)
             --from=VALUE                 Start date of graph (2011/12/08 12:10:00) required if t=c or sc
             --to=VALUE                   End date of graph (2011/12/08 12:10:00) required if t=c or sc
         -h, --height=VALUE               graph height (default 10
         -w, --width=VALUE                graph width (default is deteced from $COLUMNS)
         -c, --color=VALUE                Color of graph bar (black/red/green/yellow/blue/magenta/cyan/white)
+        -y, --y-axis-label=VALUE         Show y axis labels (hide/show/simple: default is show)
         -n, --non-fullwidth-font         Show bar symbol as fullwidth
             --sslnoverify                don't verify SSL
             --sslcacert=v                SSL CA CERT
@@ -61,7 +63,7 @@ Or install it yourself as:
           s8h : 8 Hours (1min avg)
            4h : 4 Hours (5min avg)
           s4h : 4 Hours (1min avg)
-            h : Hour (5min avg),
+            h : Hour (5min avg)
            sh : Hour (1min avg)
             n : Half Day (5min avg)
            sn : Half Day (1min avg)
@@ -70,7 +72,7 @@ Or install it yourself as:
 
 gfspark does not supports "COMPLEX GRAPH".
 if graph output is broken, try `--non-fullwidth-font` option.
-For example, your Terminal font is "Rickty", then it'll be fix graph output problem.
+For example, if your Terminal font is "Rickty", then it'll be fix graph output problem.
 
 ## Configuration
 

data/lib/gfspark/app.rb

@@ -29,6 +29,14 @@ class Gfspark::App
       return
     end
 
+    @options[:t] ||= "d"
+    unless RANGES.keys.include?(@options[:t])
+      puts "Unknown graph range t=#{@options[:t]}"
+      @valid = false
+      return
+    end
+
+    @options[:y_axis_label] ||= "show"
     @valid = true
     detect_width_and_height!
     set_ssl_options!

data/lib/gfspark/config.rb

@@ -64,7 +64,7 @@ module Gfspark::Config
     puts <<-MSG
 
     -t option detail:
-#{Gfspark::Graph::RANGE_DEFS.map{|k,v| sprintf("      %3s : %s", k, v)}.join("\n")}
+#{Gfspark::Graph::RANGE_DEFS.map{|k,v,_| sprintf("      %3s : %s", k, v)}.join("\n")}
     MSG
   end
 
@@ -76,7 +76,7 @@ module Gfspark::Config
   def detect_width_and_height!
     @stty_height, @stty_width = `stty size`.split.map(&:to_i)
 
-    width = ((@stty_width - 12) / 2).floor
+    width = ((@stty_width - 18) / 2).floor
     @options[:width] ||= width
     @width = @options[:width].to_i
     height = @options[:height].to_i
@@ -116,13 +116,14 @@ module Gfspark::Config
       opts.on("--url=VALUE", "Your GrowthForecast URL"){|v| @options[:url] = v}
       opts.on('-u=USER',  '--user=USER'){|v| @options[:username] = v }
       opts.on('-p=PASS',  '--pass=PASS'){|v| @options[:password] = v }
-      opts.on("-t=VALUE", "Range of Graph"){|v| @options[:t] = v}
+      opts.on("-t=VALUE", "--type=VALUE", "Range of Graph"){|v| @options[:t] = v}
       opts.on("--gmode=VALUE", "graph mode: gauge or subtract (default is gauge)"){|v| @options[:gmode] = v}
       opts.on("--from=VALUE", "Start date of graph (2011/12/08 12:10:00) required if t=c or sc"){|v| @options[:from] = v}
       opts.on("--to=VALUE", "End date of graph (2011/12/08 12:10:00) required if t=c or sc"){|v| @options[:to] = v}
       opts.on("-h=VALUE", "--height=VALUE", "graph height (default 10"){|v| @options[:height] = v}
       opts.on("-w=VALUE", "--width=VALUE", "graph width (default is deteced from $COLUMNS)"){|v| @options[:width] = v}
       opts.on("-c=VALUE", "--color=VALUE", "Color of graph bar (#{COLORS.join("/")})"){|v| @options[:color] = v if COLORS.include?(v.to_sym)}
+      opts.on("-y=VALUE", "--y-axis-label=VALUE", "Show y axis labels (hide/show/simple: default is show)"){|v| @options[:y_axis_label] = v}
       opts.on("-n", "--non-fullwidth-font", "Show bar symbol as fullwidth"){ @options[:non_fullwidth_font] = true }
       opts.on("--sslnoverify", "don't verify SSL"){|v| @options[:sslNoVerify] = true}
       opts.on("--sslcacert=v", "SSL CA CERT"){|v| @options[:sslCaCert] = v}

data/lib/gfspark/graph.rb

@@ -21,19 +21,33 @@ module Gfspark::Graph
     }
   end
 
+  def seconds_to_label(sec)
+    t = Time.at(sec).utc
+    d, h, m, s = t.day.pred, t.hour, t.min, t.sec
+    res = ""
+    res += "#{d}day" unless d.zero?
+    res += "#{h}h"   unless h.zero? && (d.zero? || (m.zero? && s.zero?))
+    res += "#{m}min" unless m.zero? && ((d.zero? && h.zero?) || s.zero?)
+    res += "#{s}sec" unless s.zero?
+    return res
+  end
+
   def render(json, summary, url = nil)
-    rows = json['rows']
-    max = rows.flatten.compact.max
+    rows    = json['rows']
+    step    = json['step'].to_i
+    max     = rows.flatten.compact.max
     max_val = (max / 8).ceil * 8
-    unit  = max_val / (@height * 8).to_f
+    unit    = max_val / (@height * 8).to_f
 
-    s = Time.at(json["start_timestamp"].to_i).strftime("%Y-%m-%d %H:%M:%S")
-    e = Time.at(json["end_timestamp"].to_i).strftime("%Y-%m-%d %H:%M:%S")
+    start_timestamp = json["start_timestamp"].to_i
+    end_timestamp   = json["end_timestamp"].to_i
+    s = Time.at(start_timestamp).localtime.strftime("%Y-%m-%d %H:%M:%S")
+    e = Time.at(end_timestamp  ).localtime.strftime("%Y-%m-%d %H:%M:%S")
 
     puts "  #{blue(json["column_names"].first)}"
     puts "    #{yellow(url)}"
     puts ""
-    puts "    #{period_title}   #{s} - #{e}"
+    puts "    #{period_title}   #{s} - #{e}  step: /#{seconds_to_label(step)}"
     puts ""
 
     result = []
@@ -45,15 +59,51 @@ module Gfspark::Graph
       if color = @options[:color]
         line = Term::ANSIColor.send(color, line)
       end
-      result << "#{sprintf("%10s", label)} | #{line} |"
+      result << "#{sprintf("%10s", label)} |#{line}|"
     end
     puts result.join("\n")
+
+    render_y_axis_labels(rows, start_timestamp, step)
+
     puts ""
 
     sums = summary.first.last
     puts "    #{sprintf("cur: %.1f  ave: %.1f  max: %.1f  min %.1f", *sums)}"
   end
 
+  def render_y_axis_labels(rows, start_timestamp, step)
+    y_axis_labels = rows.length.times.select{|n| n % 4 == 0}. map{|n|
+      t = Time.at(start_timestamp + (n * step)).localtime
+      sprintf("%-8s", to_axis_label(t))
+    }.join
+    y_axis_arrows= rows.length.times.select{|n| n % 4 == 0}. map{|n|
+      " /      "
+    }.join
+
+    case @options[:y_axis_label]
+      when "show"
+        puts sprintf("%10s%s", "", y_axis_arrows)
+        puts sprintf("%10s%s", "", y_axis_labels)
+      when "simple"
+        puts sprintf("%10s%s", "", y_axis_labels)
+     end
+  end
+
+  def axis_unit
+    @axis_unit ||= RANGE_DEFS.find{|_| _.first == @options[:t]}.last
+  end
+
+  def to_axis_label(t)
+    case axis_unit
+      when :min   then t.strftime("%M")
+      when :hour  then t.strftime("%H:%M")
+      when :day   then t.strftime("%d")
+      when :week  then t.strftime("%a")
+      when :month then t.strftime("%m")
+      else             t.strftime("%H:%M")
+    end
+  end
+
   def period_title
     case @options[:t]
       when "c", "sc" then sprintf("%s to %s", @options[:from], @options[:to])
@@ -62,25 +112,26 @@ module Gfspark::Graph
   end
 
   RANGE_DEFS = [
-    ["y"   , 'Year (1day avg)'],
-    ["m"   , 'Month (2hour avg)'],
-    ["w"   , 'Week (30min avg)'],
-    ["3d"  , '3 Days (5min avg)'],
-    ["s3d" , '3 Days (5min avg)'],
-    ["d"   , 'Day (5min avg)'],
-    ["sd"  , 'Day (1min avg)' ],
-    ["8h"  , '8 Hours (5min avg)'],
-    ["s8h" , '8 Hours (1min avg)' ],
-    ["4h"  , '4 Hours (5min avg)'],
-    ["s4h" , '4 Hours (1min avg)' ],
-    ["h"   , 'Hour (5min avg), '],
-    ["sh"  , 'Hour (1min avg)' ],
-    ["n"   , 'Half Day (5min avg)'],
-    ["sn"  , 'Half Day (1min avg)'],
-    ["c"   , "Custom (5min avg)"],
-    ["sc"  , "Custom (1min avg)"]
+    # option, label, y-axis unit
+    ["y"   , 'Year (1day avg)'     , :month],
+    ["m"   , 'Month (2hour avg)'   , :day  ],
+    ["w"   , 'Week (30min avg)'    , :week ],
+    ["3d"  , '3 Days (5min avg)'   , :hour ],
+    ["s3d" , '3 Days (5min avg)'   , :hour ],
+    ["d"   , 'Day (5min avg)'      , :hour ],
+    ["sd"  , 'Day (1min avg)'      , :hour ],
+    ["8h"  , '8 Hours (5min avg)'  , :hour ],
+    ["s8h" , '8 Hours (1min avg)'  , :hour ],
+    ["4h"  , '4 Hours (5min avg)'  , :hour ],
+    ["s4h" , '4 Hours (1min avg)'  , :hour ],
+    ["h"   , 'Hour (5min avg)'     , :min  ],
+    ["sh"  , 'Hour (1min avg)'     , :min  ],
+    ["n"   , 'Half Day (5min avg)' , :hour ],
+    ["sn"  , 'Half Day (1min avg)' , :hour ],
+    ["c"   , "Custom (5min avg)"   , :min  ],
+    ["sc"  , "Custom (1min avg)"   , :min  ]
   ]
-  RANGES = Hash[*RANGE_DEFS.flatten]
+  RANGES = Hash[*RANGE_DEFS.map{|k,v,_| [k,v]}.flatten]
 
   def range_arg?(t)
     RANGES.keys.include? t

data/lib/gfspark/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module Gfspark
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,75 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gfspark
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Tomohito Ozaki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-29 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2013-05-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70140268416000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: *70140268416000
+- !ruby/object:Gem::Dependency
   name: term-ansicolor
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70140268415440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: *70140268415440
+- !ruby/object:Gem::Dependency
   name: rake
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70140268414960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70140268414960
 description: GrowthForecast on Terminal
-email: 
+email:
 - ozaki@yuroyoro.com
-executables: 
+executables:
 - gfspark
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -78,45 +60,36 @@ files:
 - bin/gfspark
 - gfspark.gemspec
 - images/gfspark_screenshot.png
+- images/gfspark_screenshot1.png
+- images/gfspark_screenshot2.png
 - lib/gfspark.rb
 - lib/gfspark/app.rb
 - lib/gfspark/config.rb
 - lib/gfspark/connection.rb
 - lib/gfspark/graph.rb
 - lib/gfspark/version.rb
-has_rdoc: true
 homepage: http://yuroyoro.github.io/gfspark/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: GrowthForecast Graph viewer on Terminal
 test_files: []
-