wavefront-cli 8.5.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 363b1be94331165aacf1538c797d07bdbefda71e801335bb4e35df97cb0bd950
-  data.tar.gz: 5563b27f93c679dde5947c220d80c37816ba6faf8844d08111cbf7dcc65a76c1
+  metadata.gz: 1040d65b6cf4352d960ff941f05f3bd5e924a4ebc13d1a0cff48c8920f1b426a
+  data.tar.gz: 841d25680790e0c8cf8623d09fc6bc6720c725f7b415f7342263d9e66501eb02
 SHA512:
-  metadata.gz: ce61f68ba09a6ba395143fa92abeadcdb0de127f8991fe61b979ae49379d026973c5d47a09d6d4f0b306006a15f95a717cac02160af0b727f2858ba66a9fddae
-  data.tar.gz: 111d9d52a0e0c3955164e1872198531b9e2bd61184dc430050029efdf8d19f9cd845885a7f1d5d5685d03dbf7de0845453d95f888e13eb0195b83fd25437116d
+  metadata.gz: 120360b39776bd3711df4bd455cc4785d880447fc33c625ce5b30d9a69f29f51717f5133be78af65657f424d31188fc69afe8183d72cf8d88717cd20825922aa
+  data.tar.gz: 452d2d4e951dfeb02ca1a104fab5401feaaf8a9f3c7b1e649afb3eaebe3e5307f47fb0273cefc947de0e0fd655c761eee0e25bea5289279b7132458f071f6cf6

data/.github/workflows/release.yml

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

data/.github/workflows/test.yml

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

data/.rubocop.yml

@@ -1,19 +1,20 @@
 ---
-
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   NewCops: enable
 
+require:
+  - rubocop-rake
+  - rubocop-minitest
+  - rubocop-performance
+
+Layout/LineLength:
+  Max: 80 # Is nothing sacred?
 Metrics/ClassLength:
   Max: 400
-
+Naming/VariableNumber:
+  Enabled: false
 Style/IfUnlessModifier:
   Enabled: false # because it wants to make lines >80 chars
-Style/StringConcatenation:
-  Enabled: false
 Style/OptionalBooleanParameter:
   Enabled: false
-
-# Is nothing sacred?
-Layout/LineLength:
-  Max: 80

data/HISTORY.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 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`.
+
 ## 8.5.0 (2021-01-12)
 * Allow attachment of roles and ingestion policies when creating service
   accounts.

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.
+2.7. 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

@@ -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/.rubocop.yml

@@ -1,19 +1,8 @@
 ---
-AllCops:
-  NewCops: enable
+inherit_from:
+  - ../../../.rubocop.yml
 
 # There are long things in here, but they're fine
 #
 Metrics/MethodLength:
   Max: 25
-
-# 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/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
 
@@ -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.
@@ -165,6 +166,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/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

@@ -54,7 +54,7 @@ module WavefrontCli
 
     def do_show
       present?
-      puts IO.read(config_file)
+      puts File.read(config_file)
     end
 
     def do_about
@@ -97,7 +97,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
@@ -138,8 +138,8 @@ module WavefrontCli
 
     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

data/lib/wavefront-cli/constants.rb

@@ -3,6 +3,7 @@
 require 'pathname'
 
 module WavefrontCli
+  #
   # Universal truths
   #
   module Constants
@@ -24,7 +25,7 @@ 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
     #

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

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

@@ -399,9 +399,10 @@ module WavefrontDisplay
     # @return [String, String] DateTime formatter, strptime formatter
     #
     def time_formats(str)
-      if str =~ /^\d{13}$/
+      case str
+      when /^\d{13}$/
         ['%Q', HUMAN_TIME_FORMAT_MS]
-      elsif str =~ /^\d{10}$/
+      when /^\d{10}$/
         ['%s', HUMAN_TIME_FORMAT]
       else
         raise ArgumentError

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module WavefrontDisplay
+  #
+  # Format human-readable output of the metrics policy.
+  #
+  class MetricsPolicy < Base
+    def do_history
+      readable_time_arr(:updateTime)
+      long_output
+    end
+  end
+end

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

@@ -84,7 +84,7 @@ module WavefrontDisplayPrinter
       elsif data.is_a?(Array)
         append_array(data, aggr, depth, last_key)
       else
-        aggr.<< ['', preened_value(data), depth]
+        aggr << ['', preened_value(data), depth]
       end
     end
     # rubocop:enable Style/CaseLikeIf
@@ -99,16 +99,14 @@ module WavefrontDisplayPrinter
     # @return [Integer]
     #
     def longest_key_col(data)
-      data.map { |d| d[0].size + opts[:padding] + opts[:indent] * d[2] }.max
+      data.map { |d| d[0].size + opts[:padding] + (opts[:indent] * d[2]) }.max
     end
 
     # Turn the list made by #make_list into user output
     # @return [String]
     #
     def to_s
-      list.map do |item|
-        stringify_line(item)
-      end.join("\n")
+      list.map { |item| stringify_line(item) }.join("\n")
     end
 
     # @param item [Array] of the form [key, value, indent_level]
@@ -162,7 +160,7 @@ module WavefrontDisplayPrinter
         elsif v.is_a?(Array)
           aggr = append_array_values(k, v, aggr, depth)
         else
-          aggr.<< [k, smart_value(v), depth]
+          aggr << [k, smart_value(v), depth]
         end
       end
 
@@ -183,7 +181,7 @@ module WavefrontDisplayPrinter
 
         if opts[:separator] && element.is_a?(Hash) && i < data.size &&
            depth < opts[:sep_depth]
-          aggr.<< ['', :separator, depth]
+          aggr << ['', :separator, depth]
         end
       end
 
@@ -202,9 +200,9 @@ module WavefrontDisplayPrinter
     #
     def append_hash_values(key, values, aggr, depth)
       if values.empty? && opts[:none]
-        aggr.<< [key, '<none>', depth]
+        aggr << [key, '<none>', depth]
       else
-        aggr.<< [key, nil, depth]
+        aggr << [key, nil, depth]
         make_list(values, aggr, depth + 1)
       end
     end
@@ -218,13 +216,13 @@ module WavefrontDisplayPrinter
     #
     def append_array_values(key, values, aggr, depth)
       if values.empty? && opts[:none]
-        aggr.<< [key, '<none>', depth]
-      elsif values.all? { |w| w.is_a?(String) }
+        aggr << [key, '<none>', depth]
+      elsif values.all?(String)
         values.sort!
-        aggr.<< [key, preened_value(values.shift), depth]
+        aggr << [key, preened_value(values.shift), depth]
         make_list(values, aggr, depth, key)
       else
-        aggr.<< [key, nil, depth]
+        aggr << [key, nil, depth]
         make_list(values, aggr, depth + 1, key)
       end
     end

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

@@ -16,7 +16,7 @@ class WavefrontSparkline
   attr_reader :sparkline
 
   def initialize(series)
-    @sparkline = '>' + generate_sparkline(series) + '<'
+    @sparkline = ">#{generate_sparkline(series)}<"
   end
 
   # @return [String] the block corresponding to the given value in
@@ -38,8 +38,8 @@ class WavefrontSparkline
   def make_fit(vals)
     return vals if vals.size < SPARK_WIDTH
 
-    vals.<< vals.last if vals.size.odd?
-    ret = vals.each_slice(2).with_object([]) { |s, a| a.<< s.inject(:+) / 2 }
+    vals << vals.last if vals.size.odd?
+    ret = vals.each_slice(2).with_object([]) { |s, a| a << (s.sum / 2) }
     make_fit(ret)
   end
 

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

@@ -86,7 +86,7 @@ module WavefrontDisplay
       if data.empty?
         puts 'No aliases defined.'
       else
-        data.each_key { |k| puts k.to_s[2..-1] }
+        data.each_key { |k| puts k.to_s[2..] }
       end
     end