matt 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0d982bf8b24d2c37f18bc1db92ba7f7382402d33b2cda5d9e63e23c3074856d
-  data.tar.gz: b6fdeddbf7570e4424c69e16718900b91fac8dc051f4a04bb6c8fe9246c128d2
+  metadata.gz: 89d30cc70cfb6d7b0bec8dbe5c26a14bdcc3b52af7d6a6a6a20194d88bc3bb47
+  data.tar.gz: a71165a1b2a84d8652da562e96473385e2ab8a4a7d88cf8bf3130b5faa1e2e90
 SHA512:
-  metadata.gz: 23144f539ac737c3f89454076a96961f350c8eb642661346056bebdc37abed009af67b5454a97c2806f972a43b0d2a60ac8ffe5fa5dca6bd01fdc6b3faae9064
-  data.tar.gz: d9d12f0a4289ab2ff1b6ac99093d15d6a374d8415f9eed06d37318281e9d6130a7d1ce3aecd09289c82b105a0ade2746e727fcca8ab2da3371db599533553f29
+  metadata.gz: dac740d330fa55714c282475e0ef61e39175096d088ffb1a79b47983b2c201f86753a85143a23a8e4c8ff927510fcc4350d402c650c38e9d17e9fc6fee5f2b62
+  data.tar.gz: 7c029f44ed6caea484a2c6937a03850f6f82ca45ac81f7b349d74ace9d7dd5a8dda8c5897901d903f7ef49b49ae80a9e66cddf521132c01c31ce6102120c7cee

data/lib/matt.rb

@@ -38,6 +38,25 @@ module Matt
   end
   module_function :today_predicate
 
+  def last_predicate(arg)
+    raise Error, "Invalid predicate `#{arg}`" unless arg.strip =~ /^(\d+)days$/
+    Predicate.gte(:at, Date.today - $1.to_i) & Predicate.lt(:at, Date.today + 1)
+  end
+  module_function :last_predicate
+
+  def since_predicate(arg)
+    raise Error, "Invalid predicate `#{arg}`" unless since = Date.parse(arg)
+    Predicate.gte(:at, since) & Predicate.lt(:at, Date.today + 1)
+  end
+  module_function :since_predicate
+
+  def between_predicate(from, to)
+    raise Error, "Invalid predicate `#{arg}`" unless from = Date.parse(from)
+    raise Error, "Invalid predicate `#{arg}`" unless to = Date.parse(to)
+    Predicate.gte(:at, from) & Predicate.lt(:at, to)
+  end
+  module_function :between_predicate
+
 end # module Matt
 require_relative 'matt/version'
 require_relative 'matt/support'

data/lib/matt/command.rb

@@ -13,6 +13,9 @@
 #/     --all-time         Do not restrict measures shown/exported
 #/     --today            Only show/export measures for today
 #/     --yesterday        Only show/export measures for yesterday's (default)
+#/     --last=Ndays       Only show/export measures for the last N days
+#/     --since=date       Only show/export measures since a given date (YYYY-MM-DD)
+#/     --between=from,to  Only show/export measures between two dates (YYYY-MM-DD)
 #/     --to=exporter,...  Override the default exporters
 #/     --json             Use json when displaying measures on console
 #/     --csv              Use csv when displaying measures on console (default)
@@ -93,7 +96,8 @@ module Matt
     def do_show(argv)
       argv_count!(argv, 1)
       m = measure_exists!(argv.first)
-      data = m.full_data.restrict(configuration.at_predicate)
+      data = m.data_at(configuration.at_predicate)
+      debug("show -- #{data.inspect}")
       case of = output_format
       when :json
         puts_out JSON.pretty_generate(data)
@@ -114,7 +118,8 @@ module Matt
     def do_export(argv)
       which_ones = argv_to_xs(argv, :measures)
       which_ones.each do |m|
-        data = m.full_data.restrict(configuration.at_predicate)
+        data = m.data_at(configuration.at_predicate)
+        debug("export -- #{data.inspect}")
         (@to || m.exporters).each do |e|
           exporter = exporter_exists!(e)
           exporter.export(m, data)
@@ -153,6 +158,15 @@ module Matt
         opts.on("--today") do
           self.configuration.at_predicate = Matt.today_predicate
         end
+        opts.on("--last=X") do |x|
+          self.configuration.at_predicate = Matt.last_predicate(x)
+        end
+        opts.on("--since=X") do |x|
+          self.configuration.at_predicate = Matt.since_predicate(x)
+        end
+        opts.on("--between=X,Y") do |arg|
+          self.configuration.at_predicate = Matt.between_predicate(*arg.split(','))
+        end
         opts.on("--to=EXPORTERS") do |exporters|
           @to = (@to || []) + exporters.split(/\s*,\s*/).map{|e|
             exporter_exists!(e.to_sym).name

data/lib/matt/datasource/sql.rb

@@ -24,8 +24,8 @@ module Matt
         end
       end
 
-      def sequel(*args)
-        Bmg.sequel(*args)
+      def sequel(table, type = nil)
+        Bmg.sequel(*[table, type, sequel_db].compact)
       end
 
     end

data/lib/matt/measure.rb

@@ -18,5 +18,13 @@ module Matt
       configuration.datasources
     end
 
+    def data_at(at_predicate)
+      full_data.restrict(at_predicate)
+    end
+
+    def full_data
+      raise NotImplementedError, "#{self} must implement `full_data`"
+    end
+
   end # module Measure
 end # module Matt

data/lib/matt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matt
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: path