wavefront-cli 2.8.0 → 2.9.0

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

@@ -8,7 +8,7 @@ require_relative 'base_spec'
 class WavefrontCommmandLinkTest < WavefrontCommmandBaseTest
   def setup
     @wf = WavefrontCommandLink.new
-    @col_width = 19
+    @col_width = 24
   end
 
   def word

data/spec/wavefront-cli/derivedmetric_spec.rb

@@ -30,7 +30,7 @@ describe "#{word} command" do
                        'User-Agent': /wavefront.*/ })
       .to_return(status: 200, body: '', headers: {})
     cmd_to_call(word, "delete #{id}",
-                {  method: :delete, path: "/api/v2/#{word}/#{id}" }, k)
+                { method: :delete, path: "/api/v2/#{word}/#{id}" }, k)
   end
 
   cmd_to_call(word, "search id=#{id}",
@@ -73,7 +73,7 @@ describe "#{word} command" do
                         name:                   'test_dm',
                         includeObsoleteMetrics: false,
                         processRateMinutes:     3,
-                        tags:                   ['tag1', 'tag2'],
+                        tags:                   %w[tag1 tag2],
                         query:                  'ts(series)' },
                 headers: JSON_POST_HEADERS }, k)
 end

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

@@ -149,8 +149,10 @@ class WavefrontDisplayBaseTest < MiniTest::Test
     assert_raises(ArgumentError) { wf.human_time(123) }
     assert_raises(ArgumentError) { wf.human_time(12_345_678_901_234) }
     assert_equal('2017-07-07 11:23:35', wf.human_time(1_499_426_615, true))
+    # rubocop:disable Style/DateTime
     assert_match(/^20\d\d-[01]\d-[0-3]\d [0-2]\d:[0-5]\d:[0-5]\d.\d{3}$/,
                  wf.human_time(DateTime.now.strftime('%Q')))
+    # rubocop:enable Style/DateTime
     assert_match(/^20\d\d-[01]\d-[0-3]\d [0-2]\d:[0-5]\d:[0-5]\d$/,
                  wf.human_time(Time.now.to_i))
     assert_equal('2017-07-07 11:23:35.123', wf.human_time(1_499_426_615_123,

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

@@ -2,6 +2,7 @@
 
 require_relative '../../../../lib/wavefront-cli/display/printer/long'
 require_relative '../spec_helper'
+require_relative '../../../spec_helper'
 
 # Test verbose printing stuff
 #

data/spec/wavefront-cli/externallink_spec.rb

@@ -3,20 +3,26 @@
 require_relative '../spec_helper'
 require_relative '../../lib/wavefront-cli/externallink'
 
-id = 'lq6rPlSg2CFMSrg6'
+id     = 'lq6rPlSg2CFMSrg6'
 bad_id = '__BAD__'
-k = WavefrontCli::ExternalLink
-word = 'link'
+k      = WavefrontCli::ExternalLink
+word   = 'link'
 
 describe "#{word} command" do
   missing_creds(word, ['list', "describe #{id}", "delete #{id}"])
+
   list_tests(word, 'extlink', k)
+
   cmd_to_call(word, "describe #{id}", { path: "/api/v2/extlink/#{id}" }, k)
+
   cmd_to_call(word, "delete #{id}",
               { method: :delete, path: "/api/v2/extlink/#{id}" }, k)
+
   invalid_ids(word, ["describe #{bad_id}", "delete #{bad_id}"])
+
   cmd_to_call(word, "search -L 100 id~#{id}",
-              { method: :post, path: '/api/v2/search/externallink',
+              { method: :post,
+                path:   '/api/v2/search/extlink',
                 body:   { limit: '100',
                           offset: 0,
                           query: [{ key: 'id',
@@ -24,4 +30,46 @@ describe "#{word} command" do
                                     matchingMethod: 'CONTAINS' }],
                           sort: { field: 'id', ascending: true } },
                 headers: JSON_POST_HEADERS }, WavefrontCli::ExternalLink)
+
+  cmd_to_call(word, 'create name description template',
+              { method: :post,
+                path:   '/api/v2/extlink',
+                body: {
+                  name:        'name',
+                  template:    'template',
+                  description: 'description'
+                }.to_json,
+                headers: JSON_POST_HEADERS },
+              WavefrontCli::ExternalLink)
+
+  cmd_to_call(word, 'create -m metricregex -s sourceregex name ' \
+                    'description template',
+              { method: :post,
+                path:   '/api/v2/extlink',
+                body: {
+                  name:              'name',
+                  template:          'template',
+                  description:       'description',
+                  metricFilterRegex: 'metricregex',
+                  sourceFilterRegex: 'sourceregex'
+                }.to_json,
+                headers: JSON_POST_HEADERS },
+              WavefrontCli::ExternalLink)
+
+  cmd_to_call(word, 'create -p key1=reg1 -p key2=reg2 ' \
+                    '-m metricregex name description template',
+              { method: :post,
+                path:   '/api/v2/extlink',
+                body: {
+                  name:              'name',
+                  template:          'template',
+                  description:       'description',
+                  metricFilterRegex: 'metricregex',
+                  pointFilterRegex: {
+                    key1: 'reg1',
+                    key2: 'reg2'
+                  }
+                }.to_json,
+                headers: JSON_POST_HEADERS },
+              WavefrontCli::ExternalLink)
 end

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

@@ -3,6 +3,8 @@
 require_relative '../../spec_helper'
 require_relative '../../../lib/wavefront-cli/output/hcl'
 
+# Test HCL stuff
+#
 class WavefrontOutputBaseTest < MiniTest::Test
   attr_reader :wfo
 
@@ -35,7 +37,7 @@ class WavefrontOutputBaseTest < MiniTest::Test
 
     (CMDS - supported_commands).each do |cmd|
       wfo = WavefrontOutput::Hcl.new(load_query_response, class: cmd)
-      assert_raises(LoadError) { wfo.command_class  }
+      assert_raises(LoadError) { wfo.command_class }
     end
   end
 end

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

@@ -3,6 +3,11 @@
 require_relative '../../spec_helper'
 require_relative '../../../lib/wavefront-cli/output/ruby'
 
+# We can't really test this without `eval`-ing the output, and
+# knowing how squeamish people are about eval(), even in as
+# controlled an environment as this, I'm not going to bother. We
+# only p() an objecty anyway.
+#
 class WavefrontOutputJsonTest < MiniTest::Test
   attr_reader :wfo
 
@@ -10,11 +15,6 @@ class WavefrontOutputJsonTest < MiniTest::Test
     @wfo = WavefrontOutput::Ruby.new(load_query_response)
   end
 
-  # We can't really test this without `eval`-ing the output, and
-  # knowing how squeamish people are about eval(), even in as
-  # controlled an environment as this, I'm not going to bother. We
-  # only p() an objecty anyway.
-  #
   def test__run
     out = wfo._run
     assert_instance_of(Hash, out)

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

@@ -4,32 +4,36 @@ require_relative '../../../spec_helper'
 require_relative '../../../../lib/wavefront-cli/output/wavefront/query'
 
 # Test Wavefront wire-format output
-
+#
 class WavefrontOutputWavefrontTest < MiniTest::Test
   attr_reader :wfq, :wfr
 
   def setup
     @wfq = WavefrontWavefrontOutput::Query.new(load_query_response, {})
-    @wfr = WavefrontWavefrontOutput::Query.new(load_raw_query_response,
-    { raw: true, host: 'www-blue', '<metric>': 'solaris.network.obytes64' })
+    @wfr = WavefrontWavefrontOutput::Query.new(
+      load_raw_query_response,
+      raw: true,
+      host: 'www-blue',
+      '<metric>': 'solaris.network.obytes64'
+    )
   end
 
   def test_wavefront_format
     assert_equal(
       'metric.path 1.23 1533682320 source=testhost',
-      wfq.wavefront_format('metric.path', 1.23, 1533682320, 'testhost')
+      wfq.wavefront_format('metric.path', 1.23, 1_533_682_320, 'testhost')
     )
 
     assert_equal(
       'metric.path 1.234567 1533682320 source=testhost tag="val"',
-      wfq.wavefront_format('metric.path', 1.234567, 1533682320, 'testhost',
-                           {tag: 'val'})
+      wfq.wavefront_format('metric.path', 1.234567, 1_533_682_320,
+                           'testhost', tag: 'val')
     )
 
     assert_equal(
       'metric.path 1 1533682320 source=testhost tag1="val1" tag2="val2"',
-      wfq.wavefront_format('metric.path', 1, 1533682320, 'testhost',
-                           {tag1: 'val1', tag2: 'val2'})
+      wfq.wavefront_format('metric.path', 1, 1_533_682_320, 'testhost',
+                           tag1: 'val1', tag2: 'val2')
     )
   end
 
@@ -40,7 +44,8 @@ class WavefrontOutputWavefrontTest < MiniTest::Test
       'solaris.network.obytes64 20910.38968253968 1533679200 ' \
       'source=wavefront-blue colour="blue" environment="production" ' \
       'product="websites" role="wavefront-proxy" nic="net0" ' \
-      'platform="JPC-triton" dc="eu-ams-1"', out[0])
+      'platform="JPC-triton" dc="eu-ams-1"', out[0]
+    )
 
     assert_equal(24, out.size)
     check_wf_native_output(out)

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

@@ -3,6 +3,8 @@
 require_relative '../../spec_helper'
 require_relative '../../../lib/wavefront-cli/output/wavefront'
 
+# Test the Wavefront instantiation of the base class
+#
 class WavefrontOutputBaseTest < MiniTest::Test
   attr_reader :wfo
 
@@ -36,7 +38,7 @@ class WavefrontOutputBaseTest < MiniTest::Test
 
     (CMDS - supported_commands).each do |cmd|
       wfo = WavefrontOutput::Wavefront.new(load_query_response, class: cmd)
-      assert_raises(LoadError) { wfo.command_class  }
+      assert_raises(LoadError) { wfo.command_class }
     end
   end
 end

data/spec/wavefront-cli/query_spec.rb

@@ -5,7 +5,9 @@ word = 'query'
 require_relative '../spec_helper'
 require_relative "../../lib/wavefront-cli/#{word}"
 require 'wavefront-sdk/mixins'
+# rubocop:disable Style/MixinUsage
 include Wavefront::Mixins
+# rubocop:enable Style/MixinUsage
 
 q = 'ts("dev.cli.test")'
 t1 = parse_time('12:00', true)

data/spec/wavefront-cli/{string_spec.rb → stdlib/string_spec.rb}

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require_relative '../spec_helper'
-require_relative '../../lib/wavefront-cli/string'
-require_relative '../../lib/wavefront-cli/commands/base'
+require_relative '../../spec_helper'
+require_relative '../../../lib/wavefront-cli/stdlib/string'
+require_relative '../../../lib/wavefront-cli/commands/base'
 
 # Test extensions to string class
 #

data/wavefront-cli.gemspec

@@ -20,18 +20,18 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split("\n")
   gem.executables   = 'wf'
   gem.test_files    = gem.files.grep(/^spec/)
-  gem.require_paths = %w(lib)
+  gem.require_paths = %w[lib]
 
-  gem.add_dependency 'docopt', '~> 0.6.0'
-  gem.add_runtime_dependency 'wavefront-sdk', '~> 1.6', '>= 1.6.0'
+  gem.add_runtime_dependency 'docopt', '~> 0.6.0'
+  gem.add_runtime_dependency 'wavefront-sdk', '~> 1.6', '>= 1.6.1'
 
   gem.add_development_dependency 'bundler', '~> 1.3'
-  gem.add_development_dependency 'rake', '~> 12.0'
-  gem.add_development_dependency 'yard', '~> 0.9.5'
-  gem.add_development_dependency 'rubocop', '~> 0.52.0'
-  gem.add_development_dependency 'webmock', '~> 3.0'
   gem.add_development_dependency 'minitest', '~> 5.11', '>= 5.11.0'
+  gem.add_development_dependency 'rake', '~> 12.0'
+  gem.add_development_dependency 'rubocop', '~> 0.54.0'
   gem.add_development_dependency 'spy', '~> 0.4.0'
+  gem.add_development_dependency 'webmock', '~> 3.0'
+  gem.add_development_dependency 'yard', '~> 0.9.5'
 
   gem.required_ruby_version = Gem::Requirement.new('>= 2.2.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -33,7 +33,7 @@ dependencies:
         version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,95 +59,95 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '5.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '5.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.11.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: spy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.11.0
+        version: '3.0'
   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: '3.0'
 - !ruby/object:Gem::Dependency
-  name: spy
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.9.5
 description: 'CLI for Wavefront (wavefront.com) API v2 '
 email: slackboy@gmail.com
 executables:
@@ -158,6 +158,7 @@ files:
 - ".codeclimate.yml"
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - HISTORY.md
@@ -169,6 +170,7 @@ files:
 - lib/wavefront-cli/base.rb
 - lib/wavefront-cli/base_write.rb
 - lib/wavefront-cli/cloudintegration.rb
+- lib/wavefront-cli/commands/.rubocop.yml
 - lib/wavefront-cli/commands/alert.rb
 - lib/wavefront-cli/commands/base.rb
 - lib/wavefront-cli/commands/cloudintegration.rb
@@ -232,6 +234,8 @@ files:
 - lib/wavefront-cli/output/hcl/base.rb
 - lib/wavefront-cli/output/hcl/dashboard.rb
 - lib/wavefront-cli/output/hcl/notificant.rb
+- lib/wavefront-cli/output/hcl/stdlib/array.rb
+- lib/wavefront-cli/output/hcl/stdlib/string.rb
 - lib/wavefront-cli/output/json.rb
 - lib/wavefront-cli/output/ruby.rb
 - lib/wavefront-cli/output/wavefront.rb
@@ -243,7 +247,7 @@ files:
 - lib/wavefront-cli/report.rb
 - lib/wavefront-cli/savedsearch.rb
 - lib/wavefront-cli/source.rb
-- lib/wavefront-cli/string.rb
+- lib/wavefront-cli/stdlib/string.rb
 - lib/wavefront-cli/user.rb
 - lib/wavefront-cli/version.rb
 - lib/wavefront-cli/webhook.rb
@@ -296,7 +300,7 @@ files:
 - spec/wavefront-cli/resources/wavefront.conf
 - spec/wavefront-cli/savedsearch_spec.rb
 - spec/wavefront-cli/source_spec.rb
-- spec/wavefront-cli/string_spec.rb
+- spec/wavefront-cli/stdlib/string_spec.rb
 - spec/wavefront-cli/user_spec.rb
 - spec/wavefront-cli/webhook_spec.rb
 - wavefront-cli.gemspec
@@ -373,6 +377,6 @@ test_files:
 - spec/wavefront-cli/resources/wavefront.conf
 - spec/wavefront-cli/savedsearch_spec.rb
 - spec/wavefront-cli/source_spec.rb
-- spec/wavefront-cli/string_spec.rb
+- spec/wavefront-cli/stdlib/string_spec.rb
 - spec/wavefront-cli/user_spec.rb
 - spec/wavefront-cli/webhook_spec.rb