wavefront-cli 8.5.0 → 8.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 363b1be94331165aacf1538c797d07bdbefda71e801335bb4e35df97cb0bd950
-  data.tar.gz: 5563b27f93c679dde5947c220d80c37816ba6faf8844d08111cbf7dcc65a76c1
+  metadata.gz: 5f464387b5dfcc05cdec2af09eaf006ff9544d880185a21fc787ba25b2d1686c
+  data.tar.gz: c90b1bd9e45e9aadcf4374dea2a3c8794c8560e371e5d597aad88f95ffcd813f
 SHA512:
-  metadata.gz: ce61f68ba09a6ba395143fa92abeadcdb0de127f8991fe61b979ae49379d026973c5d47a09d6d4f0b306006a15f95a717cac02160af0b727f2858ba66a9fddae
-  data.tar.gz: 111d9d52a0e0c3955164e1872198531b9e2bd61184dc430050029efdf8d19f9cd845885a7f1d5d5685d03dbf7de0845453d95f888e13eb0195b83fd25437116d
+  metadata.gz: 24fb5ca35864e6624905e311430c73c16c5581d909f12af1e6183fac5e9717245c770a3bfcc552d60c78f63a43c077e38e43c7ce78317a71af9de535de5952b9
+  data.tar.gz: 55ab4e7a41e3139141d018be4c71505e66d42a9ead87a006c5a39eb7c50a342257ef706cef24680523a08b7a8a865f59ef391958d5556bad2c7d9a18e186e053

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@v2
+    - name: Set env
+      run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF:10})" >> $GITHUB_ENV
+
+    - name: Set up Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - 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_AUTH_TOKEN}}"

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.5.8, 2.6.6, 2.7.2]
+    steps:
+    - uses: actions/checkout@v2
+    - 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,23 @@
 ---
-
 AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
 
+require:
+  - rubocop-rake
+  - rubocop-minitest
+  - rubocop-performance
+  - 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,8 @@
 # Changelog
 
+## 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/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/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/printer/sparkline.rb

@@ -39,7 +39,7 @@ class WavefrontSparkline
     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 }
+    ret = vals.each_slice(2).with_object([]) { |s, a| a.<< s.sum / 2 }
     make_fit(ret)
   end
 

data/lib/wavefront-cli/event_store.rb

@@ -41,7 +41,7 @@ module WavefrontCli
     end
 
     def event_file(id)
-      id =~ /^\d{13}:.+/ ? dir + id : nil
+      /^\d{13}:.+/.match?(id) ? dir + id : nil
     end
 
     # We can override the temp directory with the WF_EVENT_STATE_DIR env var.
@@ -70,7 +70,7 @@ module WavefrontCli
     def event(id)
       if !id
         pop_event!
-      elsif id =~ /^\d{13}:.+:\d+/
+      elsif /^\d{13}:.+:\d+/.match?(id)
         id
       else
         pop_event!(id)

data/lib/wavefront-cli/exception.rb

@@ -7,26 +7,47 @@ module WavefrontCli
   #
   class Exception
     class CredentialError < RuntimeError; end
+
     class MandatoryValue < RuntimeError; end
+
     class ConfigFileNotFound < IOError; end
+
     class FileNotFound < IOError; end
+
     class ImpossibleSearch < RuntimeError; end
+
     class InsufficientData < RuntimeError; end
+
     class InvalidInput < RuntimeError; end
+
     class InvalidQuery < RuntimeError; end
+
     class InvalidValue < RuntimeError; end
+
     class ProfileExists < RuntimeError; end
+
     class ProfileNotFound < RuntimeError; end
+
     class SystemError < RuntimeError; end
+
     class UnhandledCommand < RuntimeError; end
+
     class UnparseableInput < RuntimeError; end
+
     class UnparseableResponse < RuntimeError; end
+
     class UnparseableSearchPattern < RuntimeError; end
+
     class UnsupportedFileFormat < RuntimeError; end
+
     class UnsupportedNoop < RuntimeError; end
+
     class UnsupportedOperation < RuntimeError; end
+
     class UnsupportedOutput < RuntimeError; end
+
     class UserGroupNotFound < RuntimeError; end
+
     class UserError < RuntimeError; end
   end
 end

data/lib/wavefront-cli/exception_handler.rb

@@ -8,6 +8,7 @@ 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
@@ -26,6 +27,8 @@ module WavefrontCli
         abort 'Connection timed out.'
       when Wavefront::Exception::InvalidPermission
         abort "'#{exception}' is not a valid Wavefront permission."
+      when Wavefront::Exception::InvalidTimestamp
+        abort "'#{exception}' is not a parseable time."
       when Wavefront::Exception::InvalidUserGroupId
         abort "'#{exception}' is not a valid user group ID."
       when Wavefront::Exception::InvalidAccountId
@@ -80,6 +83,7 @@ module WavefrontCli
         abort
       end
     end
+    # rubocop:enable Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/CyclomaticComplexity

data/lib/wavefront-cli/opt_handler.rb

@@ -29,7 +29,7 @@ module WavefrontCli
 
     def initialize(cli_opts = {})
       cred_opts = setup_cred_opts(cli_opts)
-      cli_opts.reject! { |_k, v| v.nil? }
+      cli_opts.compact!
       @opts = DEFAULT_OPTS.merge(load_profile(cred_opts)).merge(cli_opts)
     rescue WavefrontCli::Exception::ConfigFileNotFound => e
       abort "Configuration file '#{e}' not found."

data/lib/wavefront-cli/query.rb

@@ -126,7 +126,7 @@ module WavefrontCli
       end
     end
 
-    def handle_errcode_404(_status)
+    def handle_errcode404(_status)
       'Perhaps metric does not exist for given host.'
     end
   end

data/lib/wavefront-cli/settings.rb

@@ -7,6 +7,8 @@ module WavefrontCli
   # CLI coverage for the v2 'settings' API.
   #
   class Settings < WavefrontCli::Base
+    JOBS = %w[invitePermissions defaultUserGroups].freeze
+
     def do_list_permissions
       wf.permissions
     end
@@ -24,10 +26,7 @@ module WavefrontCli
         k, v = o.split('=', 2)
         next unless v && !v.empty?
 
-        if %w[invitePermissions defaultUserGroups].include?(k)
-          v = v.include?(',') ? v.split(',') : [v]
-        end
-
+        v = v.include?(',') ? v.split(',') : [v] if JOBS.include?(k)
         a[k] = v
       end
 

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

@@ -50,7 +50,7 @@ class String
   # undesirable line breaking. This puts it back
   #
   def restored
-    tr('^', ' ').chomp("\n")
+    tr('^', ' ').chomp
   end
 
   # Fold long value lines in two-column output. The returned string

data/lib/wavefront-cli/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WF_CLI_VERSION = '8.5.0'
+WF_CLI_VERSION = '8.5.1'

data/lib/wavefront-cli/write.rb

@@ -375,7 +375,7 @@ module WavefrontCli
     end
 
     def format_string_is_all_valid_chars?(fmt)
-      return true if fmt =~ /^[dmstTv]+$/
+      return true if /^[dmstTv]+$/.match?(fmt)
 
       raise(WavefrontCli::Exception::UnparseableInput,
             'unsupported field in format string')

data/spec/.rubocop.yml

@@ -1,23 +1,8 @@
 ---
-AllCops:
-  NewCops: enable
+inherit_from:
+  - ../.rubocop.yml
 
 Metrics/MethodLength:
   Max: 30
-
 Metrics/AbcSize:
   Max: 45
-
-Metrics/ClassLength:
-  Max: 300
-
-# 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

@@ -214,9 +214,9 @@ module Minitest
     private
 
     def mk_headers(token = nil)
-      { 'Accept': /.*/,
+      { Accept: /.*/,
         'Accept-Encoding': /.*/,
-        'Authorization': 'Bearer ' + (token || '0123456789-ABCDEF'),
+        Authorization: 'Bearer ' + (token || '0123456789-ABCDEF'),
         'User-Agent': "wavefront-cli-#{WF_CLI_VERSION}" }
     end
 

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

@@ -72,7 +72,7 @@ class WavefrontCommmandBaseTest < MiniTest::Test
       next if skip_cmd && c.match(skip_cmd)
 
       assert_match(/^  \w+/, c)
-      assert_includes(c, CMN) unless c =~ /--help$/
+      assert_includes(c, CMN) unless /--help$/.match?(c)
     end
   end
 
@@ -88,7 +88,7 @@ class WavefrontCommmandBaseTest < MiniTest::Test
       refute o.end_with?('.')
     end
 
-    assert_equal(1, wf.options.split("\n").select(&:empty?).size)
+    assert_equal(1, wf.options.split("\n").count(&:empty?))
   end
 
   def test_opt_row

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

@@ -28,7 +28,7 @@ class WavefrontCommmandConfigTest < WavefrontCommmandBaseTest
       refute o.end_with?('.')
     end
 
-    assert_equal(wf.options.split("\n").select(&:empty?).size, 0)
+    assert_equal(wf.options.split("\n").count(&:empty?), 0)
   end
 
   def test_commands

data/spec/wavefront-cli/controller_spec.rb

@@ -52,6 +52,7 @@ class WavefrontCliHelpTest < MiniTest::Test
     end
   end
 
+  # rubocop:disable Style/RedundantBegin
   def test_command_help
     SupportedCommands.new.all.each do |cmd|
       begin
@@ -66,6 +67,7 @@ class WavefrontCliHelpTest < MiniTest::Test
       end
     end
   end
+  # rubocop:enable Style/RedundantBegin
 
   def test_malformed_config
     capture_io do

data/spec/wavefront-cli/opt_handler_spec.rb

@@ -19,7 +19,7 @@ class OptHandlerTest < MiniTest::Test
     x = WavefrontCli::OptHandler.new
     assert x.is_a?(WavefrontCli::OptHandler)
     assert x.opts.is_a?(Hash)
-    assert x.opts.keys.include?(:endpoint)
+    assert x.opts.key?(:endpoint)
   end
 
   def test_missing_config
@@ -36,7 +36,7 @@ class OptHandlerTest < MiniTest::Test
     o = x.opts
     assert x.is_a?(WavefrontCli::OptHandler)
     assert o.is_a?(Hash)
-    refute o.keys.include?(:token)
+    refute o.key?(:token)
     assert_equal(o[:endpoint], 'metrics.wavefront.com')
   end
 
@@ -52,7 +52,7 @@ class OptHandlerTest < MiniTest::Test
     assert_equal(o[:token], 'abcd1234')
     assert_nil o[:config]
     assert_equal(o[:endpoint], 'myendpoint.wavefront.com')
-    refute o.keys.include?(:proxy)
+    refute o.key?(:proxy)
     ENV['WAVEFRONT_TOKEN'] = nil
     ENV['WAVEFRONT_ENDPOINT'] = nil
   end

data/spec/wavefront-cli/serviceaccount_spec.rb

@@ -6,7 +6,6 @@ require_relative '../../lib/wavefront-cli/serviceaccount'
 
 # Ensure 'serviceaccount' commands produce the correct API calls.
 #
-# rubocop:disable Metrics/ClassLength
 class ServiceAccountEndToEndTest < EndToEndTest
   include WavefrontCliTest::Describe
   # include WavefrontCliTest::Import
@@ -430,4 +429,3 @@ class ServiceAccountEndToEndTest < EndToEndTest
       identifier: 'sa::test' }
   end
 end
-# rubocop:enable Metrics/ClassLength

data/wavefront-cli.gemspec

@@ -30,7 +30,10 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'minitest', '~> 5.14'
   gem.add_development_dependency 'rake', '~> 13.0'
-  gem.add_development_dependency 'rubocop', '0.91.0'
+  gem.add_development_dependency 'rubocop', '~> 1.9'
+  gem.add_development_dependency 'rubocop-minitest', '~> 0.10'
+  gem.add_development_dependency 'rubocop-performance', '~> 1.3'
+  gem.add_development_dependency 'rubocop-rake', '~> 0.5'
   gem.add_development_dependency 'spy', '~> 1.0.0'
   gem.add_development_dependency 'webmock', '~> 3.8'
   gem.add_development_dependency 'yard', '~> 0.9.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 8.5.0
+  version: 8.5.1
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -90,16 +90,58 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: spy
   requirement: !ruby/object:Gem::Requirement
@@ -150,9 +192,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - LICENSE.txt
@@ -411,7 +454,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: CLI for Wavefront API v2

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-before_install: gem install bundler --no-document
-deploy:
-  provider: rubygems
-  api_key:
-    secure: dpVC480pAmGQrkEeugPowxhYzM8Er9UDhY02u2P5ytrCXC9J05uGKvN8uZ6H8SJr1ZKUb7OGxCq+EVKrA/q1s6Cv07Xl9u1HiOR0cB4ZUW3wBl6TGdl7c/rcor5AQxjELTcWnhCJvTzB+i46a1s4AcWjGBIVEY7/b1iloj/Sm0U43UZPcWPaIl5xfnANBk6v9F5eEfQy5IXlQUQKtRLXzgyqwyJi7DQcNcnEXA0O33KKwka7QDQsycYE7axEiJGOBt0PbYiRUXRZBxKWnsrtq9Sk9QukYsZSQqZgkykV6ImvMYzWI/vUwDRl+dJWmyAG6K2mz4kqMjhiMkB4ctbj5sxDG1BzsBlNTTEb0P8PGBEYgcf4VBd7XDlEt0Sythp6ztn9EVtw35M22n5Q7sdgalf6TFrzQpp9sec3o4AqO3IXUIqRN4VD4vPRQVBJHcwFOuZ3EUO0VekUzCUO3R/mG4oHUIQ9VgRzrUuyYpCwuwWyoVKVA/AukHHW6Y7El2g+JlpP+ijf0ABpqusHENELVWnuCRcv36sxbyM6Rbt2JrT9FrG1oSAELz4yMS86Qhq104II89d6apGJT3thUH8n9m2KA16DmxQYXkNamfygCn3D5ogC2gcIgVicQnJma+405Pv43/a+PaKy/oKr3/H7IJJmoqHfiMyG9DtkFTWQrfA=
-  gem: wavefront-cli
-  on:
-    tags: true
-    repo: snltd/wavefront-cli
-    ruby: 2.6.6
-notifications:
-  email: false
-  slack:
-    secure: YrwfBiBscjUCHZIyPHH/FEm5VbHZN3AczHnlOJfETsAdsVpM+JOvHnoCaY0AGjvCvmFMPE9yg11yhwMfXZJVwjAC6b75VrXoCFIvC1tjLqFizuI4VBZXUZk3CQZK0pIh1ZRYVINa0LuYLDyxF0EG2N9KTYqQcMEsBwsVohsca+zjbjyIW5H0FeVWJC4QlFqVHBwFHvylfHnPjh0pQAn3sE9j7Of3W2HQVM753/lsOkMf3sHYOv8AOrzjTNqyrageTxUGnO91S41DirNdesrjF8Qg+/s1RSiNeYSZLkqI2pk+3sdkMkpA+2z2zQ/ZbgudS/38AVlh2Wb2KkmFw0+XhdpUGqQZgLlgWMDKoiS7j2dNQ3zA4guCZIQSW6gqR76wTUqeCZQ3UNalChAhACFnG0FmZj+AIE72r28dOH747zKEmTaoJt5FR7GlSoG6cH1EV9qTeIjZ/33ehL703E6qrWITjQ6VrNrPsTCt8rvoW2MV8TP9qb32JVJqWxabqUMBicIWLEeDjPyAmOZs32cWwfk9zcJ6hIJcFffkxgVJN0vU6Qi4tGWUmYK12EIclVgrKgvN1yHUrUN/r7+sUPX9WRj82RNFU6RSPircekV9oWj9Hr8A2imnFqiMTnPpSb56y02cG9FbwFPqxLSaNNV4lALzoBmluKv0RSeEWhRvrGI=