quicky 0.1.1 → 0.2.0

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    quicky (0.1.0)
+    quicky (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    test-unit (2.5.1)
+    test-unit (2.5.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -13,6 +13,11 @@ quicky = Quicky::Timer.new
 quicky.time(:test1) do
   sleep 2
 end
+```
+
+Call time over and over again and when ready for results:
+
+```ruby
 # Print average duration for all :test1 timings
 p quicky.results(:test1).duration
 # Print total duration for all :test1 timings
@@ -21,6 +26,7 @@ p quicky.results(:test1).total_duration
 p quicky.results(:test1).max_duration
 # Print shortest duration for all :test1 timings
 p quicky.results(:test1).min_duration
+```
 
 ### Time in a loop
 
@@ -49,3 +55,34 @@ end
 
 - warmup: X -- will throw out the first X results.
 
+## Results
+
+You can get all the results with:
+
+```ruby
+results =  quicky.results
+```
+
+Or a single result:
+
+```ruby
+result = quicky.results(:test1)
+```
+
+Or turn it into a straight up hash:
+
+```ruby
+hash = quicky.results.to_hash
+```
+
+And even marshal a hash back into a quicky objects:
+
+```ruby
+results = Quicky::ResultsHash.from_hash(hash)
+```
+
+Or merge several results hashes together (if you were doing some tests in parallel):
+
+```ruby
+results.merge!(other_results)
+```

data/lib/quicky/results_hash.rb

@@ -5,11 +5,32 @@ module Quicky
     # returns results in a straight up hash.
     def to_hash
       ret = {}
-      self.each_pair do |k,v|
+      self.each_pair do |k, v|
         ret[k] = v.to_hash()
       end
       ret
     end
+
+    # if given the same results from to_hash, this will recreate the ResultsHash
+    def self.from_hash(h)
+      rh = ResultsHash.new
+      h.each_pair do |k, v|
+        rh[k] = TimeCollector.from_hash(v)
+      end
+      rh
+    end
+
+    # merges multiple ResultsHash's
+    def merge!(rh)
+      rh.each_pair do |k, v|
+        # v is a TimeCollector
+        if        self.has_key?(k)
+          self[k].merge!(v)
+        else
+          self[k] = v
+        end
+      end
+    end
   end
+end
 
-end

data/lib/quicky/timer.rb

@@ -56,7 +56,7 @@ module Quicky
   class TimeCollector
     INT_MAX = ((2 ** (32 - 2)) - 1)
 
-    attr_accessor :name
+    attr_accessor :name, :total_duration, :count, :max_duration, :min_duration
 
     def initialize(name)
       @name = name
@@ -64,34 +64,24 @@ module Quicky
       @total_duration = 0.0
       @max_duration = 0.0
       @min_duration = INT_MAX
+      @count = 0
     end
 
     def <<(val)
       # pull out duration for totals
       @total_duration += val.duration
-      @max_duration = val.duration if val.duration > @max_duration
-      @min_duration = val.duration if val.duration < @min_duration
+      update_max_min(val.duration)
       @collector << val
+      @count += 1
     end
 
-    def duration
-      @total_duration / @collector.size
-    end
-
-    def total_duration
-      @total_duration
-    end
-
-    def max_duration
-      @max_duration
-    end
-
-    def min_duration
-      @min_duration
+    def update_max_min(duration)
+      @max_duration = duration if duration > @max_duration
+      @min_duration = duration if duration < @min_duration
     end
 
-    def count
-      @collector.size
+    def duration
+      @total_duration / self.count
     end
 
     def to_hash
@@ -105,6 +95,21 @@ module Quicky
       }
     end
 
+    def self.from_hash(h)
+      t = TimeCollector.new(h['name'])
+      h.each_pair do |k,v|
+        t.instance_variable_set("@#{k}", v)
+      end
+      t
+    end
+
+    def merge!(tc)
+      self.count += tc.count
+      self.total_duration += tc.total_duration
+      update_max_min(tc.max_duration)
+      update_max_min(tc.min_duration)
+    end
+
   end
 
   class TimeResult

data/lib/quicky/version.rb

@@ -1,3 +1,3 @@
 module Quicky
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/quicky.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["treeder@gmail.com"]
   gem.description   = "Rest client wrapper that chooses best installed client."
   gem.summary       = "Rest client wrapper that chooses best installed client."
-  gem.homepage      = "https://github.com/iron-io/quicky"
+  gem.homepage      = "https://github.com/treeder/quicky"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/test/test_basics.rb

@@ -42,10 +42,20 @@ class TestBasics < TestBase
     assert result.min_duration < 0.55 && result.min_duration > 0.1
     assert result.max_duration > 0.5 && result.max_duration < 0.7
 
-    hash = quicky.results.to_hash
+    r1 = quicky.results
+    p r1
+    hash = r1.to_hash
     p hash
     assert hash[:test3][:duration] >= 0.5
 
+    r2 = Quicky::ResultsHash.from_hash(hash)
+    p r2
+    assert_equal r1.size, r2.size
+    r1.each_pair do |k, v|
+      # v should be a TimeCollector
+      assert_equal v.count, r2[k].count
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quicky
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -47,7 +47,7 @@ files:
 - quicky.gemspec
 - test/test_base.rb
 - test/test_basics.rb
-homepage: https://github.com/iron-io/quicky
+homepage: https://github.com/treeder/quicky
 licenses: []
 post_install_message: 
 rdoc_options: []