statsd-instrument 3.0.0.pre1 → 3.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec03c4f1452d2b5bca53c83faf68955d8095ad75ed0484103091789764e02233
-  data.tar.gz: 6037bd8e41bfc3b7d726c9f1120d10ce202a206dbfdd1e3368d550ed90f0bcc9
+  metadata.gz: 9d300be8b2e40d3b175eff237d7991949c962b284603c8e16852247171177965
+  data.tar.gz: d3e43a58dec356b4606be2c0c39321db12223672f7caa02dd2b09331ebae9b02
 SHA512:
-  metadata.gz: f282acf3e05dac8b66eddc5b2fb8e11501543bc2125c92d7154835bd832304d706e35dc831c7c4ea879f05f4f1b0568b67bd19e4a657ef45c8272c81aa29b0af
-  data.tar.gz: 65546513cc2e0fb9ea06ab220d63102ba354963397c96ae8d81983d3b9178ca8ca03ed1536c29a8d2938b125e7644a37cdc40c0707d9eab1ccca2298bd3b6ad1
+  metadata.gz: f269fec546184d3cee07a3cb365babb87bc739c126985bb9218a63f3ec86a58bf22e0f4cbf73fade2f1618cca58b9c32c9d442ebf29f3d81ca0bcfbfc1e024b1
+  data.tar.gz: 0ee20bb6244d8403cd8c4441e9d35cafbff82c8d58b76b7c53a91c2b3d510944769a945f5a151d1b760e6d1799789c79248102a34734806eaaeded24394f8238

data/.github/workflows/ci.yml

@@ -4,24 +4,17 @@ on: push
 
 jobs:
   test:
-    name: Ruby ${{ matrix.ruby }} on ${{ matrix.platform }}
-    runs-on: ${{ matrix.platform }}
+    name: Ruby ${{ matrix.ruby }} on ubuntu-18.04
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
-        # Windows started failing on the following command for some reason.
-        #
-        #     gem install bundler && bundle install --jobs 4 --retry 3
-        #                         ~~
-        #     The token '&&' is not a valid statement separator in this version.
-        #
-        # Temporarily disable Windows builds to unblock CI.
-        #
-        # platform: [ubuntu-18.04, windows-2019, macOS-10.14]
-        platform: [ubuntu-18.04, macOS-10.14]
+        # Windows on macOS builds started failing, so they are disabled for noew
+
         ruby: [2.3, 2.4, 2.5, 2.6]
+        # platform: [windows-2019, macOS-10.14, ubuntu-18.04]
 
-        exclude:
+        # exclude:
         # The Windows environment does not support older Ruby versions. We only test against the latest version
         # - platform: windows-2019
         #   ruby: 2.3
@@ -31,12 +24,12 @@ jobs:
         #   ruby: 2.5
 
         # On macOS, we only test against the Ruby version macOS ships with (2.3)
-        - platform: macOS-10.14
-          ruby: 2.4
-        - platform: macOS-10.14
-          ruby: 2.5
-        - platform: macOS-10.14
-          ruby: 2.6
+        # - platform: macOS-10.14
+        #   ruby: 2.4
+        # - platform: macOS-10.14
+        #   ruby: 2.5
+        # - platform: macOS-10.14
+        #   ruby: 2.6
 
     steps:
     - uses: actions/checkout@v1

data/CHANGELOG.md

@@ -8,6 +8,17 @@ section below.
 
 _Nothing yet_
 
+## Version 2.9.2
+
+- Allow providing a value as second positional argument to `assert_statsd_*`
+  methods, rather than as keyword argument. This matches the arguments to the
+  StatsD metric call.
+  ``` ruby
+    assert_statsd_increment('batch_size', 10) do
+      StatsD.increment('batch_size', 10)
+    end
+  ```
+
 ## Version 2.9.1
 
 - The `VOID` object being returned by metric methods (e.g. `StatsD.increment`)

data/lib/statsd/instrument/assertions.rb

@@ -71,8 +71,8 @@ module StatsD::Instrument::Assertions
   # @return [void]
   # @raise [Minitest::Assertion] If an exception occurs, or if the metric did
   #   not occur as specified during the execution the block.
-  def assert_statsd_increment(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.increment(metric_name, **options)
+  def assert_statsd_increment(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.increment(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -83,8 +83,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_measure(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.measure(metric_name, **options)
+  def assert_statsd_measure(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.measure(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -95,8 +95,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_gauge(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.gauge(metric_name, **options)
+  def assert_statsd_gauge(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.gauge(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -107,8 +107,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_histogram(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.histogram(metric_name, **options)
+  def assert_statsd_histogram(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.histogram(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -119,8 +119,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_distribution(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.distribution(metric_name, **options)
+  def assert_statsd_distribution(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.distribution(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -131,8 +131,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_set(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.set(metric_name, **options)
+  def assert_statsd_set(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.set(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -143,8 +143,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_key_value(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.key_value(metric_name, **options)
+  def assert_statsd_key_value(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.key_value(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 

data/lib/statsd/instrument/expectation.rb

@@ -3,32 +3,32 @@
 # @private
 class StatsD::Instrument::Expectation
   class << self
-    def increment(name, **options)
-      new(type: :c, name: name, **options)
+    def increment(name, value = nil, **options)
+      new(type: :c, name: name, value: value, **options)
     end
 
-    def measure(name, **options)
-      new(type: :ms, name: name, **options)
+    def measure(name, value = nil, **options)
+      new(type: :ms, name: name, value: value, **options)
     end
 
-    def gauge(name, **options)
-      new(type: :g, name: name, **options)
+    def gauge(name, value = nil, **options)
+      new(type: :g, name: name, value: value, **options)
     end
 
-    def set(name, **options)
-      new(type: :s, name: name, **options)
+    def set(name, value = nil, **options)
+      new(type: :s, name: name, value: value, **options)
     end
 
-    def key_value(name, **options)
-      new(type: :kv, name: name, **options)
+    def key_value(name, value = nil, **options)
+      new(type: :kv, name: name, value: value, **options)
     end
 
-    def distribution(name, **options)
-      new(type: :d, name: name, **options)
+    def distribution(name, value = nil, **options)
+      new(type: :d, name: name, value: value, **options)
     end
 
-    def histogram(name, **options)
-      new(type: :h, name: name, **options)
+    def histogram(name, value = nil, **options)
+      new(type: :h, name: name, value: value, **options)
     end
   end
 

data/lib/statsd/instrument/version.rb

@@ -2,6 +2,6 @@
 
 module StatsD
   module Instrument
-    VERSION = "3.0.0.pre1"
+    VERSION = "3.0.0.pre2"
   end
 end

data/test/assertions_test.rb

@@ -132,43 +132,55 @@ class AssertionsTest < Minitest::Test
   end
 
   def test_assert_statsd_gauge_call_with_numeric_value
-    @test_case.assert_statsd_gauge('gauge', value: 42) do
+    @test_case.assert_statsd_gauge('gauge', 42) do
       StatsD.gauge('gauge', 42)
     end
 
-    @test_case.assert_statsd_gauge('gauge', value: '42') do
+    @test_case.assert_statsd_gauge('gauge', '42') do
       StatsD.gauge('gauge', 42)
     end
 
     assert_raises(Minitest::Assertion) do
-      @test_case.assert_statsd_gauge('gauge', value: 42) do
+      @test_case.assert_statsd_gauge('gauge', 42) do
         StatsD.gauge('gauge', 45)
       end
     end
+
+    @test_case.assert_statsd_gauge('gauge', value: 42) do
+      StatsD.gauge('gauge', 42)
+    end
   end
 
   def test_assert_statsd_set_call_with_string_value
-    @test_case.assert_statsd_set('set', value: 12345) do
+    @test_case.assert_statsd_set('set', 12345) do
       StatsD.set('set', '12345')
     end
 
-    @test_case.assert_statsd_set('set', value: '12345') do
+    @test_case.assert_statsd_set('set', '12345') do
       StatsD.set('set', '12345')
     end
 
-    @test_case.assert_statsd_set('set', value: 12345) do
+    @test_case.assert_statsd_set('set', 12345) do
       StatsD.set('set', 12345)
     end
 
-    @test_case.assert_statsd_set('set', value: '12345') do
+    @test_case.assert_statsd_set('set', '12345') do
       StatsD.set('set', 12345)
     end
 
     assert_raises(Minitest::Assertion) do
-      @test_case.assert_statsd_set('set', value: '42') do
+      @test_case.assert_statsd_set('set', '42') do
         StatsD.set('set', 45)
       end
     end
+
+    @test_case.assert_statsd_set('set', value: 12345) do
+      StatsD.set('set', '12345')
+    end
+
+    @test_case.assert_statsd_set('set', 'wrong_value', value: 12345) do
+      StatsD.set('set', '12345')
+    end
   end
 
   def test_tags_will_match_subsets
@@ -285,7 +297,7 @@ class AssertionsTest < Minitest::Test
     end
 
     foo_1_metric = StatsD::Instrument::Expectation.increment('counter', times: 2, tags: ['foo:1'])
-    foo_2_metric = StatsD::Instrument::Expectation.increment('counter', tags: ['foo:2'])
+    foo_2_metric = StatsD::Instrument::Expectation.increment('counter', 1, tags: ['foo:2'])
     @test_case.assert_statsd_expectations([foo_1_metric, foo_2_metric]) do
       StatsD.increment('counter', tags: { foo: 1 })
       StatsD.increment('counter', tags: { foo: 1 })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre1
+  version: 3.0.0.pre2
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake