miga-base 0.5.7.3 → 0.5.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb263d4c4556c44c22d5a5819f629bfc55a6cd041082a30b6d468ed6b5c8acb2
-  data.tar.gz: 145db67bc03d30a4d868a7684d682ac5c43463eeed0ea06bb4c8f0889ad3b752
+  metadata.gz: a3fc33951911397d8c6305f0bf893cbc373c7ca09f55531c95adf15439e9a938
+  data.tar.gz: e1fd8f3d96c50770d2dc029fd9285ff79e536df888097d89705087d3a2c9a5d0
 SHA512:
-  metadata.gz: 677b3f0cbf9cc5432cff0468f9707a08e81a84867f244bb7960c971e1472c045ec5372a7f8d572844460d087a4a7941b8601139669d5bcf21093950305abf9c7
-  data.tar.gz: d96f0de11e4790793098fb9f5709e5f2c51df5c5789b14951b8764b2d4ceb9be278f045738f21d0ce5e771b1c01e563c6802f0eec6f30e9cdf20f28162d19fba
+  metadata.gz: be1241558fc879d2c6e5e6c2cb36432c004b7b4264116d3a2ff9ddc1cf5354efdfe001362a23145a6cc341ee9133d00e181184624a6adf4e40199e0d22b6ffb9
+  data.tar.gz: f2f14e380a596510f7d2803cac7c41069bbe0a9e2b5d1fd565d57daebbaebfdcd9bf71d1065fb92dfca63e278ff9647cc032abeaea3302ef79c790f481b90bfd

data/lib/miga/cli/action/ls.rb

@@ -18,11 +18,19 @@ class MiGA::Cli::Action::Ls < MiGA::Cli::Action
         '-p', '--processing',
         'Print information on processing advance'
       ) { |v| cli[:processing] = v }
+      opt.on(
+        '-t', '--task-status',
+        'Print the status of each processing step'
+      ) { |v| cli[:taskstatus] = v }
       opt.on(
         '-m', '--metadata STRING',
         'Print name and metadata field only',
-        'If set, ignores -i and assumes --tab'
+        'If set, ignores --info and forces --tab (without header)'
       ) { |v| cli[:datum] = v }
+      opt.on(
+        '-f', '--fields STR1,STR2,STR3', Array,
+        'Comma-delimited metadata fields to print'
+      ) { |v| cli[:fields] = v }
       opt.on(
         '--tab',
         'Return a tab-delimited table'
@@ -41,24 +49,45 @@ class MiGA::Cli::Action::Ls < MiGA::Cli::Action
   def perform
     ds = cli.load_and_filter_datasets(cli[:silent])
     exit(ds.empty? ? 1 : 0) if cli[:silent]
-    io = cli[:output].nil? ? $stdout : File.open(cli[:output], 'w')
     if !cli[:datum].nil?
-      ds.each do |d|
-        v = d.metadata[cli[:datum]]
-        cli.puts(io, "#{d.name}\t#{v.nil? ? '?' : v}")
+      cli[:tabular] = true
+      format_table(ds, [nil,nil]) { |d| [d.name, d.metadata[cli[:datum]]] }
+    elsif !cli[:fields].nil?
+      format_table(ds, [:name] + cli[:fields]) do |d|
+        [d.name] + cli[:fields].map { |f| d.metadata[f] }
       end
     elsif cli[:info]
-      cli.table(Dataset.INFO_FIELDS, ds.map { |d| d.info }, io)
+      format_table(ds, Dataset.INFO_FIELDS) { |d| d.info }
     elsif cli[:processing]
       comp = %w[- done queued]
-      cli.table(
-        [:name] + MiGA::Dataset.PREPROCESSING_TASKS,
-        ds.map { |d| [d.name] + d.profile_advance.map { |i| comp[i] } },
-        io
-      )
+      format_table(ds, [:name] + MiGA::Dataset.PREPROCESSING_TASKS) do |d|
+        [d.name] + d.profile_advance.map { |i| comp[i] }
+      end
+    elsif cli[:taskstatus]
+      format_table(ds, [:name] + MiGA::Dataset.PREPROCESSING_TASKS) do |d|
+        [d.name] + d.results_status.values
+      end
     else
-      ds.each { |d| cli.puts(io, d.name) }
+      cli[:tabular] = true
+      format_table(ds, [nil]) { |d| [d.name] }
     end
+  end
+
+  private
+
+  def format_table(ds, header, &blk)
+    io = cli[:output].nil? ? $stdout : File.open(cli[:output], 'w')
+    cli.say 'Collecting metadata'
+    k = 0
+    cli.table(
+      header,
+      ds.map do |d|
+        cli.advance('Datasets:', k += 1, ds.size, false)
+        blk[d]
+      end,
+      io
+    )
+    cli.say ''
     io.close unless cli[:output].nil?
   end
 end

data/lib/miga/cli/objects_helper.rb

@@ -16,14 +16,14 @@ module MiGA::Cli::ObjectsHelper
   ##
   # Load the dataset defined in the CLI
   # If +silent=true+, it allows failures silently
-  def load_dataset(silent = false)
-    return @objects[:dataset] unless @objects[:dataset].nil?
-    ensure_par(dataset: '-D')
-    @objects[:dataset] = load_project.dataset(self[:dataset])
-    if !silent && @objects[:dataset].nil?
-      raise "Cannot load dataset: #{self[:dataset]}"
+  def load_dataset(silent = false, name = nil)
+    if name.nil?
+      ensure_par(dataset: '-D')
+      name = self[:dataset]
     end
-    return @objects[:dataset]
+    d = load_project.dataset(name)
+    raise "Cannot load dataset: #{self[:dataset]}" if !silent && d.nil?
+    return d
   end
 
   ##
@@ -38,8 +38,15 @@ module MiGA::Cli::ObjectsHelper
   def load_and_filter_datasets(silent = false)
     return @objects[:filtered_datasets] unless @objects[:filtered_datasets].nil?
     say 'Listing datasets'
-    ds = self[:dataset].nil? ?
-      load_project.datasets : [load_dataset(silent)].compact
+    ds = if ! self[:dataset].nil?
+      [load_dataset(silent)].compact
+    elsif ! self[:ds_list].nil?
+      File.readlines(self[:ds_list]).map do |i|
+        load_dataset(silent, i.chomp)
+      end.compact
+    else
+      load_project.datasets
+    end
     k = 0
     n = ds.size
     ds.select! do |d|

data/lib/miga/cli/opt_helper.rb

@@ -143,6 +143,10 @@ module MiGA::Cli::OptHelper
         raise "Internal error: Unrecognized option: #{w}"
       end
     end
+    opt.on(
+      '--ds-list FILE',
+      'File containing a list of dataset names, one per line'
+    ) { |v| self[:ds_list] = v }
     opt.on(
       '--dataset-k INTEGER', Integer,
       'Use only the k-th dataset in the list'

data/lib/miga/common/format.rb

@@ -9,7 +9,8 @@ module MiGA::Common::Format
   # Tabulates an +values+, and Array of Arrays, all with the same number of
   # entries as +header+. Returns an Array of String, one per line.
   def tabulate(header, values, tabular = false)
-    fields = [header.map(&:to_s)]
+    fields = []
+    fields << header.map(&:to_s) unless tabular && header.all?(&:nil?)
     fields << fields.first.map { |h| h.gsub(/\S/, '-') } unless tabular
     fields += values.map { |r| r.map { |cell| cell.nil? ? '?' : cell.to_s } }
     clen = tabular ? Array.new(header.size, 0) :

data/lib/miga/dataset/result.rb

@@ -64,7 +64,7 @@ module MiGA::Dataset::Result
   # execution order). This typically corresponds to the result used as the
   # initial input. Passes +save+ to #add_result.
   def first_preprocessing(save = false)
-    @@PREPROCESSING_TASKS.find do |t|
+    @first_processing ||= @@PREPROCESSING_TASKS.find do |t|
       not ignore_task?(t) and not add_result(t, save).nil?
     end
   end
@@ -126,6 +126,8 @@ module MiGA::Dataset::Result
 
   ##
   # Returns the status of +task+. The status values are symbols:
+  # - -: the task is upstream from the initial input
+  # - ignore_empty: the dataset has no data
   # - ignore_inactive: the dataset is inactive
   # - ignore_force: forced to ignore by metadata
   # - ignore_project: incompatible project
@@ -136,8 +138,13 @@ module MiGA::Dataset::Result
   # - complete: a task with registered results
   # - pending: a task queued to be performed
   def result_status(task)
-    if not get_result(task).nil?
+    if first_preprocessing.nil?
+      :ignore_empty
+    elsif not get_result(task).nil?
       :complete
+    elsif @@PREPROCESSING_TASKS.index(task) <
+            @@PREPROCESSING_TASKS.index(first_preprocessing)
+      :-
     elsif ignore_task?(task)
       if not is_active?
         :ignore_inactive

data/lib/miga/version.rb

@@ -10,7 +10,7 @@ module MiGA
   # - Float representing the major.minor version.
   # - Integer representing gem releases of the current version.
   # - Integer representing minor changes that require new version number.
-  VERSION = [0.5, 7, 3]
+  VERSION = [0.5, 10, 0]
 
   ##
   # Nickname for the current major.minor version.
@@ -18,7 +18,7 @@ module MiGA
 
   ##
   # Date of the current gem release.
-  VERSION_DATE = Date.new(2020, 2, 8)
+  VERSION_DATE = Date.new(2020, 2, 25)
 
   ##
   # Reference of MiGA.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 0.5.7.3
+  version: 0.5.10.0
 platform: ruby
 authors:
 - Luis M. Rodriguez-R
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons