process-group 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 372a5e01e0eec6598278b7b6d9d7752f59190b66
-  data.tar.gz: ef2061f5503a85c60a0e56a81efaff25b1d95dc6
+  metadata.gz: eb7a4e8773cff719edfa1b553e7773c34d6a3537
+  data.tar.gz: b746a13f2d670c5a3051c1d076da83b38461d5ee
 SHA512:
-  metadata.gz: ffff6097b47894fef08ad2e083d0a5834929393d278085b00c3e6a5dfc508801266c0a2752f437feea24b7b1f43fcc9f368584df45d3dbcdf00fd04e87c97dcb
-  data.tar.gz: bff7b9a0140d6e6c5655824ac4b7110b75a2095b281a1d5e143870dac6dfc6454d792e7a21f4fc1403de4bae53243863796296afd75bf9906521ba887fea878c
+  metadata.gz: 5d475c34015705d9a7fd8fbca38bff1e1964338e9c210c6dc901da1ce40393d690cccaee4df3201ac4badff5151e9c74ef76f3c51a6f69ee2fc7d10ba7789d68
+  data.tar.gz: 0f9d5c41fb03e194cee54272a87a3d0c3df2f6251587648ef1cc04d3d3a9a8e5e109e0519ae62e02de460d30d92833a5f65655b0c06fe1ce7af485470de9c157

data/.simplecov

@@ -0,0 +1,9 @@
+
+SimpleCov.start do
+	add_filter "/spec/"
+end
+
+if ENV['TRAVIS']
+	require 'coveralls'
+	Coveralls.wear!
+end

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
+sudo: false
 rvm:
-  - "1.9"
   - "2.0"
   - "2.1"
+  - "2.2"
+env: COVERAGE=true

data/Gemfile

@@ -3,3 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in process-pool.gemspec
 gemspec
 
+group :test do
+	gem 'simplecov'
+	gem 'coveralls', require: false
+end

data/README.md

@@ -2,7 +2,9 @@
 
 `Process::Group` allows for multiple fibers to run system processes concurrently with minimal overhead.
 
-[![Build Status](https://travis-ci.org/ioquatix/process-group.svg?branch=master)](https://travis-ci.org/ioquatix/process-group)
+[![Build Status](https://secure.travis-ci.org/ioquatix/process-group.svg)](http://travis-ci.org/ioquatix/process-group)
+[![Code Climate](https://codeclimate.com/github/ioquatix/process-group.svg)](https://codeclimate.com/github/ioquatix/process-group)
+[![Coverage Status](https://coveralls.io/repos/ioquatix/process-group/badge.svg)](https://coveralls.io/r/ioquatix/process-group)
 
 ## Installation
 
@@ -101,7 +103,7 @@ If there are no running processes, this is a no-op (rather than an error).
 
 #### Handling Interrupts
 
-`Process::Graph` transparently handles `Interrupt` when raised within a `Fiber`. If `Interrupt` is raised, all children processes will be sent `kill(:INT)` and we will wait for all children to complete, but without resuming the controlling fibers. If `Interrupt` is raised during this process, children will be sent `kill(:TERM)`. After calling `Interrupt`, the fibers will not be resumed.
+`Process::Group` transparently handles `Interrupt` when raised within a `Fiber`. If `Interrupt` is raised, all children processes will be sent `kill(:INT)` and we will wait for all children to complete, but without resuming the controlling fibers. If `Interrupt` is raised during this process, children will be sent `kill(:TERM)`. After calling `Interrupt`, the fibers will not be resumed.
 
 ### Process Timeout
 

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |task|
+	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
+end
 
 task :default => :spec

data/lib/process/group.rb

@@ -48,7 +48,8 @@ module Process
 		class Fork
 			def initialize(block, options, fiber = Fiber.current)
 				@options = options
-				@block = block
+				
+				raise ArgumentError.new("Fork requires a block!") unless @block = block
 				
 				@fiber = fiber
 			end
@@ -73,9 +74,11 @@ module Process
 		end
 		
 		# Create a new process group. Can specify `options[:limit]` which limits the maximum number of concurrent processes.
-		def initialize(options = {})
+		def initialize(limit: nil)
+			@pid = Process.pid
+			
 			@queue = []
-			@limit = options[:limit]
+			@limit = limit
 		
 			@running = {}
 			@fiber = nil
@@ -109,14 +112,11 @@ module Process
 			end.resume
 		end
 		
-		def spawn(*arguments)
-			# Could be nice to use ** splat, but excludes ruby < 2.0.
-			options = Hash === arguments.last ? arguments.pop : {}
-	
+		def spawn(*arguments, **options)
 			append! Command.new(arguments, options)
 		end
 		
-		def fork(options = {}, &block)
+		def fork(**options, &block)
 			append! Fork.new(block, options)
 		end
 		
@@ -136,6 +136,8 @@ module Process
 		
 		# Wait for all processes to finish, naturally would schedule any fibers which are currently blocked.
 		def wait
+			raise ArgumentError.new("Cannot call Process::Group#wait from child process!") unless @pid == Process.pid
+			
 			while running?
 				process, status = wait_one
 				
@@ -196,7 +198,7 @@ module Process
 				else
 					pid = process.run(:pgroup => @pgid)
 				end
-			
+				
 				@running[pid] = process
 			end
 		end

data/lib/process/group/version.rb

@@ -20,6 +20,6 @@
 
 module Process
 	class Group
-		VERSION = "0.2.1"
+		VERSION = "1.0.0"
 	end
 end

data/process-group.gemspec

@@ -20,7 +20,9 @@ Gem::Specification.new do |spec|
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
 
+	spec.required_ruby_version = '>= 2.0'
+
 	spec.add_development_dependency "bundler", "~> 1.3"
-	spec.add_development_dependency "rspec", "~> 3.0.0.rc1"
+	spec.add_development_dependency "rspec", "~> 3.3.0"
 	spec.add_development_dependency "rake"
 end

data/spec/process/group/fork_spec.rb

@@ -49,6 +49,9 @@ module Process::Group::ForkSpec
 		
 			Fiber.new do
 				result = group.fork do
+					# Don't print out a backtrace when Ruby invariably exits due to the execption below:
+					$stderr.reopen('/dev/null', 'w')
+					
 					raise Interrupt
 				end
 			

data/spec/process/group/interrupt_spec.rb

@@ -144,7 +144,7 @@ module Process::Group::InterruptSpec
 			end_time = Time.now
 		
 			expect(checkpoint).to be == 'ABCE'
-			expect(end_time - start_time).to be_within(0.1).of 4.0
+			expect(end_time - start_time).to be_within(0.2).of 4.0
 		end
 	end
 end

data/spec/process/group/load_spec.rb

@@ -0,0 +1,46 @@
+# Copyright, 2015, 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 'process/group'
+
+module Process::Group::LoadSpec
+	describe Process::Group do
+		it "should only run a limited number of processes" do
+			group = Process::Group.new(limit: 5)
+			
+			expect(group.available?).to be_truthy
+			expect(group.blocking?).to be_falsey
+			
+			5.times do
+				Fiber.new do
+					result = group.fork do
+						exit(0)
+					end
+					
+					expect(result.exitstatus).to be == 0
+				end.resume
+			end
+			
+			expect(group.blocking?).to be_truthy
+			
+			group.wait
+		end
+	end
+end

data/spec/process/group/process_spec.rb

@@ -0,0 +1,57 @@
+# Copyright, 2015, 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.
+
+module Process::Group::ProcessSpec
+	describe Process do
+		it "default fork exit status should be 0" do
+			pid = fork do
+			end
+			
+			Process.waitpid(pid)
+			
+			expect($?.exitstatus).to be == 0
+		end
+		
+		it "should fork and return exit status correctly" do
+			pid = fork do
+				exit(1)
+			end
+			
+			Process.waitpid(pid)
+			
+			expect($?.exitstatus).to be == 1
+		end
+		
+		# This is currently broken on Rubinius.
+		it "should be okay to use fork within a fiber" do
+			pid = nil
+			
+			Fiber.new do
+				pid = fork do
+					exit(2)
+				end
+			end.resume
+			
+			Process.waitpid(pid)
+			
+			expect($?.exitstatus).to be == 2
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process-group
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2015-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".simplecov"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -73,6 +74,8 @@ files:
 - spec/process/group/fork_spec.rb
 - spec/process/group/interrupt_spec.rb
 - spec/process/group/io_spec.rb
+- spec/process/group/load_spec.rb
+- spec/process/group/process_spec.rb
 - spec/process/group/spawn_spec.rb
 homepage: ''
 licenses:
@@ -86,7 +89,7 @@ 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:
   - - ">="
@@ -102,4 +105,6 @@ test_files:
 - spec/process/group/fork_spec.rb
 - spec/process/group/interrupt_spec.rb
 - spec/process/group/io_spec.rb
+- spec/process/group/load_spec.rb
+- spec/process/group/process_spec.rb
 - spec/process/group/spawn_spec.rb