statsd-instrument 2.0.4 → 2.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4676e97c70d4ea8a412d1835d5b341e86f7eb056
+  data.tar.gz: 9f3cb9257f3d0e6c3edc152dd45f53e30ad2301c
+SHA512:
+  metadata.gz: 272ec7539100efa9e4572114e20f36b6584f3a4a604b4574e7cf3b496c13a125691f102af649d8279317e86bd4758adacabc68b4d5a3c8949149ae18292747fa
+  data.tar.gz: 97fa56c8eff9da0754b0f1ff437c27b365ab701cb3894023caa3eefbbb001a0a66d38d69a8cf52fd46a2061a882e221c71b33e2eb3abe9cdd6bb87b658047a40

data/lib/statsd/instrument/assertions.rb

@@ -6,6 +6,10 @@ module StatsD::Instrument::Assertions
     block.call
     mock_backend.collected_metrics
   ensure
+    if old_backend.kind_of?(StatsD::Instrument::Backends::CaptureBackend)
+      old_backend.collected_metrics.concat(mock_backend.collected_metrics)
+    end
+
     StatsD.backend = old_backend
   end
 

data/lib/statsd/instrument/version.rb

@@ -1,5 +1,5 @@
 module StatsD
   module Instrument
-    VERSION = "2.0.4"
+    VERSION = "2.0.5"
   end
 end

data/test/assertions_test.rb

@@ -113,7 +113,44 @@ class AssertionsTest < Minitest::Test
         StatsD.increment('counter', tags: ['a:b', 'c:d'])
       end
     end
-  end  
+  end
+
+  def test_nested_assertions
+    assert_no_assertion_triggered do
+      @test_case.assert_statsd_increment('counter1') do
+        @test_case.assert_statsd_increment('counter2') do
+          StatsD.increment('counter1')
+          StatsD.increment('counter2')
+        end
+      end
+    end
+
+    assert_no_assertion_triggered do
+      @test_case.assert_statsd_increment('counter1') do
+        StatsD.increment('counter1')
+        @test_case.assert_statsd_increment('counter2') do
+          StatsD.increment('counter2')
+        end
+      end
+    end    
+
+    assert_assertion_triggered do
+      @test_case.assert_statsd_increment('counter1') do
+        @test_case.assert_statsd_increment('counter2') do
+          StatsD.increment('counter2')
+        end
+      end
+    end
+
+    assert_assertion_triggered do
+      @test_case.assert_statsd_increment('counter1') do
+        @test_case.assert_statsd_increment('counter2') do
+          StatsD.increment('counter1')
+        end
+        StatsD.increment('counter2')
+      end
+    end
+  end
 
   private
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 2.0.4
-  prerelease: 
+  version: 2.0.5
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,54 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A StatsD client for Ruby appspec. Provides metaprogramming methods to
@@ -101,27 +94,26 @@ files:
 homepage: https://github.com/Shopify/statsd-instrument
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A StatsD client for Ruby apps
 test_files:
 - test/assertions_test.rb