andromeda 0.1.2 → 0.1.3

data/Gemfile

@@ -1,30 +1,2 @@
 source "http://rubygems.org"
-
-gem 'json', '>=1.6.5'
-gem 'atomic'
-gem 'facter'
-gem 'statval'
-gem 'threadpool'
-
-group :development do
-  gem 'rake'
-  gem 'yard'
-  gem 'irbtools'
-end
-
-group :test do
-  gem 'rspec', '2.6.0'
-  gem 'simplecov'
-end
-
-platforms :ruby do
-  gem 'redcarpet'
-end
-
-platforms :rbx do
-  gem 'redcarpet'
-end
-
-platforms :jruby do
-  gem 'maruku'
-end
+gemspec

data/Gemfile.lock

@@ -1,90 +1,46 @@
+PATH
+  remote: .
+  specs:
+    andromeda (0.1.3)
+      atomic
+      facter
+      json
+      statval
+      threadpool
+
 GEM
   remote: http://rubygems.org/
   specs:
-    atomic (1.0.0)
-    atomic (1.0.0-java)
-    awesome_print (1.0.2)
-    boson (1.1.1)
-    clipboard (1.0.1)
-    coderay (1.0.6)
+    atomic (1.0.1)
     diff-lcs (1.1.3)
-    every_day_irb (1.2.2)
-    facter (1.6.8)
-    fancy_irb (0.7.2)
-      paint (>= 0.8.1)
-      unicode-display_width (>= 0.1.1)
-    g (1.6.0)
-      ruby_gntp
-    hirb (0.6.2)
-    interactive_editor (0.0.10)
-      spoon (>= 0.0.1)
-    irbtools (1.2.2)
-      awesome_print (~> 1.0.2)
-      boson (~> 1.1.1)
-      clipboard (~> 1.0.1)
-      coderay (~> 1.0.5)
-      every_day_irb (>= 1.2.2)
-      fancy_irb (>= 0.7.2)
-      g (>= 1.5.0)
-      hirb (~> 0.6.1)
-      interactive_editor (>= 0.0.10)
-      method_locator (>= 0.0.4)
-      method_source (>= 0.7.0)
-      methodfinder (>= 1.2.5)
-      ori (~> 0.1.0)
-      paint (>= 0.8.4)
-      sketches (>= 0.1.1)
-      wirb (>= 0.4.2)
-      zucker (>= 12.1)
-    json (1.6.6)
-    json (1.6.6-java)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
-    method_locator (0.0.4)
-    method_source (0.7.1)
-    methodfinder (1.2.5)
-    multi_json (1.3.2)
-    ori (0.1.0)
-    paint (0.8.4)
+    facter (1.6.9)
+    json (1.7.3)
+    multi_json (1.3.5)
     rake (0.9.2.2)
     redcarpet (2.1.1)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    ruby_gntp (0.3.4)
-    simplecov (0.6.2)
-      multi_json (~> 1.3)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sketches (0.1.1)
-    spoon (0.0.1)
     statval (0.1.2)
-    syntax (1.0.0)
     threadpool (0.1.0.1)
-    unicode-display_width (0.1.1)
-    wirb (0.4.2)
-    yard (0.7.5)
-    zucker (12.1)
+    yard (0.8.1)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  atomic
-  facter
-  irbtools
-  json (>= 1.6.5)
-  maruku
+  andromeda!
   rake
   redcarpet
-  rspec (= 2.6.0)
+  rspec
   simplecov
-  statval
-  threadpool
   yard

data/README.md

@@ -24,7 +24,7 @@ Below is an example that writes events to a file and reads them back such that t
     r = Cmd::Reader.new path: '/tmp/some_file'
     p = Cmd::Parser.new
     t = Kit::Tee.new
-    s = Sync::ScopeWaiter.new
+    s = Sync::Bracket.new
     # Connect the processing steps (Plans)
     s >> r >> p >> t
     # Enfore reader to run on a separate single thread
@@ -76,8 +76,8 @@ To sum up, plans are factory objects that describe the instantiation of concrete
 ### Quick Usage Example
 
     class MyPlan < Andromeda::Plan
-      attr_spot :a, :b
-      meth_spot :alternative
+      spot_attr :a, :b
+      spot_meth :alternative
 
       def data_key(name, data) ; data end
 
@@ -135,7 +135,7 @@ Andromeda provides a small set of reserved default tags that should not be overw
 
 #### Wating for event handling completion
 
-Waiting for event handling completion may be achieved by utilizing a special wrapper plan (cf. Sync::ScopeWaiter). This is implemented using an atomic counter (cf. Atom::Region).
+Waiting for event handling completion may be achieved by utilizing a special wrapper plan (cf. Sync::Bracket). This is implemented using an atomic counter (cf. Atom::Region).
 
 #### Performance
 

data/ROADMAP.md

@@ -4,12 +4,12 @@ This document contains planning steps and ideas for the future of andromeda.
 
 ## Short-Term Todo's
 
-* Test with macruby, figure out if rubinius pre-compilation should be added
-* Convert old Pool code into Guards
-* Convert Kit into Plans
-* Convert Command into Plans, moving it into a submodule
+* DONE Test with macruby, figure out if rubinius pre-compilation should be added, doesnt work
+* DONE Convert old Pool code into Guards
+* DONE Convert Kit into Plans
+* DONE Convert Command into Plans, moving it into a submodule
 * Test scope, tags, threading in IRB
-* Subscopes
+* Subscopes ?
 
 ### Write Test-Cases
 
@@ -23,7 +23,7 @@ around when andromeda is re-used by neoscout.
 * Add high-level description to README.md
 * Add examples to README.md
 * Add link to yardocs to README.md as soon as that makes sense
-* Figure out yardoc methods for documenting meth_spot and attr_spot
+* Figure out yardoc methods for documenting spot_meth and spot_attr
 
 ### Write a better DSL for connecting plans
 
@@ -69,5 +69,4 @@ on intern using the yet to be written Atom::* vars.
 
 Add automatic distribution support.
 
-It should not be that hard.  In the end this is just a mildly interesting graph transformation on the topology, a bit of rewiring, and some support code to run stuff on remote machines.  Ah maybe we just use capistrano for that. Of course, that would be static only. Dynamic job submission is a diffrerent story, as is at-most-once messaging (i.e. transactionality).
-
+It should not be that hard.  In the end this is just a mildly interesting graph transformation on the topology, a bit of rewiring, and some support code to run stuff on remote machines.  Ah maybe we just use capistrano for that. Of course, that would be static only. Dynamic job submission is a diffrerent story, as is at-most-once messaging (i.e. transactionality).

data/andromeda.gemspec

@@ -5,7 +5,7 @@ require 'andromeda/version'
 Gem::Specification.new do |s|
   s.name        = 'andromeda'
   s.version     = Andromeda::VERSION
-  s.summary     = 'light weght framework for complex event processing based on a dataflow DSL'
+  s.summary     = 'light weight framework for complex event processing based on a dataflow DSL'
   s.description = 'Andromeda is a light weight framework for complex event processing on multicore architectures. Andromeda users construct networks of plans that are interconnected via endpoint spots, describe how plans are scheduled onto threads, and process data by feeding data events to the resulting structure.'
   s.author      = 'Stefan Plantikow'
   s.email       = 'stefanp@moviepilot.com'
@@ -20,4 +20,20 @@ Gem::Specification.new do |s|
   s.bindir      = 'script'
   s.executables = `git ls-files -- script/*`.split("\n").map{ |f| File.basename(f) }
   s.licenses = ['PUBLIC DOMAIN WITHOUT ANY WARRANTY']
+
+  s.add_dependency 'json'
+  s.add_dependency 'atomic'
+  s.add_dependency 'facter'
+  s.add_dependency 'statval'
+  s.add_dependency 'threadpool'
+
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'yard'
+
+  case RUBY_ENGINE.to_sym
+    when :jruby then s.add_development_dependency 'maruku'
+    else s.add_development_dependency 'redcarpet'
+  end
 end

data/lib/andromeda.rb

@@ -16,40 +16,40 @@ require 'andromeda/version'
 
 module Andromeda
 
-	def self.files
-		f = []
-		f << 'andromeda/impl/to_s'
-		f << 'andromeda/impl/atom'
-		f << 'andromeda/impl/xor_id'
-		f << 'andromeda/impl/class_attr'
-		f << 'andromeda/impl/proto_plan'
-
-		f << 'andromeda/id'
-		f << 'andromeda/atom'
-		f << 'andromeda/error'
-		f << 'andromeda/copy_clone'
-		f << 'andromeda/guide_track'
-		f << 'andromeda/pool_guide'
-
-		f << 'andromeda/spot'
-		f << 'andromeda/plan'
-		f << 'andromeda/sync'
-		f << 'andromeda/sugar'
-
-		f << 'andromeda/kit'
-		f << 'andromeda/cmd'
-		f << 'andromeda/map_reduce'
-		f
-	end
-
-	def self.load_relative(f)
-		path = "#{File.join(File.dirname(caller[0]), f)}.rb"
- 	  load path
-	end
-
-	def self.reload!
-		files.each { |f| load_relative f }
-	end
+  def self.files
+    f = []
+    f << 'andromeda/impl/to_s'
+    f << 'andromeda/impl/atom'
+    f << 'andromeda/impl/xor_id'
+    f << 'andromeda/impl/class_attr'
+    f << 'andromeda/impl/proto_plan'
+
+    f << 'andromeda/id'
+    f << 'andromeda/atom'
+    f << 'andromeda/error'
+    f << 'andromeda/copy_clone'
+    f << 'andromeda/guide_track'
+    f << 'andromeda/pool_guide'
+
+    f << 'andromeda/spot'
+    f << 'andromeda/plan'
+    f << 'andromeda/sync'
+    f << 'andromeda/sugar'
+
+    f << 'andromeda/kit'
+    f << 'andromeda/cmd'
+    f << 'andromeda/map_reduce'
+    f
+  end
+
+  def self.load_relative(f)
+    path = "#{File.join(File.dirname(caller[0]), f)}.rb"
+    load path
+  end
+
+  def self.reload!
+    files.each { |f| load_relative f }
+  end
 
 end
 

data/lib/andromeda/atom.rb

@@ -1,105 +1,105 @@
 module Andromeda
 
-	module Impl
+  module Impl
 
-		class Atom < Atomic
-			include To_S
+    class Atom < Atomic
+      include To_S
 
-			def initialize(init_val = nil)
-				super init_val
-			end
+      def initialize(init_val = nil)
+        super init_val
+      end
 
-			def empty? ; value.nil? end
-			def full? ; ! value.nil? end
+      def empty? ; value.nil? end
+      def full? ; ! value.nil? end
 
-			def to_short_s ; "(#{To_S.short_s(value)})" end
-			alias_method :inspect, :to_s
+      def to_short_s ; "(#{To_S.short_s(value)})" end
+      alias_method :inspect, :to_s
 
-			def wait_while(&test)
-				while test.call(value) ; Thread::pass	end
-			end
+      def wait_while(&test)
+        while test.call(value) ; Thread::pass end
+      end
 
-			def wait_until_eq(val = nil)
-				raise ArgumentError unless val.kind_of?(Fixnum)
-				wait_while { |v| v != val }
-			end
+      def wait_until_eq(val = nil)
+        raise ArgumentError unless val.kind_of?(Fixnum)
+        wait_while { |v| v != val }
+      end
 
-			def wait_until_ne(val = nil)
-				raise ArgumentError unless val.kind_of?(Fixnum)
-				wait_while { |v| v == val }
-			end
+      def wait_until_ne(val = nil)
+        raise ArgumentError unless val.kind_of?(Fixnum)
+        wait_while { |v| v == val }
+      end
 
-			def wait_until_empty?
-				wait_until_eq nil
-			end
+      def wait_until_empty?
+        wait_until_eq nil
+      end
 
-			def wait_until_full?
-				wait_until_ne nil
-			end
+      def wait_until_full?
+        wait_until_ne nil
+      end
 
-			def with_value
-				update { |v| yield v ; v }
-			end
-		end
+      def with_value
+        update { |v| yield v ; v }
+      end
+    end
 
-	end
+  end
 
-	module Atom
+  module Atom
 
-		class Region
-			include Impl::To_S
+    class Region
+      include Impl::To_S
 
-			def to_short_s ; "(#{Impl::To_S.short_s(value)})" end
-			alias_method :inspect, :to_s
+      def to_short_s ; "(#{Impl::To_S.short_s(value)})" end
+      alias_method :inspect, :to_s
 
-			def initialize(init_value = 0)
-				init_value = init_value[:init_value].to_i if init_value.kind_of?(Hash)
-				raise ArgumentError unless init_value.kind_of?(Fixnum)
-				@count = Impl::Atom.new init_value
-			end
+      def initialize(init_value = 0)
+        init_value = init_value[:init_value].to_i if init_value.kind_of?(Hash)
+        raise ArgumentError unless init_value.kind_of?(Fixnum)
+        @count = Impl::Atom.new init_value
+      end
 
-			alias_method :inspect, :to_s
+      alias_method :inspect, :to_s
 
-			def value ; @count.value end
+      def value ; @count.value end
 
-			def enter(amount = 1)
-				raise ArgumentError unless amount.kind_of?(Fixnum)
-				raise ArgumentError unless amount >= 0
-				@count.update { |v| v + amount }
-			end
+      def enter(amount = 1)
+        raise ArgumentError unless amount.kind_of?(Fixnum)
+        raise ArgumentError unless amount >= 0
+        @count.update { |v| v + amount }
+      end
 
-			def leave(amount = 1)
-				raise ArgumentError unless amount >= 0
-				raise ArgumentError unless amount.kind_of?(Fixnum)
-				@count.update { |v| v - amount }
-			end
+      def leave(amount = 1)
+        raise ArgumentError unless amount >= 0
+        raise ArgumentError unless amount.kind_of?(Fixnum)
+        @count.update { |v| v - amount }
+      end
 
-			def wait_until_eq(val) ; @count.wait_until_eq(val) end
-		end
+      def wait_until_eq(val) ; @count.wait_until_eq(val) end
+    end
 
-		class Var < Impl::Atom
-		end
+    class Var < Impl::Atom
+    end
 
-		class FillOnce < Var
-			def empty! ; super.update nil end
+    class FillOnce < Var
+      def empty! ; super.update nil end
 
-			def update(v)
-				super.update do |o|
-					raise ArgumentError, 'Attempt to refill FillOnce' if o
-					v
-				end
-			end
-		end
+      def update(v)
+        super.update do |o|
+          raise ArgumentError, 'Attempt to refill FillOnce' if o
+          v
+        end
+      end
+    end
 
-		class Combiner < Var
-			attr_reader :combiner
+    class Combiner < Var
+      attr_reader :combiner
 
-			def update(v)
-				super.update do |o|
-					if combiner then combiner.call o, v else v end
-				end
-			end
-		end
+      def update(v)
+        super.update do |o|
+          if combiner then combiner.call o, v else v end
+        end
+      end
+    end
 
-	end
+  end
 end