Merge pull request #481 from ruby-concurrency/fix-autoload-bug-on-jruby

Resolved NameError on JRuby by using fewer autoloads.

Author: jdantonio

.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - 1.9.3
   - ruby-head
   - jruby-1.7.19
+  - jruby-9.0.1.0
   - jruby-9.0.3.0
   - jruby-9.0.4.0
   - jruby-head

lib/concurrent/delay.rb

@@ -5,6 +5,7 @@
 
 module Concurrent
 
+  # This file has circular require issues. It must be autoloaded here.
   autoload :Options, 'concurrent/options'
 
   # Lazy evaluation of a block yielding an immutable result. Useful for

lib/concurrent/executor/timer_set.rb

@@ -4,9 +4,9 @@
 require 'concurrent/executor/executor_service'
 require 'concurrent/executor/single_thread_executor'
 
-module Concurrent
+require 'concurrent/options'
 
-  autoload :Options, 'concurrent/options'
+module Concurrent
 
   # Executes a collection of tasks, each after a given delay. A master task
   # monitors the set and schedules each task for execution at the appropriate
@@ -21,7 +21,7 @@ class TimerSet < RubyExecutorService
     # Create a new set of timed tasks.
     #
     # @!macro [attach] executor_options
-    #  
+    #
     #   @param [Hash] opts the options used to specify the executor on which to perform actions
     #   @option opts [Executor] :executor when set use the given `Executor` instance.
     #     Three special values are also supported: `:task` returns the global task pool,

lib/concurrent/future.rb

@@ -4,9 +4,9 @@
 require 'concurrent/ivar'
 require 'concurrent/executor/safe_task_executor'
 
-module Concurrent
+require 'concurrent/options'
 
-  autoload :Options, 'concurrent/options'
+module Concurrent
 
   # {include:file:doc/future.md}
   #

lib/concurrent/options.rb

@@ -1,5 +1,3 @@
-# This file has circular require issues. It must be autoloaded.
-
 require 'concurrent/configuration'
 
 module Concurrent

lib/concurrent/promise.rb

@@ -3,9 +3,9 @@
 require 'concurrent/errors'
 require 'concurrent/ivar'
 
-module Concurrent
+require 'concurrent/options'
 
-  autoload :Options, 'concurrent/options'
+module Concurrent
 
   PromiseExecutionError = Class.new(StandardError)
 

lib/concurrent/scheduled_task.rb

@@ -5,9 +5,9 @@
 require 'concurrent/collection/copy_on_notify_observer_set'
 require 'concurrent/utility/monotonic_time'
 
-module Concurrent
+require 'concurrent/options'
 
-  autoload :Options, 'concurrent/options'
+module Concurrent
 
   # `ScheduledTask` is a close relative of `Concurrent::Future` but with one
   # important difference: A `Future` is set to execute as soon as possible