ripe 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d0147532866d432fa9ebc800658011dfe59852
-  data.tar.gz: c1c99f6a5488a17a05cccc6d486e3d1856d33337
+  metadata.gz: f8c9495954bce6425a4043a52c79d40e8ea3945f
+  data.tar.gz: e8e3ab0a02addf1ac505aa8193e238d4eefd3020
 SHA512:
-  metadata.gz: cf6f6acf16d7e27a82a3b68c3639b9b022ddc53f7242e585e21e6231fecf77e05a75478487545ffe5aecd54b6dfbee3708f88e9c601ccafe14f0eb4ea0700e36
-  data.tar.gz: b8b58cbefde13d9821a6ddee94b4e155434083e7f3efdaade4c32d47751acb0bdc0a5bc49bb5dcfdd6fb6b22b0b69481a0fbe3abd3560b39bef7ae780906d91c
+  metadata.gz: c494c400af63cf21c2c55a8d87cb6688e9175a0b029a7c6c91a8f4cb6cecc906a1c72509268b97c30f9d291036a24ef558565387ff688419f5203b6b8022ce67
+  data.tar.gz: 2e2ae3f075bd43b9a9e575a509c1276a549c0283d7453575aaf99ea2365ddb25411ebb8cbf0a8affdb365a55e9f10913b6c36ea315b1e67c5bfa98a9cb4d18fb

data/Guardfile

@@ -0,0 +1,5 @@
+guard :rspec, cmd: 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/ripe/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/bin/ripe

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'ripe'
+require_relative '../lib/ripe'
 require 'thor'
 
 include Ripe

data/lib/ripe/controller.rb

@@ -2,6 +2,7 @@ require 'active_record'
 require 'fileutils'
 require_relative 'block'
 require_relative 'worker'
+require_relative 'worker_controller'
 require_relative 'worker_migration'
 require_relative 'working_block'
 require_relative 'liquid_block'
@@ -45,7 +46,7 @@ module Ripe
     end
 
     def prepare(samples, callback, vars = {})
-      Worker.prepare(samples, callback, vars)
+      WorkerController.instance.prepare(samples, callback, vars)
     end
   end
 end

data/lib/ripe/version.rb

@@ -1,3 +1,3 @@
 module Ripe
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/ripe/worker.rb

@@ -30,126 +30,8 @@ module Ripe
       FileUtils.rm_r dir if Dir.exists? dir
     end
 
-    def self.prepare(samples, callback, vars = {})
-      vars = {
-        wd:        Dir.pwd,
-        mode:      :patch,
-        group_num: 1,
-      }.merge(vars)
-
-      return if ![:patch, :force, :depend].include? vars[:mode].to_sym
-
-      samples = samples.map do |sample|
-        block = callback.call(sample, vars).prune(vars[:mode].to_sym == :force,
-                                                  vars[:mode].to_sym == :depend)
-        if block != nil
-          puts "Preparing sample #{sample}"
-          [sample, block]
-        else
-          puts "Nothing to do for sample #{sample}"
-          nil
-        end
-      end
-      samples = samples.compact
-
-      samples.each_slice(vars[:group_num].to_i).map do |worker_samples|
-        worker = Worker.create(handle: vars[:handle])
-
-        blocks = worker_samples.map do |sample, block|
-          # Preorder traversal of blocks -- assign incremental numbers starting from
-          # 1 to each node as it is being traversed.
-          post_var_assign = lambda do |subblock|
-            if subblock.blocks.length == 0
-              task = worker.tasks.create({
-                sample: sample,
-                block:  subblock.id,
-              })
-              subblock.vars.merge!(log: task.log)
-            else
-              subblock.blocks.each(&post_var_assign)
-            end
-          end
-
-          post_var_assign.call(block)
-          block
-        end
-
-        vars = vars.merge({
-          name:    worker.id,
-          stdout:  worker.stdout,
-          stderr:  worker.stderr,
-          command: SerialBlock.new(*blocks).command,
-        })
-
-        file = File.new(worker.sh, 'w')
-        file.puts LiquidBlock.new("#{PATH}/share/moab.sh", vars).command
-        file.close
-
-        worker.update({
-          status:   :prepared,
-          ppn:      vars[:ppn],
-          queue:    vars[:queue],
-          walltime: vars[:walltime],
-        })
-        worker
-      end
-    end
-
     def self.sync
-      lists = {idle: '-i', blocked: '-b', active:  '-r'}
-      lists = lists.map do |status, op|
-        showq = `showq -u $(whoami) #{op} | grep $(whoami)`.split("\n")
-        showq.map do |job|
-          {
-            moab_id:   job[/^([0-9]+) /, 1],
-            time:      job[/  ([0-9]{1,2}(\:[0-9]{2})+)  /, 1],
-            status:    status,
-          }
-        end
-      end
-
-      # Update status
-      lists = lists.inject(&:+).each do |job|
-        moab_id   = job[:moab_id]
-        time      = job[:time]
-        status    = job[:status]
-        worker    = Worker.find_by(moab_id: moab_id)
-
-        if worker
-          worker.update(time: time)
-          unless ['cancelled', status].include? worker.status
-            checkjob = `checkjob #{moab_id}`
-            worker.update({
-              host:      checkjob[/Allocated Nodes:\n\[(.*):[0-9]+\]\n/, 1],
-              status:    status, # Queued jobs that appear become either idle, blocked or active
-            })
-          end
-        end
-      end
-
-      # Mark workers that were previously in active, blocked or idle as completed
-      # if they cannot be found anymore.
-      jobs = lists.map { |job| job[:moab_id] }
-      Worker.where('status in (:statuses)',
-                   :statuses => ['active', 'idle', 'blocked']).each do |worker|
-        if jobs.include? worker.moab_id
-          jobs.delete(worker.moab_id) # Remove from list
-        elsif (worker.status != 'cancelled')
-          if File.exists? worker.stdout
-            stdout = File.new(worker.stdout).readlines.join 
-          else
-            stdout = ""
-          end
-          worker.update({
-            cpu_used:    stdout[/Resources:[ \t]*cput=([0-9]{1,2}(\:[0-9]{2})+),/, 1],
-            exit_code:   stdout[/Exit code:[ \t]*(.*)$/, 1],
-            host:        stdout[/Nodes:[ \t]*(.*)$/, 1],
-            memory_used: stdout[/Resources:.*,mem=([0-9]*[a-zA-Z]*),/, 1],
-            time:        stdout[/Resources:.*,walltime=([0-9]{1,2}(\:[0-9]{2})+)$/, 1],
-            status:      :completed,
-          })
-        end
-      end
+      WorkerController.instance.sync
     end
 
     def start!

data/lib/ripe/worker_controller.rb

@@ -0,0 +1,130 @@
+require 'singleton'
+require_relative 'worker'
+
+module Ripe
+  class WorkerController
+    include Singleton
+
+    def prepare(samples, callback, vars = {})
+      vars = {
+        wd:        Dir.pwd,
+        mode:      :patch,
+        group_num: 1,
+      }.merge(vars)
+
+      return if ![:patch, :force, :depend].include? vars[:mode].to_sym
+
+      samples = samples.map do |sample|
+        block = callback.call(sample, vars).prune(vars[:mode].to_sym == :force,
+                                                  vars[:mode].to_sym == :depend)
+        if block != nil
+          puts "Preparing sample #{sample}"
+          [sample, block]
+        else
+          puts "Nothing to do for sample #{sample}"
+          nil
+        end
+      end
+      samples = samples.compact
+
+      samples.each_slice(vars[:group_num].to_i).map do |worker_samples|
+        worker = Worker.create(handle: vars[:handle])
+
+        blocks = worker_samples.map do |sample, block|
+          # Preorder traversal of blocks -- assign incremental numbers starting from
+          # 1 to each node as it is being traversed.
+          post_var_assign = lambda do |subblock|
+            if subblock.blocks.length == 0
+              task = worker.tasks.create({
+                sample: sample,
+                block:  subblock.id,
+              })
+              subblock.vars.merge!(log: task.log)
+            else
+              subblock.blocks.each(&post_var_assign)
+            end
+          end
+
+          post_var_assign.call(block)
+          block
+        end
+
+        vars = vars.merge({
+          name:    worker.id,
+          stdout:  worker.stdout,
+          stderr:  worker.stderr,
+          command: SerialBlock.new(*blocks).command,
+        })
+
+        file = File.new(worker.sh, 'w')
+        file.puts LiquidBlock.new("#{PATH}/share/moab.sh", vars).command
+        file.close
+
+        worker.update({
+          status:   :prepared,
+          ppn:      vars[:ppn],
+          queue:    vars[:queue],
+          walltime: vars[:walltime],
+        })
+        worker
+      end
+    end
+
+    def sync
+      lists = {idle: '-i', blocked: '-b', active:  '-r'}
+      lists = lists.map do |status, op|
+        showq = `showq -u $(whoami) #{op} | grep $(whoami)`.split("\n")
+        showq.map do |job|
+          {
+            moab_id:   job[/^([0-9]+) /, 1],
+            time:      job[/  ([0-9]{1,2}(\:[0-9]{2})+)  /, 1],
+            status:    status,
+          }
+        end
+      end
+
+      # Update status
+      lists = lists.inject(&:+).each do |job|
+        moab_id   = job[:moab_id]
+        time      = job[:time]
+        status    = job[:status]
+        worker    = Worker.find_by(moab_id: moab_id)
+
+        if worker
+          worker.update(time: time)
+          unless ['cancelled', status].include? worker.status
+            checkjob = `checkjob #{moab_id}`
+            worker.update({
+              host:      checkjob[/Allocated Nodes:\n\[(.*):[0-9]+\]\n/, 1],
+              status:    status, # Queued jobs that appear become either idle, blocked or active
+            })
+          end
+        end
+      end
+
+      # Mark workers that were previously in active, blocked or idle as completed
+      # if they cannot be found anymore.
+      jobs = lists.map { |job| job[:moab_id] }
+      Worker.where('status in (:statuses)',
+                   :statuses => ['active', 'idle', 'blocked']).each do |worker|
+        if jobs.include? worker.moab_id
+          jobs.delete(worker.moab_id) # Remove from list
+        elsif (worker.status != 'cancelled')
+          if File.exists? worker.stdout
+            stdout = File.new(worker.stdout).readlines.join
+          else
+            stdout = ""
+          end
+          worker.update({
+            cpu_used:    stdout[/Resources:[ \t]*cput=([0-9]{1,2}(\:[0-9]{2})+),/, 1],
+            exit_code:   stdout[/Exit code:[ \t]*(.*)$/, 1],
+            host:        stdout[/Nodes:[ \t]*(.*)$/, 1],
+            memory_used: stdout[/Resources:.*,mem=([0-9]*[a-zA-Z]*),/, 1],
+            time:        stdout[/Resources:.*,walltime=([0-9]{1,2}(\:[0-9]{2})+)$/, 1],
+            status:      :completed,
+          })
+        end
+      end
+    end
+  end
+end

data/lib/ripe.rb

@@ -1,5 +1,5 @@
-require 'ripe/version'
-require 'ripe/controller'
+require_relative 'ripe/version'
+require_relative 'ripe/controller'
 
 module Ripe
   PATH = File.expand_path('..', File.dirname(__FILE__))

data/ripe.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ripe/version'
+require_relative 'lib/ripe/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "ripe"
@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "rspec-nc", "~> 0.2"
+  spec.add_development_dependency "guard-rspec", "~> 4.5"
 
   spec.add_runtime_dependency "activerecord", "~> 4.2"
   spec.add_runtime_dependency "fileutils", "~> 0.7"

data/spec/block_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Ripe::Block do
+  it 'does stuff' do
+    true
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+if !ENV['CODECLIMATE_REPO_TOKEN'].nil?
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+end
 
-require 'ripe'
+require_relative '../lib/ripe'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ripe
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nicolas De Jay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +204,7 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -205,10 +220,12 @@ files:
 - lib/ripe/task_migration.rb
 - lib/ripe/version.rb
 - lib/ripe/worker.rb
+- lib/ripe/worker_controller.rb
 - lib/ripe/worker_migration.rb
 - lib/ripe/working_block.rb
 - ripe.gemspec
 - share/moab.sh
+- spec/block_spec.rb
 - spec/ripe_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ndejay/ripe
@@ -236,5 +253,6 @@ signing_key:
 specification_version: 4
 summary: Abstraction layer between the MOAB/Torque stack and your pipeline.
 test_files:
+- spec/block_spec.rb
 - spec/ripe_spec.rb
 - spec/spec_helper.rb