wavefront-cli 7.2.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65a2455065fbd4b69b42718f7789e4c01cb5245a0015ea7d2977b96581ad0b83
-  data.tar.gz: 2c01e8464589c804271a97dba24a19a62b3f4a1dba9af588216f1d0b911c9ec9
+  metadata.gz: 4935d9901fe186c38fdbe357b4ee52d3b98d3bc6a214f4c3648d52229f760e92
+  data.tar.gz: acbf0f389bbfc37c2bc61ab1aa772afdbc92984d4d7592bf8f8f93ba606d78be
 SHA512:
-  metadata.gz: 392ea65a15b94665c5255da837abcaf3a8b69d38db9b675652c5c824627b3436b4b802174283bcdda6d2f95150cb3fce0a21de2dfcb449c64a0a73259d16357b
-  data.tar.gz: f55ffa3998170ee1a3d98f55cdefa9cd27d2f84e39f3c2fcbe3ffb649bcb34eeb96e93e1a486f4edfa030244e4640e3777865eef6f6119380dec7ff273637041
+  metadata.gz: 8efc8b7a1363bc0e0b0b3800ce70b0fb1b4cb8b8dd61a03fdd56be5376fe4abf178975414926dfff03ae742f66f7469f5810c29bd0fafcc070423fd34175c5e3
+  data.tar.gz: 725f41a25db164bf4c3f5835df9ff490bfe54e1f4b3cc2beb461d1000bd1ef212584f995501e8706aa876c989ec258176239996d50bb943c963395d7a5a1367d

data/.rubocop.yml

@@ -1,49 +1,18 @@
 ---
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
+  NewCops: enable
 
 Metrics/ClassLength:
   Max: 400
 
 Style/IfUnlessModifier:
   Enabled: false # because it wants to make lines >80 chars
-Style/HashEachMethods:
-    Enabled: true
-Style/HashTransformKeys:
-    Enabled: true
-Style/HashTransformValues:
-    Enabled: true
-
-# New compatabilities
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Style/ExponentialNotation:
-  Enabled: true
-Style/SlicingWithRange:
-  Enabled: true
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-Style/RedundantRegexpEscape:
-  Enabled: true
-Style/AccessorGrouping:
-  Enabled: true
-Style/BisectedAttrAccessor:
-  Enabled: true
-Style/RedundantAssignment:
-  Enabled: true
-Style/RedundantFetchBlock:
-  Enabled: true
+Style/StringConcatenation:
+  Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false
 
 # Is nothing sacred?
 Layout/LineLength:

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 before_install: gem install bundler --no-document
 deploy:
   provider: rubygems
@@ -14,7 +13,7 @@ deploy:
   on:
     tags: true
     repo: snltd/wavefront-cli
-    ruby: 2.6.5
+    ruby: 2.6.6
 notifications:
   email: false
   slack:

data/HISTORY.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 8.0.0 (2020-09-20
+* Drop Ruby 2.4.0 support. (Breaking change.)
+
 ## 7.2.0 (2020-08-12)
 * Add `cloudintegration awsid generate` command.
 * Add `cloudintegration awsid delete <external_id>` command.

data/README.md

@@ -15,7 +15,7 @@ $ gem install wavefront-cli
 
 It is built on [our Wavefront Ruby
 SDK](https://github.com/snltd/wavefront-sdk) and requires Ruby >=
-2.4. It has no "native extension" dependencies.
+2.5. It has no "native extension" dependencies.
 
 For a far more comprehensive overview/tutorial, please read [this
 article](https://sysdef.xyz/article/wavefront-cli).

data/lib/wavefront-cli/base.rb

@@ -102,12 +102,10 @@ module WavefrontCli
 
     def validate_tags(key = :'<tag>')
       Array(options[key]).each do |t|
-        begin
-          send(:wf_tag?, t)
-        rescue Wavefront::Exception::InvalidTag
-          raise(WavefrontCli::Exception::InvalidInput,
-                "'#{t}' is not a valid tag.")
-        end
+        send(:wf_tag?, t)
+      rescue Wavefront::Exception::InvalidTag
+        raise(WavefrontCli::Exception::InvalidInput,
+              "'#{t}' is not a valid tag.")
       end
     end
 
@@ -371,9 +369,10 @@ module WavefrontCli
     def do_dump
       cannot_noop!
 
-      if options[:format] == 'yaml'
+      case options[:format]
+      when 'yaml'
         ok_exit dump_yaml
-      elsif options[:format] == 'json'
+      when 'json'
         ok_exit dump_json
       else
         abort format("Dump format must be 'json' or 'yaml'. " \
@@ -539,7 +538,8 @@ module WavefrontCli
     #
     # rubocop:disable Metrics/MethodLength
     def extract_values(obj, key, aggr = [])
-      if obj.is_a?(Hash)
+      case obj.class
+      when Hash
         obj.each_pair do |k, v|
           if k == key && !v.to_s.empty?
             aggr.<< v
@@ -547,7 +547,7 @@ module WavefrontCli
             extract_values(v, key, aggr)
           end
         end
-      elsif obj.is_a?(Array)
+      when Array
         obj.each { |e| extract_values(e, key, aggr) }
       end
 

data/lib/wavefront-cli/commands/.rubocop.yml

@@ -1,47 +1,19 @@
 ---
+AllCops:
+  NewCops: enable
 
 # There are long things in here, but they're fine
 #
 Metrics/MethodLength:
   Max: 25
 
-Style/HashEachMethods:
-    Enabled: true
-Style/HashTransformKeys:
-    Enabled: true
-Style/HashTransformValues:
-    Enabled: true
-
-# new compatabilities
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Style/ExponentialNotation:
-  Enabled: true
-Style/SlicingWithRange:
-  Enabled: true
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-Style/RedundantRegexpEscape:
-  Enabled: true
-Style/AccessorGrouping:
-  Enabled: true
-Style/BisectedAttrAccessor:
-  Enabled: true
-Style/RedundantAssignment:
-  Enabled: true
-Style/RedundantFetchBlock:
-  Enabled: true
-
 # Is nothing sacred?
 Layout/LineLength:
   Max: 80
+
+Style/IfUnlessModifier:
+  Enabled: false # because it wants to make lines >80 chars
+Style/StringConcatenation:
+  Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false

data/lib/wavefront-cli/config.rb

@@ -36,11 +36,13 @@ module WavefrontCli
 
     RX = /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/.freeze
 
+    # rubocop:disable Lint/MissingSuper
     def initialize(options)
       @options = options
       @config_file = _config_file
       @profile = options[:'<profile>'] || 'default'
     end
+    # rubocop:enable Lint/MissingSuper
 
     def do_location
       puts config_file
@@ -144,7 +146,7 @@ module WavefrontCli
     # catch a ctrl-d
     #
     def read_input
-      STDIN.gets.strip
+      $stdin.gets.strip
     rescue NoMethodError
       abort "\nInput aborted at user request."
     end

data/lib/wavefront-cli/controller.rb

@@ -177,8 +177,6 @@ class WavefrontCliController
   # return [Hash] h with modified keys
   #
   def sanitize_keys(options)
-    options.each_with_object({}) do |(k, v), r|
-      r[k.to_s.delete('-').to_sym] = v
-    end
+    options.transform_keys { |k| k.to_s.delete('-').to_sym }
   end
 end

data/lib/wavefront-cli/display/printer/long.rb

@@ -75,6 +75,7 @@ module WavefrontDisplayPrinter
     #
     # Make an array of hashes: { key, value, depth }
     #
+    # rubocop:disable Style/CaseLikeIf
     def make_list(data, aggr = [], depth = 0, last_key = nil)
       if data.is_a?(Hash)
         append_hash(data, aggr, depth)
@@ -84,6 +85,7 @@ module WavefrontDisplayPrinter
         aggr.<< ['', preened_value(data), depth]
       end
     end
+    # rubocop:enable Style/CaseLikeIf
 
     def smart_value(val)
       val.to_s.empty? && opts[:none] ? '<none>' : preened_value(val)
@@ -150,6 +152,7 @@ module WavefrontDisplayPrinter
     # @param depth [Integer]
     # @return [Array[Array]]
     #
+    # rubocop:disable Style/CaseLikeIf
     def append_hash(data, aggr, depth)
       data.each_pair do |k, v|
         if v.is_a?(Hash)
@@ -163,6 +166,7 @@ module WavefrontDisplayPrinter
 
       aggr
     end
+    # rubocop:enable Style/CaseLikeIf
 
     # Part of the #make_list recursion. Deals with arrays.
     #

data/lib/wavefront-cli/event.rb

@@ -97,6 +97,7 @@ module WavefrontCli
     # return [Hash] body for #create() method
     #
     # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def create_body(opts, t_start)
       { name: opts[:'<event>'],
         startTime: t_start,
@@ -111,6 +112,7 @@ module WavefrontCli
           end
         end
     end
+    # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
 
     def annotations(opts)

data/lib/wavefront-cli/exception_handler.rb

@@ -8,7 +8,6 @@ module WavefrontCli
     # rubocop:disable Metrics/MethodLength
     # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/PerceivedComplexity
     def exception_handler(exception)
       case exception
       when WavefrontCli::Exception::UnhandledCommand
@@ -83,7 +82,6 @@ module WavefrontCli
     end
     # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/AbcSize
-    # rubocop:enable Metrics/PerceivedComplexity
     # rubocop:enable Metrics/CyclomaticComplexity
   end
 end

data/lib/wavefront-cli/externallink.rb

@@ -38,12 +38,10 @@ module WavefrontCli
 
     def point_filter_regexes
       ret = options[:pointregex].each_with_object({}) do |r, a|
-        begin
-          k, v = r.split('=', 2)
-          a[k.to_sym] = v
-        rescue StandardError
-          puts "cannot parse point regex '#{r}'. Skipping."
-        end
+        k, v = r.split('=', 2)
+        a[k.to_sym] = v
+      rescue StandardError
+        puts "cannot parse point regex '#{r}'. Skipping."
       end
 
       ret.empty? ? nil : ret

data/lib/wavefront-cli/helpers/load_file.rb

@@ -57,7 +57,7 @@ module WavefrontCli
       #   does not parse
       #
       def load_from_stdin
-        raw = STDIN.read
+        raw = $stdin.read
 
         if raw.start_with?('---')
           read_yaml(raw)

data/lib/wavefront-cli/opt_handler.rb

@@ -2,7 +2,7 @@
 
 require 'pathname'
 require 'wavefront-sdk/credentials'
-require_relative 'constants.rb'
+require_relative 'constants'
 
 module WavefrontCli
   #
@@ -69,7 +69,7 @@ module WavefrontCli
     #
     def load_profile(cred_opts)
       creds = Wavefront::Credentials.new(cred_opts).config
-      Hash[creds.map { |k, v| [k.to_sym, v] }]
+      creds.transform_keys(&:to_sym)
     end
   end
 end

data/lib/wavefront-cli/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WF_CLI_VERSION = '7.2.0'
+WF_CLI_VERSION = '8.0.0'

data/lib/wavefront-cli/write.rb

@@ -167,12 +167,10 @@ module WavefrontCli
     #
     def process_input_file(data)
       data.each_with_object([]) do |l, a|
-        begin
-          a.<< process_line(l)
-        rescue WavefrontCli::Exception::UnparseableInput => e
-          puts "Bad input. #{e.message}."
-          next
-        end
+        a.<< process_line(l)
+      rescue WavefrontCli::Exception::UnparseableInput => e
+        puts "Bad input. #{e.message}."
+        next
       end
     end
 
@@ -193,7 +191,7 @@ module WavefrontCli
     #
     def read_stdin
       open_connection
-      STDIN.each_line { |l| call_write(process_line(l.strip), false) }
+      $stdin.each_line { |l| call_write(process_line(l.strip), false) }
       close_connection
     rescue SystemExit, Interrupt
       puts 'ctrl-c. Exiting.'

data/spec/.rubocop.yml

@@ -1,4 +1,7 @@
 ---
+AllCops:
+  NewCops: enable
+
 Metrics/MethodLength:
   Max: 30
 
@@ -8,43 +11,13 @@ Metrics/AbcSize:
 Metrics/ClassLength:
   Max: 300
 
-Style/HashEachMethods:
-    Enabled: true
-Style/HashTransformKeys:
-    Enabled: true
-Style/HashTransformValues:
-    Enabled: true
-
-# new compatabilities
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Style/ExponentialNotation:
-  Enabled: true
-Style/SlicingWithRange:
-  Enabled: true
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-Style/RedundantRegexpEscape:
-  Enabled: true
-Style/AccessorGrouping:
-  Enabled: true
-Style/BisectedAttrAccessor:
-  Enabled: true
-Style/RedundantAssignment:
-  Enabled: true
-Style/RedundantFetchBlock:
-  Enabled: true
-
 # Is nothing sacred?
 Layout/LineLength:
   Max: 80
+
+Style/IfUnlessModifier:
+  Enabled: false # because it wants to make lines >80 chars
+Style/StringConcatenation:
+  Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false

data/spec/support/minitest_assertions.rb

@@ -105,11 +105,9 @@ module Minitest
                    "performed as no-ops.\n", err)
     end
 
-    def assert_repeated_output(msg)
+    def assert_repeated_output(msg, &block)
       begin
-        out, err = capture_io do
-          yield
-        end
+        out, err = capture_io(&block)
       rescue SystemExit => e
         puts e.backtrace
         p e

data/spec/wavefront-cli/config_spec.rb

@@ -48,7 +48,7 @@ class WavefrontCliConfigTest < MiniTest::Test
 
   def test_read_input
     ["value  \n", " value\n", "    value  \t\n", "value\n"].each do |v|
-      STDIN.stub(:gets, v) { assert_equal('value', wf.read_input) }
+      $stdin.stub(:gets, v) { assert_equal('value', wf.read_input) }
     end
   end
 

data/spec/wavefront-cli/controller_spec.rb

@@ -79,9 +79,11 @@ end
 # so we can get at the methods without triggering one of the things
 # tested above.
 #
+# rubocop:disable Lint/MissingSuper
 class Giblets < WavefrontCliController
   def initialize; end
 end
+# rubocop:enable Lint/MissingSuper
 
 # Here's the subclass
 #

data/wavefront-cli.gemspec

@@ -30,10 +30,10 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'minitest', '~> 5.11', '>= 5.11.0'
   gem.add_development_dependency 'rake', '~> 13.0'
-  gem.add_development_dependency 'rubocop', '0.87.1'
+  gem.add_development_dependency 'rubocop', '0.91.0'
   gem.add_development_dependency 'spy', '~> 1.0.0'
   gem.add_development_dependency 'webmock', '~> 3.7'
   gem.add_development_dependency 'yard', '~> 0.9.5'
 
-  gem.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
+  gem.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.87.1
+        version: 0.91.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.87.1
+        version: 0.91.0
 - !ruby/object:Gem::Dependency
   name: spy
   requirement: !ruby/object:Gem::Requirement
@@ -402,7 +402,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="