rubyperf 1.4.0 → 1.5.0

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.5.0

data/lib/perf/meter_factory.rb

@@ -79,6 +79,12 @@ module Perf
       @factory_options.merge!(options)
     end
 
+    # Clear factory options.
+
+    def clear_factory_options!
+      @factory_options.clear
+    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.
 
@@ -116,5 +122,13 @@ module Perf
       @perf_meters.clear
     end
 
+    # Used by ProductionMeterFactory to return the instance ensuring that no Perf::Meters will be created if they
+    # do not exist.
+
+    def no_op_instance
+      @factory_options[:noop] = true
+      self
+    end
+
   end
 end

data/lib/perf/production_meter_factory.rb

@@ -0,0 +1,11 @@
+require "rubyperf"
+
+module Perf
+  class ProductionMeterFactory
+
+    def self.instance
+      Perf::MeterFactory.instance.no_op_instance
+    end
+
+  end
+end

data/lib/rubyperf.rb

@@ -5,6 +5,7 @@
 require 'perf/measure'
 require 'perf/meter'
 require 'perf/meter_factory'
+require 'perf/production_meter_factory'
 require 'perf/no_op_meter'
 require 'perf/report_format'
 require 'perf/report_format_simple'

data/rubyperf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyperf}
-  s.version = "1.4.0"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lpasqualis"]
-  s.date = %q{2012-01-19}
+  s.date = %q{2012-01-22}
   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 = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "lib/perf/meter.rb",
     "lib/perf/meter_factory.rb",
     "lib/perf/no_op_meter.rb",
+    "lib/perf/production_meter_factory.rb",
     "lib/perf/report_format.rb",
     "lib/perf/report_format_html.rb",
     "lib/perf/report_format_list_of_measures.rb",

data/test/perf_test_example.rb

@@ -12,14 +12,14 @@ class PerfTestExample
   end
 
   def test_with_measure
-    Perf::MeterFactory.get.measure(:test_with_measure_block) do
+    Perf::MeterFactory.instance.get.measure(:test_with_measure_block) do
       test(1,2,3)
       PerfTestExample.static_method
     end
   end
 
   def test_with_measure_static
-    Perf::MeterFactory.get.measure(:test_with_measure_block) do
+    Perf::MeterFactory.instance.get.measure(:test_with_measure_block) do
       static_method
     end
   end

data/test/test_meter_factory.rb

@@ -11,11 +11,12 @@ class TestMeterFactory < Test::Unit::TestCase
 
   def setup()
     Perf::MeterFactory.instance.clear_all!
+    Perf::MeterFactory.instance.clear_factory_options!
   end
 
   def teardown()
     Perf::MeterFactory.instance.clear_all!
-    Perf::MeterFactory.instance.set_factory_options(:noop=>false)
+    Perf::MeterFactory.instance.clear_factory_options!
   end
 
   def test_noop
@@ -28,6 +29,28 @@ class TestMeterFactory < Test::Unit::TestCase
     assert m1.report_simple.nil?
   end
 
+  def test_production_meter_factory
+    # If we get the production factory first, the :noop option is set so the first get returns a NoOpMeter
+    m=Perf::ProductionMeterFactory.instance.get
+    assert m.is_a? Perf::NoOpMeter
+
+    # The second get, even with the MeterFactory, still returns a NoOpMeter
+    m=Perf::MeterFactory.instance.get
+    assert m.is_a? Perf::NoOpMeter
+
+    # If we clean everything up...
+    Perf::MeterFactory.instance.clear_all!
+    Perf::MeterFactory.instance.clear_factory_options!
+
+    # And we use MeterFactory as first get, we get a normal meter
+    m=Perf::MeterFactory.instance.get
+    assert m.is_a? Perf::Meter
+
+    # At this point ProductionFactory also gets a normal meter.
+    m=Perf::ProductionMeterFactory.instance.get
+    assert m.is_a? Perf::Meter
+  end
+
   def test_meter
     m=Perf::MeterFactory.instance.meter
     assert m.is_a? Perf::NoOpMeter

data/test/test_perf_meter.rb

@@ -153,8 +153,8 @@ class TestPerfMeter < Test::Unit::TestCase
   end
 
   def test_methods_with_measure
-    Perf::MeterFactory.clear_all!
-    m=Perf::MeterFactory.get
+    Perf::MeterFactory.instance.clear_all!
+    m=Perf::MeterFactory.instance.get
     m.method_meters(PerfTestExample,[:test,:test_np,:test_with_measure],[:static_method]) do
       a=PerfTestExample.new
       a.test(1,2,3)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyperf
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - lpasqualis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-19 00:00:00 -08:00
+date: 2012-01-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,7 @@ files:
 - lib/perf/meter.rb
 - lib/perf/meter_factory.rb
 - lib/perf/no_op_meter.rb
+- lib/perf/production_meter_factory.rb
 - lib/perf/report_format.rb
 - lib/perf/report_format_html.rb
 - lib/perf/report_format_list_of_measures.rb