miga-base 1.4.0.1 → 1.4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4b67bd0a5a151b1aa8598c56df2db8e286382dec6a43714b04e41bc3fd03302
-  data.tar.gz: 8e52fcc9cdd873467318854b8048503374354fb71026cc66c52cf835511259ff
+  metadata.gz: 89632a79a0801cd74a67f37390872ba90b30689f43da76d233c83de2b1db6f58
+  data.tar.gz: d7eca23c6be21fb737f6c4c9e04ee433800f09536c48ae4d6fd3eba7953de980
 SHA512:
-  metadata.gz: b1f9746da7cc703094dd602ebb91482930b78031cfcd6249d0e1bd5efbfa39c122adc1c30133e3791e66b0651d5e057b8df397e2f542938e74829afc5d0c955c
-  data.tar.gz: 0b37cf54c49dbac3c81d118e9b2ccded9b11ee13b073847ddf6f7bd187102067e850bdf9a7b912a8bbdece6f0e581aeebf6b1689f45d79b83b5f381b20f93c51
+  metadata.gz: d4da7811ccdc35c231933e6151c6f81f0f3aaaf292226ee6439220beb3cfd3a8f98c945f58ff222f8c908f879c8164ccd4cc8e1cd549e1907b5e5a86c2cf0a0c
+  data.tar.gz: c4c82c1d28c14523d84033390f7499667915a251e48649795f76f992a06ee1b8ad440cd41d5377b1d630f708cacd77fcefda65b9039803daafa3b0d9bd52b961

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

@@ -33,6 +33,14 @@ class MiGA::Cli::Action::Lair < MiGA::Cli::Action
       opt.on(
         '--exclude-releases', 'Exclude projects with release metadata'
       ) { |v| cli[:exclude_releases] = v }
+      opt.on(
+        '--max-running INT', Integer,
+        'Maximum number of running projects at the same time',
+        'by default, unlimited'
+      ) { |v| cli[:max_running] = v }
+      opt.on(
+        '--ignore-complete', 'Ignore fully-processed projects'
+      ) { |v| cli[:ignore_complete] = v }
       opt.on(
         '--json PATH',
         'Path to a custom daemon definition in json format'
@@ -90,7 +98,7 @@ class MiGA::Cli::Action::Lair < MiGA::Cli::Action
     cli.ensure_par(path: '-p')
     k_opts = %i[
       json latency wait_for keep_inactive trust_timestamp name dry
-      exclude exclude_releases
+      exclude exclude_releases max_running ignore_complete
     ]
     opts = Hash[k_opts.map { |k| [k, cli[k]] }]
     lair = MiGA::Lair.new(cli[:path], opts)

data/lib/miga/lair.rb

@@ -33,6 +33,9 @@ class MiGA::Lair < MiGA::MiGA
   #   them
   # - exclude: Array of project names to be excluded from the lair
   # - exclude_releases: Exclude projects with release metadata from the lair
+  # - max_running: Run a maximum of this many projects at time
+  # - ignore_complete: Ignore projects that are complete based on their datasets
+  #   reported metadata status
   def initialize(path, opts = {})
     @path = File.expand_path(path)
     @options = opts
@@ -45,7 +48,9 @@ class MiGA::Lair < MiGA::MiGA
       name: File.basename(@path),
       dry: false,
       exclude: [],
-      exclude_releases: false
+      exclude_releases: false,
+      max_running: nil,
+      ignore_complete: false
     }.each { |k, v| @options[k] = v if @options[k].nil? }
   end
 
@@ -139,16 +144,19 @@ class MiGA::Lair < MiGA::MiGA
   ##
   # Traverse directories checking MiGA projects
   def check_directories
+    active = 0
     each_project do |project|
+      break if options[:max_running] && active >= options[:max_running]
+
       d = project_daemon(project)
-      next if d.active?
+      d.active? and active += 1 and next
 
       l_alive = d.last_alive
       unless l_alive.nil?
         next if options[:trust_timestamp] && project.metadata.updated < l_alive
         next if l_alive > Time.now - options[:wait_for]
       end
-      launch_daemon(project)
+      launch_daemon(project) && active += 1
     end
   end
 
@@ -156,6 +164,8 @@ class MiGA::Lair < MiGA::MiGA
   # Launch daemon for the MiGA::Project +project+ and returns the corresponding
   # MiGA::Daemon object
   def launch_daemon(project)
+    return if options[:ignore_complete] && project.complete?
+
     say "Launching daemon: #{project.path}"
     daemon = project_daemon(project)
     daemon.runopts(:shutdown_when_done, true) unless options[:keep_inactive]

data/lib/miga/project/dataset.rb

@@ -175,6 +175,16 @@ module MiGA::Project::Dataset
     end
   end
 
+  ##
+  # Are all datasets reportedly done based on their status, and the results
+  # from the project complete?
+  #
+  # If you need to actually check all results, use +done_preprocessing?+ instead
+  def complete?
+    each_dataset.all? { |d| d.metadata[:status] != 'incomplete' } &&
+      next_task.nil?
+  end
+
   ##
   # Returns a two-dimensional matrix (Array of Array) where the first index
   # corresponds to the dataset, the second index corresponds to the dataset

data/lib/miga/version.rb

@@ -12,7 +12,7 @@ module MiGA
   # - String indicating release status:
   #   - rc* release candidate, not released as gem
   #   - [0-9]+ stable release, released as gem
-  VERSION = [1.4, 0, 1].freeze
+  VERSION = [1.4, 0, 2].freeze
 
   ##
   # Nickname for the current major.minor version.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 1.4.0.1
+  version: 1.4.0.2
 platform: ruby
 authors:
 - Luis M. Rodriguez-R