Removing dependency on quantity as it conflicts with ActiveSupport

.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"

Gemfile.lock

@@ -3,14 +3,12 @@ PATH
   specs:
     ruby-metrics (0.8.0)
       json
-      quantity
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
     json (1.5.1)
-    quantity (0.1.1)
     rack (1.2.2)
     rack-test (0.5.7)
       rack (>= 1.0)

lib/ruby-metrics.rb

@@ -1,6 +1,5 @@
 # == Metrics Initialization
 #
-require 'quantity/all'
 
 module Metrics
 
@@ -13,10 +12,5 @@ def logger
 
 end
 
-Quantity::Unit.add_unit :minute,  :time, 60000,     :minutes
-Quantity::Unit.add_unit :hour,    :time, 3600000,   :hours
-Quantity::Unit.add_unit :day,     :time, 86400000,  :days
-Quantity::Unit.add_unit :week,    :time, 604800000, :weeks
-
 
 require File.join(File.dirname(__FILE__), 'ruby-metrics', 'agent')

lib/ruby-metrics/statistics/exponential_sample.rb

@@ -7,7 +7,7 @@ def initialize(size = 1028, alpha = 0.015)
         @count  = 0
         @size   = size
         @alpha  = alpha
-        @rescale_window = 1.hour.to_seconds.to_i
+        @rescale_window = 3600  #seconds -- 1 hour
         self.clear
       end
 
@@ -89,4 +89,4 @@ def values
       end
     end
   end
-end
+end

ruby-metrics.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "ruby-metrics"
 
   s.add_dependency "json"
-  s.add_dependency "quantity"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "simplecov", [">= 0.3.8"] #, :require => false

spec/instruments/meter_spec.rb

@@ -32,8 +32,8 @@
       @meter.tick()
     end
 
-    def tick_for(time)
-      count = ((time.to_seconds) / 5).to_i
+    def tick_for(seconds)
+      count = ((seconds) / 5).to_i
       (1..count).each do
         @meter.tick()
       end
@@ -45,7 +45,7 @@ def tick_for(time)
       end
 
       it "should have a rate of 0.22072766470286553 events/sec after 1 minute" do
-        tick_for(1.minute)
+        tick_for(60)
         @meter.one_minute_rate.should == 0.22072766470286553
       end
     end
@@ -56,7 +56,7 @@ def tick_for(time)
       end
 
       it "should have a rate of 0.49123845184678905 events/sec after 1 minute" do
-        tick_for(1.minute)
+        tick_for(60)
         @meter.five_minute_rate.should == 0.49123845184678905
       end
     end
@@ -75,7 +75,7 @@ def tick_for(time)
       end
 
       it "should have a rate of 0.5613041910189706 events/sec after 1 minute" do
-        tick_for(1.minute)
+        tick_for(60)
         @meter.fifteen_minute_rate.should == 0.5613041910189706
       end      
     end