wavefront-cli 9.0.0 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1040d65b6cf4352d960ff941f05f3bd5e924a4ebc13d1a0cff48c8920f1b426a
-  data.tar.gz: 841d25680790e0c8cf8623d09fc6bc6720c725f7b415f7342263d9e66501eb02
+  metadata.gz: e3cc375202509fd2afb294abeb754c14be541d80595995ccea9f0ac3a2a2c2b5
+  data.tar.gz: 6161a91e6dc4bce5c5581ddeb272f104d57049d2b230ecb2d3edad9975eae7e6
 SHA512:
-  metadata.gz: 120360b39776bd3711df4bd455cc4785d880447fc33c625ce5b30d9a69f29f51717f5133be78af65657f424d31188fc69afe8183d72cf8d88717cd20825922aa
-  data.tar.gz: 452d2d4e951dfeb02ca1a104fab5401feaaf8a9f3c7b1e649afb3eaebe3e5307f47fb0273cefc947de0e0fd655c761eee0e25bea5289279b7132458f071f6cf6
+  metadata.gz: e2f3cb2a9492934c12e18784b79551ccbb33d4b5adb0991b75eab1cd0a3e84031574449894dc465f93d390faf069d8b1851beaee92be778431cb168c2aa01e82
+  data.tar.gz: b4b4f79d6d866b223551cffbab943cd059fd54270d66148ff1932bc45bb80e1a85a3c2557446268f384a4ffaa4cfe67a7ad23b2d6886b539978e0c5cd540ab03

data/.github/workflows/release.yml

@@ -15,10 +15,10 @@ jobs:
     - name: Set env
       run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF:10})" >> $GITHUB_ENV
 
-    - name: Set up Ruby 3.0
+    - name: Set up Ruby 3.2
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0
+        ruby-version: 3.2
     - run: bundle install
 
     - name: Run tests

data/.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.7.7, 3.1.3, 3.2.0]
+        ruby-version: [3.0, 3.1, 3.2, 3.3]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby

data/.rubocop.yml

@@ -1,6 +1,6 @@
 ---
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   NewCops: enable
 
 require:

data/Gemfile

@@ -2,3 +2,13 @@
 
 source 'https://rubygems.org'
 gemspec
+
+gem 'minitest', '~> 5.21', group: :development
+gem 'rake', '~> 13.0', group: :development
+gem 'rubocop', '~> 1.60', group: :development
+gem 'rubocop-minitest', '~> 0.26', group: :development
+gem 'rubocop-performance', '~> 1.15', group: :development
+gem 'rubocop-rake', '~> 0.6', group: :development
+gem 'spy', '~> 1.0', group: :development
+gem 'webmock', '~> 3.20.0', group: :development
+gem 'yard', '~> 0.9', group: :development

data/HISTORY.md

@@ -1,7 +1,15 @@
 # Changelog
 
-## 9.0.0 (2023-01-20)
+## 10.0.1 (2024-04-07)
+* Fix "no status in API response" bug when sending stdin data to API.
+
+## 10.0.0 (2024-01-19)
+* Remove support for Ruby < 3.0 (Breaking change.)
+* Fix HTTP proxy write bug by bumping SDK dependency.
+* Add `config cluster` command.
+* Revamp `config` command internals and improve tests.
 
+## 9.0.0 (2023-01-20)
 * Drop support for Ruby 2.5. (Breaking change.)
 * Drop support for Ruby 2.6. (Breaking change.)
 * Add `metricspolicy` command.

data/README.md

@@ -1,5 +1,5 @@
 # Wavefront CLI
-[![Test](https://github.com/snltd/wavefront-cli/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/snltd/wavefront-cli/actions/workflows/test.yml) ![Release](https://github.com/snltd/wavefront-sdk/workflows/Release/badge.svg) [![Maintainability](https://api.codeclimate.com/v1/badges/9b712047af0b2dafc146/maintainability)](https://codeclimate.com/github/snltd/wavefront-cli/maintainability) [![Gem Version](https://badge.fury.io/rb/wavefront-cli.svg)](https://badge.fury.io/rb/wavefront-cli) ![](http://ruby-gem-downloads-badge.herokuapp.com/wavefront-cli?type=total)
+[![Test](https://github.com/snltd/wavefront-cli/actions/workflows/test.yml/badge.svg)](https://github.com/snltd/wavefront-cli/actions/workflows/test.yml) ![Release](https://github.com/snltd/wavefront-sdk/workflows/Release/badge.svg) [![Gem Version](https://badge.fury.io/rb/wavefront-cli.svg)](https://badge.fury.io/rb/wavefront-cli) ![](http://ruby-gem-downloads-badge.herokuapp.com/wavefront-cli?type=total)
 
 This is a complete command-line interface to
 [Wavefront](https://www.wavefront.com/)'s API. It also provides easy
@@ -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.7. It has no "native extension" dependencies.
+3.0. 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

@@ -49,7 +49,7 @@ module WavefrontCli
     # Overriding this method lets you map to something else.
     #
     def _sdk_class
-      self.class.name.sub(/Cli/, '')
+      self.class.name.sub('Cli', '')
     end
 
     # Some subcommands don't make an API call, so they don't return
@@ -85,7 +85,7 @@ module WavefrontCli
     # that, override this method.
     #
     def validator_method
-      "wf_#{klass_word}_id?".to_sym
+      :"wf_#{klass_word}_id?"
     end
 
     def validator_exception
@@ -246,7 +246,7 @@ module WavefrontCli
 
     def check_response_blocks(data)
       %i[status response].each do |b|
-        abort "no #{b} block in API response" unless data.respond_to?(b)
+        abort "No #{b} block in API response" unless data.respond_to?(b)
       end
     end
 

data/lib/wavefront-cli/commands/base.rb

@@ -72,7 +72,7 @@ class WavefrontCommandBase
   # @return [String] the command keyword
   #
   def word
-    self.class.name.sub(/WavefrontCommand/, '').downcase
+    self.class.name.sub('WavefrontCommand', '').downcase
   end
 
   def thing
@@ -143,10 +143,12 @@ class WavefrontCommandBase
   #   columns. This is used to indent following lines
   # @param term_width [Integer] the width of the user's terminal
   #
+  # rubocop:disable Lint/FormatParameterMismatch
   def opt_row(opt_str, width, term_width = TW)
     format("  %s %-#{width}s %s",
            *opt_str.split(/\s+/, 3)).opt_fold(term_width, width + 5)
   end
+  # rubocop:enable Lint/FormatParameterMismatch
 
   # @return [Integer] the width of the column containing short and
   #   long options

data/lib/wavefront-cli/commands/config.rb

@@ -6,7 +6,7 @@ require_relative 'base'
 #
 class WavefrontCommandConfig < WavefrontCommandBase
   def description
-    'create and manage local configuration'
+    'create and manage local configuration, and display debug info'
   end
 
   def _commands
@@ -16,15 +16,11 @@ class WavefrontCommandConfig < WavefrontCommandBase
      'setup [-D] [-c file] [<profile>]',
      'delete [-D] [-c file] <profile>',
      'envvars',
+     "cluster #{CMN}",
      'about']
   end
 
   def _options
-    ['-c, --config=FILE    path to configuration file',
-     '-D, --debug          enable debug mode']
-  end
-
-  def global_options
-    []
+    [common_options]
   end
 end

data/lib/wavefront-cli/config.rb

@@ -6,11 +6,7 @@ require_relative 'base'
 
 module WavefrontCli
   #
-  # Create and manage a local configuration file. This class doesn't
-  # fit many of the assumptions made by the Base class. (Primarily,
-  # that it will consume the SDK.) Rather than split everything up,
-  # we're going to do some bad programming and override a couple of
-  # methods in the parent class to force different behaviour.
+  # Create and manage a local configuration file.
   #
   class Config < WavefrontCli::Base
     attr_reader :config_file, :profile
@@ -34,41 +30,39 @@ module WavefrontCli
         test: proc { |v| %w[human json yaml].include?(v) } }
     ].freeze
 
-    RX = /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/.freeze
+    RX = /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/
 
-    # rubocop:disable Lint/MissingSuper
-    def initialize(options)
-      @options = options
+    def post_initialize(options)
       @config_file = _config_file
       @profile = options[:'<profile>'] || 'default'
     end
-    # rubocop:enable Lint/MissingSuper
+
+    def _sdk_class
+      'Wavefront::Cluster'
+    end
 
     def do_location
-      puts config_file
+      config_file
     end
 
     def do_profiles
-      read_config.sections.each { |s| puts s }
+      read_config.sections.sort
     end
 
     def do_show
       present?
-      puts File.read(config_file)
+      File.read(config_file)
     end
 
     def do_about
       require 'wavefront-sdk/defs/version'
-      require_relative 'display/base'
 
-      info = { 'wf version': WF_CLI_VERSION,
-               'wf path': CMD_PATH.realpath.to_s,
-               'SDK version': WF_SDK_VERSION,
-               'SDK location': WF_SDK_LOCATION.to_s,
-               'Ruby version': RUBY_VERSION,
-               'Ruby platform': Gem::Platform.local.os.capitalize }
-
-      WavefrontDisplay::Base.new(info).long_output
+      { 'wf version': WF_CLI_VERSION,
+        'wf path': CMD_PATH.realpath.to_s,
+        'SDK version': WF_SDK_VERSION,
+        'SDK location': WF_SDK_LOCATION.to_s,
+        'Ruby version': RUBY_VERSION,
+        'Ruby platform': Gem::Platform.local.os.capitalize }
     end
 
     def base_config
@@ -121,21 +115,23 @@ module WavefrontCli
     end
 
     def do_envvars
-      %w[WAVEFRONT_ENDPOINT WAVEFRONT_TOKEN WAVEFRONT_PROXY].each do |v|
-        puts format('%-20<var>s %<value>s',
-                    var: v,
-                    value: ENV[v] || 'unset')
+      %w[WAVEFRONT_ENDPOINT WAVEFRONT_TOKEN WAVEFRONT_PROXY].map do |v|
+        format('%-20<var>s %<value>s', var: v, value: ENV[v] || 'unset')
       end
     end
 
-    def validate_opts; end
+    def do_cluster
+      wf.describe
+    end
 
-    def display(_data, _method); end
+    def validate_opts; end
 
-    def run
-      dispatch
+    def no_api_response
+      %w[do_location do_profiles do_show do_envvars do_about]
     end
 
+    # def display(_data, _method); end
+
     def input_prompt(label, default)
       ret = format('  %<label>s', label: label)
       ret << format(' [%<value>s]', value: default) unless default.nil?
@@ -156,10 +152,10 @@ module WavefrontCli
     #
     def read_thing(thing)
       print input_prompt(thing[:text], thing[:default])
-      validate_input(read_input, thing[:default], thing[:test])
+      validate_thing_input(read_input, thing[:default], thing[:test])
     end
 
-    def validate_input(input, default, test)
+    def validate_thing_input(input, default, test)
       if input.empty?
         raise WavefrontCli::Exception::MandatoryValue if default.nil?
 

data/lib/wavefront-cli/constants.rb

@@ -29,7 +29,7 @@ module WavefrontCli
 
     # Split regex for searches
     #
-    SEARCH_SPLIT = /\^|!\^|=|!=|~|!~/.freeze
+    SEARCH_SPLIT = /\^|!\^|=|!=|~|!~/
 
     # Where we store local event information
     #

data/lib/wavefront-cli/display/base.rb

@@ -45,8 +45,8 @@ module WavefrontDisplay
         run_list
       elsif method == 'do_search'
         run_search
-      elsif respond_to?("#{method}_brief") && !options[:long]
-        send("#{method}_brief")
+      elsif respond_to?(:"#{method}_brief") && !options[:long]
+        send(:"#{method}_brief")
       elsif respond_to?(method)
         send(method)
       else

data/lib/wavefront-cli/display/cluster.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module WavefrontDisplay
+  #
+  # Format human-readable output for config commands.
+  #
+  class Cluster < Base
+    def do_location
+      puts data
+    end
+    alias do_profiles do_location
+    alias do_show do_location
+    alias do_envvars do_location
+
+    def do_about
+      long_output
+    end
+  end
+end

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

@@ -77,7 +77,6 @@ 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)
@@ -87,7 +86,6 @@ 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)
@@ -152,7 +150,6 @@ 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)
@@ -166,7 +163,6 @@ module WavefrontDisplayPrinter
 
       aggr
     end
-    # rubocop:enable Style/CaseLikeIf
 
     # Part of the #make_list recursion. Deals with arrays.
     #

data/lib/wavefront-cli/exception_handler.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'faraday'
+
 module WavefrontCli
   #
   # Handle fatal errors.
@@ -80,6 +82,8 @@ module WavefrontCli
         abort 'Search on non-existent key. Please use a top-level field.'
       when Wavefront::Exception::InvalidSamplingValue
         abort 'Sampling rates must be between 0 and 0.05.'
+      when Faraday::ConnectionFailed
+        abort 'Error connecting to remote host.'
       else
         warn "general error: #{exception}"
         backtrace_message(exception)

data/lib/wavefront-cli/maintenancewindow.rb

@@ -27,7 +27,7 @@ module WavefrontCli
 
       [%i[CustomerTags atag], %i[HostTags htag],
        %i[HostNames host]].each do |key, opt|
-        k = "relevant#{key}".to_sym
+        k = :"relevant#{key}"
         body[k] = options[opt] unless options[opt].empty?
       end
 

data/lib/wavefront-cli/output/csv/query.rb

@@ -92,7 +92,7 @@ module WavefrontCsvOutput
     end
 
     def quote_value(value)
-      format('"%<value>s"', value: value.to_s.gsub(/"/, '\"'))
+      format('"%<value>s"', value: value.to_s.gsub('"', '\"'))
     end
 
     # Turn a string of output options into an easy-to-query array

data/lib/wavefront-cli/output/hcl/base.rb

@@ -61,9 +61,9 @@ module WavefrontHclOutput
     # @return [String]
     #
     def handler(key, val)
-      key_handler = "khandle_#{key}".to_sym
-      value_handler = "vhandle_#{key}".to_sym
-      quote_handler = "qhandle_#{key}".to_sym
+      key_handler = :"khandle_#{key}"
+      value_handler = :"vhandle_#{key}"
+      quote_handler = :"qhandle_#{key}"
       key = send(key_handler) if respond_to?(key_handler)
       val = send(value_handler, val) if respond_to?(value_handler)
 
@@ -92,7 +92,7 @@ module WavefrontHclOutput
     def quote_value(val)
       case val.class.to_s.to_sym
       when :String
-        format('"%<value>s"', value: val.gsub(/"/, '\"'))
+        format('"%<value>s"', value: val.gsub('"', '\"'))
       else
         val
       end

data/lib/wavefront-cli/output/hcl/dashboard.rb

@@ -91,7 +91,7 @@ module WavefrontHclOutput
     end
 
     def quote_value(val)
-      val.gsub!(/\$/, '$$') if val.is_a?(String)
+      val.gsub!('$', '$$') if val.is_a?(String)
       super
     end
   end

data/lib/wavefront-cli/stdlib/array.rb

@@ -9,7 +9,7 @@ class Array
   def max_length
     return 0 if empty?
 
-    map(&:to_s).map(&:length).max
+    map { |x| x.to_s.length }.max
   end
 
   # @return [Integer] the length of the longest value in an array of

data/lib/wavefront-cli/stdlib/string.rb

@@ -35,7 +35,7 @@ class String
   # @return [String] the folded line
   #
   def fold(twidth = TW, indent = 10, prefix = '')
-    chunks = gsub(/default: /, 'default:^').scan_line(twidth - 8)
+    chunks = gsub('default: ', 'default:^').scan_line(twidth - 8)
     first_line = format("%<padding>s%<text>s\n",
                         padding: prefix,
                         text: chunks.shift)

data/lib/wavefront-cli/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WF_CLI_VERSION = '9.0.0'
+WF_CLI_VERSION = '10.0.1'

data/lib/wavefront-cli/write.rb

@@ -11,7 +11,7 @@ module WavefrontCli
     attr_reader :fmt
 
     include Wavefront::Mixins
-    SPLIT_PATTERN = /\s(?=(?:[^"]|"[^"]*")*$)/.freeze
+    SPLIT_PATTERN = /\s(?=(?:[^"]|"[^"]*")*$)/
 
     # rubocop:disable Metrics/AbcSize
     def do_point(value = options[:'<value>'])
@@ -187,8 +187,11 @@ module WavefrontCli
     #
     def read_stdin
       open_connection
-      $stdin.each_line { |l| call_write(process_line(l.strip), false) }
+      ret = $stdin.each_line.map do |l|
+        call_write(process_line(l.strip), false)
+      end
       close_connection
+      ret.last
     rescue SystemExit, Interrupt
       puts 'ctrl-c. Exiting.'
       wf.close
@@ -235,7 +238,7 @@ module WavefrontCli
     #
     def extract_ts(chunks)
       ts = chunks[fmt.index('t')]
-      return parse_time(ts) if valid_timestamp?(ts)
+      parse_time(ts) if valid_timestamp?(ts)
     rescue TypeError
       Time.now.utc.to_i
     end

data/spec/constants.rb

@@ -14,7 +14,7 @@ ENDPOINT = 'metrics.wavefront.com'
 TOKEN = '0123456789-ABCDEF'
 RES_DIR = ROOT.join('spec', 'wavefront-cli', 'resources')
 CF = RES_DIR.join('wavefront.conf')
-CF_VAL =  IniFile.load(CF)
+CF_VAL = IniFile.load(CF)
 JSON_POST_HEADERS = { 'Content-Type': 'application/json',
                       Accept: 'application/json' }.freeze
 TEE_ZERO = Time.now.freeze

data/spec/support/command_base.rb

@@ -8,7 +8,7 @@ require_relative '../../lib/wavefront-cli/controller'
 # An abstract class which facilitates "end-to-end" testing of
 # commands.
 #
-class EndToEndTest < MiniTest::Test
+class EndToEndTest < Minitest::Test
   attr_accessor :single_perm
   attr_reader :wf
 

data/spec/wavefront-cli/base_spec.rb

@@ -12,7 +12,7 @@ require_relative '../../lib/wavefront-cli/version'
 # class via an instantiation of a concrete class. I don't think any
 # of this matters.
 #
-class WavefrontCliBaseTest < MiniTest::Test
+class WavefrontCliBaseTest < Minitest::Test
   attr_reader :wf, :wf_cmd
 
   def setup

data/spec/wavefront-cli/commands/base_spec.rb

@@ -8,7 +8,7 @@ require_relative '../../../lib/wavefront-cli/commands/base'
 
 # Abstract class for testing commands
 #
-class WavefrontCommmandBaseTest < MiniTest::Test
+class WavefrontCommmandBaseTest < Minitest::Test
   attr_reader :wf, :col_width, :skip_cmd
 
   def setup

data/spec/wavefront-cli/commands/config_spec.rb

@@ -13,11 +13,11 @@ require_relative 'base_spec'
 class WavefrontCommmandConfigTest < WavefrontCommmandBaseTest
   def setup
     @wf = WavefrontCommandConfig.new
-    @col_width = 17
+    @col_width = 19
   end
 
   def test_options
-    refute wf.options(600).start_with?("Global options:\n")
+    assert wf.options(600).start_with?("Global options:\n")
     assert_match(/Options:\n/, wf.options)
 
     wf.options(600).split("\n")[1..].each do |o|
@@ -28,7 +28,7 @@ class WavefrontCommmandConfigTest < WavefrontCommmandBaseTest
       refute o.end_with?('.')
     end
 
-    assert_equal(wf.options.split("\n").count(&:empty?), 0)
+    assert_equal(wf.options.split("\n").count(&:empty?), 1)
   end
 
   def test_commands
@@ -45,7 +45,7 @@ class WavefrontCommmandConfigTest < WavefrontCommmandBaseTest
   def test_docopt
     x = wf.docopt
     assert x.start_with?("Usage:\n")
-    refute_match("\nGlobal options:\n", x)
+    assert_match("\nGlobal options:\n", x)
     assert_match("--help\n", x)
     assert_instance_of(String, x)
   end

data/spec/wavefront-cli/config_spec.rb

@@ -5,29 +5,32 @@ require 'pathname'
 require 'minitest/autorun'
 require_relative '../constants'
 require_relative '../../lib/wavefront-cli/config'
+require_relative '../support/command_base'
 
 DEF_CF = Pathname.new(Dir.home).join('.wavefront')
 CONF_TMP = Pathname.new('/tmp/outfile')
+CMD_PATH = Pathname.new(__FILE__)
 
 # Test CLI configuration command
 #
-class WavefrontCliConfigTest < MiniTest::Test
+class WavefrontCliConfigTest < Minitest::Test
   attr_reader :wf, :wfo, :wfn
 
   def setup
+    blank_envvars
     @wf = WavefrontCli::Config.new({})
     @wfo = WavefrontCli::Config.new(config: CF)
     @wfn = WavefrontCli::Config.new(config: '/no/file')
   end
 
   def test_do_location
-    assert_output(format("%<file>s\n", file: CF)) { wfo.do_location }
-    assert_output("/no/file\n") { wfn.do_location }
-    assert_output(format("%<file>s\n", file: DEF_CF)) { wf.do_location }
+    assert_equal(DEF_CF, wf.do_location)
+    assert_equal(Pathname('/no/file'), wfn.do_location)
+    assert_equal(CF, wfo.do_location)
   end
 
   def test_do_profiles
-    assert_output("default\nother\n") { wfo.do_profiles }
+    assert_equal(%w[default other], wfo.do_profiles)
 
     assert_raises(WavefrontCli::Exception::ConfigFileNotFound) do
       wfn.do_profiles
@@ -35,10 +38,10 @@ class WavefrontCliConfigTest < MiniTest::Test
   end
 
   def test_do_show
-    out, err = capture_io { wfo.do_show }
-    assert_empty(err)
-    assert out.start_with?("[default]\n")
-    assert_equal(10, out.split("\n").size)
+    assert_equal(File.read(CF), wfo.do_show)
+    # assert_empty(err)
+    # assert out.start_with?("[default]\n")
+    # assert_equal(10, out.split("\n").size)
   end
 
   def test_input_prompt
@@ -72,23 +75,25 @@ class WavefrontCliConfigTest < MiniTest::Test
     end
   end
 
-  def test_validate_input
-    assert_equal('str', wf.validate_input('str', nil,
-                                          proc { |v| v.is_a?(String) }))
+  def test_validate_thing_input
+    assert_equal('str', wf.validate_thing_input('str', nil,
+                                                proc { |v| v.is_a?(String) }))
 
-    assert_equal('defval', wf.validate_input('', 'defval',
-                                             proc { |v| v.is_a?(String) }))
+    assert_equal('defval', wf.validate_thing_input('', 'defval',
+                                                   proc { |v|
+                                                     v.is_a?(String)
+                                                   }))
 
     assert_raises(WavefrontCli::Exception::MandatoryValue) do
-      wf.validate_input('', nil, proc { |v| v.is_a?(String) })
+      wf.validate_thing_input('', nil, proc { |v| v.is_a?(String) })
     end
 
     assert_raises(WavefrontCli::Exception::InvalidValue) do
-      wf.validate_input(:symbol, nil, proc { |v| v.is_a?(String) })
+      wf.validate_thing_input(:symbol, nil, proc { |v| v.is_a?(String) })
     end
 
     assert_raises(WavefrontCli::Exception::InvalidValue) do
-      wf.validate_input('', 123, proc { |v| v.is_a?(String) })
+      wf.validate_thing_input('', 123, proc { |v| v.is_a?(String) })
     end
   end
 
@@ -204,41 +209,29 @@ class WavefrontCliConfigTest < MiniTest::Test
     end
   end
 
-  def test_do_envvars_1
-    blank_envvars
-    out, err = capture_io { wfo.do_envvars }
-    assert_empty(err)
-    out.each_line { |l| assert_match(/WAVEFRONT_[A-Z]+\s+unset$/, l) }
-    blank_envvars
+  def test_do_envvars_all_unset
+    assert_equal(['WAVEFRONT_ENDPOINT   unset',
+                  'WAVEFRONT_TOKEN      unset',
+                  'WAVEFRONT_PROXY      unset'], wfo.do_envvars)
   end
 
-  def test_do_envvars_2
-    blank_envvars
+  def test_do_envvars_proxy_set
     ENV['WAVEFRONT_PROXY'] = 'myproxy'
 
-    out, err = capture_io { wfo.do_envvars }
-    assert_empty(err)
-    assert_match(/WAVEFRONT_ENDPOINT+\s+unset$/, out)
-    assert_match(/WAVEFRONT_TOKEN+\s+unset$/, out)
-    assert_match(/WAVEFRONT_PROXY+\s+myproxy$/, out)
-    blank_envvars
+    assert_equal(['WAVEFRONT_ENDPOINT   unset',
+                  'WAVEFRONT_TOKEN      unset',
+                  'WAVEFRONT_PROXY      myproxy'], wfo.do_envvars)
   end
 
-  def test_do_envvars_3
-    blank_envvars
+  def test_do_envvars_proxy_and_token_set
     ENV['WAVEFRONT_PROXY'] = 'myproxy'
     ENV['WAVEFRONT_TOKEN'] = 'token'
 
-    out, err = capture_io { wfo.do_envvars }
-    assert_empty(err)
-    assert_match(/WAVEFRONT_ENDPOINT+\s+unset$/, out)
-    assert_match(/WAVEFRONT_TOKEN+\s+token$/, out)
-    assert_match(/WAVEFRONT_PROXY+\s+myproxy$/, out)
-    blank_envvars
+    assert_equal(['WAVEFRONT_ENDPOINT   unset',
+                  'WAVEFRONT_TOKEN      token',
+                  'WAVEFRONT_PROXY      myproxy'], wfo.do_envvars)
   end
 
-  def test_read_thing; end
-
   def test_present?
     assert wfo.present?
     assert_raises(WavefrontCli::Exception::ConfigFileNotFound) do
@@ -261,3 +254,50 @@ class WavefrontCliConfigTest < MiniTest::Test
     end
   end
 end
+
+class ConfigEndToEndTest < EndToEndTest
+  def test_location
+    assert_output("#{Pathname.new(Dir.home).join('.wavefront')}\n", '') do
+      wf.new('config location'.split)
+    end
+  end
+
+  def test_profiles
+    assert_output("default\nother\n", '') do
+      wf.new("config profiles -c #{CF}".split)
+    end
+  end
+
+  def test_envvars
+    out, err = capture_io { wf.new('config envvars'.split) }
+    assert_equal(3, out.lines.count)
+    assert_empty err
+    assert_match(/^WAVEFRONT_ENDPOINT /, out)
+    assert_match(/^WAVEFRONT_TOKEN /, out)
+    assert_match(/^WAVEFRONT_PROXY /, out)
+  end
+
+  def test_cluster
+    assert_abort_on_missing_creds('cluster')
+    quietly { assert_cmd_gets('cluster', '/api/v2/cluster/info') }
+  end
+
+  def test_about
+    out, err = capture_io { wf.new('config about'.split) }
+    lines = out.lines
+
+    assert_match(/^wf version *#{WF_CLI_VERSION}$/o, lines[0])
+    assert lines[1].start_with?('wf path')
+    assert lines[2].start_with?('SDK version')
+    assert lines[3].start_with?('SDK location')
+    assert lines[4].start_with?('Ruby version')
+    assert lines[5].start_with?('Ruby platform')
+    assert_empty err
+  end
+
+  private
+
+  def cmd_word
+    'config'
+  end
+end

data/spec/wavefront-cli/controller_spec.rb

@@ -8,7 +8,7 @@ require_relative '../../lib/wavefront-cli/controller'
 
 # Be sure the CLI behaves properly when people ask for help
 #
-class WavefrontCliHelpTest < MiniTest::Test
+class WavefrontCliHelpTest < Minitest::Test
   def test_development_mode
     refute defined?(DEVELOPMENT) if ENV['CI']
   end
@@ -103,7 +103,7 @@ end
 
 # Here's the subclass
 #
-class GibletsTest < MiniTest::Test
+class GibletsTest < Minitest::Test
   attr_reader :wfc
 
   def setup

data/spec/wavefront-cli/display/base_spec.rb

@@ -12,7 +12,7 @@ S_OPTIONS = { '<id>': 'abc123' }.freeze
 
 # Test base class for display methods
 #
-class WavefrontDisplayBaseTest < MiniTest::Test
+class WavefrontDisplayBaseTest < Minitest::Test
   attr_reader :wf, :wff
 
   def setup

data/spec/wavefront-cli/display/printer/long_spec.rb

@@ -7,7 +7,7 @@ require_relative '../../../../lib/wavefront-cli/display/printer/long'
 
 # Test verbose printing stuff
 #
-class TestWavefrontDisplayPrinterLong < MiniTest::Test
+class TestWavefrontDisplayPrinterLong < Minitest::Test
   attr_reader :wf
 
   def setup

data/spec/wavefront-cli/display/printer/terse_spec.rb

@@ -10,7 +10,7 @@ TERSE_DATA = [{ id: 'id1', name: 'name1', fa: 1, fb: 2, fc: 3 },
 
 # Test terse printer
 #
-class WavefrontDisplayPrinterTerse < MiniTest::Test
+class WavefrontDisplayPrinterTerse < Minitest::Test
   attr_reader :wf, :out
 
   def setup

data/spec/wavefront-cli/event_store_spec.rb

@@ -11,7 +11,7 @@ TEST_EVENT_STORE_DIR = Pathname.new(Dir.mktmpdir)
 # Tests for event store class. This is tested well via the interface of the
 # events CLI class.
 #
-class Test < MiniTest::Test
+class Test < Minitest::Test
   attr_reader :wf
 
   include WavefrontCli::Constants

data/spec/wavefront-cli/opt_handler_spec.rb

@@ -14,7 +14,7 @@ INTERFERING_FILE = Pathname.new(Dir.home).join('.wavefront')
 # Test option handler class. End to end tests because the work is
 # always done in the constructor
 #
-class OptHandlerTest < MiniTest::Test
+class OptHandlerTest < Minitest::Test
   def test_no_opts
     x = WavefrontCli::OptHandler.new
     assert x.is_a?(WavefrontCli::OptHandler)

data/spec/wavefront-cli/output/csv/query_spec.rb

@@ -7,7 +7,7 @@ require_relative '../../../../lib/wavefront-cli/output/csv/query'
 
 # Test CSV output
 #
-class WavefrontOutputCsvTest < MiniTest::Test
+class WavefrontOutputCsvTest < Minitest::Test
   attr_reader :wfq, :wfr, :wfqq, :wfh, :wft, :wftl
 
   def setup

data/spec/wavefront-cli/output/csv_spec.rb

@@ -8,7 +8,7 @@ require_relative '../../../lib/wavefront-cli/output/csv'
 
 # Test the CSV instantiation of the base class
 #
-class CsvOutputBaseTest < MiniTest::Test
+class CsvOutputBaseTest < Minitest::Test
   attr_reader :wfo
 
   def setup

data/spec/wavefront-cli/output/hcl_spec.rb

@@ -8,7 +8,7 @@ require_relative '../../../lib/wavefront-cli/output/hcl'
 
 # Test HCL stuff
 #
-class WavefrontOutputBaseTest < MiniTest::Test
+class WavefrontOutputBaseTest < Minitest::Test
   attr_reader :wfo
 
   def setup

data/spec/wavefront-cli/output/json_spec.rb

@@ -8,7 +8,7 @@ require_relative '../../../lib/wavefront-cli/output/json'
 
 # Test JSON output
 #
-class WavefrontOutputJsonTest < MiniTest::Test
+class WavefrontOutputJsonTest < Minitest::Test
   attr_reader :wfo
 
   def setup

data/spec/wavefront-cli/output/ruby_spec.rb

@@ -10,7 +10,7 @@ require_relative '../../../lib/wavefront-cli/output/ruby'
 # controlled an environment as this, I'm not going to bother. We
 # only p() an objecty anyway.
 #
-class WavefrontOutputJsonTest < MiniTest::Test
+class WavefrontOutputJsonTest < Minitest::Test
   attr_reader :wfo
 
   def setup

data/spec/wavefront-cli/output/wavefront/query_spec.rb

@@ -7,7 +7,7 @@ require_relative '../../../../lib/wavefront-cli/output/wavefront/query'
 
 # Test Wavefront wire-format output
 #
-class WavefrontOutputWavefrontTest < MiniTest::Test
+class WavefrontOutputWavefrontTest < Minitest::Test
   attr_reader :wfq, :wfr
 
   def setup

data/spec/wavefront-cli/output/wavefront_spec.rb

@@ -8,7 +8,7 @@ require_relative '../../../lib/wavefront-cli/output/wavefront'
 
 # Test the Wavefront instantiation of the base class
 #
-class WavefrontOutputBaseTest < MiniTest::Test
+class WavefrontOutputBaseTest < Minitest::Test
   attr_reader :wfo
 
   def setup

data/spec/wavefront-cli/output/yaml_spec.rb

@@ -8,7 +8,7 @@ require_relative '../../../lib/wavefront-cli/output/yaml'
 
 # Test YAML output
 #
-class WavefrontOutputYamlTest < MiniTest::Test
+class WavefrontOutputYamlTest < Minitest::Test
   attr_reader :wfo
 
   def setup

data/spec/wavefront-cli/query_spec.rb

@@ -199,7 +199,7 @@ end
 
 # Query tests
 #
-class QueryTest < MiniTest::Test
+class QueryTest < Minitest::Test
   attr_reader :wf
 
   def setup

data/spec/wavefront-cli/stdlib/array_spec.rb

@@ -6,7 +6,7 @@ require_relative '../../../lib/wavefront-cli/stdlib/array'
 
 # Test extensions to stlib Array
 #
-class TestArray < MiniTest::Test
+class TestArray < Minitest::Test
   def test_max_length
     assert_equal(7, %w[short longer longest].max_length)
     assert_equal(7, %i[short longer longest].max_length)

data/spec/wavefront-cli/stdlib/string_spec.rb

@@ -8,7 +8,7 @@ require_relative '../../../lib/wavefront-cli/commands/base'
 
 # Test extensions to string class
 #
-class StringTest < MiniTest::Test
+class StringTest < Minitest::Test
   def test_cmd_fold
     cmn = '[-DnV] [-c file] [-P profile] [-E endpoint] [-t token]'
     str = "command subcommand #{cmn} [-a alpha] [-b beta] [-c gamma] <id>"

data/spec/wavefront-cli/usage_spec.rb

@@ -55,7 +55,7 @@ end
 
 # test class methods
 #
-class UsageTest < MiniTest::Test
+class UsageTest < Minitest::Test
   attr_reader :wf
 
   def setup

data/spec/wavefront-cli/write_class_spec.rb

@@ -6,7 +6,7 @@ require_relative '../../lib/wavefront-cli/write'
 
 # Test base writer
 #
-class WavefrontCliWriteTest < MiniTest::Test
+class WavefrontCliWriteTest < Minitest::Test
   attr_reader :wf
 
   def setup

data/wavefront-cli.gemspec

@@ -23,18 +23,8 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'docopt', '~> 0.6'
   gem.add_runtime_dependency 'inifile', '~> 3.0'
-  gem.add_runtime_dependency 'wavefront-sdk', '~> 7.0'
+  gem.add_runtime_dependency 'wavefront-sdk', '~> 8.0'
 
-  gem.add_development_dependency 'minitest', '~> 5.17'
-  gem.add_development_dependency 'rake', '~> 13.0'
-  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 '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.7.0')
+  gem.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
   gem.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 10.0.1
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2024-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -44,140 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.17'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.43'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.43'
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.26'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.26'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: spy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.18'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '8.0'
 description: 'CLI for Wavefront (wavefront.com) API v2 '
 email: services@id264.net
 executables:
@@ -243,6 +117,7 @@ files:
 - lib/wavefront-cli/display/apitoken.rb
 - lib/wavefront-cli/display/base.rb
 - lib/wavefront-cli/display/cloudintegration.rb
+- lib/wavefront-cli/display/cluster.rb
 - lib/wavefront-cli/display/dashboard.rb
 - lib/wavefront-cli/display/derivedmetric.rb
 - lib/wavefront-cli/display/distribution.rb
@@ -445,14 +320,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: CLI for Wavefront API v2