Merged amiller's changes.

Reorganized lib. Added port_spec.
larrytheliquid · Apr 27, 2009 · fa4441d · fa4441d
1 parent 7c1946d
commit fa4441d
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 36 deletions.
diff --git a/dataflow.rb b/dataflow.rb
@@ -58,3 +58,6 @@ def method_missing(name, *args, &block)
 
   UnificationError = Class.new StandardError
 end
+
+require "#{File.dirname(__FILE__)}/lib/port"
+require "#{File.dirname(__FILE__)}/lib/actor"
diff --git a/examples/local_variables2.rb b/examples/local_variables2.rb
diff --git a/examples/messages.rb b/examples/messages.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../actor"
+require "#{File.dirname(__FILE__)}/../dataflow"
 include Dataflow
 
 Ping = Actor.new {

diff --git a/examples/portsend.rb b/examples/portsend.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../port"
+require "#{File.dirname(__FILE__)}/../dataflow"
 include Dataflow
 
 local do |p, x|

diff --git a/examples/ring.rb b/examples/ring.rb
@@ -1,9 +1,9 @@
-require "#{File.dirname(__FILE__)}/../actor"
+require "#{File.dirname(__FILE__)}/../dataflow"
 include Dataflow
 
 # Send M messages each along a ring of N nodes
-N = 40
-M = 20
+N = 4
+M = 2
 
 actors = []
 N.times do |n| 
@@ -22,4 +22,4 @@
 end
 
 actors[0].send :msg
-actors.each { |x| x.join }
+actors.each { |x| x.join }
diff --git a/actor.rb → lib/actor.rb b/actor.rb → lib/actor.rb
@@ -1,5 +1,3 @@
-require 'port'
-
 module Dataflow
   class Actor < Thread
     include Dataflow

diff --git a/port.rb → lib/port.rb b/port.rb → lib/port.rb
@@ -1,4 +1,3 @@
-require 'dataflow'
 require 'thread'
 
 module Dataflow

diff --git a/dataflow_spec.rb → spec/dataflow_spec.rb b/dataflow_spec.rb → spec/dataflow_spec.rb
@@ -1,10 +1,4 @@
-require 'rubygems'
-require 'spec'
-require 'dataflow'
-
-Spec::Runner.configure do |config|
-  config.include Dataflow
-end
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 context 'Using "local" for local variables' do
   describe 'An unbound Variable' do

diff --git a/port_spec.rb → spec/port_spec.rb b/port_spec.rb → spec/port_spec.rb
@@ -1,11 +1,4 @@
-require 'rubygems'
-require 'spec'
-require 'dataflow'
-require 'port'
-
-Spec::Runner.configure do |config|
-  config.include Dataflow
-end
+require "#{File.dirname(__FILE__)}/spec_helper"
 
 describe 'Syncronously sending to a Port' do
   it 'extends the length of the stream and preserves order' do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'spec'
+require 'dataflow'
+
+Spec::Runner.configure do |config|
+  config.include Dataflow
+end