wavefront-sdk 5.4.4 → 7.0.0

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

@@ -11,16 +11,18 @@ require_relative '../../spec_helper'
 require_relative '../../../lib/wavefront-sdk/write'
 require_relative '../../../spec/support/mocket'
 
-WS_CREDS = { proxy: 'wavefront-proxy' }.freeze
+UNIX_SOCK = '/tmp/testsock'
 
-# The Socket class writes to a proxy
+WU_CREDS = { socket: UNIX_SOCK }.freeze
+
+# Test UNIX Datagram socket writing
 #
-class WavefrontWriterSocketTest < MiniTest::Test
+class WavefrontWriterUnixTest < MiniTest::Test
   attr_reader :wf, :wf_noop
 
   def setup
-    @wf = Wavefront::Write.new(WS_CREDS, writer: :socket)
-    @wf_noop = Wavefront::Write.new(WS_CREDS, writer: :socket, noop: true)
+    @wf = Wavefront::Write.new(WU_CREDS, writer: :socket)
+    @wf_noop = Wavefront::Write.new(WU_CREDS, writer: :socket, noop: true)
   end
 
   def test_writer_class
@@ -29,16 +31,16 @@ class WavefrontWriterSocketTest < MiniTest::Test
 
   def test_write_openclose
     mocket = Mocket.new
-    Spy.on(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    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(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    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?
@@ -46,16 +48,16 @@ class WavefrontWriterSocketTest < MiniTest::Test
 
   def test_write_noop_openclose
     mocket = Mocket.new
-    Spy.on(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    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(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    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?
@@ -63,8 +65,8 @@ class WavefrontWriterSocketTest < MiniTest::Test
 
   def test_write_array
     mocket = Mocket.new
-    Spy.on(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    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?
@@ -72,32 +74,32 @@ class WavefrontWriterSocketTest < MiniTest::Test
 
   def test_noop_send_point
     mocket = Mocket.new
-    Spy.on(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    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(TCPSocket, :new)
+    tcp_spy = Spy.on(UNIXSocket, :new)
     wf.open
     assert tcp_spy.has_been_called?
-    assert_equal(['wavefront-proxy', 2878], tcp_spy.calls.first.args)
+    assert_equal([UNIX_SOCK], tcp_spy.calls.first.args)
   end
 
   def test_noop_open
-    tcp_spy = Spy.on(TCPSocket, :new)
+    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 connection to proxy.'],
+    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(TCPSocket, :new)
+    tcp_spy = Spy.on(UNIXSocket, :new)
     log_spy = Spy.on(wf_noop.logger, :log)
     wf_noop.close
     refute tcp_spy.has_been_called?
@@ -105,10 +107,10 @@ class WavefrontWriterSocketTest < MiniTest::Test
   end
 
   def test_validate_credentials
-    assert(Wavefront::Write.new(WS_CREDS, writer: :socket))
+    assert(Wavefront::Write.new(WU_CREDS, writer: :socket))
 
     assert_instance_of(Wavefront::Write,
-                       Wavefront::Write.new(WS_CREDS, writer: :socket))
+                       Wavefront::Write.new(WU_CREDS, writer: :socket))
 
     assert_raises(Wavefront::Exception::CredentialError) do
       Wavefront::Write.new({}, writer: :socket)

data/wavefront-sdk.gemspec

@@ -7,7 +7,6 @@ require_relative 'lib/wavefront-sdk/defs/version'
 Gem::Specification.new do |gem|
   gem.name          = 'wavefront-sdk'
   gem.version       = WF_SDK_VERSION
-  gem.date          = Date.today.to_s
 
   gem.summary       = 'SDK for Wavefront API v2'
   gem.description   = 'SDK for Wavefront (wavefront.com) API v2 '
@@ -18,25 +17,25 @@ Gem::Specification.new do |gem|
   gem.license       = 'BSD-2-Clause'
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  gem.test_files    = gem.files.grep(/^spec/)
   gem.require_paths = %w[lib]
   gem.bindir        = 'bin'
 
-  gem.add_dependency 'addressable', '~> 2.7'
+  gem.add_dependency 'addressable', '~> 2.8'
   gem.add_dependency 'faraday', '~> 1.1'
   gem.add_dependency 'inifile', '~> 3.0'
   gem.add_dependency 'map', '~> 6.6'
 
-  gem.add_development_dependency 'minitest', '~> 5.14'
+  gem.add_development_dependency 'minitest', '~> 5.17'
   gem.add_development_dependency 'rake', '~> 13.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 'rubocop', '~> 1.43'
+  gem.add_development_dependency 'rubocop-minitest', '~> 0.26'
+  gem.add_development_dependency 'rubocop-performance', '~> 1.15'
+  gem.add_development_dependency 'rubocop-rake', '~> 0.6'
   gem.add_development_dependency 'simplecov', '~> 0.18'
-  gem.add_development_dependency 'spy', '1.0.0'
-  gem.add_development_dependency 'webmock', '~> 3.9'
+  gem.add_development_dependency 'spy', '1.0'
+  gem.add_development_dependency 'webmock', '~> 3.18'
   gem.add_development_dependency 'yard', '~> 0.9'
 
-  gem.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
+  gem.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
+  gem.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-sdk
 version: !ruby/object:Gem::Version
-  version: 5.4.4
+  version: 7.0.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,56 +100,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.43'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.43'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.26'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.26'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.18'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,7 @@ files:
 - lib/wavefront-sdk/message.rb
 - lib/wavefront-sdk/metric.rb
 - lib/wavefront-sdk/metric_helper.rb
+- lib/wavefront-sdk/metricspolicy.rb
 - lib/wavefront-sdk/notificant.rb
 - lib/wavefront-sdk/paginator/base.rb
 - lib/wavefront-sdk/paginator/delete.rb
@@ -283,9 +284,9 @@ files:
 - lib/wavefront-sdk/writers/api.rb
 - lib/wavefront-sdk/writers/core.rb
 - lib/wavefront-sdk/writers/http.rb
+- lib/wavefront-sdk/writers/proxy.rb
 - lib/wavefront-sdk/writers/socket.rb
 - lib/wavefront-sdk/writers/summary.rb
-- lib/wavefront-sdk/writers/unix.rb
 - lib/wavefront_sdk.rb
 - spec/.rubocop.yml
 - spec/constants.rb
@@ -318,6 +319,7 @@ files:
 - spec/wavefront-sdk/message_spec.rb
 - spec/wavefront-sdk/metric_helper_spec.rb
 - spec/wavefront-sdk/metric_spec.rb
+- spec/wavefront-sdk/metricspolicy_spec.rb
 - spec/wavefront-sdk/misc_spec.rb
 - spec/wavefront-sdk/notificant_spec.rb
 - spec/wavefront-sdk/paginator/base_spec.rb
@@ -357,14 +359,15 @@ files:
 - spec/wavefront-sdk/writers/api_spec.rb
 - spec/wavefront-sdk/writers/core_spec.rb
 - spec/wavefront-sdk/writers/http_spec.rb
+- spec/wavefront-sdk/writers/proxy_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:
 - BSD-2-Clause
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -373,88 +376,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: SDK for Wavefront API v2
-test_files:
-- spec/.rubocop.yml
-- spec/constants.rb
-- spec/spec_helper.rb
-- spec/support/bad_mocket.rb
-- spec/support/hash.rb
-- spec/support/minitest_assertions.rb
-- spec/support/mocket.rb
-- spec/test_mixins/acl.rb
-- spec/test_mixins/general.rb
-- spec/test_mixins/tag.rb
-- spec/wavefront-sdk/account_spec.rb
-- spec/wavefront-sdk/alert_spec.rb
-- spec/wavefront-sdk/api_mixins/user_mixins_spec.rb
-- spec/wavefront-sdk/apitoken_spec.rb
-- spec/wavefront-sdk/cloudintegration_spec.rb
-- spec/wavefront-sdk/core/api_caller_spec.rb
-- spec/wavefront-sdk/core/api_spec.rb
-- spec/wavefront-sdk/core/logger_spec.rb
-- spec/wavefront-sdk/core/response_spec.rb
-- spec/wavefront-sdk/credentials_spec.rb
-- spec/wavefront-sdk/dashboard_spec.rb
-- spec/wavefront-sdk/derivedmetric_spec.rb
-- spec/wavefront-sdk/distribution_spec.rb
-- spec/wavefront-sdk/event_spec.rb
-- spec/wavefront-sdk/externallink_spec.rb
-- spec/wavefront-sdk/ingestionpolicy_spec.rb
-- spec/wavefront-sdk/integration_spec.rb
-- spec/wavefront-sdk/maintenancewindow_spec.rb
-- spec/wavefront-sdk/message_spec.rb
-- spec/wavefront-sdk/metric_helper_spec.rb
-- spec/wavefront-sdk/metric_spec.rb
-- spec/wavefront-sdk/misc_spec.rb
-- spec/wavefront-sdk/notificant_spec.rb
-- spec/wavefront-sdk/paginator/base_spec.rb
-- spec/wavefront-sdk/paginator/post_spec.rb
-- spec/wavefront-sdk/proxy_spec.rb
-- spec/wavefront-sdk/query_spec.rb
-- spec/wavefront-sdk/report_spec.rb
-- spec/wavefront-sdk/resources/dummy_points.rb
-- spec/wavefront-sdk/resources/malformed.conf
-- spec/wavefront-sdk/resources/test.conf
-- spec/wavefront-sdk/resources/test2.conf
-- spec/wavefront-sdk/resources/user_responses/add_user_groups.json
-- spec/wavefront-sdk/resources/user_responses/create.json
-- spec/wavefront-sdk/resources/user_responses/delete_multiple.json
-- spec/wavefront-sdk/resources/user_responses/describe.json
-- spec/wavefront-sdk/resources/user_responses/grant.json
-- spec/wavefront-sdk/resources/user_responses/list.json
-- spec/wavefront-sdk/role_spec.rb
-- spec/wavefront-sdk/savedsearch_spec.rb
-- spec/wavefront-sdk/search_spec.rb
-- spec/wavefront-sdk/serviceaccount_spec.rb
-- spec/wavefront-sdk/settings_spec.rb
-- spec/wavefront-sdk/source_spec.rb
-- spec/wavefront-sdk/spy_spec.rb
-- spec/wavefront-sdk/stdlib/array_spec.rb
-- spec/wavefront-sdk/stdlib/hash_spec.rb
-- spec/wavefront-sdk/stdlib/string_spec.rb
-- spec/wavefront-sdk/support/mixins_spec.rb
-- spec/wavefront-sdk/support/parse_time_spec.rb
-- spec/wavefront-sdk/unstable/chart_spec.rb
-- spec/wavefront-sdk/usage_spec.rb
-- spec/wavefront-sdk/user_spec.rb
-- spec/wavefront-sdk/usergroup_spec.rb
-- spec/wavefront-sdk/validators_spec.rb
-- spec/wavefront-sdk/webhook_spec.rb
-- spec/wavefront-sdk/write_spec.rb
-- spec/wavefront-sdk/writers/api_spec.rb
-- spec/wavefront-sdk/writers/core_spec.rb
-- 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
+test_files: []

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

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require 'socket'
-require_relative 'core'
-
-module Wavefront
-  module Writer
-    #
-    # Everything specific to writing points to a Unix datagram socket.
-    #
-    class Unix < Core
-      # Make a connection to a Unix datagram socket, putting the
-      # descriptor in instance variable @conn.
-      # This requires the name of the socket file in creds[:socket]
-      # @return [UnixSocket]
-      #
-      def open
-        if opts[:noop]
-          logger.log('No-op requested. Not opening socket connection.')
-          return true
-        end
-
-        logger.log("Connecting to #{creds[:socket]}.", :debug)
-        open_socket(creds[:socket])
-      end
-
-      def close
-        return if opts[:noop]
-
-        logger.log('Closing socket connection.', :debug)
-        conn.close
-      end
-
-      def validate_credentials(creds)
-        return if creds.key?(:socket) && creds[:socket]
-
-        raise(Wavefront::Exception::CredentialError,
-              'credentials must contain socket file path')
-      end
-
-      private
-
-      def open_socket(socket)
-        @conn = UNIXSocket.new(socket)
-      rescue StandardError => e
-        logger.log(e, :error)
-        raise Wavefront::Exception::InvalidEndpoint
-      end
-
-      # @param point [String] point or points in native Wavefront format.
-      #
-      def _send_point(point)
-        return if opts[:noop]
-
-        conn.write(point)
-      end
-    end
-  end
-end