rubyperf 1.3.7 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.7
+1.4.0

data/lib/perf/meter_factory.rb

@@ -1,4 +1,5 @@
 require "rubyperf"
+require "singleton"
 
 module Perf
 
@@ -9,14 +10,10 @@ module Perf
   # either creating a factory that fulfills your needs, or create Perf::Meter objects and pass them around or use
   # this factory will well planned out key values so that you won't have conflicts and overrides.
   #
-  # MeterFactory works keeping a global cache of Perf::Meter objects by key. Multiple independent parts
-  # of your code using this factory could get into trouble and trample on each other if they use the same key, or the
-  # default key.
-  #
   # Example of usage where it would be inconvenient to pass around the Perf::Meter object from example to function2:
   #
   # def example
-  #   Perf::MeterFactory.get.measure(:function1)
+  #   Perf::MeterFactory.instance.get.measure(:function1)
   #     function1()
   #   end
   # end
@@ -29,7 +26,7 @@ module Perf
   #
   # def function2()
   #   ..
-  #   Perf::MeterFactory.get.measure(:some_hot_code_in_function2)
+  #   Perf::MeterFactory.instance.get.measure(:some_hot_code_in_function2)
   #     ...
   #   end
   #   ..
@@ -37,87 +34,86 @@ module Perf
   #
 
   class MeterFactory
+    include Singleton
 
     DEFAULT_METER = :default
 
-    @@perf_meters       = nil
-    @@new_meter_options = {}
-    @@factory_options   = {:noop=>false}
+    def initialize
+      @perf_meters       = {}
+      @new_meter_options = {}
+      @factory_options   = {:noop=>false}
+    end
 
     # Returns a Perf::Meter with a given key, and creates it lazily if it doesn't exist'.
     # NOTE: The options are set ONLY the first time that get is called on a specific key.
     #       After that the options will be ignored!
 
-    def self.get(key=DEFAULT_METER,new_meter_options=nil)
-      @@perf_meters ||= {}
-      if !@@factory_options[:noop]
+    def get(key=DEFAULT_METER,new_meter_options=nil)
+      if !@factory_options[:noop]
         # Creates a real meter
-        @@perf_meters[key] ||= Perf::Meter.new(new_meter_options || @@new_meter_options)
+        @perf_meters[key] ||= Perf::Meter.new(new_meter_options || @new_meter_options)
       else
         # If noop is set, creates a no-nop version of the meter, unless a meter with this key has already been
         # created.
-        @@perf_meters[key] ||= Perf::NoOpMeter.new
+        @perf_meters[key] ||= Perf::NoOpMeter.new
       end
     end
 
     # meter is like get, but if the meter doesn't already exists it returns a NoOpMeter. You can use this every time
     # that you want "somebody else" make the decision of what meter to use.
 
-    def self.meter(key=DEFAULT_METER)
-      @@perf_meters ||= {}
-      @@perf_meters[key] ||= Perf::NoOpMeter.new
+    def meter(key=DEFAULT_METER)
+      @perf_meters[key] ||= Perf::NoOpMeter.new
     end
 
     # To set options for new meters created by get, when specific options are not passed, you can do so with this
     # method.
 
-    def self.set_new_meters_options(options)
-      @@new_meter_options.merge(options)
+    def set_new_meters_options(options)
+      @new_meter_options.merge(options)
     end
 
     # Set options for the factory behaviour.
 
-    def self.set_factory_options(options)
-      @@factory_options.merge!(options)
+    def set_factory_options(options)
+      @factory_options.merge!(options)
     end
 
     # If you use set_new_meters_options, or if you pass options to Perf::MeterFactory.get, you are setting options
     # only for if the meter is created. For this reason you might need to find out if the meter already exist.
 
     def exists?(key=DEFAULT_METER)
-      !@@perf_meters[key].nil?
+      !@perf_meters[key].nil?
     end
 
     # Pushes a Perf::Meter into a key
 
-    def self.set_meter(key,meter)
-      @@perf_meters ||= {}
-      @@perf_meters[key]=meter
+    def set_meter(key,meter)
+      @perf_meters[key]=meter
     end
 
     # Sets the default meter.
 
-    def self.set_default(meter)
+    def set_default(meter)
       set_meter(DEFAULT_METER,meter)
     end
 
     # Returns a hash of existing meters.
 
-    def self.all
-      @@perf_meters ||= {}
-      return @@perf_meters.clone
+    def all
+      @perf_meters.dup
     end
 
     # Removes an existing meter from the cache
 
-    def self.clear_meter(key=DEFAULT_METER)
-      @@perf_meters.delete(key) if @@perf_meters
+    def clear_meter(key=DEFAULT_METER)
+      @perf_meters.delete(key) if @perf_meters
     end
 
     # Clears the entire cache of meters.
 
-    def self.clear_all!
-      @@perf_meters=nil
+    def clear_all!
+      @perf_meters.clear
     end
 
   end

data/rubyperf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyperf}
-  s.version = "1.3.7"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lpasqualis"]
-  s.date = %q{2012-01-18}
+  s.date = %q{2012-01-19}
   s.description = %q{Used to easily measure the performance of blocks of Ruby code, expressions and methods; provides reporting in various formats}
   s.email = %q{lpasqualis@gmail.com}
   s.extra_rdoc_files = [
@@ -43,14 +43,13 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/lpasqualis/rubyperf}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{rubyperf helps you measure ruby code performance}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])

data/test/test_meter_factory.rb

@@ -10,17 +10,17 @@ require 'perf_test_example'
 class TestMeterFactory < Test::Unit::TestCase
 
   def setup()
-    Perf::MeterFactory.clear_all!
+    Perf::MeterFactory.instance.clear_all!
   end
 
   def teardown()
-    Perf::MeterFactory.clear_all!
-    Perf::MeterFactory.set_factory_options(:noop=>false)
+    Perf::MeterFactory.instance.clear_all!
+    Perf::MeterFactory.instance.set_factory_options(:noop=>false)
   end
 
   def test_noop
-    Perf::MeterFactory.set_factory_options(:noop=>true)
-    m1=Perf::MeterFactory.get()
+    Perf::MeterFactory.instance.set_factory_options(:noop=>true)
+    m1=Perf::MeterFactory.instance.get()
     assert m1.is_a? Perf::NoOpMeter
     m1.measure(:something) do
       # ...
@@ -29,18 +29,18 @@ class TestMeterFactory < Test::Unit::TestCase
   end
 
   def test_meter
-    m=Perf::MeterFactory.meter
+    m=Perf::MeterFactory.instance.meter
     assert m.is_a? Perf::NoOpMeter
 
-    Perf::MeterFactory.clear_all!
-    m=Perf::MeterFactory.get
-    m=Perf::MeterFactory.meter
+    Perf::MeterFactory.instance.clear_all!
+    m=Perf::MeterFactory.instance.get
+    m=Perf::MeterFactory.instance.meter
     assert m.is_a? Perf::Meter
   end
 
   def test_noop2
-    Perf::MeterFactory.set_factory_options(:noop=>true)
-    m=Perf::MeterFactory.get()
+    Perf::MeterFactory.instance.set_factory_options(:noop=>true)
+    m=Perf::MeterFactory.instance.get()
     assert m.is_a? Perf::NoOpMeter
     m.measure(:string_operations) do
       m.measure(:ciao) do
@@ -88,9 +88,9 @@ class TestMeterFactory < Test::Unit::TestCase
   end
 
   def test_basic
-    Perf::MeterFactory.clear_all!
-    m1=Perf::MeterFactory.get()
-    m2=Perf::MeterFactory.get()
+    Perf::MeterFactory.instance.clear_all!
+    m1=Perf::MeterFactory.instance.get()
+    m2=Perf::MeterFactory.instance.get()
 
     m1.measure(:a) {}
     m1.measure(:b) {}
@@ -98,27 +98,27 @@ class TestMeterFactory < Test::Unit::TestCase
     assert m1.eql?(m2)
     assert_equal 3, m2.measurements.count
     assert_equal 3, m1.measurements.count
-    assert_equal 1,Perf::MeterFactory.all.length
+    assert_equal 1,Perf::MeterFactory.instance.all.length
 
-    m3=Perf::MeterFactory.get(:some_meter)
-    m4=Perf::MeterFactory.get(:some_meter)
+    m3=Perf::MeterFactory.instance.get(:some_meter)
+    m4=Perf::MeterFactory.instance.get(:some_meter)
 
     assert m3.eql? m4
     assert !(m1.eql? m3)
-    assert_equal 2,Perf::MeterFactory.all.length
+    assert_equal 2,Perf::MeterFactory.instance.all.length
 
-    Perf::MeterFactory.clear_meter(:some_meter)
-    assert_equal 1,Perf::MeterFactory.all.length
+    Perf::MeterFactory.instance.clear_meter(:some_meter)
+    assert_equal 1,Perf::MeterFactory.instance.all.length
 
-    Perf::MeterFactory.clear_all!
-    assert_equal 0,Perf::MeterFactory.all.length
+    Perf::MeterFactory.instance.clear_all!
+    assert_equal 0,Perf::MeterFactory.instance.all.length
 
     ameter = Perf::Meter.new
-    Perf::MeterFactory.set_meter(:ameter,ameter)
-    assert (ameter.eql? Perf::MeterFactory.get(:ameter))
+    Perf::MeterFactory.instance.set_meter(:ameter,ameter)
+    assert (ameter.eql? Perf::MeterFactory.instance.get(:ameter))
 
-    Perf::MeterFactory.set_default(ameter)
-    assert (ameter.eql? Perf::MeterFactory.get)
+    Perf::MeterFactory.instance.set_default(ameter)
+    assert (ameter.eql? Perf::MeterFactory.instance.get)
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyperf
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 1
-  - 3
-  - 7
-  segments_generated: true
-  version: 1.3.7
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - lpasqualis
@@ -15,65 +15,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 -08:00
+date: 2012-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: shoulda
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id001
+  type: :development
+  name: shoulda
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        segments_generated: true
         version: 1.0.0
-  requirement: *id002
+  type: :development
+  name: bundler
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 6
         - 4
-        segments_generated: true
         version: 1.6.4
-  requirement: *id003
+  type: :development
+  name: jeweler
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id004
+  type: :development
+  name: rcov
+  version_requirements: *id004
 description: Used to easily measure the performance of blocks of Ruby code, expressions and methods; provides reporting in various formats
 email: lpasqualis@gmail.com
 executables: []
@@ -116,25 +120,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: rubyperf helps you measure ruby code performance