Merge pull request #291 from ruby-concurrency/move-to-edge

Moved classes to Edge gem.

Author: jdantonio

README.md

@@ -52,7 +52,6 @@ This library contains a variety of concurrency abstractions at high and low leve
 
 ### High-level, general-purpose asynchronous concurrency abstractions
 
-* [Agent](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Agent.html): A single atomic value that represents an identity.
 * [Async](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Async.html): A mixin module that provides simple asynchronous behavior to any standard class/object or object.
 * [Future](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Future.html): An asynchronous operation that produces a value.
   * [Dataflow](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent.html#dataflow-class_method): Built on Futures, Dataflow allows you to create a task that will be scheduled when all of its data dependencies are available.
@@ -66,11 +65,9 @@ This library contains a variety of concurrency abstractions at high and low leve
 
 ### Thread synchronization classes and algorithms
 
-* [Condition](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Condition.html)
 * [CountdownLatch](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/CountDownLatch.html)
 * [CyclicBarrier](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/CyclicBarrier.html)
 * [Event](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Event.html)
-* [Exchanger](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Exchanger.html)
 * [Semaphore](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Semaphore.html)
 * [Timeout](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent.html#timeout-class_method)
 * [Timer](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent.html#timer-class_method)
@@ -81,7 +78,6 @@ This library contains a variety of concurrency abstractions at high and low leve
 * [AtomicFixnum](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/AtomicFixnum.html)
 * [AtomicReference](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/MutexAtomic.html)
 * [Delay](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Delay.html)
-* [LazyRegister](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/LazyRegister.html)
 * [I-Structures](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/IVar.html) (IVar)
 * [M-Structures](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/MVar.html) (MVar)
 * [Thread-local variables](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/ThreadLocalVar.html)
@@ -96,10 +92,13 @@ These features are under active development and may change frequently. They are
 keep backward compatibility (there may also lack tests and documentation). Semantic versions will
 be obeyed though. Features developed in `concurrent-ruby-edge` are expected to move to `concurrent-ruby` when final.
 
-*   [Actor](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Actor.html):
-    Implements the Actor Model, where concurrent actors exchange messages.
-*   [Channel](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Channel.html):
-    Communicating Sequential Processes (CSP).
+* [Actor](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Actor.html):
+  Implements the Actor Model, where concurrent actors exchange messages.
+* [Agent](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Agent.html): A single atomic value that represents an identity.
+* [Channel](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Channel.html):
+  Communicating Sequential Processes (CSP).
+* [Exchanger](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Exchanger.html)
+* [LazyRegister](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/LazyRegister.html)
 
 ## Usage
 

Rakefile

@@ -156,7 +156,8 @@ begin
                    '--backtrace ' \
                    '--tag ~unfinished ' \
                    '--seed 1 ' \
-                   '--format documentation'
+                   '--format documentation ' \
+                   '--tag ~notravis'
   end
 
   task :ci => [:clean, :compile, :travis]

concurrent-ruby.gemspec

@@ -26,9 +26,9 @@ Inspired by Erlang, Clojure, Go, JavaScript, actors, and classic concurrency pat
   if defined?(JRUBY_VERSION)
     s.files    += Dir['lib/**/*.jar']
     s.platform = 'java'
-  else
-    s.add_runtime_dependency 'ref', '~> 1.0', '>= 1.0.5'
   end
 
+  s.add_runtime_dependency 'ref', '~> 1.0', '>= 1.0.5'
+
   s.required_ruby_version = '>= 1.9.3'
 end

lib/concurrent-edge.rb

@@ -1,7 +1,9 @@
 require 'concurrent'
 
 require 'concurrent/actor'
+require 'concurrent/agent'
 require 'concurrent/channel'
-require 'concurrent/edge/future'
-
+require 'concurrent/exchanger'
+require 'concurrent/lazy_register'
 
+require 'concurrent/edge/future'

lib/concurrent.rb

@@ -12,14 +12,11 @@
 require 'concurrent/utilities'
 
 require 'concurrent/atomic/atomic_reference'
-require 'concurrent/agent'
 require 'concurrent/async'
 require 'concurrent/dataflow'
 require 'concurrent/delay'
-require 'concurrent/exchanger'
 require 'concurrent/future'
 require 'concurrent/ivar'
-require 'concurrent/lazy_register'
 require 'concurrent/mvar'
 require 'concurrent/promise'
 require 'concurrent/scheduled_task'

lib/concurrent/atomic/condition.rb

@@ -11,6 +11,8 @@ module Concurrent
   # Every #wait must be guarded by a locked Mutex or a ThreadError will be
   # risen. Although it's not mandatory, it's recommended to call also #signal
   # and #broadcast within the same mutex
+  #
+  # @deprecated
   class Condition
 
     class Result
@@ -37,6 +39,7 @@ def timed_out?
     end
 
     def initialize
+      warn '[DEPRECATED] Will be replaced with Synchronization::Object in v1.0.'
       @condition = ConditionVariable.new
     end
 

lib/concurrent/file_map.rb

@@ -1,11 +1,14 @@
 module Concurrent
 
   git_files      = `git ls-files`.split("\n")
-  all_lib_files  = Dir['lib/concurrent/**/*.rb'] & git_files
+  all_lib_files  = (Dir['lib/concurrent/**/*.rb'] & git_files) - ['lib/concurrent/file_map.rb']
   edge_lib_files = Dir['lib/concurrent/actor.rb',
                        'lib/concurrent/actor/**/*.rb',
                        'lib/concurrent/channel.rb',
                        'lib/concurrent/channel/**/*.rb',
+                       'lib/concurrent/agent.rb',
+                       'lib/concurrent/exchanger.rb',
+                       'lib/concurrent/lazy_register.rb',
                        'lib/concurrent/edge/**/*.rb'] & git_files
   core_lib_files = all_lib_files - edge_lib_files
 

spec/concurrent/exchanger_spec.rb

@@ -1,6 +1,6 @@
 module Concurrent
 
-  describe Exchanger do
+  describe Exchanger, notravis: true do
 
     describe 'exchange' do