wavefront-cli 8.5.1 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f464387b5dfcc05cdec2af09eaf006ff9544d880185a21fc787ba25b2d1686c
-  data.tar.gz: c90b1bd9e45e9aadcf4374dea2a3c8794c8560e371e5d597aad88f95ffcd813f
+  metadata.gz: '09fbd2dd451ea0b319a8d1a36ac1c0f3e95e186fc506363f47b5f8436e67d19d'
+  data.tar.gz: c2e562c485f9e520be34922d55f5b6e7dfca5c3f876cd20857ebc2030c2cfc17
 SHA512:
-  metadata.gz: 24fb5ca35864e6624905e311430c73c16c5581d909f12af1e6183fac5e9717245c770a3bfcc552d60c78f63a43c077e38e43c7ce78317a71af9de535de5952b9
-  data.tar.gz: 55ab4e7a41e3139141d018be4c71505e66d42a9ead87a006c5a39eb7c50a342257ef706cef24680523a08b7a8a865f59ef391958d5556bad2c7d9a18e186e053
+  metadata.gz: 103663abbe25ed7a75e2622e85ea1ce1e984da813b4a85b3128e8bf24aa6d2d95d63000e5efa87d5ad615211f7bdc6f3193bacc435de0c437b3134948b5078cd
+  data.tar.gz: c8bcfaafbe5da6fe7a5a3065cf51de47b67ed086a0e54f444d1e1b7260212ea22ad032325ce8c4135d5b0c36cdd62aed91e57c1e569ac63d541f2b3d9c6ca711

data/.github/workflows/release.yml

@@ -11,14 +11,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set env
       run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF:10})" >> $GITHUB_ENV
 
-    - name: Set up Ruby 2.7
+    - name: Set up Ruby 3.2
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.2
     - run: bundle install
 
     - name: Run tests
@@ -34,4 +34,4 @@ jobs:
         chmod 0600 ${HOME}/.gem/credentials
         gem push pkg/*.gem
       env:
-        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_PUSH_KEY}}"

data/.github/workflows/test.yml

@@ -9,9 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [2.5.8, 2.6.6, 2.7.2]
+        ruby-version: [3.0, 3.1, 3.2, 3.3]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.rubocop.yml

@@ -1,13 +1,12 @@
 ---
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
   NewCops: enable
 
 require:
   - rubocop-rake
   - rubocop-minitest
   - rubocop-performance
-  - rubocop-performance
 
 Layout/LineLength:
   Max: 80 # Is nothing sacred?
@@ -17,7 +16,5 @@ Naming/VariableNumber:
   Enabled: false
 Style/IfUnlessModifier:
   Enabled: false # because it wants to make lines >80 chars
-Style/StringConcatenation:
-  Enabled: false
 Style/OptionalBooleanParameter:
   Enabled: false

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.18', group: :development
+gem 'yard', '~> 0.9', group: :development

data/HISTORY.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 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.
+* `wf write` has changed.  Tokens and API endpoints are now specified exactly
+  like other commands. This means certain options had to change.  A proxy is
+  now specified with `-y` instead of `-E`; A timestamp is given with `-s`, not
+  `-t`. (Breaking change.)
+* Unless told otherwise, `wf write` will write to a proxy over HTTP, rather
+  than over a socket. (Breaking change.)
+
 ## 8.5.1 (2021-01-28)
 * Fix stack trace when specifying an invalid time such as `Sunday`.
 

data/README.md

@@ -1,5 +1,5 @@
 # Wavefront CLI
-[![Build Status](https://travis-ci.org/snltd/wavefront-cli.svg?branch=master)](https://travis-ci.org/snltd/wavefront-cli) [![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?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)
 
 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.5. 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).
@@ -30,6 +30,7 @@ Usage:
   wf --help
 
 Commands:
+  account            view and manage Wavefront accounts
   alert              view and manage alerts
   apitoken           view and your own API tokens
   cloudintegration   view and manage cloud integrations
@@ -45,6 +46,7 @@ Commands:
   notificant         view and manage Wavefront alert targets
   proxy              view and manage proxies
   query              run Wavefront queries
+  role               view and manage roles
   savedsearch        view and manage saved searches
   serviceaccount     view and manage service accounts
   settings           view and manage system preferences

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
@@ -206,7 +206,7 @@ module WavefrontCli
     #
     def method_word_list
       do_methods = methods.select { |m| m.to_s.start_with?('do_') }
-      do_methods.map { |m| m.to_s.split('_')[1..-1] }.sort_by(&:length)
+      do_methods.map { |m| m.to_s.split('_')[1..] }.sort_by(&:length)
     end
 
     # Display a Ruby object as JSON, YAML, or human-readable.  We
@@ -545,7 +545,7 @@ module WavefrontCli
       when Hash
         obj.each_pair do |k, v|
           if k == key && !v.to_s.empty?
-            aggr.<< v
+            aggr << v
           else
             extract_values(v, key, aggr)
           end

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

@@ -29,7 +29,7 @@ class WavefrontCommandBase
   # @return [Array]
   #
   def common_options
-    ['-E, --endpoint=URI       cluster endpoint',
+    ['-E, --endpoint=URI       Wavefront cluster endpoint',
      '-t, --token=TOKEN        Wavefront authentication token']
   end
 
@@ -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
@@ -80,7 +80,7 @@ class WavefrontCommandBase
   end
 
   def things
-    thing + 's'
+    "#{thing}s"
   end
 
   # @return [String] the name of the SDK class which does the work
@@ -105,10 +105,11 @@ class WavefrontCommandBase
     text_arr = %w[Usage:]
 
     _commands.flatten.each do |cmd|
-      text_arr.<< '  ' + "#{CMD} #{word} #{cmd}\n".cmd_fold(term_width)
+      folded = "#{CMD} #{word} #{cmd}\n".cmd_fold(term_width)
+      text_arr << "  #{folded}"
     end
 
-    text_arr.<< "  #{CMD} #{word} --help"
+    text_arr << "  #{CMD} #{word} --help"
     text_arr.join("\n")
   end
 
@@ -124,15 +125,15 @@ class WavefrontCommandBase
                  global_option_text(width, term_width)
                end
 
-    text_arr.<< 'Options:'
-    _options.flatten.each { |o| text_arr.<< opt_row(o, width, term_width) }
+    text_arr << 'Options:'
+    _options.flatten.each { |o| text_arr << opt_row(o, width, term_width) }
     text_arr.join("\n")
   end
 
   def global_option_text(width, term_width)
     text_arr = ['Global options:']
-    global_options.each { |o| text_arr.<< opt_row(o, width, term_width) }
-    text_arr.<< ''
+    global_options.each { |o| text_arr << opt_row(o, width, term_width) }
+    text_arr << ''
   end
 
   # Formats an option string.
@@ -142,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
@@ -165,6 +168,6 @@ class WavefrontCommandBase
   # @return [String] a full options string which docopt understands
   #
   def docopt
-    commands + "\n\n" + options + "\n\n" + postscript
+    "#{commands}\n\n#{options}\n\n#{postscript}"
   end
 end

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/commands/derivedmetric.rb

@@ -45,7 +45,7 @@ class WavefrontCommandDerivedmetric < WavefrontCommandBase
      '-d, --desc=STRING       additional information about query',
      '-i, --interval=INTEGER  execute query every n minutes [default: 1]',
      '-r, --range=INTEGER     include results in the last n minutes ' \
-                              '[default: 5]',
+     '[default: 5]',
      "-u, --update            update an existing #{thing}",
      "-U, --upsert            import new or update existing #{thing}"]
   end

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

@@ -23,8 +23,8 @@ class WavefrontCommandMetric < WavefrontCommandBase
 
   def postscript
     "\nNOTE: the 'list under' and 'list all' sub-commands use the unoffical " \
-      "'chart' endpoint, which is not guaranteed to remain stable.\n\n" \
-      'Both commands have to make a lot of API calls, and may take a ' \
-      'very long time to run.'.cmd_fold(TW, 0)
+    "'chart' endpoint, which is not guaranteed to remain stable.\n\n" \
+    'Both commands have to make a lot of API calls, and may take a ' \
+    'very long time to run.'.cmd_fold(TW, 0)
   end
 end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+# Define the metricspolicy command.
+#
+class WavefrontCommandMetricspolicy < WavefrontCommandBase
+  def thing
+    'metrics policy'
+  end
+
+  def things
+    'metrics policies'
+  end
+
+  def sdk_class
+    'MetricsPolicy'
+  end
+
+  def _commands
+    ["describe #{CMN} [-v version]",
+     "history #{CMN} [-o offset] [-L limit]",
+     "revert #{CMN} <version>",
+     "update #{CMN} <file>"]
+  end
+
+  def _options
+    [common_options,
+     "-o, --offset=n           start from nth #{thing}",
+     "-L, --limit=COUNT        number of #{things} or revisions to list",
+     "-v, --version=INTEGER    version of #{thing}"]
+  end
+end

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

@@ -12,11 +12,11 @@ class WavefrontCommandQuery < WavefrontCommandBase
   def _commands
     ['aliases [-DV] [-c file] [-P profile]',
      "#{CMN} [-g granularity] [-s time] [-e time] " \
-           '[-ikvCGKOW] [-S mode] [-N name] [-p points] [-F options] <query>',
+     '[-ikvCGKOW] [-S mode] [-N name] [-p points] [-F options] <query>',
      "raw #{CMN} [-H host] [-s time] [-e time] " \
-           '[-F options] <metric>',
+     '[-F options] <metric>',
      "run #{CMN} [-g granularity] [-s time] [-e time] " \
-           '[-F options] [-WkivO] [-S mode] [-N name] [-p points] <alias>']
+     '[-F options] [-WkivO] [-S mode] [-N name] [-p points] <alias>']
   end
 
   def _options
@@ -34,7 +34,7 @@ class WavefrontCommandQuery < WavefrontCommandBase
      '-O, --obsolete            include metrics unreported for > 4 weeks',
      '-H, --host=STRING         host or source to query on',
      '-F, --format-opts=STRING  comma-separated options to pass to ' \
-                                'output formatter',
+     'output formatter',
      '-k, --nospark             do not show sparkline',
      '-C, --nocache             do not use the query cache',
      '-K, --nostrict            allow points outside the query window',
@@ -45,7 +45,7 @@ class WavefrontCommandQuery < WavefrontCommandBase
   def postscript
     'The query command has an additional output format. Using ' \
     "'-f wavefront' produces output suitable for feeding back into a " \
-    "proxy. Other output formats are 'yaml', 'json', 'ruby', "\
+    "proxy. Other output formats are 'yaml', 'json', 'ruby', " \
     "and 'csv'. CSV format options are 'headers' (print column headers); " \
     "'tagkeys' (print tags as key=value rather than value); and 'quote' " \
     '(force quoting of every CSV element).'.cmd_fold(TW, 0)

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

@@ -10,24 +10,24 @@ class WavefrontCommandWrite < WavefrontCommandBase
   end
 
   def _commands
-    ['point [-DnViq] [-c file] [-P profile] [-E proxy] [-t time] ' \
+    ["point #{CMN} [-iq] [-y proxy] [-s time] " \
      '[-p port] [-H host] [-T tag...] [-u method] [-S socket] <metric> ' \
      '[--] <value>',
-     'distribution [-DnViq] [-c file] [-P profile] [-E proxy] [-H host] ' \
-     '[-p port] [-T tag...] [-u method] [-S socket] [-I interval] ' \
+     "distribution #{CMN} [-iq] [-y proxy] " \
+     '[-H host] [-p port] [-T tag...] [-u method] [-S socket] [-I interval] ' \
      '<metric> [--] <val>...',
-     'file [-DnViq] [-c file] [-P profile] [-E proxy] [-H host] ' \
+     "file #{CMN} [-iq] [-y proxy] [-H host] " \
      '[-p port] [-F infileformat] [-m metric] [-T tag...] [-I interval] ' \
      '[-u method] [-S socket] <file>',
-     'noise [-DnViq] [-P profile] [-E proxy] [-H host] [-p port] ' \
+     "noise #{CMN} [-iq] [-y proxy] [-H host] [-p port] " \
      '[-T tag...] [-I interval] [-x value] [-X value] <metric>']
   end
 
   def _options
-    ['-E, --proxy=URI            proxy endpoint',
-     '-t, --time=TIME            time of data point (omit to use ' \
-     'current time)',
-     '-H, --host=STRING          source host', \
+    [common_options,
+     '-y, --proxy=URI            proxy endpoint',
+     '-s, --ts=TIME              timestamp of data point (omit for "now")',
+     '-H, --host=STRING          source host',
      '-p, --port=INT             Wavefront proxy port',
      '-T, --tag=TAG              point tag in key=value form',
      '-F, --infileformat=STRING  format of input file or stdin',
@@ -50,9 +50,9 @@ class WavefrontCommandWrite < WavefrontCommandBase
     "with the '-F' option.  Use 't' for timestamp, 'm' for metric " \
     "name, 'v' for value, 's' for source, 'd' for a comma-separated " \
     "distribution, and 'T' for tags. Put 'T' last.  Currently " \
-    "supported transport methods are 'socket' (write to a proxy: the " \
-    "default); 'api' (write directly to Wavefront); 'http' (write to " \
-    "a proxy over HTTP); and 'unix' (write to a local Unix socket)."
+    "supported transport methods are 'http' (write to a proxy over HTTP: " \
+    "the default); 'api' (write directly to Wavefront); 'proxy' (send raw " \
+    "data to a proxy); and 'socket' (write to a local Unix socket)."
       .cmd_fold(TW, 0)
   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 IO.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
@@ -97,7 +91,7 @@ module WavefrontCli
       prof_arr = ["[#{profile}]"]
 
       CONFIGURABLES.each do |c|
-        prof_arr.<< format('%<key>s=%<value>s',
+        prof_arr << format('%<key>s=%<value>s',
                            key: c[:key],
                            value: read_thing(c))
       end
@@ -121,25 +115,27 @@ 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?
-      ret + ':> '
+      ret << format(' [%<value>s]', value: default) unless default.nil?
+      "#{ret}:> "
     end
 
     # Read STDIN and strip the whitespace. The rescue is there to
@@ -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

@@ -3,6 +3,7 @@
 require 'pathname'
 
 module WavefrontCli
+  #
   # Universal truths
   #
   module Constants
@@ -24,11 +25,11 @@ module WavefrontCli
 
     # Default configuration file
     #
-    DEFAULT_CONFIG = (Pathname.new(ENV['HOME']) + '.wavefront').freeze
+    DEFAULT_CONFIG = Pathname.new(Dir.home).join('.wavefront').freeze
 
     # Split regex for searches
     #
-    SEARCH_SPLIT = /\^|!\^|=|!=|~|!~/.freeze
+    SEARCH_SPLIT = /\^|!\^|=|!=|~|!~/
 
     # Where we store local event information
     #

data/lib/wavefront-cli/controller.rb

@@ -7,8 +7,8 @@
 
 if defined?(DEVELOPMENT)
   dir = Pathname.new(__dir__).realpath.parent.parent.parent
-  $LOAD_PATH.<< dir + 'lib'
-  $LOAD_PATH.<< dir + 'wavefront-sdk' + 'lib'
+  $LOAD_PATH << dir.join('lib')
+  $LOAD_PATH << dir.join('wavefront-sdk', 'lib')
 end
 
 require 'pathname'
@@ -20,7 +20,7 @@ require_relative 'opt_handler'
 require_relative 'exception_handler'
 require_relative 'stdlib/string'
 
-CMD_DIR = Pathname.new(__dir__) + 'commands'
+CMD_DIR = Pathname.new(__dir__).join('commands')
 
 # Dynamically generate a CLI interface from files which describe
 # each subcomand.
@@ -65,13 +65,13 @@ class WavefrontCliController
          'Commands:']
 
     cmds.sort.each do |k, v|
-      s.<< format('  %-18<command>s %<desc>s',
+      s << format('  %-18<command>s %<desc>s',
                   command: k,
                   desc: v.description)
     end
 
-    s.<< ''
-    s.<< "Use '#{CMD} <command> --help' for further information."
+    s << ''
+    s << "Use '#{CMD} <command> --help' for further information."
     s.join("\n")
   end
   # rubocop:enable Metrics/MethodLength
@@ -124,7 +124,7 @@ class WavefrontCliController
 
   def load_cli_class(cmd, opts)
     require_relative File.join('.', cmds[cmd].sdk_file)
-    Object.const_get('WavefrontCli').const_get(cmds[cmd].sdk_class).new(opts)
+    Object.const_get(:WavefrontCli).const_get(cmds[cmd].sdk_class).new(opts)
   end
 
   def run_command(cli_class_obj)
@@ -145,15 +145,19 @@ class WavefrontCliController
   # @param error [WavefrontCli::Exception::CredentialError]
   #
   def handle_missing_credentials(error)
-    if DEFAULT_CONFIG.exist? && DEFAULT_CONFIG.file?
-      abort "Credential error. #{error.message}"
-    else
-      puts 'No credentials supplied on the command line or via ' \
-           'environment variables, and no configuration file found. ' \
-           "Please run 'wf config setup' to create configuration."
-        .fold(TW, 0)
-      exit 1
+    message = error.message.capitalize
+    message << ('.') unless message.end_with?('.')
+
+    puts "Credential error. #{message}"
+
+    unless DEFAULT_CONFIG.exist? && DEFAULT_CONFIG.file?
+      puts
+      puts 'You can pass credentials on the command line or via ' \
+           "environment variables. You may also run 'wf config setup' to " \
+           'create a config file.'.fold(TW, 0)
     end
+
+    exit 1
   end
 
   # Each command is defined in its own file. Dynamically load all