in-parallel 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecbae8756fd4310b2b2330b342f7ada3ee48dae6
-  data.tar.gz: c42d6e4ffb5d87d1418d9bccbc65c4ec3347f5b5
+  metadata.gz: 71e83d885d72ee9199c9012d190f11c0e4fb7a23
+  data.tar.gz: 62274a9de6e81cd4772ce775904e49e9340b0346
 SHA512:
-  metadata.gz: 0510bb42cb5342dee946b5f383acd9da2c0277bc60c466c80f17ab10b7f243d34672868c2f95c36525781a6fe95c7d47e52bb4003c6d64d67886201b832aaf3c
-  data.tar.gz: 30d1528fa0ce04a39636f10c0e3e969315e5c679ada2b763f8b0046a802ee7a15c5d1bd6abcb61aa8a60b63a2e39cea44c706b60cb17d36f40e03f2d635d10f0
+  metadata.gz: a21762fb62f58b8a4b4eda90123bbefb41ed0dc078c07239b18a2ec2ba33b43ca5aadc10d99a8d7034ce31ffa662da081c8dbfc9a5030c45614160433c6a1a0e
+  data.tar.gz: dae9561fa380ebcfcbac4ea677fb44878b30d7248f389180578a089243fa3731e9ed815e666ae64bd4337edbf30fbd1e9475b6ffe52c26dd21ba4bf0922a709d

data/in_parallel.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
       "processes if you try to spin up a LOT of processes. If you're looking for something simple and " +
       "light-weight and on either linux or mac (forking processes is not supported on Windows), then this " +
       "solution could be what you want."
-  spec.homepage      = "https://github.com/samwoods1/in-parallel"
+  spec.homepage      = "https://github.com/puppetlabs/in-parallel"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

data/in_parallel/version.rb

@@ -1,3 +1,3 @@
 module InParallel
-  VERSION = Version = '0.1.11'
+  VERSION = Version = '0.1.12'
 end

data/lib/in_parallel.rb

@@ -104,9 +104,11 @@ module InParallel
     def self.wait_for_processes(proxy = self, binding = nil, timeout = nil, kill_all_on_error = false)
       raise_error = nil
       timeout     ||= @@parallel_default_timeout
+      send_int = false
       trap(:INT) do
         # Can't use logger inside of trap
         puts "Warning, recieved interrupt.  Processing child results and exiting."
+        send_int = true
         kill_child_processes
       end
       return unless Process.respond_to?(:fork)
@@ -170,18 +172,18 @@ module InParallel
       @@background_objs.each { |obj| result_lookup(obj[:proxy], obj[:target], results_map) }
       @@background_objs.clear
 
+      Process.kill("INT", Process.pid) if send_int
       raise raise_error unless raise_error.nil?
-
       return results
     end
 
-    # private method to execute some code in a separate process and store the STDOUT and STDERR for later retrieval
+    # private method to execute a block of code in a separate process and store the STDOUT and return value for later retrieval
     def self._execute_in_parallel(method_sym, obj = self, &block)
       ret_val                   = nil
       # Communicate the return value of the method or block
       read_result, write_result = IO.pipe
+      Dir.mkdir('tmp') unless Dir.exists? 'tmp'
       pid                       = fork do
-        Dir.mkdir('tmp') unless Dir.exists? 'tmp'
         stdout_file = File.new("tmp/pp_#{Process.pid}", 'w')
         exit_status = 0
         trap(:INT) do
@@ -201,26 +203,17 @@ module InParallel
           # close subprocess's copy of read_result since it only needs to write
           read_result.close
           ret_val = obj.instance_eval(&block)
-          # Write the result to the write_result IO stream.
-          # Have to serialize the value so it can be transmitted via IO
-          if (!ret_val.nil? && ret_val.singleton_methods && ret_val.class != TrueClass && ret_val.class != FalseClass && ret_val.class != Fixnum)
-            #in case there are other types that can't be duped
-            begin
-              ret_val = ret_val.dup
-            rescue StandardError => err
-              @@logger.warn "Warning: return value from child process #{ret_val} " +
-                                "could not be transferred to parent process: #{err.message}"
-            end
-          end
+          ret_val = strip_singleton(ret_val)
           # In case there are other types that can't be dumped
           begin
+            # Write the result to the write_result IO stream.
             Marshal.dump(ret_val, write_result) unless ret_val.nil?
           rescue StandardError => err
             @@logger.warn "Warning: return value from child process #{ret_val} " +
                               "could not be transferred to parent process: #{err.message}"
           end
         rescue Exception => err
-          @@logger.error "Error in process #{pid}: #{err.message}"
+          @@logger.error "Error in process #{Process.pid}: #{err.message}"
           # Return the error if an error is rescued so we can re-throw in the main process.
           Marshal.dump(err, write_result)
           exit_status = 1
@@ -264,9 +257,27 @@ module InParallel
         end
       end
     end
-
     private_class_method :kill_child_processes
 
+    def self.strip_singleton(obj)
+      unless (obj.nil? || obj.singleton_methods.empty?)
+        obj = obj.dup
+      end
+      begin
+        obj.singleton_class.class_eval do
+          instance_variables.each { |v| instance_eval("remove_instance_variable(:#{v})") }
+        end
+      rescue TypeError # if no singleton_class exists for the object it raises a TypeError
+      end
+
+      # Recursively check any objects assigned to instance variables for singleton methods, or variables
+      obj.instance_variables.each do |v|
+        obj.instance_variable_set(v, strip_singleton(obj.instance_variable_get(v)))
+      end
+      obj
+    end
+    private_class_method :strip_singleton
+
     # Private method to lookup results from the results_map and replace the
     # temp values with actual return values
     def self.result_lookup(proxy_obj, target_obj, results_map)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: in-parallel
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - samwoods1
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ files:
 - lib/in_parallel.rb
 - lib/parallel_enumerable.rb
 - lib/parallel_logger.rb
-homepage: https://github.com/samwoods1/in-parallel
+homepage: https://github.com/puppetlabs/in-parallel
 licenses:
 - MIT
 metadata: {}