rubysl-thwait 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 40906ea355b3bfdfa40b94426b8b51aba99e5936
-  data.tar.gz: 09a29ae3102328fa032ada0cdb9764ee4cf66acc
-SHA512:
-  metadata.gz: 3bd3b46c121211699a4a90738f49d22525eaa11be9cbfcee811ce4c22c339a451a70e447745000ffa0ab76f75ea606851ec56724afb01b90f5b49917ac159011
-  data.tar.gz: a7e449b7ff975b48e2f8471455090e223ce5bcc3ae4dfd7c475246a24781391061bb9c173c8d51a3bab8fecd7981bfd49b631a23a4dfd679741481ca7e48b35e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGU5YmNiNTg3NWZmZjQ0NjE5M2M1M2JkYmQwNjZmMjlkMWIxYmRjOA==
+  data.tar.gz: !binary |-
+    ZTI4NTE5ODAwMWQ5NTIyYjVhN2U1Mjk4YTQ3ZDljZmJiN2M5Njg3OQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NmI2ZDdlMmY1ZTlmYWMyYmQ3Y2ViNGM3YmFjMjRmZGZlMmRiMjRjMGU3Y2My
+    Yjg4YTgzNDNhNzA4ZmE5NzZjNWM4YmE3MzE3MTBkMjQ1MzQ4ZGMwNTkzNGEw
+    ZGQ3NzJiYTQwMGJkMWYzNGZkOGU4ZDljN2I0MjYyNzMzYzgwOTU=
+  data.tar.gz: !binary |-
+    NzZmN2Q1MTBjMTYxMzBlNjdhMGQwNjgzYTg3ODliODZlMTY2ZWQ0MGE0Mjg1
+    Y2JkNWFhZmUwOTNmMGZkOWZmYTU2NjM5ZjhiODM1NDY2MGFmM2I3N2MwMjI1
+    MTE2M2FiNjY3MjNiNjEwNjkwNjZlYzBhOWY4NTE2Y2RiMzNlNmM=

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
-before_install:
-  - gem update --system
-  - gem --version
-  - gem install rubysl-bundler
-script: bundle exec mspec spec
+env:
+  - RUBYLIB=lib
+script: bundle exec mspec
 rvm:
-  - rbx-nightly-18mode
+  - 1.9.3
+  - rbx-nightly-19mode

data/lib/rubysl/thwait/thwait.rb

@@ -1,42 +1,11 @@
 #
 #   thwait.rb - thread synchronization class
-#   	$Release Version: 0.9 $
-#   	$Revision: 1.3 $
-#   	$Date: 1998/06/26 03:19:34 $
-#   	by Keiju ISHITSUKA(Nihpon Rational Software Co.,Ltd.)
-#     modernized by Evan Phoenix - 2011
-# --
-#  feature:
-#  provides synchronization for multiple threads.
-#
-#  class methods:
-#  * ThreadsWait.all_waits(thread1,...)
-#    waits until all of specified threads are terminated.
-#    if a block is supplied for the method, evaluates it for
-#    each thread termination.
-#  * th = ThreadsWait.new(thread1,...)
-#    creates synchronization object, specifying thread(s) to wait.
-#  
-#  methods:
-#  * th.threads
-#    list threads to be synchronized
-#  * th.empty?
-#    is there any thread to be synchronized.
-#  * th.finished?
-#    is there already terminated thread.
-#  * th.join(thread1,...) 
-#    wait for specified thread(s).
-#  * th.join_nowait(threa1,...)
-#    specifies thread(s) to wait.  non-blocking.
-#  * th.next_wait
-#    waits until any of specified threads is terminated.
-#  * th.all_waits
-#    waits until all of specified threads are terminated.
-#    if a block is supplied for the method, evaluates it for
-#    each thread termination.
-#
+#       $Release Version: 0.9 $
+#       $Revision: 1.3 $
+#       by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd.)
 
-require "thread"
+require "thread.rb"
+require "e2mmap.rb"
 
 #
 # This class watches for termination of multiple threads.  Basic functionality
@@ -46,22 +15,25 @@ require "thread"
 #
 # Example:
 #
-#   ThreadsWait.all_waits(thr1, thr2, ...) do |t|
+#   ThreadsWait.all_wait(thr1, thr2, ...) do |t|
 #     STDERR.puts "Thread #{t} has terminated."
 #   end
 #
+#
+#   th = ThreadsWait.new(thread1,...)
+#   th.next_wait # next one to be done
+#
+#
 class ThreadsWait
-  RCS_ID='-$Id: thwait.rb:git 1.4 2011/01/24 00:00:00 evan $-'
- 
-  class ErrNoWaitingThread < StandardError
-  end
+  RCS_ID='-$Id: thwait.rb,v 1.3 1998/06/26 03:19:34 keiju Exp keiju $-'
 
-  class ErrNoFinishedThread < StandardError
-  end
+  extend Exception2MessageMapper
+  def_exception("ErrNoWaitingThread", "No threads for waiting.")
+  def_exception("ErrNoFinishedThread", "No finished threads.")
 
   #
   # Waits until all specified threads have terminated.  If a block is provided,
-  # it is executed for each thread termination.
+  # it is executed for each thread as they terminate.
   #
   def ThreadsWait.all_waits(*threads) # :yield: thread
     tw = ThreadsWait.new(*threads)
@@ -73,7 +45,7 @@ class ThreadsWait
       tw.all_waits
     end
   end
-  
+
   #
   # Creates a ThreadsWait object, specifying the threads to wait on.
   # Non-blocking.
@@ -83,32 +55,33 @@ class ThreadsWait
     @wait_queue = Queue.new
     join_nowait(*threads) unless threads.empty?
   end
-  
-  # Returns the array of threads in the wait queue.
-  attr_reader :threads
-  
+
+  # Returns the array of threads that have not terminated yet.
+  attr :threads
+
   #
-  # Returns +true+ if there are no threads to be synchronized.
+  # Returns +true+ if there are no threads in the pool still running.
   #
   def empty?
     @threads.empty?
   end
-  
+
   #
-  # Returns +true+ if any thread has terminated.
+  # Returns +true+ if any thread has terminated and is ready to be collected.
   #
   def finished?
     !@wait_queue.empty?
   end
-  
+
   #
-  # Waits for specified threads to terminate.
+  # Waits for specified threads to terminate, and returns when one of
+  # the threads terminated.
   #
   def join(*threads)
     join_nowait(*threads)
     next_wait
   end
-  
+
   #
   # Specifies the threads that this object will wait for, but does not actually
   # wait.
@@ -116,8 +89,7 @@ class ThreadsWait
   def join_nowait(*threads)
     threads.flatten!
     @threads.concat threads
-
-    threads.each do |th|
+    for th in threads
       Thread.start(th) do |t|
         begin
           t.join
@@ -127,27 +99,24 @@ class ThreadsWait
       end
     end
   end
-  
+
   #
   # Waits until any of the specified threads has terminated, and returns the one
   # that does.
   #
-  # If there are no pending threads to wait for, raises +ErrNoWaitingThread+. 
-  # If +nonblock+ is true and there is no terminated thread,
-  # raises +ErrNoFinishedThread+.
+  # If there is no thread to wait, raises +ErrNoWaitingThread+.  If +nonblock+
+  # is true, and there is no terminated thread, raises +ErrNoFinishedThread+.
   #
-  def next_wait(nonblock=nil)
-    raise ErrNoWaitingThread, "No threads for waiting" if @threads.empty?
-
+  def next_wait(nonblock = nil)
+    ThreadsWait.fail ErrNoWaitingThread if @threads.empty?
     begin
-      th = @wait_queue.pop(nonblock)
-      @threads.delete th
-      return th
+      @threads.delete(th = @wait_queue.pop(nonblock))
+      th
     rescue ThreadError
-      raise ErrNoFinishedThread, "No finished threads"
+      ThreadsWait.fail ErrNoFinishedThread
     end
   end
-  
+
   #
   # Waits until all of the specified threads are terminated.  If a block is
   # supplied for the method, it is executed for each thread termination.
@@ -162,7 +131,8 @@ class ThreadsWait
   end
 end
 
-# deprecated alias
+##
+# An alias for ThreadsWait from thwait.rb
 
 ThWait = ThreadsWait
 
@@ -170,6 +140,3 @@ ThWait = ThreadsWait
 #  - Source of documentation is evenly split between Nutshell, existing
 #    comments, and my own rephrasing.
 #  - I'm not particularly confident that the comments are all exactly correct.
-#  - The history, etc., up the top appears in the RDoc output.  Perhaps it would
-#    be better to direct that not to appear, and put something else there
-#    instead.

data/lib/rubysl/thwait/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module ThreadsWait
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/rubysl-thwait.gemspec

@@ -16,12 +16,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 1.8.7"
-
-  spec.add_runtime_dependency "rubysl-thread", "~> 1.0"
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
 end

metadata

@@ -1,30 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-thwait
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubysl-thread
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -32,13 +19,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -46,13 +33,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: mspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -60,26 +47,11 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubysl-prettyprint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Ruby standard library threads_wait.
 email:
 - brixen@gmail.com
@@ -108,19 +80,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: !binary |-
+        MA==
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby standard library threads_wait.
 test_files: []
-has_rdoc: