multi_process 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12b6e61ecec6390d6c06f1ddbdc1a9288f65c0c1
-  data.tar.gz: b09e0b1587f578428daa05bb4dacb1fe11324dc9
+  metadata.gz: b36af9795f93f2669e9dd7a511a3ac1b1f9bde68
+  data.tar.gz: 3ef8504b7074aed6326f5163ebf8a10c81b55541
 SHA512:
-  metadata.gz: 8e3e41b5665d57220412d203735786c7ae506386824cd3c6b00830692414c81e7dfdf4d697321ebffccb7d420e661018e45efe19e94712ceaad91bd38a8d7ef7
-  data.tar.gz: c57700b68cc35c3a5f63268d70ed10a89d04069e7e87f08418c8513e30c9571716b1a53699713cd83ee61846030997e2547251ab05b93b5ebf6814641fbe561c
+  metadata.gz: 49607ae3364368750c8d2492363b5503636c25b044fbe69febe07d65dc7b01c3d928a9fd394450e6bcafa20fbe839e7331c61b373d2e2ed8226d6d4ebdeb064a
+  data.tar.gz: 69f544973eee8b3cbe1191d5eba27836e289023a460d151d9f52808b198c0c69c66062b1832516e39f99567b5b88ce5ea97bfb58d9b4a86d9348f2621439569d

data/lib/multi_process.rb

@@ -7,6 +7,7 @@ module MultiProcess
   require 'multi_process/group'
   require 'multi_process/receiver'
   require 'multi_process/nil_receiver'
+  require 'multi_process/string_receiver'
   require 'multi_process/logger'
 
   require 'multi_process/process'

data/lib/multi_process/logger.rb

@@ -38,6 +38,10 @@ module MultiProcess
       pipe.gets
     end
 
+    def collapse?
+      @opts[:collapse].nil? || @opts[:collapse]
+    end
+
     private
     def output(process, line, opts = {})
       @mutex.synchronize do
@@ -50,7 +54,7 @@ module MultiProcess
         end
 
         io = opts[:io] || @out
-        if @last_name == name
+        if @last_name == name && collapse?
           io.print " #{' ' * name.length} #{opts[:delimiter]} "
         else
           io.print " #{name} #{opts[:delimiter]} "

data/lib/multi_process/process.rb

@@ -29,7 +29,7 @@ module MultiProcess
       @env          = opts[:env] if Hash === opts[:env]
       @env_clean    = opts[:clean_env].nil? ? true : !!opts[:clean_env]
 
-      self.receiver = MultiProcess::Logger.global
+      self.receiver = opts[:receiver] || MultiProcess::Logger.global
 
       self.dir      = Dir.pwd
       self.dir      = opts[:dir].to_s if opts[:dir]

data/lib/multi_process/receiver.rb

@@ -18,12 +18,12 @@ module MultiProcess
           loop do
             io = IO.select(@readers.keys, nil, nil, 0.1)
             (io.nil? ? [] : io.first).each do |reader|
+              op = @readers[reader]
+
               if reader.eof?
-                op = @readers[reader]
                 @readers.delete_if { |key, value| key == reader }
                 removed op[:process], op[:name]
               else
-                op = @readers[reader]
                 received op[:process], op[:name], read(reader)
               end
             end

data/lib/multi_process/string_receiver.rb

@@ -0,0 +1,17 @@
+module MultiProcess
+
+  # Receiver implementation storing process output
+  # in string.
+  #
+  class StringReceiver < Receiver
+
+    def received(process, name, message)
+      get(name) << message
+    end
+
+    def get(name)
+      @strings ||= Hash.new
+      @strings[name.to_s] ||= String.new
+    end
+  end
+end

data/lib/multi_process/version.rb

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

data/spec/files/env.rb

@@ -0,0 +1,5 @@
+
+$stdout.puts "ENV: #{ENV[ARGV[0]]}"
+$stdout.sync
+
+sleep 1

data/spec/multi_process_spec.rb

@@ -5,7 +5,7 @@ describe MultiProcess do
   it 'should run processes' do
     reader, writer = IO.pipe
 
-    logger = MultiProcess::Logger.new writer
+    logger = MultiProcess::Logger.new writer, collapse: false
     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')
@@ -54,4 +54,12 @@ describe MultiProcess do
     group.run
     expect(Time.now - start).to be_within(0.3).of(2)
   end
+
+  it 'should env processes' do
+    receiver = MultiProcess::StringReceiver.new
+    process  = MultiProcess::Process.new(%w(ruby spec/files/env.rb TEST), env: {'TEST' => "abc"}, receiver: receiver)
+    process.run
+
+    expect(receiver.get(:out)).to eq "ENV: abc\n"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_process
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jan Graichen
@@ -72,8 +72,10 @@ files:
 - lib/multi_process/process/bundle_exec.rb
 - lib/multi_process/process/rails.rb
 - lib/multi_process/receiver.rb
+- lib/multi_process/string_receiver.rb
 - lib/multi_process/version.rb
 - multi_process.gemspec
+- spec/files/env.rb
 - spec/files/sleep.rb
 - spec/files/test.rb
 - spec/multi_process_spec.rb
@@ -103,6 +105,7 @@ signing_key:
 specification_version: 4
 summary: Handle multiple child processes.
 test_files:
+- spec/files/env.rb
 - spec/files/sleep.rb
 - spec/files/test.rb
 - spec/multi_process_spec.rb