process-group 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8d207f2d37df9b65b6e179ac9109dd9e3a5a443
-  data.tar.gz: 4422d1d9fc5171dc8dc5236b4b9745fbe81dda5b
+  metadata.gz: 026f8b1f40e77c491180b9faff360d884a6717fa
+  data.tar.gz: c4ecc9c7c932b7c662f420f3c82ece3ea0a6d7b1
 SHA512:
-  metadata.gz: f2c49a5f6980e9bb4b44c90f5577e5a664611bef83e22da9f3e5bfbc1525870a76a4ff11cffa36340b30f77e594e75e8de3b55f04132537d10b92bce2a85452c
-  data.tar.gz: 348213c1cf609dace2d8228a9111b53232cc4bf36cde8c548d62e93bc5ee4e3bb1a5fac5fe5083e2029298201e3b6636e91f8d17319946510bb74e00800aa9d5
+  metadata.gz: e364e21669e91dec753aff10d6100584c0d80057a52a4db539fcc3fb57df1b2a58b1d69220f66d9c9e8ce137383b5b7f9b62d780e51b292d295e0f5e38c283c0
+  data.tar.gz: c723127bf2fc53e8d9752f016e858ea1417f053548d687f4732866bfc29275fc80b0680f5609aee396c99fc0c2c8ad996d6396afa3d6b9a55ca6d7cf96731d5d

data/lib/process/group.rb

@@ -35,7 +35,36 @@ module Process
 			attr :options
 		
 			def run(options = {})
-				Process.spawn(*@arguments, @options.merge(options))
+				@pid = Process.spawn(*@arguments, @options.merge(options))
+				
+				return @pid
+			end
+		
+			def resume(*arguments)
+				@fiber.resume(*arguments)
+			end
+		end
+		
+		class Fork
+			def initialize(block, options, fiber = Fiber.current)
+				@options = options
+				@block = block
+				
+				@fiber = fiber
+			end
+			
+			def run(options = {})
+				@pid = Process.fork(&@block)
+				
+				if options[:pgroup] == true
+					# Establishes the child process as a process group leader:
+					Process.setpgid(@pid, 0)
+				else
+					# Set this process as part of the existing process group:
+					Process.setpgid(@pid, options[:pgroup])
+				end
+				
+				return @pid
 			end
 		
 			def resume(*arguments)
@@ -45,7 +74,7 @@ module Process
 		
 		# Create a new process group. Can specify `options[:limit]` which limits the maximum number of concurrent processes.
 		def initialize(options = {})
-			@commands = []
+			@queue = []
 			@limit = options[:limit]
 		
 			@running = {}
@@ -80,11 +109,11 @@ module Process
 			# Could be nice to use ** splat, but excludes ruby < 2.0.
 			options = Hash === arguments.last ? arguments.pop : {}
 	
-			@commands << Command.new(arguments, options)
-	
-			schedule!
-	
-			Fiber.yield
+			append! Command.new(arguments, options)
+		end
+		
+		def fork(options = {}, &block)
+			append! Fork.new(block, options)
 		end
 		
 		# Whether not not calling run would be scheduled immediately.
@@ -107,14 +136,17 @@ module Process
 				# Wait for processes in this group:
 				pid, status = Process.wait2(-@pgid)
 			
-				command = @running.delete(pid)
+				process = @running.delete(pid)
 			
-				raise RuntimeError.new("Process #{pid} is not part of group!") unless command
+				raise RuntimeError.new("Process id=#{pid} is not part of group!") unless process
 			
 				schedule!
 			
-				command.resume(status)
+				process.resume(status)
 			end
+			
+			# No processes, process group is no longer valid:
+			@pgid = nil
 		end
 		
 		# Send a signal to all processes.
@@ -126,19 +158,29 @@ module Process
 		
 		private
 		
-		# Run any commands while space is available in the group.
+		def append!(process)
+			@queue << process
+			
+			schedule!
+			
+			Fiber.yield
+		end
+		
+		# Run any processes while space is available in the group.
 		def schedule!
-			while available? and @commands.size > 0
-				command = @commands.shift
+			while available? and @queue.size > 0
+				process = @queue.shift
 			
 				if @running.size == 0
-					pid = command.run(:pgroup => true)
-					@pgid = Process.getpgid(pid)
+					pid = process.run(:pgroup => true)
+					
+					# The process group id is the pid of the first process:
+					@pgid = pid
 				else
-					pid = command.run(:pgroup => @pgid)
+					pid = process.run(:pgroup => @pgid)
 				end
 			
-				@running[pid] = command
+				@running[pid] = process
 			end
 		end
 	end

data/lib/process/group/version.rb

@@ -1,5 +1,5 @@
 module Process
 	class Group
-		VERSION = "0.0.1"
+		VERSION = "0.1.0"
 	end
 end

data/test/test_fork.rb

@@ -0,0 +1,47 @@
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# 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 'test/unit'
+
+require 'process/group'
+
+class TestFork < Test::Unit::TestCase
+	def test_fork_io
+		group = Process::Group.new
+		
+		input, output = IO.pipe
+		
+		Fiber.new do
+			result = group.fork do
+				output.puts "Hello World"
+				
+				exit(1)
+			end
+			
+			assert_equal 1, result.exitstatus
+		end.resume
+		
+		output.close
+		
+		group.wait
+		
+		assert_equal "Hello World\n", input.read
+	end
+end

data/test/{test_group.rb → test_spawn.rb}

@@ -22,7 +22,7 @@ require 'test/unit'
 
 require 'process/group'
 
-class TestGroup < Test::Unit::TestCase
+class TestSpawn < Test::Unit::TestCase
 	def test_fibers
 		group = Process::Group.new
 		
@@ -35,6 +35,7 @@ class TestGroup < Test::Unit::TestCase
 		
 		Fiber.new do
 			result = group.spawn("sleep 2")
+			
 			assert_equal 0, result
 		end.resume
 		

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process-group
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,7 +56,8 @@ files:
 - lib/process/group.rb
 - lib/process/group/version.rb
 - process-group.gemspec
-- test/test_group.rb
+- test/test_fork.rb
+- test/test_spawn.rb
 homepage: ''
 licenses:
 - MIT
@@ -82,4 +83,5 @@ signing_key:
 specification_version: 4
 summary: Run processes concurrently in separate fibers with predictable behaviour.
 test_files:
-- test/test_group.rb
+- test/test_fork.rb
+- test/test_spawn.rb