harness 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67b81f429da2eb6cf620c80daad0b9fb2a978d30
-  data.tar.gz: 1f590d74d8e61a6e6ab191a3a0180be4eb54217c
+  metadata.gz: 45b1ba669c00fddf944318514aaae8cc3184d43a
+  data.tar.gz: 7aab2e9ccd8d860dff8eab3ce29ed1aba54e8c20
 SHA512:
-  metadata.gz: 132daddd9725611539455ccbf387b0e86f2431d3a9b79907c3e39b309818a96d6d74b6a0698a0f22a7cdbe35925a6ea733d201f18ecacdce6cd703bfcfb942a2
-  data.tar.gz: 5e3a47b69a9a3fd4aaa7997bcbe8930176518fa07ebd895e72721ee4fe33e5623430836b96aba66b3abd876c16cc9030d4ce8f517b2333c93485c2862789fe9d
+  metadata.gz: e1b748e7ecbcf4a6c29da4b05835b60c1303865bacc4c0c6e9355399d25103e25624623394104a7b3f74f67b6f4ac264773dd4e1e5e30908b71056e381611914
+  data.tar.gz: 83bcf438c22c5a36a9b79cd1a4bb1449ab16dc11e698bff1ab85b6b82c6d9d04e31c82c23b08f9ad9b510846908ab5727272da1da66c5239b5634f474cc38f46

data/lib/harness.rb

@@ -78,7 +78,6 @@ module Harness
   def self.reset_counters!
     redis.smembers('counters').each do |counter|
       redis.set counter, 0
-      redis.del "meters/#{counter}"
     end
   end
 end
@@ -86,7 +85,6 @@ end
 require 'harness/measurement'
 require 'harness/counter'
 require 'harness/gauge'
-require 'harness/meter'
 
 require 'harness/instrumentation'
 

data/lib/harness/counter.rb

@@ -25,8 +25,6 @@ module Harness
         counter.value = Harness.redis.incr(counter.id).to_i
       end
 
-      Harness.redis.zadd "meters/#{counter.id}", counter.time.to_f, counter.value
-
       counter
     end
   end

data/lib/harness/version.rb

@@ -1,3 +1,3 @@
 module Harness
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/test/integration/counters_with_redis_test.rb

@@ -72,17 +72,9 @@ class CountersWithRedis < IntegrationTest
     instrument "event-counter", :counter => true
 
     assert_equal 1, redis.get("event-counter").to_i
-    assert_equal 1, redis.zcard("meters/event-counter").to_i
 
     Harness.reset_counters!
 
     assert_equal 0, redis.get("event-counter").to_i
-    assert_equal 0, redis.zcard("meters/event-counter").to_i
-  end
-
-  def test_counting_updates_sorted_set_in_redis
-    instrument "event-counter", :counter => true
-
-    assert_equal 1, redis.zcard("meters/event-counter")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harness
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - ahawkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -226,7 +226,6 @@ files:
 - lib/harness/integration/sidekiq.rb
 - lib/harness/job.rb
 - lib/harness/measurement.rb
-- lib/harness/meter.rb
 - lib/harness/queues/delayed_job_queue.rb
 - lib/harness/queues/resque_queue.rb
 - lib/harness/queues/sidekiq_queue.rb
@@ -243,7 +242,6 @@ files:
 - test/integration/integrations/active_support_test.rb
 - test/integration/integrations/sidekiq_test.rb
 - test/integration/logging_test.rb
-- test/integration/meter_test.rb
 - test/integration/queues/delayed_job_test.rb
 - test/integration/queues/resque_test.rb
 - test/integration/queues/sidekiq_test.rb
@@ -290,7 +288,6 @@ test_files:
 - test/integration/integrations/active_support_test.rb
 - test/integration/integrations/sidekiq_test.rb
 - test/integration/logging_test.rb
-- test/integration/meter_test.rb
 - test/integration/queues/delayed_job_test.rb
 - test/integration/queues/resque_test.rb
 - test/integration/queues/sidekiq_test.rb

data/lib/harness/meter.rb

@@ -1,55 +0,0 @@
-module Harness
-  class Meter
-    def initialize(name)
-      @name = name
-
-      raise Harness::NoCounter, "#{@name} is not being metered" unless redis.exists key
-    end
-
-    def per_second
-      per 1.second
-    end
-
-    def per_minute
-      per 1.minute
-    end
-
-    def per_hour
-      per 1.hour
-    end
-
-    def per(rate, base = Time.now)
-      gauge = Gauge.new :value => redis.zcount(key, base.to_f - rate, base.to_f)
-
-      if words = rate_in_words(rate)
-        gauge.name = "#{@name} per #{words}"
-        gauge.id = "#{@name}-per-#{words}"
-      else
-        gauge.id = "#{@name} gauge"
-      end
-
-      gauge.time = Time.now
-
-      gauge
-    end
-
-    private
-    def key
-      "meters/#{@name}"
-    end
-
-    def redis
-      Harness.redis
-    end
-
-    def rate_in_words(rate)
-      if rate < 1.minute
-        "second"
-      elsif rate >= 1.minute && rate < 1.hour
-        "minute"
-      elsif rate >= 1.hour && rate < 1.day
-        "hour"
-      end
-    end
-  end
-end

data/test/integration/meter_test.rb

@@ -1,32 +0,0 @@
-require 'test_helper'
-
-class CountersWithRedis < IntegrationTest
-  def test_counters_can_act_like_gauges
-    50.times { instrument "event-counter", :counter => true }
-
-    meter = Harness::Meter.new 'event-counter'
-    assert_equal 50, meter.per_second.value
-    assert_equal 50, meter.per_minute.value
-    assert_equal 50, meter.per_hour.value
-  end
-
-  def tests_raises_an_error_when_no_such_counter
-    assert_raises Harness::NoCounter do
-      Harness::Meter.new 'unknown-counter'
-    end
-  end
-
-  def test_rates_return_gauges
-    50.times { instrument "event-counter", :counter => true }
-
-    meter = Harness::Meter.new 'event-counter'
-
-    gauge = meter.per_second
-
-    assert_kind_of Harness::Gauge, gauge
-
-    assert_equal "event-counter-per-second", gauge.id
-    assert_equal "event-counter per second", gauge.name
-    assert_kind_of Time, gauge.time
-  end
-end