dumbstats 0.0.1 → 0.0.2

data/dumbstats.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["ks.ruby@kurtstephens.com"]
   gem.description   = %q{Collect data, generate stats, draw histograms, send to Graphite, do stuff in Ruby. }
   gem.summary       = %q{Simple stats collection}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/kstephens/dumbstats"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/example/ex01.rb

@@ -0,0 +1,20 @@
+$:.unshift File.expand_path("../../lib", __FILE__)
+
+require 'rubygems'
+
+require 'dumbstats/stats'
+require 'dumbstats/histogram'
+
+begin
+  stats = Dumbstats::Stats.new(:name => 'Roll 2x6')
+  1000.times do | i |
+    d1 = (i % 6) + 1
+    d2 = ((i / 6) % 6) + 1
+    stats.add!(:d1, d1)
+    stats.add!(:d2, d2)
+    stats.add!(:d6_2, d1 + d2)
+  end
+  stats[:d1].h
+  stats[:d2].h
+  stats[:d6_2].h
+end

data/lib/dumbstats/bucket.rb

@@ -1,3 +1,5 @@
+require 'dumbstats'
+
 module Dumbstats
   # Collects details.
   class Bucket

data/lib/dumbstats/graph.rb

@@ -0,0 +1,79 @@
+require 'dumbstats/bucket'
+
+module Dumbstats
+  # Prepare statitical graph for text display.
+  # A Graph of values.
+  class Graph < Bucket
+    include Initialization
+    attr_accessor :values, :width
+    attr_accessor :values_are_integers
+
+    def initialize *args
+      super
+      @force_min, @force_max = @min, @max
+      if @values
+        values = @values
+        @values = [ ]
+        values.each { | v | add! v }
+        finish!
+      end
+      @width ||= 20
+    end
+
+    def fix_width!
+      @width = 1 if @width < 1
+      @min = x_to_v(0)
+      @max = x_to_v(@width + 1)
+      @max_min = (@max - @min).to_f
+      self
+    end
+
+    def finish!
+      super
+      return nil if empty?
+      @min = @force_min if @force_min
+      @max = @force_max if @force_max
+      @max_min = @max - @min
+      @values_are_integers = @values.all?{|e| Integer === e.to_numeric}
+      if @values_are_integers
+        if @width > @max_min
+          @width = @max_min.to_i + 1
+        else
+          @max_min = @max_min.to_f
+        end
+      end
+      @width_f = @width.to_f
+      self
+    end
+
+    def sum!
+      finish! unless @sum
+      @sum
+    end
+
+    def percent value
+      '%5.1f%%' % (value * 100 / sum!.to_f)
+    end
+
+    def bar value
+      x = v_to_x(value).to_i
+      binding.pry if x < 0
+      if value > @min and x < 1
+        bar = '.'
+      else
+        bar = "*" * x
+      end
+      bar = "#{bar}#{' ' * (@width - bar.size)}"
+      bar
+    end
+
+    def v_to_x v
+      (v - @min) * @width / @max_min # = x
+    end
+
+    def x_to_v x
+      (x * @max_min / @width) + @min # = v
+    end
+  end
+end # module
+

data/lib/dumbstats/histogram.rb

@@ -1,4 +1,5 @@
 require 'dumbstats/stats'
+require 'dumbstats/graph'
 
 gem 'terminal-table'
 require 'terminal-table'
@@ -25,7 +26,7 @@ module Dumbstats
       return [ ] if @values.size < 2
       @x_graph = Graph.new(:min => @min, :max => @max, :values => @values, :width => @width)
       return [ ] if @x_graph.empty?
-      @x_graph.fix_width!
+      # @x_graph.fix_width!
 
       @buckets = Hash.new { |h, k| b = Bucket.new; b.name = k; h[k] = b }
       @values.each do | v |
@@ -64,7 +65,7 @@ module Dumbstats
         s.padding_right = 1
 
         # Header:
-        h = [ '<', '>', 'cnt', '%', "cnt h", "min", "avg", "max" ]
+        h = [ '>=', '<', 'cnt', '%', "cnt h", "min", "avg", "max" ]
         align_right = [ 0, 1, 2, 3, 5, 6, 7 ]
         if @show_sum
           h.push('sum', '%', 'sum h')
@@ -74,8 +75,12 @@ module Dumbstats
 
         cnt_sum = sum_sum = 0
         @width.times do | i |
-          x0 = @x_graph.x_to_v(i).to_i
-          x1 = @x_graph.x_to_v(i + 1).to_i - 1
+          x0 = @x_graph.x_to_v(i)
+          x1 = @x_graph.x_to_v(i + 1)
+          $stderr.puts "  i=#{i} x0=#{x0.inspect} x1=#{x1.inspect} #{@x_graph.min.inspect} #{@x_graph.max.inspect}" if @debug
+          x0 = x0.to_i
+          x1 = x1.to_i
+
           b = @buckets[i]
           b.finish!
 

data/lib/dumbstats/stats.rb

@@ -1,3 +1,4 @@
+require 'dumbstats'
 require 'dumbstats/bucket'
 require 'dumbstats/value'
 
@@ -104,77 +105,6 @@ class Stats
     nil
   end
 
-  # A Graph of values.
-  class Graph < Bucket
-    include Initialization
-    attr_accessor :values, :width
-    attr_accessor :values_are_integers
-
-    def initialize *args
-      super
-      @force_min, @force_max = @min, @max
-      if @values
-        values = @values
-        @values = [ ]
-        values.each { | v | add! v }
-        finish!
-      end
-      @width ||= 20
-    end
-
-    def fix_width!
-      @width = 1 if @width < 1
-      @max = x_to_v(@width + 1)
-      @max_min = (@max - @min).to_f
-      self
-    end
-
-    def finish!
-      super
-      return nil if empty?
-      @min = @force_min if @force_min
-      @max = @force_max if @force_max
-      @max_min = @max - @min
-      @values_are_integers = @values.all?{|e| Integer === e.to_numeric}
-      if @values_are_integers
-        if @width > @max_min
-          @width = @max_min.to_i
-        else
-          @max_min = @max_min.to_f
-        end
-      end
-      self
-    end
-
-    def sum!
-      finish! unless @sum
-      @sum
-    end
-
-    def percent value
-      '%5.1f%%' % (value * 100 / sum!.to_f)
-    end
-
-    def bar value
-      x = v_to_x(value).to_i
-      binding.pry if x < 0
-      if value > @min and x < 1
-        bar = '.'
-      else
-        bar = "*" * x
-      end
-      bar = "#{bar}#{' ' * (@width - bar.size)}"
-      bar
-    end
-
-    def v_to_x v
-      (v - @min) * @width / @max_min # = x
-    end
-
-    def x_to_v x
-      (x * @max_min / @width) + @min # = v
-    end
-  end
 end # class
 end # module
 

data/lib/dumbstats/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dumbstats
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Kurt Stephens
@@ -34,14 +34,16 @@ files:
 - README.md
 - Rakefile
 - dumbstats.gemspec
+- example/ex01.rb
 - lib/dumbstats.rb
 - lib/dumbstats/bucket.rb
+- lib/dumbstats/graph.rb
 - lib/dumbstats/graphite.rb
 - lib/dumbstats/histogram.rb
 - lib/dumbstats/stats.rb
 - lib/dumbstats/value.rb
 - lib/dumbstats/version.rb
-homepage: ""
+homepage: https://github.com/kstephens/dumbstats
 licenses: []
 
 post_install_message: