soperf 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWZhMmM2YmQ1ODgyNDJjZjUxNWJkZGYwOTI3YmM1MzI3NjU0NDI5OQ==
+    N2I1OTczMjRlMmVjODJlNTk2NDZkYWE2NGJlZGFkYmIwMzQ1ZGVkNw==
   data.tar.gz: !binary |-
-    NzQ5MWFhM2Y4NjlkM2Q5YTQ2ZDY3ZTlmYjVjMTljYTQwYTc4NzlmMA==
+    MzA2NjYwM2ExOGI2OGNjYjM1MjE1NDM5ZjVjNTU3ZjIwODg2MWYxNg==
 SHA512:
   metadata.gz: !binary |-
-    NDczNjkxZWZhZTc1MjI0ZTk3YzZjZmJiNTJhZDhmNzk5YzkwNjg5NTA1NTll
-    ZDNkYjJhNDVlYWQ0ZGExM2UxNTNiMjg4NDBmOThmN2I4Mzg2Mzg5OTM1ZmIz
-    NDkyMmFjYjdiZmY3NjhlZGMwZTQyNGUwMTQwNjYyODdkMmVhMWI=
+    ZGU2ZjI1YzQwMDU2NTZmMWQ5YzkxODk3Y2E0MWFjM2JkZmFiMTA3NTViY2M4
+    ZGQ4YzA3ZTI1NTg0ZjgwMGEzNTgzMzA1NTI2M2RiYjFhZDhhMDU3ODM0Nzdi
+    ODVlYmZkZTA5MDVmMmQ1ODIxYzJhNjc1M2FmMDllNmZiNTJkYjA=
   data.tar.gz: !binary |-
-    YWVkZDJiMjFmNzM3MzYzNTFhYjMxMDZmNGNmYTgwMDRiYmU2NzJhNjQzNmNl
-    OTMzODI1ZWM1ZWZiZTA4ZTgyNmY2NGI1YzA2Yzk1NWMxODM5MmMxMDQzY2Uz
-    MTU5NWQ1YWQzY2MxNjRlZmYxNzBmMWMwYTI4ZmY4Yzc5MWQ3MGM=
+    MjZlODExZGI3YTMxNWIzYzFiYTRiZmJlNjkzZGYwMWNhZmQ0ZThkZDM5Nzdh
+    ZTRhZmRmYTE4MDM1ZDNjZWRlYjQzNDk0NWMyNDM1MzRjNWFhMTRhOTI5OTYw
+    MGZlZTEzMjA0NmFjZDVjYTQ3NjU5NzYwMjQ3OTg2Mzc2MmYzNzg=

data/.gitignore

@@ -1,2 +1,3 @@
 /lib/soperf/test.rb
 /gems/*
+/pushgem.sh

data/Gemfile.lock

@@ -1,16 +1,14 @@
 PATH
   remote: .
   specs:
-    soperf (0.1.3)
+    soperf (0.1.5)
       colorize
-      highline
 
 GEM
   remote: https://rubygems.org/
   specs:
     colorize (0.7.5)
-    highline (1.6.21)
-    rake (10.3.2)
+    rake (10.4.2)
 
 PLATFORMS
   ruby

data/lib/soperf.rb

@@ -1,14 +1,6 @@
-# Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), ".")).each {|dir| $LOAD_PATH << dir }
-
 require 'colorize'
-require 'highline'
 require_relative 'soperf/box_drawing_chars'
+require_relative 'soperf/soperf_helpers'
 require_relative 'soperf/chart'
 require_relative 'soperf/color_helper'
 require_relative 'soperf/row'
-require_relative 'soperf/terminal_helper'
-require_relative 'soperf/time_helper'
-
-module SoPerf
-  VERSION = "0.1.4"
-end

data/lib/soperf/chart.rb

@@ -3,9 +3,10 @@
 
 require_relative 'row'
 require_relative 'box_drawing_chars'
-require_relative 'terminal_helper'
-require_relative 'time_helper'
+require_relative 'soperf_helpers'
 require_relative 'color_helper'
+require_relative 'render_job'
+require_relative 'chart_container'
 
 module SoPerf
   class Chart
@@ -13,170 +14,66 @@ module SoPerf
     include BoxDrawingChars
     include TerminalHelper
     include TimeHelper
+    include ValueFinder
 
     def initialize(data_hash)
-      @data_hash = Hash[data_hash.sort_by { |_, v| v[:start] }] #sort the data by start time
+      @data_hash = Hash[data_hash.sort_by do |_, arr| #sort the data by start time of first range
+                          arr = [arr] unless arr.is_a?(Array)
+                          arr.map { |range| range.first }.max
+                        end]
       @chart     = {}
       set_up_rows
       @duration     = data_range(:round) #Find the full range of the data, rounded up
-      @longest_name = data_hash.map { |k, v| k.to_s.length }.max #The longest name of the results
-      @text_info    = @data_hash.map { |k, v| "#{@chart[k].name(true)}: #{translate_time(v[:start])}-#{translate_time(v[:end])}" }
+      @longest_name = data_hash.map { |k, _| k.to_s.length }.max #The longest name of the results
+      @spacer       = Spacer.new(@longest_name)
+      @text_info    = @data_hash.map { |k, v| "#{@chart[k].name(true)}: #{translate_time(v.first)}-#{translate_time(v.last)}" }
       @forced_width = nil
     end
 
-    def usable_space #Space for the chart, accounting for printing row names
-      @forced_width ? @forced_width : terminal_width - spacer.length - 10
-    end
-
     def ideal_scale
       (usable_space.to_f)/duration
     end
 
-    def spacer(i=0)
-      i      = i.length if i.is_a?(String)
-      spacer = ''
-      (@longest_name-i).times { spacer<<' ' }
-      spacer
-    end
-
     def data_range(round=:round)
-      range = data_hash.map { |_, v| v[:end] }.max
+      range = data_hash.map { |_, v| v.last }.max
       round==:round ? ((range/10.0).ceil*10) : range
     end
 
     def set_up_rows
-      ColorPicker.reset_color_index
-      data_hash.each { |k, v| @chart[k] = Row.new(k, (v[:start]..v[:end])) }
+      ColorHelper.reset_color_index
+      data_hash.each { |k, v| @chart[k] = Row.new(k, v) }
     end
 
     def render(options_hash={})
       options_hash[:color] = true unless options_hash.has_key?(:color)
       @forced_width        = options_hash[:width] if options_hash.has_key?(:width)
       show_summary         = options_hash.has_key?(:summary) ? options_hash[:summary] : true
-      result               = ''
-      @scale               = ideal_scale
-      set_up_rows
+      @names               = @chart.map { |_, v| v.name(true) }
+      options_hash.merge!({duration: data_range, longest_name: @longest_name,
+                           spacer:   @spacer, names: @names})
 
-      @chart.each_pair { |_, row| result << row.render(duration, scale, scaled_tick_locations) + NEWLINE }
+      @render_job = RenderJob.new(options_hash)
 
-      rendered = "#{container(result)}\n#{(show_summary ? print_text_info : '')}"
+      result = ''
+      set_up_rows
+      @chart.each_pair { |_, row| result << row.render(@render_job) + NEWLINE }
+      contained = ChartContainer.new(@render_job).container(result)
+      rendered  = "#{contained}\n#{(show_summary ? print_text_info(@render_job) : '')}"
       reset
       options_hash[:color] ? rendered : (rendered.uncolorize)
     end
 
-    def container(rendered_string)
-      plain_string = rendered_string.split("\n")[0].uncolorize
-      width        = ([plain_string.rindex(TICK_ON_LINE_END_CHAR)||0, (plain_string.rindex(LINE_CHAR)||0)].max)+1
-      top          = []
-      width.times { top << TICK_CHAR }
-      top[0]  = TOP_LEFT_CORNER_CHAR
-      top[-1] = TOP_RIGHT_CORNER_CHAR
-      scaled_tick_locations.each { |i| top[i] = TOP_ON_LINE_CHAR if top[i] == TICK_CHAR }
-
-      bottom                = top.dup.join
-      top                   = top.join
-      bottom[0], bottom[-1] = BOTTOM_LEFT_CORNER_CHAR, BOTTOM_RIGHT_CORNER_CHAR
-      bottom.gsub!(TOP_ON_LINE_CHAR, BOTTOM_ON_LINE_CHAR)
-
-
-      "#{spacer(-1) + top}\n#{add_names(rendered_string)}#{spacer(-1) + bottom}\n#{x_axis_legend}"
-    end
-
-    def closest(arr, val) #returns the index of the closest-matching element of the array
-      closest = arr.map { |elem| (elem-val).abs }
-      closest.index(closest.min)
-    end
-
-    def tick_locations
-      @tick_locations ||=
-          (
-          result      = [] #locations of the ticks
-          tick_values = [] #value for every single space on the chart
-          (duration+1).times { |i| tick_values<<((data_range.to_f/duration)*i) }
-          pretty_tick_values.each { |val| result<<closest(tick_values, val) }
-          result
-          )
-    end
-
-    def pretty_tick_values
-      @pretty_tick_values ||=
-          (
-          arr = [0]
-          (data_range(:round)/tick_freq).times { arr<<arr.last+tick_freq }
-          arr
-          )
-    end
-
-    def tick_freq
-      @tick_freq ||=
-          (
-          result = 10
-          while (result*10)/duration<data_range/5 && result*10 < data_range
-            result*=10
-          end
-          ideal_scale > 1 ? result/=2 : result #If we've upscaled at all, add more tick lines to compensate.
-          data_range(:round)/result < usable_space/20 ? result/=2 : result #If we've got too few lines, add more!
-          result
-          )
-    end
-
     def scaled_tick_locations
       @scaled_tick_locations ||= tick_locations.map { |val| val*scale }
     end
 
-    def add_names(rendered_string)
-      lines  = rendered_string.split("\n")
-      result = ''
-      @chart.each_with_index do |(k, row), i|
-        result<< "#{spacer(row.name)}#{row.name(true)}:#{lines[i]}\n"
-      end
-      result
-    end
-
-    def x_axis_legend
-      x_axis = []
-      ticks  = tick_locations
-      usable_space.times { x_axis<<' ' }
-
-      odd_tick_locations = scaled_tick_locations.values_at(*scaled_tick_locations.each_index.select { |i| i.even? })
-      odd_ticks          = ticks.values_at(*ticks.each_index.select { |i| i.even? })
-
-      odd_tick_locations.each_with_index do |l, i|
-        x_axis[l]=odd_ticks[i]
-      end
-
-      x_axis.map! do |val|
-        val.is_a?(Integer) ? translate_time(val) : ' '
-      end
-
-      spacer('time')+"#{'time'}:#{fill_in_labels(x_axis)}"
-    end
-
-    def fill_in_labels(arr)
-      result      = ''
-      leave_blank = 0
-      arr.each do |val|
-        if val == ' ' &&
-            if leave_blank>0
-              result << ''
-              leave_blank-=1
-            else
-              result<<val
-            end
-        else
-          leave_blank += (str = "#{val}").length-1
-          result<<str
-        end
-      end
-      result
-    end
-
-    def print_text_info
-      result = spacer(-1)
+    def print_text_info(render_job)
+      # return ''
+      result = @spacer.space(-1)
 
       @text_info.length.times do |i|
-        if (result.split("\n")[-1] + @text_info[i]).uncolorize.length > usable_space
-          result << "\n" + spacer(-1) + @text_info[i] + ", "
+        if (result.split("\n")[-1] + @text_info[i]).uncolorize.length > render_job.width
+          result << "\n" + @spacer.space(-1) + @text_info[i] + ", "
         else
           result << "#{@text_info[i]}, "
         end

data/lib/soperf/chart_container.rb

@@ -0,0 +1,77 @@
+require_relative 'soperf_helpers'
+require_relative 'box_drawing_chars'
+require 'colorize'
+
+module SoPerf
+  class ChartContainer
+    include BoxDrawingChars
+    include TimeHelper
+
+    def initialize(render_job)
+      @render_job            = render_job
+      @spacer                = @render_job.spacer
+      @scaled_tick_locations = render_job.scaled_tick_locations
+    end
+
+    def container(rendered_string)
+      plain_string = rendered_string.split("\n")[0].uncolorize
+      width        = ([plain_string.rindex(TICK_ON_LINE_END_CHAR)||0, (plain_string.rindex(LINE_CHAR)||0)].max)+1
+      top          = []
+      width.times { top << TICK_CHAR }
+      top[0]  = TOP_LEFT_CORNER_CHAR
+      top[-1] = TOP_RIGHT_CORNER_CHAR
+      @render_job.scaled_tick_locations.each { |i| top[i] = TOP_ON_LINE_CHAR if top[i] == TICK_CHAR }
+
+      bottom                = top.dup.join
+      top                   = top.join
+      bottom[0], bottom[-1] = BOTTOM_LEFT_CORNER_CHAR, BOTTOM_RIGHT_CORNER_CHAR
+      bottom.gsub!(TOP_ON_LINE_CHAR, BOTTOM_ON_LINE_CHAR)
+
+      "#{@spacer.space(-1) + top}\n#{add_names(rendered_string)}#{@spacer.space(-1) + bottom}\n#{x_axis_legend}"
+    end
+
+    def x_axis_legend
+      x_axis             = Array.new(@render_job.width) { ' ' }
+      odd_tick_locations = @scaled_tick_locations.values_at(*@scaled_tick_locations.each_index.select { |i| i.even? })
+
+      odd_ticks = @render_job.pretty_tick_values.values_at(*@render_job.pretty_tick_values.each_index.select { |i| i.even? })
+
+      odd_tick_locations.each_with_index do |l, i|
+        x_axis[l]=odd_ticks[i].to_i
+      end
+      x_axis.map! do |val|
+        val.is_a?(Integer) ? translate_time(val) : ' '
+      end
+
+      @spacer.space('time')+"#{'time'}:#{fill_in_labels(x_axis)}"
+    end
+
+    def fill_in_labels(arr)
+      result      = ''
+      leave_blank = 0
+      arr.each do |val|
+        if val == ' ' &&
+            if leave_blank>0
+              result << ''
+              leave_blank-=1
+            else
+              result<<val
+            end
+        else
+          leave_blank += (str = "#{val}").length-1
+          result<<str
+        end
+      end
+      result
+    end
+
+    def add_names(rendered_string)
+      lines  = rendered_string.split("\n")
+      result = ''
+      @render_job.names.each_with_index do |name, i|
+        result<< "#{@spacer.space(name.uncolorize)}#{name}:#{lines[i]}\n"
+      end
+      result
+    end
+  end
+end

data/lib/soperf/color_helper.rb

@@ -1,7 +1,7 @@
 require_relative 'box_drawing_chars'
 
 module SoPerf
-  class ColorPicker
+  class ColorHelper
     include BoxDrawingChars
     @@use_color = true
 
@@ -28,11 +28,11 @@ module SoPerf
     def self.colorize(str, color)
       if @@use_color
         str.gsub(
-            TICK_CHAR, ColorPicker.color(TICK_CHAR, color)).gsub(
-            TICK_ON_LINE_CHAR, ColorPicker.color(TICK_ON_LINE_CHAR, color)).gsub(
-            TICK_ON_LINE_START_CHAR, ColorPicker.color(TICK_ON_LINE_START_CHAR, color)).gsub(
-            TICK_ON_LINE_END_CHAR, ColorPicker.color(TICK_ON_LINE_END_CHAR, color)).gsub(
-            SINGLE_SPACE_LINE, ColorPicker.color(SINGLE_SPACE_LINE, color))
+            TICK_CHAR, ColorHelper.color(TICK_CHAR, color)).gsub(
+            TICK_ON_LINE_CHAR, ColorHelper.color(TICK_ON_LINE_CHAR, color)).gsub(
+            TICK_ON_LINE_START_CHAR, ColorHelper.color(TICK_ON_LINE_START_CHAR, color)).gsub(
+            TICK_ON_LINE_END_CHAR, ColorHelper.color(TICK_ON_LINE_END_CHAR, color)).gsub(
+            SINGLE_SPACE_LINE, ColorHelper.color(SINGLE_SPACE_LINE, color))
       end
     end
 

data/lib/soperf/render_job.rb

@@ -0,0 +1,87 @@
+require_relative 'soperf_helpers'
+
+module SoPerf
+  class RenderJob
+    include TerminalHelper
+    include ValueFinder
+    attr_accessor :width, :scale, :raw_duration, :duration, :spacer,
+                  :tick_frequency, :pretty_tick_values, :tick_locations,
+                  :each_space_values, :scaled_tick_locations, :use_color,
+                  :names, :longest_name
+
+    def initialize(options_hash)
+      options = default_render_options.merge(options_hash)
+      raise StandardError if options[:duration].nil?
+
+      @names                 = options[:names]
+      @spacer                = options[:spacer]
+      @use_color             = options[:color]
+      @width                 = options.has_key?(:width) ? options[:width] : usable_space(terminal_width, options[:longest_name])
+      puts terminal_width
+      @raw_duration          = options[:duration]
+      @duration              = ((options[:duration]/10.0).ceil*10)
+      @scale                 = @width/@duration.to_f
+      @tick_frequency        = tick_frequency
+      @pretty_tick_values    = pretty_tick_values
+      @tick_locations        = tick_locations
+      @each_space_values     = values_for_each_space
+      @scaled_tick_locations = scaled_tick_locations
+      @longest_name          = options[:longest_name]
+    end
+
+    def default_render_options
+      { duration:     nil,
+        longest_name: 0,
+        color:        true,
+        summary:      true,
+        spacer:       Spacer.new }
+    end
+
+    def values_for_each_space
+      result = []
+      count  = 0
+      (@width+1).times do
+        result << count
+        count += @duration/@width.to_f
+      end
+      @pretty_tick_values.each do |val|
+        index         = closest(result, val)
+        result[index] = val
+      end
+      result
+    end
+
+    def tick_locations
+      result      = [] #locations of the ticks
+      tick_values = [] #value for every single space on the chart
+      (@width+1).times { |i| tick_values<<((@duration/@width.to_f)*i) }
+      @pretty_tick_values.each { |val| result<<closest(tick_values, val) }
+      result.map { |elem| elem/scale }
+    end
+
+    def tick_frequency
+      result = 10
+      while (result*10)/duration<@raw_duration/5 && result*10 < @raw_duration
+        result*=10
+      end
+      result/=2 if @scale > 1 #If we've upscaled at all, add more tick lines to compensate.
+      result/=2 if @duration/result < @width/20 #If we've got too few lines, add more!
+      result
+    end
+
+    def pretty_tick_values
+      arr = [0]
+      (@duration/@tick_frequency).times { arr<<arr.last+@tick_frequency }
+      arr.map { |val| val*@scale }
+      arr
+    end
+
+    def usable_space(base_width, longest_name) #Space for the chart,
+      base_width - longest_name - 10 #accounting for printing row names
+    end
+
+    def scaled_tick_locations
+      @tick_locations.map { |val| val*@scale }
+    end
+  end
+end

data/lib/soperf/row.rb

@@ -4,18 +4,20 @@
 require 'colorize'
 require_relative 'color_helper'
 require_relative 'box_drawing_chars'
-require_relative 'time_helper'
+require_relative 'soperf_helpers'
 
 module SoPerf
   class Row
     include BoxDrawingChars
     include TimeHelper
+    include ValueFinder
     attr_accessor :contents, :color, :raw_range
 
-    def initialize(name, raw_range, color = ColorPicker.pick_a_color)
+    def initialize(name, raw_range, color = ColorHelper.pick_a_color)
       @name            = name.to_s
       @color           = color
       @raw_range       = raw_range
+      @raw_range       = (raw_range.last..raw_range.first) if raw_range.first > raw_range.last
       @use_color       = true
       @raw_duration    = raw_range.last-raw_range.first
       @pretty_duration = translate_time(@raw_duration)
@@ -29,32 +31,33 @@ module SoPerf
       range.member?(int) ? 1 : 0
     end
 
-    def raw_array(duration, range=raw_range)
-      contents = []
-      range    = (range.first.round..range.last)
-      duration.times { |i| contents<<point_in_range?(range, i) }
+    def raw_array(duration, range=raw_range, space_vals)
+      contents       = Array.new(duration+1) { 0 }
+      starting_index = closest(space_vals, range.first)
+      ending_index   = closest(space_vals, range.last)
+      (starting_index..ending_index).each { |i| contents[i]=1 }
       contents
     end
 
     def scaled_range(scale)
-      (raw_range.first*scale..raw_range.last*scale)
+      (scale*raw_range.first..scale*raw_range.last)
     end
 
     def name(colored = false)
-      colored ? ColorPicker.color(@name, color) : @name
+      colored ? ColorHelper.color(@name, color) : @name
     end
 
-    def render(duration, scale=1, tick_locations=[], use_color=true)
-      range      = scaled_range(scale)
-      duration   = (duration*scale).ceil.to_i
-      @use_color = use_color
-      arr        = raw_array(duration, range)
-      translate(arr, tick_locations)
+    def render(render_job)
+      @render_job = render_job
+      duration    = (render_job.duration*render_job.scale).to_i
+      @use_color  = render_job.use_color
+      arr         = raw_array(duration, raw_range, render_job.each_space_values)
+      translate(arr, render_job.scaled_tick_locations)
     end
 
     def add_duration(str)
       look_ahead_spaces = (@pretty_duration.to_s).length+1
-      label             = ColorPicker.color(@pretty_duration.to_s, color)
+      label             = ColorHelper.color(@pretty_duration.to_s, color)
       if str.rindex(TICK_ON_LINE_END_CHAR)
         index = str.rindex(TICK_ON_LINE_END_CHAR)
         char  = TICK_ON_LINE_END_CHAR
@@ -115,7 +118,7 @@ module SoPerf
       str[-1]=TICK_ON_LINE_CHAR if str[-1]==TICK_CHAR
       str[-1]=LINE_CHAR if str[-1]==WHITESPACE_CHAR
 
-      result = ColorPicker.colorize(add_duration(str), color)
+      result = ColorHelper.colorize(add_duration(str), color)
       @use_color ? result : result.uncolorize
     end
   end

data/lib/soperf/soperf_helpers.rb

@@ -0,0 +1,67 @@
+require_relative 'box_drawing_chars'
+
+module SoPerf
+
+  class Spacer
+    def initialize(chars=0)
+      chars   = chars.length if chars.is_a?(String)
+      @length = chars
+    end
+
+    def space(i=0)
+      i      = i.length if i.is_a?(String)
+      spacer = ''
+      (@length-i).times { spacer<<' ' }
+      spacer
+    end
+  end
+
+  module TerminalHelper
+    def terminal_width
+      `/usr/bin/env tput cols`.to_i
+    end
+  end
+
+  module ValueFinder
+    def closest(arr, val) #returns the index of the closest-matching element of the array
+      closest = arr.map { |elem| (elem-val).abs }
+      closest.index(closest.min)
+    end
+  end
+
+  module TimeHelper
+    def translate_time(val)
+      val = val.abs.round(2)
+      if val == 0
+        0
+      else
+        res = val
+        if res/1000.0 >= 1
+          res = res/1000.0 #to seconds
+          if res/60.0 >= 1
+            res = res/60.0
+            if res/60.0 >= 1
+              res = res/60.0
+              if res/24 >= 1
+                res = res/24
+                format(res, "d")
+              else
+                format(res, "h")
+              end
+            else
+              format(res, "m")
+            end
+          else
+            format(res, "s")
+          end
+        else
+          format(res, "ms")
+        end
+      end
+    end
+
+    def format(res, unit)
+      "#{res.round(2).to_s.gsub(/\.0$/, '')}#{unit}"
+    end
+  end
+end

data/lib/soperf/version.rb

@@ -0,0 +1,3 @@
+module SoPerf
+  VERSION = "0.1.5"
+end

data/soperf.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require './lib/soperf'
+require './lib/soperf/version'
 
 Gem::Specification.new do |spec|
   spec.name        = "soperf"
@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'highline'
   spec.add_runtime_dependency 'colorize'
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/spec/lib/color_picker_spec.rb

@@ -5,11 +5,11 @@ require_relative '../../lib/soperf/color_helper'
 
 describe 'SoPerf::ColorPicker' do
   before(:all) do
-    @picker = lambda { SoPerf::ColorPicker.pick_a_color }
+    @picker = lambda { SoPerf::ColorHelper.pick_a_color }
   end
 
   before(:each) do
-    SoPerf::ColorPicker.reset_color_index
+    SoPerf::ColorHelper.reset_color_index
   end
 
   it 'should not select the same color twice consecutively' do
@@ -24,10 +24,10 @@ describe 'SoPerf::ColorPicker' do
 
   it 'should reset the color index' do
     5.times do |i|
-      SoPerf::ColorPicker.reset_color_index
+      SoPerf::ColorHelper.reset_color_index
       color1 = @picker.call
       i.times { @picker.call }
-      SoPerf::ColorPicker.reset_color_index
+      SoPerf::ColorHelper.reset_color_index
       expect(@picker.call).to eq color1
     end
   end

data/spec/lib/time_helper_spec.rb

@@ -1,7 +1,7 @@
 #!/bin/env ruby
 # encoding: utf-8
 
-require_relative '../../lib/soperf/time_helper'
+require_relative '../../lib/soperf/soperf_helpers'
 
 describe 'SoPerf::TimeHelper' do
   include SoPerf::TimeHelper

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: soperf
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Wesley Boynton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -85,10 +71,12 @@ files:
 - lib/soperf.rb
 - lib/soperf/box_drawing_chars.rb
 - lib/soperf/chart.rb
+- lib/soperf/chart_container.rb
 - lib/soperf/color_helper.rb
+- lib/soperf/render_job.rb
 - lib/soperf/row.rb
-- lib/soperf/terminal_helper.rb
-- lib/soperf/time_helper.rb
+- lib/soperf/soperf_helpers.rb
+- lib/soperf/version.rb
 - soperf.gemspec
 - spec/lib/chart_spec.rb
 - spec/lib/color_picker_spec.rb
@@ -116,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ascii table generator for performance metrics

data/lib/soperf/terminal_helper.rb

@@ -1,7 +0,0 @@
-module SoPerf
-  module TerminalHelper
-    def terminal_width
-      HighLine::SystemExtensions.terminal_size[0]
-    end
-  end
-end

data/lib/soperf/time_helper.rb

@@ -1,32 +0,0 @@
-module SoPerf
-  module TimeHelper
-    def translate_time(val)
-      if val == 0
-        0
-      else
-        res = val
-        if res/1000.0 >= 1
-          res = res/1000.0 #to seconds
-          if res/60.0 >= 1
-            res = res/60.0
-            if res/60.0 >= 1
-              res = res/60.0
-              if res/24 >= 1
-                res = res/24
-                "#{res.to_s.gsub(/\.0$/, '')}d"
-              else
-                "#{res.to_s.gsub(/\.0$/, '')}h"
-              end
-            else
-              "#{res.to_s.gsub(/\.0$/, '')}m"
-            end
-          else
-            "#{res.to_s.gsub(/\.0$/, '')}s"
-          end
-        else
-          "#{res.to_s.gsub(/\.0$/, '')}ms"
-        end
-      end
-    end
-  end
-end