matt 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92deceb672378cd120f32646aa25b2359ed71dd6f839725b4b9f5f6399e61830
-  data.tar.gz: b7e1f62d36921e21e5e5ef5d78c925500989f9fa6808c6f365bd80c3eeb6617a
+  metadata.gz: d0d982bf8b24d2c37f18bc1db92ba7f7382402d33b2cda5d9e63e23c3074856d
+  data.tar.gz: b6fdeddbf7570e4424c69e16718900b91fac8dc051f4a04bb6c8fe9246c128d2
 SHA512:
-  metadata.gz: c661c1e3a8560513026e2d48cc435742e7db307866a0546006c2304290c809a5b912ee53eda7743f1be5980c90e9c36d9d7227698904dde9661cdb77c21b71ba
-  data.tar.gz: b518ca0a0758c9828bb1ffcdbf30f85f851098007868a5fa91cf1ab5480c2794531ad4e310efee78d6f64daecd968b614f58afa7940e19ce1aa929514d5c1493
+  metadata.gz: 23144f539ac737c3f89454076a96961f350c8eb642661346056bebdc37abed009af67b5454a97c2806f972a43b0d2a60ac8ffe5fa5dca6bd01fdc6b3faae9064
+  data.tar.gz: d9d12f0a4289ab2ff1b6ac99093d15d6a374d8415f9eed06d37318281e9d6130a7d1ce3aecd09289c82b105a0ade2746e727fcca8ab2da3371db599533553f29

data/lib/matt/command.rb

@@ -105,23 +105,20 @@ module Matt
     end
 
     def do_ping(argv)
-      which_ones = if argv.empty?
-        configuration.datasources.to_h.values
-      else
-        argv.map{|arg| datasource_exists!(arg) }
-      end
+      which_ones = argv_to_xs(argv, :datasources)
       which_ones.each do |d|
         d.ping
       end
     end
 
     def do_export(argv)
-      argv_count!(argv, 1)
-      m = measure_exists!(argv.first)
-      data = m.full_data.restrict(configuration.at_predicate)
-      (@to || m.exporters).each do |e|
-        exporter = exporter_exists!(e)
-        exporter.export(m, data)
+      which_ones = argv_to_xs(argv, :measures)
+      which_ones.each do |m|
+        data = m.full_data.restrict(configuration.at_predicate)
+        (@to || m.exporters).each do |e|
+          exporter = exporter_exists!(e)
+          exporter.export(m, data)
+        end
       end
     end
 
@@ -190,25 +187,31 @@ module Matt
       abort
     end
 
-    def measure_exists!(name)
-      m = configuration.measures.send(name.to_sym)
-      return m if m
-      puts_err "No such measure #{name}"
+    def x_exists!(name, xs)
+      x = configuration.send(xs).send(name.to_sym)
+      return x if x
+      puts_err "No such #{xs[0...-1]} #{name}"
       abort
     end
 
+    def measure_exists!(name)
+      x_exists!(name, :measures)
+    end
+
     def exporter_exists!(name)
-      m = configuration.exporters.send(name.to_sym)
-      return m if m
-      puts_err "No such exporter #{name}"
-      abort
+      x_exists!(name, :exporters)
     end
 
     def datasource_exists!(name)
-      d = configuration.datasources.send(name.to_sym)
-      return d if d
-      puts_err "No such datasource #{name}"
-      abort
+      x_exists!(name, :datasources)
+    end
+
+    def argv_to_xs(argv, xs)
+      if argv.empty?
+        configuration.send(xs).to_h.values
+      else
+        argv.map{|arg| x_exists!(arg, xs) }
+      end
     end
 
     def abort

data/lib/matt/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matt
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Bernard Lambeau