ripe 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28ae834d0a84d2072400169910c39825c1c37aa3
-  data.tar.gz: 2b1be6510c88ad3679dc69e4b198eea81d050734
+  metadata.gz: 13032eb238736b94168961b94cfd79896ad89ffd
+  data.tar.gz: 6951a4e3da93749f18e44618f7ddc617edafad44
 SHA512:
-  metadata.gz: cac0941044a07fe4b97a8fda9f68e52881bc6be0943efafb6d104e0fa6e0c45e4f219ad25431b6099aa30e6fac3847fa79cc28d472b13f3cce59f852fe52fb60
-  data.tar.gz: c43fcd8a697350737a8b02fef384d40bcc6666954f0ce2e8204efb1a88f9a4661099c4c2598cbe654d1ca86dcc9e89d8c28ab456b1ea34c4a4dd5b59e8780603
+  metadata.gz: b3538313e05b7189027942f553b8886993ff361b49b99b61c8ca91af91baf319e95f51d511bb32556501ca3b7caa5d499d7acda98bf4e7318265596c2ece29c8
+  data.tar.gz: 733a2265845c4c8049756d9e06f23337a034714a97d19d232db3c7052610eb322d23f5b79a55273ba95f9f40e95ba9fd5217ce50f9b4cd2552c498d1fa73696d

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+v0.2.2
+------
+
+This release mostly contains console-related bugfixes.
+
+  - Fix bugs related to displaying workers in tabular format in the console.
+  - Fix bug causing ripe to crash when no blocks are prepared for a sample.
+
+<!-- vim: set syntax=markdown: -->

data/lib/ripe/blocks/block.rb

@@ -21,6 +21,8 @@ module Ripe
       attr_accessor :vars
 
       ##
+      # Create a new, empty {Block}.
+      #
       # @param id [String] a mandatory, but optionally unique identifier
       #   for the block
       # @param blocks [Array<Block>] list of children blocks

data/lib/ripe/blocks/liquid_block.rb

@@ -14,6 +14,8 @@ module Ripe
     class LiquidBlock < WorkingBlock
 
       ##
+      # Create a new, empty {LiquidBlock}.
+      #
       # @param filename [String] filename of the template file
       # @param vars [Hash<Symbol, String>] key-value pairs
 

data/lib/ripe/blocks/multi_block.rb

@@ -17,6 +17,8 @@ module Ripe
     class MultiBlock < Block
 
       ##
+      # Create a new, empty {MultiBlock}.
+      #
       # @param id [String] a mandatory, but optionally unique identifier
       #   for the block
       # @param blocks [Array<Block>] list of children blocks

data/lib/ripe/blocks/parallel_block.rb

@@ -9,6 +9,8 @@ module Ripe
     class ParallelBlock < MultiBlock
 
       ##
+      # Create a new, empty {ParallelBlock}.
+      #
       # @param blocks [Array<Block>] list of children blocks
 
       def initialize(*blocks)

data/lib/ripe/blocks/serial_block.rb

@@ -9,6 +9,8 @@ module Ripe
     class SerialBlock < MultiBlock
 
       ##
+      # Create a new, empty {SerialBlock}.
+      #
       # @param blocks [Array<Block>] list of children blocks
 
       def initialize(*blocks)

data/lib/ripe/blocks/working_block.rb

@@ -12,6 +12,8 @@ module Ripe
     class WorkingBlock < Block
 
       ##
+      # Create a new, empty {WorkingBlock}.
+      #
       # @param filename [String] filename of the template file
       # @param vars [Hash<Symbol, String>] key-value pairs
 

data/lib/ripe/cli.rb

@@ -87,7 +87,7 @@ module Ripe
       repo.attach
 
       unless repo.has_repository?
-        abort 'Cannot launch console: ripe repo not initialized'
+        abort 'Cannot prepare samples: ripe repo not initialized'
       end
 
       abort 'No samples specified.' if samples.length == 0

data/lib/ripe/dsl.rb

@@ -1,2 +1,11 @@
+module Ripe
+
+  # This module contains `domain-specific language` syntactic sugar for
+  # defining workflows and tasks.
+
+  module DSL; end
+
+end
+
 require_relative 'dsl/task_dsl'
 require_relative 'dsl/workflow_dsl'

data/lib/ripe/version.rb

@@ -1,3 +1,3 @@
 module Ripe
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/ripe/worker_controller.rb

@@ -34,7 +34,10 @@ module Ripe
 
     def distribute(workers, &block)
       workers = [workers] if workers.is_a? DB::Worker
-      workers.map { |w| block.call(w) }
+      workers.map do |w|
+        block.call(w)
+        w
+      end
     end
 
     ##

data/lib/ripe/worker_controller/preparer.rb

@@ -36,10 +36,14 @@ module Ripe
         # Apply the workflow to each sample
         sample_blocks = prepare_sample_blocks(samples, callback, params)
 
-        # Split samples into groups of +:group_num+ samples and produce a
-        # worker from each of these groups.
-        @workers = sample_blocks.each_slice(params[:group_num].to_i).map do |worker_blocks|
-          prepare_worker(worker_blocks, params)
+        if sample_blocks
+          # Split samples into groups of +:group_num+ samples and produce a
+          # worker from each of these groups.
+          @workers = sample_blocks.each_slice(params[:group_num].to_i).map do |worker_blocks|
+            prepare_worker(worker_blocks, params)
+          end
+        else
+          []
         end
       end
 
@@ -80,8 +84,14 @@ module Ripe
 
       def prepare_sample_blocks(samples, callback, params)
         sample_blocks = samples.map do |sample|
-          block = callback.call(sample, params).prune(params[:mode].to_sym == :force,
-                                                      params[:mode].to_sym == :depend)
+          block = callback.call(sample, params)
+
+          if block
+            # No need to prune if callback returns nil
+            block = block.prune(params[:mode].to_sym == :force,
+                              params[:mode].to_sym == :depend)
+          end
+
           if block != nil
             puts "Preparing sample #{sample}"
             {sample => block}

data/lib/ripe/worker_controller/syncer.rb

@@ -56,7 +56,7 @@ module Ripe
       # @return [void]
 
       def update_running_workers
-        @workers += @running_jobs.map do |job|
+        workers = @running_jobs.map do |job|
           worker = DB::Worker.find_by(moab_id: job[:moab_id])
           if worker
             worker.update(time: job[:time])
@@ -69,8 +69,10 @@ module Ripe
               })
             end
           end
-          worker
+          worker # This is +nil+ if worker is not found (other running jobs
+                 # that are independent from the current ripe repo).
         end
+        @workers += workers.compact
       end
 
       ##
@@ -108,6 +110,7 @@ module Ripe
             time:        stdout[/Resources:.*,walltime=([0-9]{1,2}(\:[0-9]{2})+)$/, 1],
             status:      :completed,
           })
+          worker
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ripe
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nicolas De Jay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,6 +217,7 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt