drmap 0.0.1 → 0.0.3

data/Rakefile

@@ -11,4 +11,6 @@ end
 
 Dir['tasks/**/*.rake'].each { |rake| load rake }
 
+# I CAN EDIT CODE FROM GITHUB?
+
 # vim: syntax=Ruby

data/bin/drirb

@@ -3,8 +3,42 @@
 require 'rubygems'
 require 'drmap'
 require 'irb'
+require 'open3'
+
+class Beanstalkd
+  
+  def start_daemon
+    puts "Starting beanstalkd"
+    try_journeta
+    fork do
+      Open3::popen3("beanstalkd")
+    end
+  end
+  
+  def try_journeta
+    begin
+      require 'journeta'
+      Journeta::Engine.new(:peer_port => (2048+rand(2**8)), :groups => ["drserver"]).start
+    rescue
+    end
+  end
+  
+  def stop_daemon
+    puts "\nKilling beanstalkd"
+    fork do
+      Open3::popen3("killall -9 beanstalkd")
+    end
+  end
+end
 
 if __FILE__ == $0
-  Drmap::BeanstalkPool.hosts = ['localhost:11300'] # TODO Should probably make this a command line variable
-  IRB.start(__FILE__)
+  begin
+    bs = Beanstalkd.new
+    bs.start_daemon
+    # TODO Should probably make this a command line variable
+    Drmap::BeanstalkPool.hosts = ['localhost:11300']
+    IRB.start(__FILE__)
+  ensure
+    bs.stop_daemon
+  end
 end

data/bin/drworker

@@ -3,14 +3,42 @@
 require 'rubygems'
 require 'drmap'
 
+def start_journeta
+  begin
+    require 'journeta'
+    journeta = Journeta::Engine.new(:peer_port => (2048+rand(2**8)), :groups => ["drclient"])
+    journeta.start
+    puts "Discovering server..."
+    sleep(5)
+    @peers = journeta.known_peers_in_group("drserver")
+  rescue LoadError => e
+    puts "Caught exception: #{e.message}"
+    @peers = {}
+  end
+end
+
+def discover_server
+  bserver = "localhost:11300"
+  start_journeta
+  if !@peers.empty?
+    peer = @peers[@peers.keys.first]
+    bserver = "#{peer.ip_address}:11300"
+  end
+  bserver
+end
+
 if __FILE__ == $0
-  host = "localhost:11300"
+  host =
   if ARGV[0]
     host = ARGV[0]
+  else
+    host = discover_server
   end
-  puts "Connecting to #{host}" # TODO Should probably test connection!
+
+  puts "Connecting to #{host}"
+  # TODO Should probably test connection!
   Drmap::BeanstalkPool.hosts = [host]
   pool = Drmap::BeanstalkPool.new
   worker = Drmap::BeanstalkWorker.new(pool)
   worker.process
-end
+end

data/lib/drmap.rb

@@ -5,6 +5,8 @@ require 'pp'
 
 require 'beanstalk-client'
 require 'ruby2ruby'
+require 'parse_tree'
+require 'parse_tree_extensions'
 
 require 'drmap/drmap_enumerable'
 require 'drmap/beanstalk_worker'
@@ -13,4 +15,4 @@ require 'drmap/version'
 
 module Drmap
   VERSION = Drmap::Version::STRING
-end
+end

data/lib/drmap/drmap_enumerable.rb

@@ -1,10 +1,12 @@
 module Enumerable
 
   def drmap(&block)
+    raise "No data" if self.size == 0
     pool = Drmap::BeanstalkPool.new
 
-    jid = rand(100)
+    jid = Kernel.rand(100)
     each_with_index do |element, idx|
+      # puts "Adding #{jid}, #{element}, #{block.to_ruby}"
       pool.put_job(jid, block.to_ruby, element)
     end
 

data/lib/drmap/version.rb

@@ -2,7 +2,7 @@ module Drmap
   module Version #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drmap
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors: 
 - Marc Chung
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-27 00:00:00 -07:00
+date: 2008-11-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
 description: drmap distributed Ruby blocks across processes
 email: