matt 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 712f1cd0be5efa12e62fe0491c0c14028b76a5e4edcdaf792bf8ab9652397218
-  data.tar.gz: e133df58cfba2501cdd806668ff6e21363150a32a9563a6fa554938dc2bfed5c
+  metadata.gz: 92deceb672378cd120f32646aa25b2359ed71dd6f839725b4b9f5f6399e61830
+  data.tar.gz: b7e1f62d36921e21e5e5ef5d78c925500989f9fa6808c6f365bd80c3eeb6617a
 SHA512:
-  metadata.gz: ae322c7f52f9bab450bb21781b5653bd87a6e40703fadfe2768cc56305508464945f411c15584b3702cfefc969baf2af0fe4e437b6b454355b934b7602d39920
-  data.tar.gz: d4ef94dc91c994bb4886a4b9c4beb0c863af6d62bc2c66c440fb0a594788640bca2c536bbe1f86a8f3e22ebb93bc357ef09e0e29c604256aa4f064b167ba33ef
+  metadata.gz: c661c1e3a8560513026e2d48cc435742e7db307866a0546006c2304290c809a5b912ee53eda7743f1be5980c90e9c36d9d7227698904dde9661cdb77c21b71ba
+  data.tar.gz: b518ca0a0758c9828bb1ffcdbf30f85f851098007868a5fa91cf1ab5480c2794531ad4e310efee78d6f64daecd968b614f58afa7940e19ce1aa929514d5c1493

data/lib/matt.rb

@@ -7,6 +7,9 @@ require 'path'
 require 'bmg/sequel'
 module Matt
 
+  class Error < StandardError; end
+  class UnexpectedError < Error; end
+
   def env(which, default = nil)
     val = ENV.has_key?(which) ? ENV[which] : default
     val = val.strip if val.is_a?(String)
@@ -14,6 +17,12 @@ module Matt
   end
   module_function :env
 
+  def env!(which)
+    raise Matt::Error, "Missing env var `#{which}`" unless ENV.has_key?(which)
+    env(which)
+  end
+  module_function :env!
+
   def alltime_predicate
     Predicate.tautology
   end

data/lib/matt/command.rb

@@ -16,6 +16,8 @@
 #/     --to=exporter,...  Override the default exporters
 #/     --json             Use json when displaying measures on console
 #/     --csv              Use csv when displaying measures on console (default)
+#/     --silent           Do not print any info/debug messages
+#/     --verbose          Print debug information in addition to info messages
 #/ -h, --help             Show this help message
 #/     --version          Show matt version
 #/
@@ -169,6 +171,12 @@ module Matt
           puts_out "Matt v#{VERSION} - (c) Enspirit SRL"
           abort
         end
+        opts.on("--silent") do
+          self.configuration.debug_level = Configuration::DEBUG_SILENT
+        end
+        opts.on("--verbose") do
+          self.configuration.debug_level = Configuration::DEBUG_VERBOSE
+        end
         opts.on("-h", "--help", "Prints this help") do
           do_help
           abort

data/lib/matt/configuration.rb

@@ -1,6 +1,10 @@
 module Matt
   class Configuration
 
+    DEBUG_SILENT = 0
+    DEBUG_INFO = 1
+    DEBUG_VERBOSE = 2
+
     def initialize(folder)
       @folder = folder
       @stdout = $stdout
@@ -9,12 +13,14 @@ module Matt
         :write_headers => true
       }
       @at_predicate = Matt.yesterday_predicate
+      @debug_level = DEBUG_INFO
       yield(self) if block_given?
     end
     attr_accessor :folder
     attr_accessor :stdout, :stderr
     attr_accessor :csv_options
     attr_accessor :at_predicate
+    attr_accessor :debug_level
 
     def datasources_folder
       folder/"datasources"

data/lib/matt/datasource.rb

@@ -1,9 +1,6 @@
 module Matt
   module Datasource
-    include Support::Puts
-
-    attr_accessor :name
-    attr_accessor :configuration
+    include Support::Participant
 
     def ping
       raise NotImplementedError, "#{self} should implement `ping`"

data/lib/matt/exporter.rb

@@ -1,9 +1,10 @@
 module Matt
   module Exporter
-    include Support::Puts
+    include Support::Participant
 
-    attr_accessor :name
-    attr_accessor :configuration
+    def export(measure, data)
+      raise NotImplementedError, "#{self} should implement `export`"
+    end
 
   end # module Exporter
 end # module Matt

data/lib/matt/exporter/sql.rb

@@ -35,11 +35,16 @@ module Matt
 
       def remove_old_data!(table, data)
         dates = data.project([:at]).map{|t| t[:at] }
-        table.where(:at => dates).delete
+        count = table.where(:at => dates).delete
+        info("Removed #{count} rows.")
+        count
       end
 
       def insert_new_data!(table, data)
-        table.multi_insert(data.to_a)
+        data = data.to_a
+        result = table.multi_insert(data)
+        info("Inserted #{data.size} rows.")
+        result
       end
 
       def ensure_table!(measure)
@@ -62,6 +67,7 @@ module Matt
         }
         outdated = existing - fields
         return if missing.empty? && outdated.empty?
+        debug("ALTER table #{tb_name}\n  Outdated: #{outdated.join(', ')}\n  New: #{missing.keys.join(', ')}")
         sequel_db.alter_table(tb_name) do
           outdated.each do |out|
             drop_column(out)
@@ -73,6 +79,7 @@ module Matt
       end
 
       def create_table!(tb_name, measure, fields)
+        debug("CREATE table #{tb_name}\n  Dimensions: #{measure.dimensions.keys.join(', ')}\n  Metrics: #{measure.metrics.keys.join(', ')}")
         sequel_db.create_table(tb_name) do
           column(:at, Date, :null => false)
           column(:created_at, :timestamp, :null => false)

data/lib/matt/measure.rb

@@ -1,9 +1,6 @@
 module Matt
   module Measure
-    include Support::Puts
-
-    attr_accessor :name
-    attr_accessor :configuration
+    include Support::Participant
 
     def dimensions
       {}

data/lib/matt/support.rb

@@ -1 +1,2 @@
 require_relative 'support/puts'
+require_relative 'support/participant'

data/lib/matt/support/participant.rb

@@ -0,0 +1,23 @@
+module Matt
+  module Support
+    module Participant
+      include Puts
+
+      attr_accessor :name
+      attr_accessor :configuration
+
+      def fail!(message)
+        raise UnexpectedError, message
+      end
+
+      def class_name
+        self.class.name.gsub /#<Class(.*?)>::/, ""
+      end
+
+      def to_s
+        "#{class_name}(#{self.name})"
+      end
+
+    end # module Participant
+  end # module Support
+end # module Matt

data/lib/matt/support/puts.rb

@@ -21,6 +21,20 @@ module Matt
         configuration.stderr.puts(*args, &bl)
       end
 
+      def info(message)
+        message = "#{self.to_s.ljust(30)} -- #{message}"
+        return $stderr.puts(message) unless configuration
+        return unless configuration.debug_level >= Configuration::DEBUG_INFO
+        puts_err(message)
+      end
+
+      def debug(message)
+        message = "#{self.to_s.ljust(30)} -- #{message}"
+        return $stderr.puts(message) unless configuration
+        return unless configuration.debug_level >= Configuration::DEBUG_VERBOSE
+        puts_err(message)
+      end
+
     end # module Puts
   end # module Support
 end # module Matt

data/lib/matt/version.rb

@@ -1,7 +1,7 @@
 module Matt
   module Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
   end # module Version
   VERSION = [Version::MAJOR, Version::MINOR, Version::TINY].join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matt
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: path
@@ -149,6 +149,7 @@ files:
 - lib/matt/exporter/sql.rb
 - lib/matt/measure.rb
 - lib/matt/support.rb
+- lib/matt/support/participant.rb
 - lib/matt/support/puts.rb
 - lib/matt/version.rb
 homepage: http://github.com/enspirit/matt