ruby-grafana-reporter 0.1.7 → 0.2.0

data/lib/grafana_reporter/errors.rb

@@ -1,38 +1,48 @@
-module GrafanaReporter
-  # General error of the reporter. All other errors will inherit from this class.
-  class GrafanaReporterError < StandardError
-    def initialize(message)
-      super('GrafanaReporterError: ' + message.to_s)
-    end
-  end
-
-  # Thrown, if the requested grafana instance does not have the mandatory 'host'
-  # setting configured.
-  class GrafanaInstanceWithoutHostError < GrafanaReporterError
-    def initialize(instance)
-      super("Grafana instance '#{instance}' has been configured without mandatory 'host' setting.")
-    end
-  end
-
-  # General configuration error. All configuration errors inherit from this class.
-  class ConfigurationError < GrafanaReporterError
-    def initialize(message)
-      super("Configuration error: #{message}")
-    end
-  end
-
-  # Thrown, if a configured path does not exist.
-  class FolderDoesNotExistError < ConfigurationError
-    def initialize(folder, config_item)
-      super("#{config_item} '#{folder}' does not exist.")
-    end
-  end
-
-  # Thrown if the configuration does not match the expected schema.
-  # Details about how to fix that are provided in the message.
-  class ConfigurationDoesNotMatchSchemaError < ConfigurationError
-    def initialize(item, verb, expected, currently)
-      super("Configuration file does not match schema definition. Expected '#{item}' to #{verb} '#{expected}', but was '#{currently}'.")
-    end
-  end
-end
+# frozen_string_literal: true
+
+module GrafanaReporter
+  # General error of the reporter. All other errors will inherit from this class.
+  class GrafanaReporterError < StandardError
+    def initialize(message)
+      super("GrafanaReporterError: #{message}")
+    end
+  end
+
+  # Thrown, if the requested grafana instance does not have the mandatory 'host'
+  # setting configured.
+  class GrafanaInstanceWithoutHostError < GrafanaReporterError
+    def initialize(instance)
+      super("Grafana instance '#{instance}' has been configured without mandatory 'host' setting.")
+    end
+  end
+
+  # General configuration error. All configuration errors inherit from this class.
+  class ConfigurationError < GrafanaReporterError
+    def initialize(message)
+      super("Configuration error: #{message}")
+    end
+  end
+
+  # Thrown if a non existing template has been specified.
+  class MissingTemplateError < ConfigurationError
+    def initialize(template)
+      super("Given report template '#{template}' is not a valid template.")
+    end
+  end
+
+  # Thrown, if a configured path does not exist.
+  class FolderDoesNotExistError < ConfigurationError
+    def initialize(folder, config_item)
+      super("#{config_item} '#{folder}' does not exist.")
+    end
+  end
+
+  # Thrown if the configuration does not match the expected schema.
+  # Details about how to fix that are provided in the message.
+  class ConfigurationDoesNotMatchSchemaError < ConfigurationError
+    def initialize(item, verb, expected, currently)
+      super("Configuration file does not match schema definition. Expected '#{item}' to #{verb} '#{expected}',"\
+            "but was '#{currently}'.")
+    end
+  end
+end

data/lib/grafana_reporter/logger/two_way_logger.rb

@@ -1,52 +1,58 @@
-module GrafanaReporter
-
-  # This module contains special extensions for use in the reporter.
-  module Logger
-
-    # This logger enables a special use case, so that one and the same log
-    # will automatically be send to two different logger destinations.
-    #
-    # One destination is the set {#additional_logger=} which respects the
-    # configured severity. The other destination is an internal logger, which
-    # will always log all messages in mode Logger::Severity::Debug. All messages
-    # of the internal logger can easily be retrieved, by using the
-    # {#internal_messages} method.
-    #
-    # Except the {#level=} setting, all calls to the logger will immediately
-    # be delegated to the internal logger and the configured {#additional_logger=}.
-    # By having this behavior, the class can be used wherever the standard Logger
-    # can also be used.
-    class TwoWayDelegateLogger
-      def initialize
-        @internal_messages = StringIO.new
-        @internal_logger = ::Logger.new(@internal_messages)
-        @internal_logger.level = ::Logger::Severity::DEBUG
-        @additional_logger = ::Logger.new(nil)
-      end
-
-      # Sets the severity level of the additional logger to the given severity.
-      # @param severity one of {Logger::Severity}
-      def level=(severity)
-        @additional_logger.level = severity
-      end
-
-      # @return [String] all messages of the internal logger.
-      def internal_messages
-        @internal_messages.string
-      end
-
-      # Used to set the additional logger in this class to an already existing
-      # logger.
-      # @param logger [Logger] sets the additional logger to the given value.
-      def additional_logger=(logger)
-        @additional_logger = logger || ::Logger.new(nil)
-      end
-
-      # Delegates all not configured calls to the internal and the additional logger.
-      def method_missing(method, *args)
-        @internal_logger.send(method, *args)
-        @additional_logger.send(method, *args)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module GrafanaReporter
+  # This module contains special extensions for use in the reporter.
+  module Logger
+    # This logger enables a special use case, so that one and the same log
+    # will automatically be send to two different logger destinations.
+    #
+    # One destination is the set {#additional_logger=} which respects the
+    # configured severity. The other destination is an internal logger, which
+    # will always log all messages in mode Logger::Severity::Debug. All messages
+    # of the internal logger can easily be retrieved, by using the
+    # {#internal_messages} method.
+    #
+    # Except the {#level=} setting, all calls to the logger will immediately
+    # be delegated to the internal logger and the configured {#additional_logger=}.
+    # By having this behavior, the class can be used wherever the standard Logger
+    # can also be used.
+    class TwoWayDelegateLogger
+      def initialize
+        @internal_messages = StringIO.new
+        @internal_logger = ::Logger.new(@internal_messages)
+        @internal_logger.level = ::Logger::Severity::DEBUG
+        @additional_logger = ::Logger.new(nil)
+      end
+
+      # Sets the severity level of the additional logger to the given severity.
+      # @param severity one of {Logger::Severity}
+      def level=(severity)
+        @additional_logger.level = severity
+      end
+
+      # @return [String] all messages of the internal logger.
+      def internal_messages
+        @internal_messages.string
+      end
+
+      # Used to set the additional logger in this class to an already existing
+      # logger.
+      # @param logger [Logger] sets the additional logger to the given value.
+      def additional_logger=(logger)
+        @additional_logger = logger || ::Logger.new(nil)
+      end
+
+      # Delegates all not configured calls to the internal and the additional logger.
+      def method_missing(method, *args)
+        @internal_logger.send(method, *args)
+        @additional_logger.send(method, *args)
+      end
+
+      # Registers all methods to which the internal logger responds.
+      def respond_to_missing?(method, *_args)
+        super
+        @internal_logger.respond_to?(method)
+      end
+    end
+  end
+end

data/lib/ruby-grafana-reporter.rb

@@ -1,27 +1,29 @@
-require 'net/http'
-require 'fileutils'
-require 'yaml'
-require 'socket'
-require 'uri'
-require 'json'
-require 'tempfile'
-require 'cgi'
-require 'optparse'
-require 'date'
-require 'time'
-require 'logger'
-require 'asciidoctor'
-require 'asciidoctor/extensions'
-require 'asciidoctor-pdf'
-require 'zip'
-require_relative 'VERSION.rb'
-
-folders = [
-  %w[grafana],
-  %w[grafana_reporter logger],
-  %w[grafana_reporter],
-  %w[grafana_reporter asciidoctor extensions],
-  %w[grafana_reporter asciidoctor],
-  %w[grafana_reporter application]
-]
-folders.each { |folder| Dir[File.join(__dir__, *folder, '*.rb')].sort.each { |file| require_relative file } }
+# frozen_string_literal: true
+
+require 'net/http'
+require 'fileutils'
+require 'yaml'
+require 'socket'
+require 'uri'
+require 'json'
+require 'tempfile'
+require 'cgi'
+require 'optparse'
+require 'date'
+require 'time'
+require 'logger'
+require 'asciidoctor'
+require 'asciidoctor/extensions'
+require 'asciidoctor-pdf'
+require 'zip'
+require_relative 'VERSION'
+
+folders = [
+  %w[grafana],
+  %w[grafana_reporter logger],
+  %w[grafana_reporter],
+  %w[grafana_reporter asciidoctor extensions],
+  %w[grafana_reporter asciidoctor],
+  %w[grafana_reporter application]
+]
+folders.each { |folder| Dir[File.join(__dir__, *folder, '*.rb')].sort.each { |file| require_relative file } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-grafana-reporter
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Christian Kohlmeyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-24 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -59,47 +59,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-- !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +128,7 @@ files:
 - "./lib/grafana_reporter/abstract_report.rb"
 - "./lib/grafana_reporter/application/application.rb"
 - "./lib/grafana_reporter/application/errors.rb"
+- "./lib/grafana_reporter/application/webservice.rb"
 - "./lib/grafana_reporter/asciidoctor/alerts_table_query.rb"
 - "./lib/grafana_reporter/asciidoctor/annotations_table_query.rb"
 - "./lib/grafana_reporter/asciidoctor/errors.rb"
@@ -187,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="