thread 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2345d704e37f5dd5742e8e8c69f765a70eb061aa
-  data.tar.gz: cccad52eb3d6cb3da85dd087c43c4681ddf7c4d2
+  metadata.gz: 19359ceb19e36b411191f6a1ad561f7d1d4494b1
+  data.tar.gz: 26aa332d8178f937334fb00c01b6d52767aa0164
 SHA512:
-  metadata.gz: e3007f09957036eb9e3fa180df9beeb69a429fc8d899fe36fb4a5a1d409bf0baaa1a1104b5b59585362b1d8fe95c26ca25f3aec1ee674b2b76205e2353993d30
-  data.tar.gz: 1ca741fd5f9a71f2a3c5a023c6e443b346e89d8186f4f854b03cf350eab352f2ee4bc0b50a341b1665aa3b0619e7b10768a2dffb1f32807da64ac6c7ec2d68a7
+  metadata.gz: 53b93154104816e06c93c0b4477aa1a65ebc9c878b9e8723881ccf3ea5e2f9ab41c8454b6889018fb0132e9ece4c6efcac3731bff77a987629f4e784ce9d9bfc
+  data.tar.gz: 8cd976ebd6c34ac6b0d62facda8da94d67e9fda638f4a62a1d0693c12742ac1a2afca100d4c330de3638a4ea79155c3b08afb01ab1e2ef659365da16f74e9ff9

data/.gitignore

@@ -0,0 +1,3 @@
+*.gem
+Gemfile.lock
+pkg

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/.travis.yml

@@ -1,13 +1,10 @@
 language: ruby
 
 rvm:
-  - "1.9.2"
-  - "1.9.3"
-  - "2.0.0"
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - ruby-head
   - jruby
-  - rbx
-
-before_script:
-  - gem install rspec
-  - gem build *.gemspec
-  - gem install *.gem
+  - rbx

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/LICENSE.txt

@@ -0,0 +1,13 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.

data/README.md

@@ -1,8 +1,23 @@
-thread - various extensions to the thread library
-=================================================
+# thread
+
+[![Build Status](https://travis-ci.org/meh/ruby-thread.svg?branch=master)](https://travis-ci.org/meh/ruby-thread)
+
+Various extensions to the thread library in ruby.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'thread'
+
+Or install it yourself as:
+
+    $ gem install thread
+
+## Usage
+
+### Pool
 
-Pool
-====
 All the implementations I looked at were either buggy or wasted CPU resources
 for no apparent reason, for example used a sleep of 0.01 seconds to then check for
 readiness and stuff like this.
@@ -10,9 +25,6 @@ readiness and stuff like this.
 This implementation uses standard locking functions to work properly across multiple Ruby
 implementations.
 
-Example
--------
-
 ```ruby
 require 'thread/pool'
 
@@ -31,12 +43,9 @@ pool.shutdown
 
 You should get 4 lols every 2 seconds and it should exit after 10 of them.
 
-Channel
-=======
-This implements a channel where you can write messages and receive messages.
+### Channel
 
-Example
--------
+This implements a channel where you can write messages and receive messages.
 
 ```ruby
 require 'thread/channel'
@@ -67,15 +76,12 @@ loop {
 }
 ```
 
-Pipe
-====
+### Pipe
+
 A pipe allows you to execute various tasks on a set of data in parallel,
 each datum inserted in the pipe is passed along through queues to the various
 functions composing the pipe, the final result is inserted in the final queue.
 
-Example
--------
-
 ```ruby
 require 'thread/pipe'
 
@@ -85,16 +91,13 @@ p << 2
 puts ~p # => 16
 ```
 
-Process
-=======
+### Process
+
 A process helps reducing programming errors coming from race conditions and the
 like, the only way to interact with a process is through messages.
 
 Multiple processes should talk with eachother through messages.
 
-Example
--------
-
 ```ruby
 require 'thread/process'
 
@@ -108,15 +111,12 @@ p << 42
 p << 23
 ```
 
-Promise
-=======
+### Promise
+
 This implements the promise pattern, allowing you to pass around an object
 where you can send a value and extract a value, in a thread-safe way, accessing
 the value will wait for the value to be delivered.
 
-Example
--------
-
 ```ruby
 require 'thread/promise'
 
@@ -130,8 +130,8 @@ Thread.new {
 puts ~p # => 42
 ```
 
-Future
-======
+### Future
+
 A future is somewhat a promise, except you pass it a block to execute in
 another thread.
 
@@ -144,9 +144,6 @@ the block executed in an existing thread-pool.
 
 You can also use the `Thread::Pool` helper `#future`
 
-Example
--------
-
 ```ruby
 require 'thread/future'
 
@@ -186,14 +183,11 @@ puts ~f # => 42
 ```
 
 
-Delay
-=====
+### Delay
+
 A delay is kind of a promise, except the block is called when the value is
 being accessed and the result is cached.
 
-Example
--------
-
 ```ruby
 require 'thread/delay'
 
@@ -204,15 +198,12 @@ d = Thread.delay {
 puts ~d # => 42
 ```
 
-Every
-=====
+### Every
+
 An every executes the block every given seconds and yields the value to the
 every object, you can then check if the current value is old or how much time
 is left until the second call is done.
 
-Example
--------
-
 ```ruby
 require 'net/http'
 require 'thread/every'
@@ -227,3 +218,12 @@ loop do
 	puts ~e
 end
 ```
+
+## Contributing
+
+1. Fork it ( https://github.com/meh/ruby-thread/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Verify new and old specs are green (`rake`)
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create a new Pull Request

data/Rakefile

@@ -1,15 +1,6 @@
-#! /usr/bin/env ruby
-require 'rake'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-task :default => :test
+RSpec::Core::RakeTask.new(:spec)
 
-task :test do
-	FileUtils.cd 'tests' do
-		sh 'rspec channel_spec.rb --backtrace --color --format doc'
-		sh 'rspec promise_spec.rb --backtrace --color --format doc'
-		sh 'rspec future_spec.rb --backtrace --color --format doc'
-		sh 'rspec delay_spec.rb --backtrace --color --format doc'
-		sh 'rspec pipe_spec.rb --backtrace --color --format doc'
-		sh 'rspec every_spec.rb --backtrace --color --format doc'
-	end
-end
+task :default => :spec

data/lib/thread/channel.rb

@@ -91,7 +91,7 @@ class Thread::Channel
 		end
 	end
 
-private
+	private
 	def cond?
 		instance_variable_defined? :@cond
 	end

data/lib/thread/every.rb

@@ -31,7 +31,7 @@ class Thread::Every
 
 					@mutex.synchronize {
 						@at        = Time.now
-  					@value     = value
+						@value     = value
 						@old       = false
 						@exception = nil
 					}
@@ -172,7 +172,7 @@ class Thread::Every
 		}
 	end
 
-private
+	private
 	def cond?
 		instance_variable_defined? :@cond
 	end

data/lib/thread/future.rb

@@ -121,7 +121,7 @@ class Thread::Future
 
 	alias ! value!
 
-private
+	private
 	def cond?
 		instance_variable_defined? :@cond
 	end

data/lib/thread/pipe.rb

@@ -106,7 +106,7 @@ class Thread::Pipe
 	def deq (non_block = false)
 		@output.deq(non_block)
 	end
-	
+
 	alias pop deq
 	alias ~   deq
 end

data/lib/thread/pool.rb

@@ -61,6 +61,7 @@ class Thread::Pool
 					return
 				else
 					@exception = reason
+					raise @exception if Thread::Pool.abort_on_exception
 				end
 			end
 
@@ -119,7 +120,7 @@ class Thread::Pool
 
 		@done       = ConditionVariable.new
 		@done_mutex = Mutex.new
-		
+
 		@todo     = []
 		@workers  = []
 		@timeouts = {}
@@ -200,29 +201,29 @@ class Thread::Pool
 			@done.wait @done_mutex
 		}
 	end
-	
-        # Check if there are idle workers. 
-        def idle?
-               @todo.length < @waiting
-        end
-
-        # Process Block when there is a idle worker if not block its returns
-        def idle (&block)
-                while !idle?
-                        @done_mutex.synchronize {
-                                break if idle?
-                                @done.wait @done_mutex
-                        }
-                end
-
-                unless block
-                        return
-                end
-
-                process &block
-
-        end
-        
+
+	# Check if there are idle workers.
+	def idle?
+		@todo.length < @waiting
+	end
+
+	# Process Block when there is a idle worker if not block its returns
+	def idle (*args, &block)
+		while !idle?
+			@done_mutex.synchronize {
+				break if idle?
+				@done.wait @done_mutex
+			}
+		end
+
+		unless block
+			return
+		end
+
+		process *args, &block
+
+	end
+
 	# Add a task to the pool which will execute the block with the given
 	# argument.
 	#
@@ -337,7 +338,14 @@ class Thread::Pool
 		self
 	end
 
-private
+	class << self
+		# If true, tasks will allow raised exceptions to pass through.
+		#
+		# Similar to Thread.abort_on_exception
+		attr_accessor :abort_on_exception
+	end
+
+	private
 	def wake_up_timeout
 		if defined? @pipes
 			@pipes.last.write_nonblock 'x' rescue nil
@@ -398,7 +406,7 @@ private
 
 		thread
 	end
-	
+
 	def spawn_timeout_thread
 		@pipes   = IO.pipe
 		@timeout = Thread.new {
@@ -428,7 +436,7 @@ private
 				}
 
 				@timeouts.reject! { |task, _| task.terminated? || task.finished? }
-				
+
 				break if @shutdown == :now
 			end
 		}
@@ -446,4 +454,4 @@ class Thread
 	def self.pool (*args, &block)
 		Thread::Pool.new(*args, &block)
 	end
-end
+end

data/lib/thread/process.rb

@@ -53,7 +53,7 @@ class Thread::Process
 
 	alias << send
 
-private
+	private
 	def receive
 		@channel.receive
 	end

data/lib/thread/promise.rb

@@ -58,7 +58,7 @@ class Thread::Promise
 
 	alias ~ value
 
-private
+	private
 	def cond?
 		instance_variable_defined? :@cond
 	end

data/{tests → spec/thread}/channel_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-require 'rubygems'
 require 'thread/channel'
 
 describe Thread::Channel do

data/{tests → spec/thread}/delay_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-require 'rubygems'
 require 'thread/delay'
 
 describe Thread::Delay do

data/{tests → spec/thread}/every_spec.rb

@@ -1,10 +1,8 @@
-#! /usr/bin/env ruby
-require 'rubygems'
 require 'thread/every'
 
 describe Thread::Every do
 	it 'delivers a value properly' do
-		e = Thread.every(5) { sleep 0.5; 42 }
+		e = Thread.every(5) { sleep 0.02; 42 }
 
 		e.value.should == 42
 	end

data/{tests → spec/thread}/future_spec.rb

@@ -1,12 +1,9 @@
-#! /usr/bin/env ruby
-require 'rubygems'
 require 'thread/future'
 
 describe Thread::Future do
 	it 'delivers a value properly' do
 		f = Thread.future {
-			sleep 0.2
-			
+			sleep 0.02
 			42
 		}
 
@@ -15,19 +12,19 @@ describe Thread::Future do
 
 	it 'properly checks if anything has been delivered' do
 		f = Thread.future {
-			sleep 0.2
+			sleep 0.02
 
 			42
 		}
 
 		f.delivered?.should == false
-		sleep 0.3
+		sleep 0.03
 		f.delivered?.should == true
 	end
 
 	it 'does not block when a timeout is passed' do
 		f = Thread.future {
-			sleep 0.2
+			sleep 0.02
 
 			42
 		}

data/{tests → spec/thread}/pipe_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-require 'rubygems'
 require 'thread/pipe'
 
 describe Thread::Pipe do
@@ -14,7 +12,7 @@ describe Thread::Pipe do
 	end
 
 	it 'empty works properly' do
-		p = Thread |-> d { sleep 0.2; d * 2 } |-> d { d * 4 }
+		p = Thread |-> d { sleep 0.02; d * 2 } |-> d { d * 4 }
 
 		p.empty?.should == true
 		p.enq 42

data/{tests → spec/thread}/promise_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-require 'rubygems'
 require 'thread/promise'
 
 describe Thread::Promise do
@@ -7,7 +5,7 @@ describe Thread::Promise do
 		p = Thread.promise
 
 		Thread.new {
-			sleep 0.2
+			sleep 0.02
 
 			p << 42
 		}
@@ -19,13 +17,13 @@ describe Thread::Promise do
 		p = Thread.promise
 
 		Thread.new {
-			sleep 0.2
+			sleep 0.02
 
 			p << 42
 		}
 
 		p.delivered?.should == false
-		sleep 0.3
+		sleep 0.03
 		p.delivered?.should == true
 	end
 

data/thread.gemspec

@@ -1,19 +1,22 @@
-Gem::Specification.new {|s|
-	s.name         = 'thread'
-	s.version      = '0.1.4'
-	s.author       = 'meh.'
-	s.email        = 'meh@schizofreni.co'
-	s.homepage     = 'http://github.com/meh/ruby-thread'
-	s.platform     = Gem::Platform::RUBY
-	s.summary      = 'Various extensions to the base thread library.'
-	s.description  = 'Includes a thread pool, message passing capabilities, a recursive mutex, promise, future and delay.'
-	s.license      = 'WTFPL'
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-	s.files         = `git ls-files`.split("\n")
-	s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-	s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-	s.require_paths = ['lib']
+Gem::Specification.new do |spec|
+  spec.name          = "thread"
+  spec.version       = "0.1.5"
+  spec.authors       = ["meh."]
+  spec.email         = ["meh@schizofreni.co"]
+  spec.summary       = %q{Various extensions to the base thread library.}
+  spec.description   = %q{Includes a thread pool, message passing capabilities, a recursive mutex, promise, future and delay.}
+  spec.homepage      = "http://github.com/meh/ruby-thread"
+  spec.license       = "WTFPL"
 
-	s.add_development_dependency 'rspec'
-	s.add_development_dependency 'rake'
-}
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rake"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thread
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - meh.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -40,12 +40,17 @@ dependencies:
         version: '0'
 description: Includes a thread pool, message passing capabilities, a recursive mutex,
   promise, future and delay.
-email: meh@schizofreni.co
+email:
+- meh@schizofreni.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rspec"
 - ".travis.yml"
+- Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - lib/thread/channel.rb
@@ -57,12 +62,12 @@ files:
 - lib/thread/process.rb
 - lib/thread/promise.rb
 - lib/thread/recursive_mutex.rb
-- tests/channel_spec.rb
-- tests/delay_spec.rb
-- tests/every_spec.rb
-- tests/future_spec.rb
-- tests/pipe_spec.rb
-- tests/promise_spec.rb
+- spec/thread/channel_spec.rb
+- spec/thread/delay_spec.rb
+- spec/thread/every_spec.rb
+- spec/thread/future_spec.rb
+- spec/thread/pipe_spec.rb
+- spec/thread/promise_spec.rb
 - thread.gemspec
 homepage: http://github.com/meh/ruby-thread
 licenses:
@@ -84,9 +89,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Various extensions to the base thread library.
-test_files: []
+test_files:
+- spec/thread/channel_spec.rb
+- spec/thread/delay_spec.rb
+- spec/thread/every_spec.rb
+- spec/thread/future_spec.rb
+- spec/thread/pipe_spec.rb
+- spec/thread/promise_spec.rb
 has_rdoc: