right_support 2.8.7 → 2.8.8

data/VERSION

@@ -1 +1 @@
-2.8.7
+2.8.8

data/lib/right_support/net/request_balancer.rb

@@ -121,6 +121,8 @@ module RightSupport::Net
         :health_check => DEFAULT_HEALTH_CHECK_PROC
     }
 
+    attr_reader :endpoints
+
     def self.request(endpoints, options={}, &block)
       new(endpoints, options).request(&block)
     end

data/lib/right_support/stats/activity.rb

@@ -69,14 +69,13 @@ module RightSupport::Stats
     # Ignore the update if its type contains "stats"
     #
     # @param type [String, Symbol] Type of activity, with anything that is not a symbol, true, or false
-    #   automatically converted to a String and truncated to MAX_TYPE_SIZE characters,
-    #   defaults to nil
+    #   automatically converted to a String and truncated to MAX_TYPE_SIZE characters; defaults to nil
     # @param id [String] Unique identifier associated with this activity
     #
     # @return [Time] Update time
     def update(type = nil, id = nil)
       now = Time.now
-      if type.nil? || !(type =~ /stats/)
+      if type.nil? || type !~ /stats/
         @interval = average(@interval, now - @last_start_time) if @measure_rate
         @last_start_time = now
         @total += 1
@@ -108,6 +107,25 @@ module RightSupport::Stats
       duration
     end
 
+    # Update activity and measure its duration
+    #
+    # @param type [String, Symbol] Type of activity, with anything that is not a symbol, true, or false
+    #   automatically converted to a String and truncated to MAX_TYPE_SIZE characters; defaults to nil
+    # @param id [String] Unique identifier associated with this activity
+    #
+    # @yield [] required block being measured
+    #
+    # @return [Object] Result from yield
+    #
+    # @raise [ArgumentError] block missing
+    def measure(type, id)
+      raise ArgumentError, "block missing" unless block_given?
+      start_time = update(type, id)
+      result = yield
+      finish(start_time, id)
+      result
+    end
+
     # Convert average interval to average rate
     #
     # @return [Float, NilClass] Recent average rate, or nil if total is 0

data/right_support.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "right_support"
-  s.version = "2.8.7"
+  s.version = "2.8.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tony Spataro", "Sergey Sergyenko", "Ryan Williamson", "Lee Kirchhoff", "Alexey Karpik", "Scott Messier"]
-  s.date = "2013-12-20"
+  s.date = "2014-01-09"
   s.description = "A toolkit of useful, reusable foundation code created by RightScale."
   s.email = "support@rightscale.com"
   s.extra_rdoc_files = [

data/spec/stats/activity_spec.rb

@@ -120,6 +120,11 @@ describe RightSupport::Stats::Activity do
       @stats.instance_variable_get(:@total).should == 1
       @stats.instance_variable_get(:@count_per_type).should == {}
     end
+
+    it "tracks the id associated with the update" do
+      @stats.update("test", "id")
+      @stats.instance_variable_get(:@last_id).should == "id"
+    end
   end
 
   context :finish do
@@ -146,6 +151,34 @@ describe RightSupport::Stats::Activity do
     end
   end
 
+  context :measure do
+    it "updates and finishes the activity" do
+      flexmock(Time).should_receive(:now).and_return(1000010, 1000020)
+      @stats.measure("test", "id") { }
+      @stats.instance_variable_get(:@interval).should == 1.0
+      @stats.instance_variable_get(:@last_start_time).should == @now + 10
+      @stats.instance_variable_get(:@total).should == 1
+      @stats.instance_variable_get(:@count_per_type).should == {"test" => 1}
+      @stats.instance_variable_get(:@last_id).should == 0
+      @stats.instance_variable_get(:@avg_duration).should == 1.0
+    end
+
+    it "yields to the block" do
+      called = 0
+      flexmock(Time).should_receive(:now).and_return(1000010, 1000030)
+      @stats.measure("test", "id") { called += 1}
+      called.should == 1
+    end
+
+    it "returns the result of the yield" do
+      @stats.measure("test", "id") { 99 }.should == 99
+    end
+
+    it "raises exception if block is missing" do
+      lambda { @stats.measure("test", "id") }.should raise_error(ArgumentError, "block missing")
+    end
+  end
+
   context :avg_rate do
     it "converts interval to rate" do
       flexmock(Time).should_receive(:now).and_return(1000020)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 63
   prerelease: 
   segments: 
   - 2
   - 8
-  - 7
-  version: 2.8.7
+  - 8
+  version: 2.8.8
 platform: ruby
 authors: 
 - Tony Spataro
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-20 00:00:00 Z
+date: 2014-01-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement