multi_process 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 731c2378d159300a61fd6a9f23dddd45622796e1
-  data.tar.gz: f2566050f932d6ab956546488f4e71c809309300
+  metadata.gz: 12b6e61ecec6390d6c06f1ddbdc1a9288f65c0c1
+  data.tar.gz: b09e0b1587f578428daa05bb4dacb1fe11324dc9
 SHA512:
-  metadata.gz: 5caec6a0db5b55c9f15a54d2ffe90c1193788b143294f6055b066a8b8df2686b4f2abd5c5e02639540f9b30e5a70e8297f49348e6b2c43d615deed5dc41c8356
-  data.tar.gz: 532cded7fcbc61978623ddf44527db3060812e91896081d78b294e2f1749ff7f46c571b14af4e8896bf76dbfe77f7754999c6194722f0b323e65504c492c02e0
+  metadata.gz: 8e3e41b5665d57220412d203735786c7ae506386824cd3c6b00830692414c81e7dfdf4d697321ebffccb7d420e661018e45efe19e94712ceaad91bd38a8d7ef7
+  data.tar.gz: c57700b68cc35c3a5f63268d70ed10a89d04069e7e87f08418c8513e30c9571716b1a53699713cd83ee61846030997e2547251ab05b93b5ebf6814641fbe561c

data/lib/multi_process/group.rb

@@ -13,6 +13,9 @@ module MultiProcess
     #
     attr_accessor :receiver
 
+    # Partition size.
+    attr_reader :partition
+
     # Create new process group.
     #
     # @param opts [ Hash ] Options
@@ -22,6 +25,8 @@ module MultiProcess
     def initialize(opts = {})
       @processes = []
       @receiver  = opts[:receiver] ? opts[:receiver] : MultiProcess::Logger.global
+      @partition = opts[:partition] ? opts[:partition].to_i : 0
+      @mutex     = Mutex.new
     end
 
     # Add new process or list of processes.
@@ -33,7 +38,7 @@ module MultiProcess
     def <<(process)
       Array(process).flatten.each do |process|
         processes << process
-        # process.receiver = receiver
+        process.receiver = receiver
 
         if started?
           start process
@@ -89,14 +94,27 @@ module MultiProcess
 
     # Start all process and wait for them to terminate.
     #
-    # Given options will be passed to {#wait}.
+    # Given options will be passed to {#start} and {#wait}.
+    # {#start} will only be called if partition is zero.
     #
     # If timeout is given process will be terminated using {#stop}
     # when timeout error is raised.
     #
     def run(opts = {})
-      start
-      wait opts
+      if partition > 0
+        threads = Array.new
+        partition.times do
+          threads << Thread.new do
+            while (process = next_process)
+              process.run
+            end
+          end
+        end
+        threads.each &:join
+      else
+        start opts
+        wait opts
+      end
     ensure
       stop
     end
@@ -132,5 +150,14 @@ module MultiProcess
         processes.each{|p| p.available! }
       end
     end
+
+    private
+    def next_process
+      @mutex.synchronize do
+        @index ||= 0
+        @index += 1
+        processes[@index - 1]
+      end
+    end
   end
 end

data/lib/multi_process/logger.rb

@@ -30,7 +30,7 @@ module MultiProcess
       when :out, :stdout
         output process, line
       when :sys
-        output(process, line, delimiter: '$>')# if @opts[:sys]
+        output(process, line, delimiter: '$>') if @opts[:sys]
       end
     end
 

data/lib/multi_process/process.rb

@@ -187,13 +187,12 @@ module MultiProcess
     #
     def start_childprocess
       env.each{|k, v| childprocess.environment[k.to_s] = v.to_s }
+      childprocess.cwd = dir
 
-      Dir.chdir(dir) do
-        if clean_env?
-          Bundler.with_clean_env { childprocess.start }
-        else
-          childprocess.start
-        end
+      if clean_env?
+        Bundler.with_clean_env { childprocess.start }
+      else
+        childprocess.start
       end
     end
   end

data/lib/multi_process/version.rb

@@ -1,7 +1,7 @@
 module MultiProcess
   module VERSION
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

data/spec/files/test.rb

@@ -1,6 +1,6 @@
 
 2.times do
-  $stdout.print "Output from #{ARGV[0]}"
+  $stdout.puts "Output from #{ARGV[0]}"
   $stdout.flush
   sleep rand
 end

data/spec/multi_process_spec.rb

@@ -6,26 +6,26 @@ describe MultiProcess do
     reader, writer = IO.pipe
 
     logger = MultiProcess::Logger.new writer
-    group  = MultiProcess::Group.new #receiver: logger
+    group  = MultiProcess::Group.new receiver: logger
     group << MultiProcess::Process.new(%w(ruby spec/files/test.rb A), title: 'rubyA')
     group << MultiProcess::Process.new(%w(ruby spec/files/test.rb B), title: 'rubyB')
     group << MultiProcess::Process.new(%w(ruby spec/files/test.rb C), title: 'rubyC')
     group.run
 
     expect(reader.read_nonblock(4096).split("\n")).to match_array <<-EOF.gsub(/^\s+/, ' ').split("\n")
-    rubyB | Output from B
-    rubyA | Output from A
-    rubyA | Output from A
-    rubyC | Output from C
-    rubyC | Output from C
-    rubyB | Output from B
+    rubyB  | Output from B
+    rubyA  | Output from A
+    rubyA  | Output from A
+    rubyC  | Output from C
+    rubyC  | Output from C
+    rubyB  | Output from B
     EOF
   end
 
   it 'should run processes' do
     start = Time.now
 
-    group = MultiProcess::Group.new# logger: MultiProcess::NilReceiver.new
+    group = MultiProcess::Group.new receiver: MultiProcess::NilReceiver.new
     group << MultiProcess::Process.new(%w(ruby spec/files/sleep.rb 5000), title: 'rubyA')
     group << MultiProcess::Process.new(%w(ruby spec/files/sleep.rb 5000), title: 'rubyB')
     group << MultiProcess::Process.new(%w(ruby spec/files/sleep.rb 5000), title: 'rubyC')
@@ -38,4 +38,20 @@ describe MultiProcess do
     end
     expect(Time.now - start).to be < 2
   end
+
+  it 'should partition processes' do
+    group = MultiProcess::Group.new partition: 4, receiver: MultiProcess::NilReceiver.new
+    group << MultiProcess::Process.new(%w(ruby sleep.rb 1), dir: 'spec/files', title: 'rubyA')
+    group << MultiProcess::Process.new(%w(ruby sleep.rb 1), dir: 'spec/files', title: 'rubyB')
+    group << MultiProcess::Process.new(%w(ruby sleep.rb 1), dir: 'spec/files', title: 'rubyC')
+    group << MultiProcess::Process.new(%w(ruby sleep.rb 1), dir: 'spec/files', title: 'rubyD')
+    group << MultiProcess::Process.new(%w(ruby sleep.rb 1), dir: 'spec/files', title: 'rubyE')
+    group << MultiProcess::Process.new(%w(ruby sleep.rb 1), dir: 'spec/files', title: 'rubyF')
+    group << MultiProcess::Process.new(%w(ruby sleep.rb 1), dir: 'spec/files', title: 'rubyG')
+    group << MultiProcess::Process.new(%w(ruby sleep.rb 1), dir: 'spec/files', title: 'rubyH')
+
+    start = Time.now
+    group.run
+    expect(Time.now - start).to be_within(0.3).of(2)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_process
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jan Graichen