ppool 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 440a4893e77aede60e337fa03a33a04efd842adf
-  data.tar.gz: fdc7ddf70a85f7634e3ae92c2c932071b4fab269
+  metadata.gz: c44a544f926a9563eb3d498c8a194676863919d5
+  data.tar.gz: f8977e5444cc2df43c0df2ff5712edfed61c8bcc
 SHA512:
-  metadata.gz: fac3e95edd1a6199030f6847805936c88e5a2c395489de0bb68d58ff23e888cff3057c84e137991174b549058e5eee1b57f9413807785e90f48b5baaf18351bd
-  data.tar.gz: cd1182ccd48acd747d4c225bd9cd8ad2b9036c9df5cd7ad11d7e3a3257de1963894a7f1da84bf1d534773876e97043c7b6a1f9b4c29145f96cccf1a15ba2733d
+  metadata.gz: ea14c6efa27b98e2a9ae5f83565d71950b13b5587ef430e345b4c83631af2f44f1133b4f6443b1a5893321fb4d0d44c9f180a2886f9c76d21812982874e191b7
+  data.tar.gz: 15ab0325e16cf79ce093f604f55fc6515b4e8d5b7776c27916ed413ab61bd560794dc3f02abfa8efc9801fc2509f93547f1c6cad07a3044d33cef2556fd8290a

data/bin/ppool

@@ -1,4 +1,27 @@
 #!/usr/bin/env ruby
+#
+# MIT License
+#
+# Copyright (c) 2016 Paul Taylor
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
 
 require 'rubygems'
 require 'ppool'
@@ -6,9 +29,11 @@ require 'optparse'
 
 
 options = {
-    :logdir => "./logs",
     :size => 1,
+    :delay => 100,
     :basic => false,
+    :logdir => "./ppool-logs",
+    :rmlogs => false
 }
 
 $USAGE = "Usage: ppool [options] COMMAND ARGS..."
@@ -17,9 +42,11 @@ $USAGE = "Usage: ppool [options] COMMAND ARGS..."
 OptionParser.new do |opts|
   opts.banner = $USAGE
 
-  opts.on('-l', '--logs DIR',  'Log directory') { |v| options[:logdir] = v }
   opts.on('-s', '--size SIZE', 'Initial pool size') { |v| options[:size] = v }
+  opts.on('-d', '--delay MSECS', 'The delay between checking the state of the process pool (default 100ms)') { |v| options[:delay] = v }
   opts.on('-b', '--basic', 'Basic (non curses) verion') { |v| options[:basic] = true}
+  opts.on('-r', '--rmlogs', 'Remove logs for processes that exited successfully') { |v| options[:rmlogs] = true}
+  opts.on('-l', '--logdir DIR',  'Log directory') { |v| options[:logdir] = v }
 
   opts.on("-h", "--help", "Show this message") {
         puts opts
@@ -40,11 +67,12 @@ if ! Dir.exist?(logdir)
 end
 
 size = options[:size].to_i
+delay = options[:delay].to_i
 
 if options[:basic]
-  controller = TerminalProcessController.new(size, command, logdir)
+  controller = TerminalProcessController.new(size, delay, command, logdir, options[:rmlogs])
 else 
-  controller = CursesProcessController.new(size, command, logdir)
+  controller = CursesProcessController.new(size, delay, command, logdir, options[:rmlogs])
 end
 
 ProcessPool.new(controller).run

data/lib/basic_process_controller.rb

@@ -1,3 +1,27 @@
+#
+# MIT License
+#
+# Copyright (c) 2016 Paul Taylor
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
 class BasicProcessController 
 
   def initialize

data/lib/curses_process_controller.rb

@@ -1,13 +1,37 @@
+#
+# MIT License
+#
+# Copyright (c) 2016 Paul Taylor
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
 
 require 'curses'
 
 class CursesProcessController < ShellProcessController
 
-  def initialize(size, script, logdir)
-    super(script, logdir)
+  def initialize(size, delay, script, logdir, rmlogs)
+    super(script, logdir, rmlogs)
     @finishing = false
     @finished = false
     @size = size
+    @delay = delay
     @msg = ""
     @last_stats = {}
     init_window
@@ -25,9 +49,6 @@ class CursesProcessController < ShellProcessController
   def process_started(pid, num_processes) 
   end
 
-  def process_ended(pid, status)
-    #draw_window
-  end
 
   def progress(stats)
 
@@ -57,7 +78,6 @@ class CursesProcessController < ShellProcessController
     process_keys
 
     if @finishing
-      info "finishing #{stats[:active_processes]}"
       if stats[:active_processes] == 0
         @finished = true
       end
@@ -67,7 +87,7 @@ class CursesProcessController < ShellProcessController
   end
 
   def delay
-    return 0.1
+    return @delay / 1000
   end
 
 

data/lib/ppool.rb

@@ -1,3 +1,26 @@
+#
+# MIT License
+#
+# Copyright (c) 2016 Paul Taylor
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
 
 require "process_pool.rb"
 require "basic_process_controller.rb"

data/lib/process_pool.rb

@@ -1,3 +1,26 @@
+#
+# MIT License
+#
+# Copyright (c) 2016 Paul Taylor
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
 
 class ProcessPool
 

data/lib/shell_process_controller.rb

@@ -1,10 +1,37 @@
+#
+# MIT License
+#
+# Copyright (c) 2016 Paul Taylor
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
 class ShellProcessController < BasicProcessController
 
-  def initialize(script, logdir)
+  def initialize(script, logdir, rmlogs)
     super()
     @script = script
     @logdir = logdir
+    @rmlogs = rmlogs
     @log = File.open("#{logdir}/ppool.log", 'w')
+    @stdout_log = {}
+    @stderr_log = {}
 
   end
 
@@ -22,9 +49,31 @@ class ShellProcessController < BasicProcessController
 
   end
 
+  def process_ended(pid, status)
+
+    if @rmlogs && status == 0    
+      delete_log_file(pid, 'stderr')
+      delete_log_file(pid, 'stdout')
+    end
+     
+  end
+
   def info(m)
     @log.write("#{m}\n")
     @log.flush
   end
 
+
+  def delete_log_file(pid, suffix)
+    begin 
+      Dir.glob("#{@logdir}/process_#{pid}_*.#{suffix}") { |file| 
+       info "deleting log file #{file} for process #{pid}"
+       File.delete(file)
+      }
+   rescue => e
+     info "error deleting log file for process #{pid}: #{e}"
+   end
+
+  end
+
 end

data/lib/terminal_process_controller.rb

@@ -1,14 +1,38 @@
+#
+# MIT License
+#
+# Copyright (c) 2016 Paul Taylor
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
 
 require 'io/console'
 require 'io/wait'
 
 class TerminalProcessController < ShellProcessController
 
-  def initialize(size, script, logdir)
-    super(script, logdir)
+  def initialize(size, delay, script, logdir, rmlogs)
+    super(script, logdir, rmlogs)
     @finishing = false
     @finished = false
     @size = size
+    @delay = delay
     @msg = ""
     @last_stats = {}
     @count = 0
@@ -30,9 +54,6 @@ class TerminalProcessController < ShellProcessController
   def process_started(pid, num_processes) 
   end
 
-  def process_ended(pid, status)
-  end
-
   def progress(stats)
 
      if stats != @last_stats
@@ -51,7 +72,6 @@ class TerminalProcessController < ShellProcessController
      process_keys
 
     if @finishing
-      info "finishing #{stats[:active_processes]}"
       if stats[:active_processes] == 0
         @finished = true
       end
@@ -61,7 +81,7 @@ class TerminalProcessController < ShellProcessController
   end
 
   def delay
-    return 0.1
+    return @delay / 1000
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ppool
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Paul Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -24,7 +24,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: Run a pool of processes
+description: Start of pool of processes running a single command and control the pool
+  size via the keyboard.
 email: pftylr@gmail.com
 executables:
 - ppool
@@ -48,9 +49,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -58,8 +59,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Process pool
+summary: Pool of processes running a single command
 test_files: []