wavefront-cli 2.18.0 → 3.0.0

data/wavefront-cli.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.description   = 'CLI for Wavefront (wavefront.com) API v2 '
 
   gem.authors       = ['Robert Fisher']
-  gem.email         = 'slackboy@gmail.com'
+  gem.email         = 'services@id264.net'
   gem.homepage      = 'https://github.com/snltd/wavefront-cli'
   gem.license       = 'BSD-2-Clause'
 
@@ -24,9 +24,8 @@ 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', '~> 2.5', '>= 2.5.0'
+  gem.add_runtime_dependency 'wavefront-sdk', '~> 3.0', '>= 3.0.0'
 
-  gem.add_development_dependency 'bundler', '~> 1.3'
   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'
@@ -34,5 +33,5 @@ Gem::Specification.new do |gem|
   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')
+  gem.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-23 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -44,34 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +149,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.5
 description: 'CLI for Wavefront (wavefront.com) API v2 '
-email: slackboy@gmail.com
+email: services@id264.net
 executables:
 - wf
 extensions: []
@@ -171,7 +157,6 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".gitignore"
-- ".gitlab-ci.yml"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
@@ -182,7 +167,6 @@ files:
 - bin/wf
 - lib/wavefront-cli/alert.rb
 - 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
@@ -199,8 +183,8 @@ files:
 - lib/wavefront-cli/commands/notificant.rb
 - lib/wavefront-cli/commands/proxy.rb
 - lib/wavefront-cli/commands/query.rb
-- lib/wavefront-cli/commands/report.rb
 - lib/wavefront-cli/commands/savedsearch.rb
+- lib/wavefront-cli/commands/settings.rb
 - lib/wavefront-cli/commands/source.rb
 - lib/wavefront-cli/commands/user.rb
 - lib/wavefront-cli/commands/usergroup.rb
@@ -225,14 +209,13 @@ files:
 - lib/wavefront-cli/display/message.rb
 - lib/wavefront-cli/display/metric.rb
 - lib/wavefront-cli/display/notificant.rb
-- lib/wavefront-cli/display/printer/base.rb
 - lib/wavefront-cli/display/printer/long.rb
 - lib/wavefront-cli/display/printer/sparkline.rb
 - lib/wavefront-cli/display/printer/terse.rb
 - lib/wavefront-cli/display/proxy.rb
 - lib/wavefront-cli/display/query.rb
-- lib/wavefront-cli/display/report.rb
 - lib/wavefront-cli/display/savedsearch.rb
+- lib/wavefront-cli/display/settings.rb
 - lib/wavefront-cli/display/source.rb
 - lib/wavefront-cli/display/user.rb
 - lib/wavefront-cli/display/usergroup.rb
@@ -265,9 +248,10 @@ files:
 - lib/wavefront-cli/output/yaml.rb
 - lib/wavefront-cli/proxy.rb
 - lib/wavefront-cli/query.rb
-- lib/wavefront-cli/report.rb
 - lib/wavefront-cli/savedsearch.rb
+- lib/wavefront-cli/settings.rb
 - lib/wavefront-cli/source.rb
+- lib/wavefront-cli/stdlib/array.rb
 - lib/wavefront-cli/stdlib/string.rb
 - lib/wavefront-cli/user.rb
 - lib/wavefront-cli/usergroup.rb
@@ -300,7 +284,6 @@ files:
 - spec/wavefront-cli/dashboard_spec.rb
 - spec/wavefront-cli/derivedmetric_spec.rb
 - spec/wavefront-cli/display/base_spec.rb
-- spec/wavefront-cli/display/printer/base_spec.rb
 - spec/wavefront-cli/display/printer/long_spec.rb
 - spec/wavefront-cli/display/printer/terse_spec.rb
 - spec/wavefront-cli/display/spec_helper.rb
@@ -321,11 +304,37 @@ files:
 - spec/wavefront-cli/output/yaml_spec.rb
 - spec/wavefront-cli/proxy_spec.rb
 - spec/wavefront-cli/query_spec.rb
+- spec/wavefront-cli/resources/display/alert-human-long
+- spec/wavefront-cli/resources/display/alert-input.json
+- spec/wavefront-cli/resources/display/alerts-human-terse
+- spec/wavefront-cli/resources/display/alerts-input.json
+- spec/wavefront-cli/resources/display/user-human-long
+- spec/wavefront-cli/resources/display/user-human-long-no_sep
+- spec/wavefront-cli/resources/display/user-input.json
+- spec/wavefront-cli/resources/responses/README.md
+- spec/wavefront-cli/resources/responses/alert-list.json
+- spec/wavefront-cli/resources/responses/backups.json
+- spec/wavefront-cli/resources/responses/cloudintegration-list.json
+- spec/wavefront-cli/resources/responses/dashboard-list.json
+- spec/wavefront-cli/resources/responses/derivedmetric-list.json
+- spec/wavefront-cli/resources/responses/event-list.json
+- spec/wavefront-cli/resources/responses/integration-list.json
+- spec/wavefront-cli/resources/responses/link-list.json
+- spec/wavefront-cli/resources/responses/notificant-list.json
+- spec/wavefront-cli/resources/responses/proxy-list.json
+- spec/wavefront-cli/resources/responses/query-cpu.json
+- spec/wavefront-cli/resources/responses/savedsearch-list.json
+- spec/wavefront-cli/resources/responses/user-list.json
+- spec/wavefront-cli/resources/responses/usergroup-list.json
+- spec/wavefront-cli/resources/responses/webhook-list.json
+- spec/wavefront-cli/resources/responses/window-list.json
 - spec/wavefront-cli/resources/sample_query_response.json
 - spec/wavefront-cli/resources/sample_raw_query_response.json
 - spec/wavefront-cli/resources/wavefront.conf
 - spec/wavefront-cli/savedsearch_spec.rb
+- spec/wavefront-cli/settings_spec.rb
 - spec/wavefront-cli/source_spec.rb
+- spec/wavefront-cli/stdlib/array_spec.rb
 - spec/wavefront-cli/stdlib/string_spec.rb
 - spec/wavefront-cli/user_spec.rb
 - spec/wavefront-cli/usergroup_spec.rb
@@ -344,14 +353,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: CLI for Wavefront API v2
@@ -382,7 +391,6 @@ test_files:
 - spec/wavefront-cli/dashboard_spec.rb
 - spec/wavefront-cli/derivedmetric_spec.rb
 - spec/wavefront-cli/display/base_spec.rb
-- spec/wavefront-cli/display/printer/base_spec.rb
 - spec/wavefront-cli/display/printer/long_spec.rb
 - spec/wavefront-cli/display/printer/terse_spec.rb
 - spec/wavefront-cli/display/spec_helper.rb
@@ -403,11 +411,37 @@ test_files:
 - spec/wavefront-cli/output/yaml_spec.rb
 - spec/wavefront-cli/proxy_spec.rb
 - spec/wavefront-cli/query_spec.rb
+- spec/wavefront-cli/resources/display/alert-human-long
+- spec/wavefront-cli/resources/display/alert-input.json
+- spec/wavefront-cli/resources/display/alerts-human-terse
+- spec/wavefront-cli/resources/display/alerts-input.json
+- spec/wavefront-cli/resources/display/user-human-long
+- spec/wavefront-cli/resources/display/user-human-long-no_sep
+- spec/wavefront-cli/resources/display/user-input.json
+- spec/wavefront-cli/resources/responses/README.md
+- spec/wavefront-cli/resources/responses/alert-list.json
+- spec/wavefront-cli/resources/responses/backups.json
+- spec/wavefront-cli/resources/responses/cloudintegration-list.json
+- spec/wavefront-cli/resources/responses/dashboard-list.json
+- spec/wavefront-cli/resources/responses/derivedmetric-list.json
+- spec/wavefront-cli/resources/responses/event-list.json
+- spec/wavefront-cli/resources/responses/integration-list.json
+- spec/wavefront-cli/resources/responses/link-list.json
+- spec/wavefront-cli/resources/responses/notificant-list.json
+- spec/wavefront-cli/resources/responses/proxy-list.json
+- spec/wavefront-cli/resources/responses/query-cpu.json
+- spec/wavefront-cli/resources/responses/savedsearch-list.json
+- spec/wavefront-cli/resources/responses/user-list.json
+- spec/wavefront-cli/resources/responses/usergroup-list.json
+- spec/wavefront-cli/resources/responses/webhook-list.json
+- spec/wavefront-cli/resources/responses/window-list.json
 - spec/wavefront-cli/resources/sample_query_response.json
 - spec/wavefront-cli/resources/sample_raw_query_response.json
 - spec/wavefront-cli/resources/wavefront.conf
 - spec/wavefront-cli/savedsearch_spec.rb
+- spec/wavefront-cli/settings_spec.rb
 - spec/wavefront-cli/source_spec.rb
+- spec/wavefront-cli/stdlib/array_spec.rb
 - spec/wavefront-cli/stdlib/string_spec.rb
 - spec/wavefront-cli/user_spec.rb
 - spec/wavefront-cli/usergroup_spec.rb

data/.gitlab-ci.yml

@@ -1,16 +0,0 @@
-dependency_scanning:
-  image: docker:stable
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-      --env DEP_SCAN_DISABLE_REMOTE_CHECKS="${DEP_SCAN_DISABLE_REMOTE_CHECKS:-false}"
-      --volume "$PWD:/code"
-      --volume /var/run/docker.sock:/var/run/docker.sock
-      "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
-  artifacts:
-    paths: [gl-dependency-scanning-report.json]

data/lib/wavefront-cli/base_write.rb

@@ -1,298 +0,0 @@
-require 'wavefront-sdk/support/mixins'
-require_relative 'base'
-
-module WavefrontCli
-  #
-  # Send points to a proxy.
-  #
-  class BaseWrite < Base
-    attr_reader :fmt
-    include Wavefront::Mixins
-
-    # rubocop:disable Metrics/AbcSize
-    def do_point
-      p = { path:  options[:'<metric>'],
-            value: options[:'<value>'].delete('\\').to_f,
-            tags:  tags_to_hash(options[:tag]) }
-
-      p[:source] = options[:host] if options[:host]
-      p[:ts] = parse_time(options[:time]) if options[:time]
-      send_point(p)
-    end
-    # rubocop:enable Metrics/AbcSize
-
-    def send_point(point)
-      call_write(point)
-    rescue Wavefront::Exception::InvalidEndpoint
-      abort format("Could not connect to proxy '%s:%s'.",
-                   options[:proxy], options[:port])
-    end
-
-    def do_file
-      valid_format?(options[:infileformat])
-      setup_fmt(options[:infileformat] || 'tmv')
-      process_input(options[:'<file>'])
-    end
-
-    # Read the input, from a file or from STDIN, and turn each line
-    # into Wavefront points.
-    #
-    def process_input(file)
-      if file == '-'
-        read_stdin
-      else
-        data = process_input_file(load_data(Pathname.new(file)).split("\n"))
-        call_write(data)
-      end
-    end
-
-    def process_input_file(data)
-      data.each_with_object([]) do |l, a|
-        begin
-          a.<< process_line(l)
-        rescue WavefrontCli::Exception::UnparseableInput => e
-          puts "Bad input. #{e.message}."
-          next
-        end
-      end
-    end
-
-    # A wrapper which lets us send normal points, deltas, or
-    # distributions
-    #
-    def call_write(data, openclose = true)
-      if options[:delta]
-        wf.write_delta(data, openclose)
-      else
-        wf.write(data, openclose)
-      end
-    end
-
-    # Read from standard in and stream points through an open
-    # socket. If the user hits ctrl-c, close the socket and exit
-    # politely.
-    #
-    def read_stdin
-      open_connection
-      STDIN.each_line { |l| call_write(process_line(l.strip), false) }
-      close_connection
-    rescue SystemExit, Interrupt
-      puts 'ctrl-c. Exiting.'
-      wf.close
-      exit 0
-    end
-
-    # Find and return the value in a chunked line of input
-    #
-    # param chunks [Array] a chunked line of input from #process_line
-    # return [Float] the value
-    # raise TypeError if field does not exist
-    # raise Wavefront::Exception::InvalidValue if it's not a value
-    #
-    def extract_value(chunks)
-      if fmt.include?('v')
-        v = chunks[fmt.index('v')]
-        v.to_f
-      else
-        raw = chunks[fmt.index('d')].split(',')
-        xpanded = expand_dist(raw)
-        wf.mk_distribution(xpanded)
-      end
-    end
-
-    # We will let users write a distribution as '1 1 1' or '3x1' or
-    # even a mix of the two
-    #
-    def expand_dist(dist)
-      dist.map do |v|
-        if v.is_a?(String) && v.include?('x')
-          x, val = v.split('x', 2)
-          Array.new(x.to_i, val.to_f)
-        else
-          v.to_f
-        end
-      end.flatten
-    end
-
-    # Find and return the source in a chunked line of input.
-    #
-    # @param chunks [Array] a chunked line of input from #process_line
-    # @return [Float] the timestamp, if it is there, or the current
-    #   UTC time if it is not.
-    #
-    def extract_ts(chunks)
-      ts = chunks[fmt.index('t')]
-      return parse_time(ts) if valid_timestamp?(ts)
-    rescue TypeError
-      Time.now.utc.to_i
-    end
-
-    def extract_tags(chunks)
-      tags_to_hash(chunks.last.split(/\s(?=(?:[^"]|"[^"]*")*$)/))
-    end
-
-    # Find and return the metric path in a chunked line of input.
-    # The path can be in the data, or passed as an option, or both.
-    # If the latter, then we assume the option is a prefix, and
-    # concatenate the value in the data.
-    #
-    # param chunks [Array] a chunked line of input from #process_line
-    # return [String] the metric path
-    # raise TypeError if field does not exist
-    #
-    def extract_path(chunks)
-      m = chunks[fmt.index('m')]
-      options[:metric] ? [options[:metric], m].join('.') : m
-    rescue TypeError
-      return options[:metric] if options[:metric]
-      raise
-    end
-
-    # Find and return the source in a chunked line of input.
-    #
-    # param chunks [Array] a chunked line of input from #process_line
-    # return [String] the source, if it is there, or if not, the
-    #   value passed through by -H, or the local hostname.
-    #
-    def extract_source(chunks)
-      chunks[fmt.index('s')]
-    rescue TypeError
-      options[:source] || Socket.gethostname
-    end
-
-    # Process a line of input, as described by the format string
-    # held in @fmt. Produces a hash suitable for the SDK to send on.
-    #
-    # We let the user define most of the fields, but anything beyond
-    # what they define is always assumed to be point tags.  This is
-    # because you can have arbitrarily many of those for each point.
-    #
-    # @raise WavefrontCli::Exception::UnparseableInput if the line
-    #   doesn't look right
-    #
-    # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/MethodLength
-    # rubocop:disable Metrics/CyclomaticComplexity
-    def process_line(line)
-      return true if line.empty?
-      chunks = line.split(/\s+/, fmt.length)
-      enough_fields?(line) # can raise exception
-
-      begin
-        point = { path:  extract_path(chunks),
-                  tags:  line_tags(chunks),
-                  value: extract_value(chunks) }
-
-        point[:ts]       = extract_ts(chunks)        if fmt.include?('t')
-        point[:source]   = extract_source(chunks)    if fmt.include?('s')
-        point[:interval] = options[:interval] || 'm' if fmt.include?('d')
-      rescue TypeError
-        raise(WavefrontCli::Exception::UnparseableInput,
-              "could not process #{line}")
-      end
-
-      point
-    end
-    # rubocop:enable Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/MethodLength
-    # rubocop:enable Metrics/AbcSize
-
-    # We can get tags from the file, from the -T option, or both.
-    # Merge them, making the -T win if there is a collision.
-    #
-    def line_tags(chunks)
-      file_tags = fmt.last == 'T' ? extract_tags(chunks) : {}
-      opt_tags = tags_to_hash(options[:tag])
-      file_tags.merge(opt_tags)
-    end
-
-    # Takes an array of key=value tags (as produced by docopt) and
-    # turns it into a hash of key: value tags.  Anything not of the
-    # form key=val is dropped.  If key or value are quoted, we
-    # remove the quotes.
-    #
-    # @param tags [Array]
-    # return Hash
-    #
-    def tags_to_hash(tags)
-      return nil unless tags
-
-      [tags].flatten.each_with_object({}) do |t, ret|
-        k, v = t.split('=', 2)
-        k.gsub!(/^["']|["']$/, '')
-        ret[k] = v.to_s.gsub(/^["']|["']$/, '') if v
-      end
-    end
-
-    # The format string must contain values. They can be single
-    # values or distributions. So we must have 'v' xor 'd'. It must
-    # not contain anything other than 'm', 't', 'T', 's', 'd', or
-    # 'v', and the 'T', if there, must be at the end. No letter must
-    # appear more than once.
-    #
-    # @param fmt [String] format of input file
-    #
-    # rubocop:disable Metrics/PerceivedComplexity
-    # rubocop:disable Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/AbcSize
-    def valid_format?(fmt)
-      err = if fmt.include?('v') && fmt.include?('d')
-              "'v' and 'd' are mutually exclusive"
-            elsif !fmt.include?('v') && !fmt.include?('d')
-              "format string must include 'v' or 'd'"
-            elsif !fmt.match(/^[dmstTv]+$/)
-              'unsupported field in format string'
-            elsif !fmt == fmt.split('').uniq.join
-              'repeated field in format string'
-            elsif fmt.include?('T') && !fmt.end_with?('T')
-              "if used, 'T' must come at end of format string"
-            end
-
-      return true if err.nil?
-
-      raise(WavefrontCli::Exception::UnparseableInput, err)
-    end
-    # rubocop:enable Metrics/PerceivedComplexity
-    # rubocop:enable Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/AbcSize
-
-    # Make sure we have the right number of columns, according to
-    # the format string. We want to take every precaution we can to
-    # stop users accidentally polluting their metric namespace with
-    # junk.
-    #
-    # If the format string says we are expecting point tags, we
-    # may have more columns than the length of the format string.
-    #
-    def enough_fields?(line)
-      ncols = line.split.length
-      return true if fmt.include?('T') && ncols >= fmt.length
-      return true if ncols == fmt.length
-      raise(WavefrontCli::Exception::UnparseableInput,
-            format('Expected %s fields, got %s', fmt.length, ncols))
-    end
-
-    # Although the SDK does value checking, we'll add another layer
-    # of input checing here.  See if the time looks valid. We'll
-    # assume anything before 2000/01/01 or after a year from now is
-    # wrong.  Arbitrary, but there has to be a cut-off somewhere.
-    #
-    def valid_timestamp?(timestamp)
-      (timestamp.is_a?(Integer) || timestamp.match(/^\d+$/)) &&
-        timestamp.to_i > 946_684_800 &&
-        timestamp.to_i < (Time.now.to_i + 31_557_600)
-    end
-
-    private
-
-    def setup_fmt(fmt)
-      @fmt = fmt.split('')
-    end
-
-    def load_data(file)
-      IO.read(file)
-    rescue StandardError
-      raise WavefrontCli::Exception::FileNotFound
-    end
-  end
-end