wavefront-cli 6.0.0 → 8.0.1

data/spec/wavefront-cli/write_spec.rb

@@ -209,4 +209,48 @@ class WavefrontCliWriteTest < MiniTest::Test
     refute WavefrontCli::Write.new(infileformat: 'fma').distribution?
     refute WavefrontCli::Write.new({}).distribution?
   end
+
+  def test_sane_value
+    assert_equal(0, wf.sane_value(0))
+    assert_equal(0, wf.sane_value(''))
+    assert_equal(-10, wf.sane_value('-10.0'))
+    assert_equal(10, wf.sane_value('   10'))
+    assert_equal(10, wf.sane_value('\\10'))
+    assert_equal(10, wf.sane_value('\10'))
+    assert_raises(WavefrontCli::Exception::InvalidValue) { wf.sane_value(nil) }
+    assert_raises(WavefrontCli::Exception::InvalidValue) { wf.sane_value({}) }
+    assert_raises(WavefrontCli::Exception::InvalidValue) { wf.sane_value([]) }
+  end
+
+  def test_random_value_asymmetric_range
+    lower_bound = -5
+    upper_bound = 20
+
+    max = (1..1000).map { wf.random_value(lower_bound, upper_bound) }.max
+    min = (1..1000).map { wf.random_value(lower_bound, upper_bound) }.min
+
+    assert(max <= upper_bound)
+    assert(min >= lower_bound)
+    refute_equal(max, min)
+  end
+
+  def test_random_value_symmetric_range
+    lower_bound = -15
+    upper_bound = 15
+
+    max = (1..1000).map { wf.random_value(lower_bound, upper_bound) }.max
+    min = (1..1000).map { wf.random_value(lower_bound, upper_bound) }.min
+
+    assert(max <= upper_bound)
+    assert(min >= lower_bound)
+    refute_equal(max, min)
+  end
+
+  def test_random_value_single_value
+    lower_bound = 5
+    upper_bound = 5
+
+    assert_equal([5, 5, 5, 5, 5, 5, 5, 5, 5, 5],
+                 (1..10).map { wf.random_value(lower_bound, upper_bound) })
+  end
 end

data/wavefront-cli.gemspec

@@ -26,14 +26,14 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'docopt', '~> 0.6.0'
   gem.add_runtime_dependency 'inifile', '~> 3.0'
-  gem.add_runtime_dependency 'wavefront-sdk', '~> 4.0', '>= 4.0.0'
+  gem.add_runtime_dependency 'wavefront-sdk', '~> 5.2'
 
-  gem.add_development_dependency 'minitest', '~> 5.11', '>= 5.11.0'
-  gem.add_development_dependency 'rake', '~> 12.0'
-  gem.add_development_dependency 'rubocop', '~> 0.79'
+  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 'spy', '~> 1.0.0'
-  gem.add_development_dependency 'webmock', '~> 3.7'
+  gem.add_development_dependency 'webmock', '~> 3.8'
   gem.add_development_dependency 'yard', '~> 0.9.5'
 
-  gem.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
+  gem.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -44,68 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.11.0
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.11.0
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: 0.91.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: 0.91.0
 - !ruby/object:Gem::Dependency
   name: spy
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +153,7 @@ files:
 - README.md
 - Rakefile
 - bin/wf
+- lib/wavefront-cli/account.rb
 - lib/wavefront-cli/alert.rb
 - lib/wavefront-cli/apitoken.rb
 - lib/wavefront-cli/base.rb
@@ -172,6 +161,7 @@ files:
 - lib/wavefront-cli/command_mixins/acl.rb
 - lib/wavefront-cli/command_mixins/tag.rb
 - lib/wavefront-cli/commands/.rubocop.yml
+- lib/wavefront-cli/commands/account.rb
 - lib/wavefront-cli/commands/alert.rb
 - lib/wavefront-cli/commands/apitoken.rb
 - lib/wavefront-cli/commands/base.rb
@@ -188,13 +178,13 @@ files:
 - lib/wavefront-cli/commands/notificant.rb
 - lib/wavefront-cli/commands/proxy.rb
 - lib/wavefront-cli/commands/query.rb
+- lib/wavefront-cli/commands/role.rb
 - lib/wavefront-cli/commands/savedsearch.rb
 - lib/wavefront-cli/commands/serviceaccount.rb
 - lib/wavefront-cli/commands/settings.rb
 - lib/wavefront-cli/commands/source.rb
 - lib/wavefront-cli/commands/spy.rb
 - lib/wavefront-cli/commands/usage.rb
-- lib/wavefront-cli/commands/user.rb
 - lib/wavefront-cli/commands/usergroup.rb
 - lib/wavefront-cli/commands/webhook.rb
 - lib/wavefront-cli/commands/window.rb
@@ -204,6 +194,7 @@ files:
 - lib/wavefront-cli/controller.rb
 - lib/wavefront-cli/dashboard.rb
 - lib/wavefront-cli/derivedmetric.rb
+- lib/wavefront-cli/display/account.rb
 - lib/wavefront-cli/display/alert.rb
 - lib/wavefront-cli/display/apitoken.rb
 - lib/wavefront-cli/display/base.rb
@@ -224,18 +215,19 @@ files:
 - lib/wavefront-cli/display/printer/terse.rb
 - lib/wavefront-cli/display/proxy.rb
 - lib/wavefront-cli/display/query.rb
+- lib/wavefront-cli/display/role.rb
 - lib/wavefront-cli/display/savedsearch.rb
 - lib/wavefront-cli/display/serviceaccount.rb
 - lib/wavefront-cli/display/settings.rb
 - lib/wavefront-cli/display/source.rb
 - lib/wavefront-cli/display/spy.rb
 - lib/wavefront-cli/display/usage.rb
-- lib/wavefront-cli/display/user.rb
 - lib/wavefront-cli/display/usergroup.rb
 - lib/wavefront-cli/display/webhook.rb
 - lib/wavefront-cli/display/write.rb
 - lib/wavefront-cli/event.rb
 - lib/wavefront-cli/exception.rb
+- lib/wavefront-cli/exception_handler.rb
 - lib/wavefront-cli/externallink.rb
 - lib/wavefront-cli/helpers/load_file.rb
 - lib/wavefront-cli/ingestionpolicy.rb
@@ -263,6 +255,7 @@ files:
 - lib/wavefront-cli/output/yaml.rb
 - lib/wavefront-cli/proxy.rb
 - lib/wavefront-cli/query.rb
+- lib/wavefront-cli/role.rb
 - lib/wavefront-cli/savedsearch.rb
 - lib/wavefront-cli/serviceaccount.rb
 - lib/wavefront-cli/settings.rb
@@ -272,7 +265,6 @@ files:
 - lib/wavefront-cli/stdlib/string.rb
 - lib/wavefront-cli/subcommands/import.rb
 - lib/wavefront-cli/usage.rb
-- lib/wavefront-cli/user.rb
 - lib/wavefront-cli/usergroup.rb
 - lib/wavefront-cli/version.rb
 - lib/wavefront-cli/webhook.rb
@@ -296,6 +288,7 @@ files:
 - spec/test_mixins/search.rb
 - spec/test_mixins/set.rb
 - spec/test_mixins/tag.rb
+- spec/wavefront-cli/account_spec.rb
 - spec/wavefront-cli/alert_spec.rb
 - spec/wavefront-cli/apitoken_spec.rb
 - spec/wavefront-cli/base_spec.rb
@@ -369,7 +362,6 @@ files:
 - spec/wavefront-cli/resources/responses/query.json
 - spec/wavefront-cli/resources/responses/savedsearch-list.json
 - spec/wavefront-cli/resources/responses/usage-export-csv.json
-- spec/wavefront-cli/resources/responses/user-list.json
 - spec/wavefront-cli/resources/responses/user-validate.json
 - spec/wavefront-cli/resources/responses/usergroup-list.json
 - spec/wavefront-cli/resources/responses/webhook-list.json
@@ -379,6 +371,7 @@ files:
 - spec/wavefront-cli/resources/updates/alert.json
 - spec/wavefront-cli/resources/updates/dashboard.json
 - spec/wavefront-cli/resources/wavefront.conf
+- spec/wavefront-cli/role_spec.rb
 - spec/wavefront-cli/savedsearch_spec.rb
 - spec/wavefront-cli/serviceaccount_spec.rb
 - spec/wavefront-cli/settings_spec.rb
@@ -387,7 +380,6 @@ files:
 - spec/wavefront-cli/stdlib/array_spec.rb
 - spec/wavefront-cli/stdlib/string_spec.rb
 - spec/wavefront-cli/usage_spec.rb
-- spec/wavefront-cli/user_spec.rb
 - spec/wavefront-cli/usergroup_spec.rb
 - spec/wavefront-cli/webhook_spec.rb
 - spec/wavefront-cli/write_spec.rb
@@ -404,15 +396,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: CLI for Wavefront API v2
@@ -436,6 +427,7 @@ test_files:
 - spec/test_mixins/search.rb
 - spec/test_mixins/set.rb
 - spec/test_mixins/tag.rb
+- spec/wavefront-cli/account_spec.rb
 - spec/wavefront-cli/alert_spec.rb
 - spec/wavefront-cli/apitoken_spec.rb
 - spec/wavefront-cli/base_spec.rb
@@ -509,7 +501,6 @@ test_files:
 - spec/wavefront-cli/resources/responses/query.json
 - spec/wavefront-cli/resources/responses/savedsearch-list.json
 - spec/wavefront-cli/resources/responses/usage-export-csv.json
-- spec/wavefront-cli/resources/responses/user-list.json
 - spec/wavefront-cli/resources/responses/user-validate.json
 - spec/wavefront-cli/resources/responses/usergroup-list.json
 - spec/wavefront-cli/resources/responses/webhook-list.json
@@ -519,6 +510,7 @@ test_files:
 - spec/wavefront-cli/resources/updates/alert.json
 - spec/wavefront-cli/resources/updates/dashboard.json
 - spec/wavefront-cli/resources/wavefront.conf
+- spec/wavefront-cli/role_spec.rb
 - spec/wavefront-cli/savedsearch_spec.rb
 - spec/wavefront-cli/serviceaccount_spec.rb
 - spec/wavefront-cli/settings_spec.rb
@@ -527,7 +519,6 @@ test_files:
 - spec/wavefront-cli/stdlib/array_spec.rb
 - spec/wavefront-cli/stdlib/string_spec.rb
 - spec/wavefront-cli/usage_spec.rb
-- spec/wavefront-cli/user_spec.rb
 - spec/wavefront-cli/usergroup_spec.rb
 - spec/wavefront-cli/webhook_spec.rb
 - spec/wavefront-cli/write_spec.rb

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

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'base'
-
-# Define the user command.
-#
-class WavefrontCommandUser < WavefrontCommandBase
-  def description
-    "view and manage Wavefront #{things}"
-  end
-
-  # delete uses a different string because it accepts multiples.
-  # Adding ellipsis to <id> causes everything else to expect an
-  # array.
-  #
-  def _commands
-    ["list #{CMN} [-l] [-O fields]",
-     "describe #{CMN} <id>",
-     "create #{CMN} [-e] [-m permission...] [-g group...] <id>",
-     "invite #{CMN} [-m permission...] [-g group...] <id>",
-     "delete #{CMN} <user>...",
-     "dump #{CMN}",
-     "import #{CMN} [-uU] <file>",
-     "groups #{CMN} <id>",
-     "privileges #{CMN} <id>",
-     "join #{CMN} <id> <group>...",
-     "leave #{CMN} <id> <group>...",
-     "grant #{CMN} <privilege> to <id>",
-     "revoke #{CMN} <privilege> from <id>",
-     "business functions #{CMN} <id>",
-     "validate #{CMN} [-l] <user>...",
-     "search #{CMN} [-al] [-o offset] [-L limit] [-O fields] <condition>..."]
-  end
-
-  def _options
-    [common_options,
-     "-l, --long               list #{things} in detail",
-     "-a, --all                list all #{things}",
-     "-o, --offset=n           start from nth #{thing}",
-     "-L, --limit=COUNT        number of #{things} to list",
-     '-O, --fields=F1,F2,...   only show given fields',
-     "-u, --update             update an existing #{thing}",
-     "-U, --upsert             import new or update existing #{thing}",
-     "-e, --email              send e-mail to #{thing} on account creation",
-     "-m, --permission=STRING  give #{thing} this permission",
-     "-g, --group=STRING       add #{thing} to this user group"]
-  end
-
-  def postscript
-    'If your account does not have RBAC enabled, you must grant user ' \
-    "permissions with '-m'. For a list of permissions, see " \
-    "'wf usergroup --help'.".fold(TW, 0)
-  end
-end

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

@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'base'
-
-module WavefrontDisplay
-  #
-  # Format human-readable output for user management.
-  #
-  class User < Base
-    def do_list_brief
-      data.each { |user| puts user[:identifier] }
-    end
-
-    def do_groups
-      groups = data.first.userGroups
-
-      if groups.empty?
-        puts 'User does not belong to any groups.'
-      else
-        groups.each { |u| puts format('%<id>s (%<name>s)', u) }
-      end
-    end
-
-    def do_privileges
-      puts(if data.first[:groups].empty?
-             'User does not have any Wavefront privileges.'
-           else
-             data.first[:groups]
-           end)
-    end
-
-    def do_create
-      info = data[0]
-      puts format("Created user '%<user>s'.\nPermission groups\n" \
-                  "%<perm_groups>s\nUser groups\n%<user_groups>s",
-                  user: info[:identifier],
-                  perm_groups: groups_as_string(info[:groups]),
-                  user_groups: user_groups_as_string(info[:userGroups]))
-    end
-
-    def groups_as_string(groups)
-      return '  <none>' if groups.empty?
-
-      data.response.groups.map do |g|
-        format('  %<group>s', group: g)
-      end.join("\n  ")
-    end
-
-    def user_groups_as_string(groups)
-      return '  <none>' if groups.empty?
-
-      groups.map { |g| format('  %<name>s (%<id>s)', g) }.join("\n")
-    end
-
-    def do_delete
-      puts format('Deleted %<quoted_user>s.',
-                  quoted_user: quoted(options[:'<user>']))
-    end
-
-    def do_invite
-      puts format("Sent invitation to '%<id>s'.", id: options[:'<id>'])
-    end
-
-    def do_grant
-      puts format("Granted '%<priv>s' to '%<id>s'.",
-                  priv: options[:'<privilege>'],
-                  id: options[:'<id>'])
-    end
-
-    def do_revoke
-      puts format("Revoked '%<priv>s' from '%<id>s'.",
-                  priv: options[:'<privilege>'],
-                  id: options[:'<id>'])
-    end
-
-    def do_join
-      puts format("Added '%<id>s' to %<quoted_group>s.",
-                  id: options[:'<id>'],
-                  quoted_group: quoted(options[:'<group>']))
-    end
-
-    def do_leave
-      puts format("Removed '%<id>s' from %<quoted_group>s.",
-                  id: options[:'<id>'],
-                  quoted_group: quoted(options[:'<group>']))
-    end
-
-    def do_business_functions
-      puts data.sort
-    end
-
-    def do_validate_brief
-      valid = data[0][:validUsers]
-      invalid = data[0][:invalidIdentifiers]
-
-      puts 'valid ',
-           valid.empty? ? '  <none>' : valid.map { |u| "  #{u[:identifier]}" }
-
-      puts 'invalid',
-           invalid.empty? ? '  <none>' : invalid.map { |u| "  #{u}" }
-    end
-  end
-end