wavefront-sdk 5.3.1 → 5.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fc4311b2322403ef715d9a62c5f84712accb5ed1ee9e5350e0bbcb6237fe631
-  data.tar.gz: f2fb99d1f35d601a619f0e7135f8b22ea0b22d0697752af5a265132d867216bb
+  metadata.gz: 1f0aafb012ded5a99a13ee3553d686e0552f5c4cae8da39e70139f6882aadcc9
+  data.tar.gz: b033a54d99e7a8402d04fd3555d56c53c765b655f89c59c6b1b27e2880ec5945
 SHA512:
-  metadata.gz: a2e79e3ce013f9fcdc3e28d7e111c586746e65ae341b0187b44b3908d29d81ae9aa8f0723d8eeea239c27f9976b232aa2acf2ecda92b797b0c45f25dc9e9c612
-  data.tar.gz: 20f3124667013b4f1212df12c6e04c235e7dfda24e3f0ac9a87ba4c4a4884d96d11f1a855d460f8026d65d8a35754d7a2f5d0bf705f13456dea066d0faee7822
+  metadata.gz: e647c51a97b626d080d7d666e17b81c6ead709b8780f0bb3f2897fc34d326df65d6c524359f4ea461520ef75cf7d29883f1f822feb774b06a3d822ce7717e882
+  data.tar.gz: c6602237acfdf5c18820e086071e1f06cc73199fc45ef02e689f091fec36208936b3618c5ec0d1464fff2773f4424bb49d0be3c9ba394da5d31143a14e2aed71

data/.codeclimate.yml

@@ -11,7 +11,7 @@ engines:
   fixme:
     enabled: true
   rubocop:
-    enabled: true
+    enabled: false
 ratings:
   paths:
   - "**.rb"

data/.github/workflows/release.yml

@@ -0,0 +1,37 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set env
+      run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF:10})" >> $GITHUB_ENV
+
+    - name: Set up Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - run: bundle install
+
+    - name: Run tests
+      run: bundle exec rake
+
+    - name: Build Gem
+      run: bundle exec rake build
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p ${HOME}/.gem
+        echo -e "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}" >${HOME}/.gem/credentials
+        chmod 0600 ${HOME}/.gem/credentials
+        gem push pkg/*.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.github/workflows/test.yml

@@ -0,0 +1,23 @@
+name: Test
+
+on:
+  push:
+    branches-ignore: release
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [2.4.10, 2.5.8, 2.6.6, 2.7.2, 3.0.0]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/.rubocop.yml

@@ -4,15 +4,17 @@ AllCops:
   TargetRubyVersion: 2.4
   NewCops: enable
 
-Metrics/ClassLength:
-  Max: 150
+require:
+  - rubocop-rake
+  - rubocop-minitest
+  - rubocop-performance
+  - rubocop-performance
 
-# Is nothing sacred?
 Layout/LineLength:
   Max: 80
-
+Metrics/ClassLength:
+  Max: 150
 Style/StringConcatenation:
   Enabled: false
-
 Style/OptionalBooleanParameter:
   Enabled: false

data/HISTORY.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 5.4.4 (2021-02-01)
+* Fix credential validation on writer classes.
+* Improve tests for writer classes
+* Change the level of "wire format" messages from `INFO` to `DEBUG`.
+* Officially support Ruby 3.0.0.
+* Move off Travis, and on to Github Actions.
+* Modernise linting and use of linter.
+
+## 5.4.3 (2021-01-28)
+* Always pass through invalid timestamp on time-parsing error.
+
+## 5.4.2 (2021-01-11)
+* Fix bug which blocked event updates.
+
+## 5.4.1 (2020-12-17)
+* Fix error on derived metric modification.
+
+## 5.4.0 (2020-12-16)
+* Add `raw_response` option, which makes the SDK return the raw API response
+  as plain JSON text, rather than as a `Wavefront::Response` object.
+
 ## 5.3.1 (2020-12-11)
 * Fix error when renaming ingestion policies, and improve testing which should
   have caught the problem in the first place.

data/README.md

@@ -1,5 +1,5 @@
 # wavefront-sdk
-[![Build Status](https://travis-ci.org/snltd/wavefront-sdk.svg?branch=master)](https://travis-ci.org/snltd/wavefront-sdk) [![Code Climate](https://codeclimate.com/github/snltd/wavefront-sdk/badges/gpa.svg)](https://codeclimate.com/github/snltd/wavefront-sdk) [![Issue Count](https://codeclimate.com/github/snltd/wavefront-sdk/badges/issue_count.svg)](https://codeclimate.com/github/snltd/wavefront-sdk) [![Gem Version](https://badge.fury.io/rb/wavefront-sdk.svg)](https://badge.fury.io/rb/wavefront-sdk) ![](http://ruby-gem-downloads-badge.herokuapp.com/wavefront-sdk?type=total)
+![Test](https://github.com/snltd/wavefront-sdk/workflows/Test/badge.svg) ![Release](https://github.com/snltd/wavefront-sdk/workflows/Release/badge.svg) [![Code Climate](https://codeclimate.com/github/snltd/wavefront-sdk/badges/gpa.svg)](https://codeclimate.com/github/snltd/wavefront-sdk) [![Issue Count](https://codeclimate.com/github/snltd/wavefront-sdk/badges/issue_count.svg)](https://codeclimate.com/github/snltd/wavefront-sdk) [![Gem Version](https://badge.fury.io/rb/wavefront-sdk.svg)](https://badge.fury.io/rb/wavefront-sdk) ![](http://ruby-gem-downloads-badge.herokuapp.com/wavefront-sdk?type=total)
 
 This is a Ruby SDK for v2 of
 [Wavefront](https://www.wavefront.com/)'s public API. It aims to be

data/lib/wavefront-sdk/core/api_caller.rb

@@ -15,8 +15,7 @@ module Wavefront
   class ApiCaller
     include Wavefront::Mixins
 
-    attr_reader :opts, :noop, :debug, :verbose, :net, :logger,
-                :calling_class
+    attr_reader :opts, :noop, :debug, :verbose, :net, :logger, :calling_class
 
     # @param calling_class [
     # @param creds [Hash] Wavefront credentials
@@ -135,7 +134,7 @@ module Wavefront
     def post(path, body = nil, ctype = 'text/plain')
       body = body.to_json unless body.is_a?(String)
       make_call(mk_conn(path,  'Content-Type': ctype,
-                               'Accept': 'application/json'),
+                               Accept: 'application/json'),
                 :post, nil, body)
     end
 
@@ -150,7 +149,7 @@ module Wavefront
     #
     def put(path, body = nil, ctype = 'application/json')
       make_call(mk_conn(path,  'Content-Type': ctype,
-                               'Accept': 'application/json'),
+                               Accept: 'application/json'),
                 :put, nil, body.to_json)
     end
 
@@ -178,7 +177,9 @@ module Wavefront
                resp.body
              end
 
-      Wavefront::Response.new(body, resp.status, @opts)
+      return body if opts[:raw_response]
+
+      Wavefront::Response.new(body, resp.status, opts)
     end
 
     # Try to describe the actual HTTP calls we make. There's a bit

data/lib/wavefront-sdk/core/exception.rb

@@ -6,61 +6,117 @@ module Wavefront
   #
   class Exception
     class CredentialError < RuntimeError; end
+
     class EmptyMetricName < RuntimeError; end
+
     class EnumerableError < RuntimeError; end
+
     class InvalidAccountId < RuntimeError; end
+
     class InvalidAlertId < RuntimeError; end
+
     class InvalidAlertSeverity < RuntimeError; end
+
     class InvalidApiTokenId < RuntimeError; end
+
     class InvalidAwsExternalId < RuntimeError; end
+
     class InvalidConfigFile < RuntimeError; end
+
     class InvalidCloudIntegrationId < RuntimeError; end
+
     class InvalidDashboardId < RuntimeError; end
+
     class InvalidDerivedMetricId < RuntimeError; end
+
     class InvalidDistribution < RuntimeError; end
+
     class InvalidDistributionInterval < RuntimeError; end
+
     class InvalidDistributionCount < RuntimeError; end
+
     class InvalidEndpoint < RuntimeError; end
+
     class InvalidEventId < RuntimeError; end
+
     class InvalidExternalLinkId < RuntimeError; end
+
     class InvalidGranularity < RuntimeError; end
+
     class InvalidHostname < RuntimeError; end
+
     class InvalidIngestionPolicyId < RuntimeError; end
+
     class InvalidIntegrationId < RuntimeError; end
+
     class InvalidLinkTemplate < RuntimeError; end
+
     class InvalidMaintenanceWindowId < RuntimeError; end
+
     class InvalidMonitoredClusterId < RuntimeError; end
+
     class InvalidMessageId < RuntimeError; end
+
     class InvalidMetricName < RuntimeError; end
+
     class InvalidMetricValue < RuntimeError; end
+
     class InvalidName < RuntimeError; end
+
     class InvalidNotificantId < RuntimeError; end
+
     class InvalidPermission < RuntimeError; end
+
     class InvalidPoint < RuntimeError; end
+
     class InvalidPrefixLength < RuntimeError; end
+
     class InvalidProxyId < RuntimeError; end
+
     class InvalidRoleId < RuntimeError; end
+
     class InvalidRelativeTime < RuntimeError; end
+
     class InvalidSamplingValue < RuntimeError; end
+
     class InvalidSavedSearchEntity < RuntimeError; end
+
     class InvalidSavedSearchId < RuntimeError; end
+
     class InvalidServiceAccountId < RuntimeError; end
+
     class InvalidSourceId < RuntimeError; end
+
     class InvalidString < RuntimeError; end
+
     class InvalidTag < RuntimeError; end
+
     class InvalidTimeFormat < RuntimeError; end
+
     class InvalidTimeUnit < RuntimeError; end
+
     class InvalidTimestamp < RuntimeError; end
+
     class InvalidUserId < RuntimeError; end
+
     class InvalidUserGroupId < RuntimeError; end
+
     class InvalidVersion < RuntimeError; end
+
     class InvalidWebhookId < RuntimeError; end
+
     class MissingConfigProfile < RuntimeError; end
+
     class NetworkTimeout < RuntimeError; end
+
     class NotImplemented < RuntimeError; end
+
     class SocketError < RuntimeError; end
+
     class UnparseableResponse < RuntimeError; end
+
     class UnsupportedWriter < RuntimeError; end
+
     class ValueOutOfRange < RuntimeError; end
   end
 end

data/lib/wavefront-sdk/credentials.rb

@@ -65,12 +65,14 @@ module Wavefront
     # @return void
     #
     def populate(raw)
+      creds_keys = %i[endpoint token]
+      proxy_keys = %i[proxy port]
+      all_keys = creds_keys + proxy_keys
+
       @config = Map(raw)
-      @creds  = Map(raw.select { |k, _v| %i[endpoint token].include?(k) })
-      @proxy  = Map(raw.select { |k, _v| %i[proxy port].include?(k) })
-      @all    = Map(raw.select do |k, _v|
-        %i[proxy port endpoint token].include?(k)
-      end)
+      @creds  = Map(raw.select { |k, _v| creds_keys.include?(k) })
+      @proxy  = Map(raw.select { |k, _v| proxy_keys.include?(k) })
+      @all    = Map(raw.select { |k, _v| all_keys.include?(k) })
     end
 
     # @return [Array] a list of possible credential files

data/lib/wavefront-sdk/defs/version.rb

@@ -2,5 +2,5 @@
 
 require 'pathname'
 
-WF_SDK_VERSION = '5.3.1'
+WF_SDK_VERSION = '5.4.4'
 WF_SDK_LOCATION = Pathname.new(__dir__).parent.parent.parent

data/lib/wavefront-sdk/derivedmetric.rb

@@ -113,7 +113,7 @@ module Wavefront
     end
 
     def update_keys
-      %i[name query tags additionalInformation includeObsoleteMetrics
+      %i[id name query tags additionalInformation includeObsoleteMetrics
          processRateMinutes minutes]
     end
   end

data/lib/wavefront-sdk/event.rb

@@ -12,7 +12,7 @@ module Wavefront
     include Wavefront::Mixin::Tag
 
     def update_keys
-      %i[startTime endTime name annotations]
+      %i[id name]
     end
 
     # GET /api/v2/event
@@ -28,6 +28,7 @@ module Wavefront
     # @param limit [Integer] the number of events to return
     # @return [Wavefront::Response]
     #
+    # rubocop:disable Metrics/ParameterLists
     def list(from = nil, to = Time.now, limit = 100, cursor = nil)
       raise ArgumentError unless from && to
 
@@ -37,6 +38,7 @@ module Wavefront
       wf_ms_ts?(body[:latestStartTimeEpochMillis])
       api.get('', body.cleanse)
     end
+    # rubocop:enable Metrics/ParameterLists
 
     # POST /api/v2/event
     # Create a specific event.
@@ -100,7 +102,9 @@ module Wavefront
 
       return api.put(id, body, 'application/json') unless modify
 
-      api.put(id, hash_for_update(describe(id), body), 'application/json')
+      api.put(id,
+              hash_for_update(describe(id).response, body),
+              'application/json')
     end
 
     # POST /api/v2/event/id/close

data/lib/wavefront-sdk/query.rb

@@ -30,6 +30,7 @@ module Wavefront
     # @raise [ArgumentError] if query is not a string
     # @return [Wavefront::Response]
     #
+    # rubocop:disable Metrics/ParameterLists
     def query(query, granularity = nil, t_start = nil, t_end = nil,
               options = {})
 
@@ -45,6 +46,7 @@ module Wavefront
 
       api.get('api', options)
     end
+    # rubocop:enable Metrics/ParameterLists
 
     # GET /api/v2/chart/raw
     # Perform a raw data query against Wavefront servers that

data/lib/wavefront-sdk/search.rb

@@ -113,6 +113,7 @@ module Wavefront
     #   specified in the body. See the Swagger docs for more
     #   information.
     #
+    # rubocop:disable Metrics/ParameterLists
     def raw_facet_search(entity = nil, body = nil, deleted = false,
                          facet = false)
       raise ArgumentError unless entity.is_a?(String) && body.is_a?(Hash)
@@ -122,5 +123,6 @@ module Wavefront
       path.<< facet || 'facets'
       api.post(path, body, 'application/json')
     end
+    # rubocop:enable Metrics/ParameterLists
   end
 end

data/lib/wavefront-sdk/support/parse_time.rb

@@ -58,7 +58,7 @@ module Wavefront
       method = ('parse_time_' + t.class.name.downcase).to_sym
       send(method)
     rescue StandardError
-      raise Wavefront::Exception::InvalidTimestamp
+      raise Wavefront::Exception::InvalidTimestamp, t
     end
   end
 end

data/lib/wavefront-sdk/validators.rb

@@ -48,8 +48,8 @@ module Wavefront
     #
     def wf_metric_name?(metric)
       if metric.is_a?(String) && metric.size < 1024 &&
-         (metric.match(/^#{DELTA}?[\w\-.]+$/) ||
-          metric.match(%r{^"#{DELTA}?[\w\-./,]+"$}))
+         (metric.match(/^#{DELTA}?[\w\-.]+$/o) ||
+          metric.match(%r{^"#{DELTA}?[\w\-./,]+"$}o))
         return true
       end
 

data/lib/wavefront-sdk/write.rb

@@ -118,7 +118,7 @@ module Wavefront
       summary = { sent: 0, rejected: 0, unsent: 0 }
 
       %i[sent rejected unsent].each do |k|
-        summary[k] = responses.map { |r| r.response[k] }.inject(:+)
+        summary[k] = responses.sum { |r| r.response[k] }
       end
 
       Wavefront::Response.new(

data/lib/wavefront-sdk/writers/api.rb

@@ -19,12 +19,12 @@ module Wavefront
       end
 
       def validate_credentials(creds)
-        unless creds.key?(:endpoint)
+        unless creds.key?(:endpoint) && creds[:endpoint]
           raise(Wavefront::Exception::CredentialError,
                 'credentials must contain API endpoint')
         end
 
-        return true if creds.key?(:token)
+        return if creds.key?(:token) && creds[:token]
 
         raise(Wavefront::Exception::CredentialError,
               'credentials must contain API token')

data/lib/wavefront-sdk/writers/core.rb

@@ -99,7 +99,7 @@ module Wavefront
       #
       def hash_to_wf(point)
         wf_point = calling_class.hash_to_wf(point)
-        logger.log(wf_point, :info)
+        logger.log(wf_point, :debug)
         wf_point
       end
 

data/lib/wavefront-sdk/writers/http.rb

@@ -29,10 +29,10 @@ module Wavefront
       end
 
       def validate_credentials(creds)
-        return true if creds.key?(:proxy)
+        return true if creds.key?(:proxy) && creds[:proxy]
 
         raise(Wavefront::Exception::CredentialError,
-              'credentials must contain proxy')
+              'credentials must contain proxy address')
       end
 
       def chunk_size

data/lib/wavefront-sdk/writers/socket.rb

@@ -35,10 +35,10 @@ module Wavefront
       end
 
       def validate_credentials(creds)
-        return true if creds.key?(:proxy)
+        return if creds.key?(:proxy) && creds[:proxy]
 
         raise(Wavefront::Exception::CredentialError,
-              'creds must contain proxy address')
+              'credentials must contain proxy address')
       end
 
       private

data/lib/wavefront-sdk/writers/unix.rb

@@ -6,8 +6,7 @@ require_relative 'core'
 module Wavefront
   module Writer
     #
-    # Everything specific to writing points to a Unix datagram
-    # socket.
+    # Everything specific to writing points to a Unix datagram socket.
     #
     class Unix < Core
       # Make a connection to a Unix datagram socket, putting the
@@ -33,10 +32,10 @@ module Wavefront
       end
 
       def validate_credentials(creds)
-        return true if creds.key?(:socket)
+        return if creds.key?(:socket) && creds[:socket]
 
         raise(Wavefront::Exception::CredentialError,
-              'creds must contain socket file path')
+              'credentials must contain socket file path')
       end
 
       private
@@ -48,10 +47,11 @@ module Wavefront
         raise Wavefront::Exception::InvalidEndpoint
       end
 
-      # @param point [String] point or points in native Wavefront
-      # format.
+      # @param point [String] point or points in native Wavefront format.
       #
       def _send_point(point)
+        return if opts[:noop]
+
         conn.write(point)
       end
     end

data/spec/.rubocop.yml

@@ -1,23 +1,11 @@
-AllCops:
-  NewCops: enable
+inherit_from:
+  - ../.rubocop.yml
 
 Metrics/AbcSize:
   Max: 64
-
-# Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 400
-
-# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 39
-
-# Is nothing sacred?
-Layout/LineLength:
-  Max: 80
-
-Style/StringConcatenation:
-  Enabled: false
-
-Style/OptionalBooleanParameter:
+Naming/VariableNumber:
   Enabled: false

data/spec/constants.rb

@@ -26,7 +26,7 @@ U_ACL_1 = 'someone@example.com'
 U_ACL_2 = 'other@elsewhere.com'
 GRP_ACL = 'f8dc0c14-91a0-4ca9-8a2a-7d47f4db4672'
 
-DEFAULT_HEADERS = { 'Accept': /.*/,
+DEFAULT_HEADERS = { Accept: /.*/,
                     'Accept-Encoding': /.*/,
-                    'Authorization': 'Bearer 0123456789-ABCDEF',
+                    Authorization: 'Bearer 0123456789-ABCDEF',
                     'User-Agent': /wavefront-sdk \d+\.\d+\.\d+/ }.freeze

data/spec/support/mocket.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-# A mock socket
+# A mock socket. Stubs TCP sockets and UNIX domain sockets.
 #
 class Mocket
   def puts(socket); end
 
+  def write(socket); end
+
   def close; end
 
   def ok?

data/spec/wavefront-sdk/derivedmetric_spec.rb

@@ -29,6 +29,7 @@ class WavefrontDerivedMetricTest < WavefrontTestBase
   def payload
     { minutes: 5,
       name: 'test_1',
+      id: id,
       query: 'aliasMetric(ts("test.metric"), "derived.test_1")',
       tags: { customerTags: ['test'] },
       includeObsoleteMetrics: false,

data/spec/wavefront-sdk/metric_helper_spec.rb

@@ -115,12 +115,12 @@ class WavefrontMetricHelperTest < MiniTest::Test
     out = wfd.dists_to_wf(input)
     assert_instance_of(Array, out)
     assert_equal(3, out.size)
-    assert_equal(1, out.select do |o|
+    assert_equal(1, out.count do |o|
                       o[:value] == [[2, 10.0], [1, 11.0],
                                     [1, 12.0]]
-                    end.size)
-    assert_equal(1, out.select { |o| o[:tags] == WH_TAGS }.size)
-    assert_equal(3, out.select { |o| o[:path] == 'test.dist1' }.size)
+                    end)
+    assert_equal(1, out.count { |o| o[:tags] == WH_TAGS })
+    assert_equal(3, out.count { |o| o[:path] == 'test.dist1' })
   end
 
   def test_flush_gauges

data/spec/wavefront-sdk/validators_spec.rb

@@ -84,7 +84,7 @@ class WavefrontValidatorsTest < MiniTest::Test
             { tag1: 'val 1', tag2: 'val 2' },
             { TAG1: 'val 1', tag2: 'val 2' },
             { 'TAG-1': 'val 1', tag2: 'val 2' },
-            { 'TAG_1': 'val 1', tag_2: 'val 2' },
+            { TAG_1: 'val 1', tag_2: 'val 2' },
             { 'TAG.1': 'val 1', tag_2: 'val 2' },
             { 'TAG-1': 'val 1', tag2: 'val 2' },
             { tag1: '(>_<)', tag2: '^_^' }]

data/spec/wavefront-sdk/writers/api_spec.rb

@@ -42,5 +42,9 @@ class WavefrontWriterApiTest < MiniTest::Test
     assert_raises(Wavefront::Exception::CredentialError) do
       Wavefront::Write.new({ token: 'abcdef' }, writer: :api)
     end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ token: 'abcdef', endpoint: nil }, writer: :api)
+    end
   end
 end

data/spec/wavefront-sdk/writers/core_spec.rb

@@ -6,9 +6,7 @@ require_relative '../../spec_helper'
 require_relative '../../../lib/wavefront-sdk/writers/core'
 require_relative '../resources/dummy_points'
 
-# rubocop:disable Style/MutableConstant
-WBWT_CREDS = { endpoint: 'stub.wavefront.com', token: 'tkn' }
-# rubocop:enable Style/MutableConstant
+WBWT_CREDS = { endpoint: 'stub.wavefront.com', token: 'tkn' }.freeze
 
 # Fake class for testing
 #

data/spec/wavefront-sdk/writers/http_spec.rb

@@ -6,6 +6,7 @@ require_relative '../resources/dummy_points'
 require_relative '../../../lib/wavefront-sdk/write'
 
 BODY = 'test.metric 123456 1469987572 source=testhost t1="v1" t2="v2"'
+WH_CREDS = { proxy: 'wavefront-proxy' }.freeze
 
 # Test HTTP transport
 #
@@ -20,27 +21,6 @@ class WavefrontWriterSocketTest < MiniTest::Test
     assert_instance_of(Wavefront::Writer::Http, wf.writer)
   end
 
-  def test_validate_credentials
-    assert Wavefront::Write.new({ proxy: 'wavefront' }, writer: :http)
-    assert_instance_of(Wavefront::Write, wf)
-
-    assert_raises(Wavefront::Exception::CredentialError) do
-      Wavefront::Write.new(CREDS, writer: :http)
-    end
-
-    assert_raises(Wavefront::Exception::CredentialError) do
-      Wavefront::Write.new({}, writer: :http)
-    end
-
-    assert_raises(Wavefront::Exception::CredentialError) do
-      Wavefront::Write.new({ endpoint: 'wavefront.com' }, writer: :http)
-    end
-
-    assert_raises(Wavefront::Exception::CredentialError) do
-      Wavefront::Write.new({ token: 'abcdef' }, writer: :http)
-    end
-  end
-
   def test_write_2878
     wf1 = Wavefront::Write.new({ proxy: 'wavefront' }, writer: :http)
 
@@ -67,4 +47,27 @@ class WavefrontWriterSocketTest < MiniTest::Test
     assert_requested(:post, 'http://wavefront:1234', headers: POST_HEADERS)
     WebMock.reset!
   end
+
+  def test_validate_credentials
+    assert(Wavefront::Write.new(WH_CREDS, writer: :http))
+
+    assert_instance_of(Wavefront::Write,
+                       Wavefront::Write.new(WH_CREDS, writer: :http))
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({}, writer: :http)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ endpoint: 'wavefront.com' }, writer: :http)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ token: 'abcdef' }, writer: :http)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ proxy: nil }, writer: :http)
+    end
+  end
 end

data/spec/wavefront-sdk/writers/socket_spec.rb

@@ -6,17 +6,14 @@ require 'spy'
 require 'spy/integration'
 require 'socket'
 require 'logger'
+require_relative '../resources/dummy_points'
 require_relative '../../spec_helper'
 require_relative '../../../lib/wavefront-sdk/write'
-require_relative '../resources/dummy_points'
+require_relative '../../../spec/support/mocket'
 
-# rubocop:disable Style/MutableConstant
-WS_CREDS = { proxy: 'wavefront-proxy' }
-# rubocop:enable Style/MutableConstant
+WS_CREDS = { proxy: 'wavefront-proxy' }.freeze
 
-# It's not straightforward to test the Writer::Socket class on its
-# own. It makes far more sense to test the Write interface which
-# calls it.
+# The Socket class writes to a proxy
 #
 class WavefrontWriterSocketTest < MiniTest::Test
   attr_reader :wf, :wf_noop
@@ -106,4 +103,27 @@ class WavefrontWriterSocketTest < MiniTest::Test
     refute tcp_spy.has_been_called?
     refute log_spy.has_been_called?
   end
+
+  def test_validate_credentials
+    assert(Wavefront::Write.new(WS_CREDS, writer: :socket))
+
+    assert_instance_of(Wavefront::Write,
+                       Wavefront::Write.new(WS_CREDS, writer: :socket))
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({}, writer: :socket)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ endpoint: 'wavefront.com' }, writer: :socket)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ token: 'abcdef' }, writer: :socket)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ proxy: nil }, writer: :socket)
+    end
+  end
 end

data/spec/wavefront-sdk/writers/unix_spec.rb

@@ -0,0 +1,131 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'webmock/minitest'
+require 'spy'
+require 'spy/integration'
+require 'socket'
+require 'logger'
+require_relative '../resources/dummy_points'
+require_relative '../../spec_helper'
+require_relative '../../../lib/wavefront-sdk/write'
+require_relative '../../../spec/support/mocket'
+
+UNIX_SOCK = '/tmp/testsock'
+
+WU_CREDS = { socket: UNIX_SOCK }.freeze
+
+# Test UNIX Datagram socket writing
+#
+class WavefrontWriterUnixTest < MiniTest::Test
+  attr_reader :wf, :wf_noop
+
+  def setup
+    @wf = Wavefront::Write.new(WU_CREDS, writer: :unix)
+    @wf_noop = Wavefront::Write.new(WU_CREDS, writer: :unix, noop: true)
+  end
+
+  def test_writer_class
+    assert_instance_of(Wavefront::Writer::Unix, wf.writer)
+  end
+
+  def test_write_openclose
+    mocket = Mocket.new
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
+    wf.write(POINT)
+    assert mocket_spy.has_been_called?
+  end
+
+  def test_write_noop
+    mocket = Mocket.new
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
+    wf_noop.open
+    wf_noop.write(POINT, false)
+    refute mocket_spy.has_been_called?
+  end
+
+  def test_write_noop_openclose
+    mocket = Mocket.new
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
+    wf_noop.write(POINT)
+    refute mocket_spy.has_been_called?
+  end
+
+  def test_write
+    mocket = Mocket.new
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
+    wf.open
+    wf.write(POINT, false)
+    assert mocket_spy.has_been_called?
+  end
+
+  def test_write_array
+    mocket = Mocket.new
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
+    wf.open
+    wf.write(POINT_A, false)
+    assert mocket_spy.has_been_called?
+  end
+
+  def test_noop_send_point
+    mocket = Mocket.new
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
+    wf_noop.open
+    wf_noop.send_point(POINT_L)
+    refute mocket_spy.has_been_called?
+  end
+
+  def test_open
+    tcp_spy = Spy.on(UNIXSocket, :new)
+    wf.open
+    assert tcp_spy.has_been_called?
+    assert_equal([UNIX_SOCK], tcp_spy.calls.first.args)
+  end
+
+  def test_noop_open
+    tcp_spy = Spy.on(UNIXSocket, :new)
+    log_spy = Spy.on(wf_noop.logger, :log)
+    wf_noop.open
+    refute tcp_spy.has_been_called?
+    assert_equal(['No-op requested. Not opening socket connection.'],
+                 log_spy.calls.last.args)
+    assert_equal(1, log_spy.calls.size)
+  end
+
+  def test_noop_close
+    tcp_spy = Spy.on(UNIXSocket, :new)
+    log_spy = Spy.on(wf_noop.logger, :log)
+    wf_noop.close
+    refute tcp_spy.has_been_called?
+    refute log_spy.has_been_called?
+  end
+
+  def test_validate_credentials
+    assert(Wavefront::Write.new(WU_CREDS, writer: :unix))
+
+    assert_instance_of(Wavefront::Write,
+                       Wavefront::Write.new(WU_CREDS, writer: :unix))
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({}, writer: :unix)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ endpoint: 'wavefront.com' }, writer: :unix)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ token: 'abcdef' }, writer: :unix)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ proxy: nil }, writer: :unix)
+    end
+  end
+end

data/wavefront-sdk.gemspec

@@ -29,7 +29,10 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'minitest', '~> 5.14'
   gem.add_development_dependency 'rake', '~> 13.0'
-  gem.add_development_dependency 'rubocop', '1.0'
+  gem.add_development_dependency 'rubocop', '~> 1.9'
+  gem.add_development_dependency 'rubocop-minitest', '~> 0.10'
+  gem.add_development_dependency 'rubocop-performance', '~> 1.3'
+  gem.add_development_dependency 'rubocop-rake', '~> 0.5'
   gem.add_development_dependency 'simplecov', '~> 0.18'
   gem.add_development_dependency 'spy', '1.0.0'
   gem.add_development_dependency 'webmock', '~> 3.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-sdk
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.4.4
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-12 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -98,16 +98,58 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -171,10 +213,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
-- ".github/workflows/ruby.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - LICENSE.txt
@@ -317,6 +359,7 @@ files:
 - spec/wavefront-sdk/writers/http_spec.rb
 - spec/wavefront-sdk/writers/socket_spec.rb
 - spec/wavefront-sdk/writers/summary_spec.rb
+- spec/wavefront-sdk/writers/unix_spec.rb
 - wavefront-sdk.gemspec
 homepage: https://github.com/snltd/wavefront-sdk
 licenses:
@@ -337,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: SDK for Wavefront API v2
@@ -414,3 +457,4 @@ test_files:
 - spec/wavefront-sdk/writers/http_spec.rb
 - spec/wavefront-sdk/writers/socket_spec.rb
 - spec/wavefront-sdk/writers/summary_spec.rb
+- spec/wavefront-sdk/writers/unix_spec.rb

data/.github/workflows/ruby.yml

@@ -1,32 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: [2.4.10, 2.5.8, 2.6.6, 2.7.2]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with: 
-        ruby-version: ${{ matrix.ruby-version }}     
-        bundler-cache: true
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.4.9
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-before_install: gem install bundler --no-document
-deploy:
-  provider: rubygems
-  api_key:
-    secure: dfmL5JwBn+u3cUmyAaDsApDa7ljGajGNz3GDcKd2J8FOt7+a758/lmL8EQ34sDT1ZFotrxn/y1RbgXlaDxAE1XDfrZbjckmx7a6wa2sqR3kBraJ2tx7CiXodbw3Z8XZf9WLb0kYGmlLtI73GNcuunMt/9f1cobqWISRLHw6b7amlO7GW2ZBZgzRS+N8TSS2dicIvKMo5HoMYU+uWLM4zDFBPnGNcMiWxh8ysLzJoKqA9kbBUyCVEZ03MlV7G71ObvWCLasKnZ3W5U+K1NbgU7mgMYfl9KIcA4y9hQ9hUCijk40SmT7ffy3P2gq8zblC/4x5Eefpau9X/bdLwXoRCIzqk05t4f45wstj2auHGK0HJwOYRtx8apdaLSgyJ5lQpGcbCRu40WR9mDkaM8m9n3u2o6GJmftCg3AN1QtsourmQB84x67LEbHzValMaokrbCol4XeWqlC+dCNLPixemQRBvcNfI3V9C6RqVGfjpoGlSTI+RkQqwm01PcxpeqIVfdMd1wnfUuAOywUO6UpvtK9TZaxg0NnVElXpPseQbtzulLwZ7R5Y3A4Ss8Z7w43c1KHxTkg54FWUOp065ItjAc4lmyORXq/2+F7sMvRN6dtCLaXTUlkYuU3cjFLIPlLGFYgqq4T4xQa+e5NEK1XW7nghv+IRfKfyVeZsB0WpY+uc=
-  gem: wavefront-sdk
-  on:
-    tags: true
-    repo: snltd/wavefront-sdk
-    ruby: 2.6.6
-notifications:
-  email: false
-  slack:
-    secure: cTG5e5NsnfZCNF6mUbnz8rdxmiPvrihJJN/7vEltO6rSCR4ew+9dfga9n7N5wCu7nae3lEysbRw7vPw605VVkZrfA4gn+HUsoHbKzaKNOB6AV9a8kkbjC4y6MH7EWSD2qsUWeeINP7dNs80cqvEwU2tgtIiBWNAP+e/eCjTEQCq4UIXnEB0f0UIP4bvl3w7/fSd0iFykBiVTiXvGBWKkqbetSAcAvsV5wxbPGqrhBp5AQQ9izm0Uh/P/hv8gaqMariFYA6rIpunWmwxPCHf3B87CTdl6T8uC5bi4bfgb3mFbQUiP9TTblz2XTI3Q9tRDbcFcr4BGpjB1Lyfdy1puRi3QzP5VME5AXvDTr9GVgi9TS6EWqy7P4HC//qZziWllTLlst6R9r/NlagTsiDB/mcnxkJBvOBYAvmzXS5ID6DfNxx/xCfCZuQzp5ISoWawGCvuGHBSOlzZZXKD4AAT8/69SIVybM23Hj/YBPKVvR9brpCmIlK4YXi14SA5sInjD4zn20u/p22vlEybjlnM8td7ryuhmCYm1ptk8y0tZ4oRoK2fBNo2VTD73aXq6P2q3AKuT6A9hRbypEJgawNgOAKJEWDHdu29LfeJIUnm25MzaFzx145it2hDU2/hOUlpFq9QKsmR2pAiI17sAMgHJ15cgaeOv1soWaYJsMOZil74=