gongren 0.1.0 → 0.1.1

data/README.rdoc

@@ -4,6 +4,8 @@ Gongren distributes jobs to workers, with support for failed worker daemons and
 
 Gongren is Chinese worker: 工人.  See http://www.ehow.com/video_4403851_say-worker-chinese.html for pronunciation.
 
+Gongren uses prior work by Dan DeLeo: http://github.com/danielsdeleo/qusion/
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -80,3 +80,23 @@ rescue LoadError
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
   end
 end
+
+namespace :version do
+  task :rewrite do
+    require "erb"
+    require "ostruct"
+
+    version = Rake.application.jeweler.version_helper.to_s
+    template = ERB.new <<-EOT.gsub(/^\s{6}/, "")
+      # Nothing interesting here: see {Gongren::Server} or {Gongren::Worker}.
+      module Gongren
+        VERSION = "<%= version %>"
+      end
+    EOT
+    File.open(File.join(Dir.pwd, "lib/gongren.rb"), "w") {|out| out.puts template.result(binding)}
+  end
+end
+
+task "version:bump:patch" => "version:rewrite"
+task "version:bump:minor" => "version:rewrite"
+task "version:bump:major" => "version:rewrite"

data/examples/clock/consumer.rb

@@ -0,0 +1,14 @@
+require "rubygems"
+begin
+  require "gongren/worker"
+rescue LoadError
+  path = File.expand_path(File.join(File.dirname(__FILE__), "../../lib"))
+  raise if $LOAD_PATH.include?(path)
+
+  $LOAD_PATH.unshift(path)
+  retry
+end
+
+Gongren::Worker.start do |message|
+  p message[:time]
+end

data/examples/clock/producer.rb

@@ -0,0 +1,17 @@
+require "rubygems"
+begin
+  require "gongren/server"
+rescue LoadError
+  path = File.expand_path(File.join(File.dirname(__FILE__), "../../lib"))
+  raise if $LOAD_PATH.include?(path)
+
+  $LOAD_PATH.unshift(path)
+  retry
+end
+
+Gongren::Server.start do |server|
+  # On every tick, submit an event
+  EM.add_periodic_timer(1) do
+    server.submit("tick", :time => Time.now.utc)
+  end
+end

data/examples/faster_clock/consumer.rb

@@ -0,0 +1,15 @@
+require "rubygems"
+begin
+  require "gongren/worker"
+rescue LoadError
+  path = File.expand_path(File.join(File.dirname(__FILE__), "../../lib"))
+  raise if $LOAD_PATH.include?(path)
+
+  $LOAD_PATH.unshift(path)
+  retry
+end
+
+Gongren::Worker.start do |message|
+  p message[:time]
+  sleep 1.8 # Ensure we can never catch up
+end

data/examples/faster_clock/producer.rb

@@ -0,0 +1,17 @@
+require "rubygems"
+begin
+  require "gongren/server"
+rescue LoadError
+  path = File.expand_path(File.join(File.dirname(__FILE__), "../../lib"))
+  raise if $LOAD_PATH.include?(path)
+
+  $LOAD_PATH.unshift(path)
+  retry
+end
+
+Gongren::Server.start do |server|
+  # On every tick, submit an event
+  EM.add_periodic_timer(1) do
+    server.submit("tick", :time => Time.now.utc)
+  end
+end

data/lib/gongren.rb

@@ -1,4 +1,4 @@
 # Nothing interesting here: see {Gongren::Server} or {Gongren::Worker}.
 module Gongren
-  VERSION = "0.0.1"
+  VERSION = "0.1.1"
 end

data/lib/gongren/server.rb

@@ -1,58 +1,59 @@
+require "mq"
 require "logger"
-require "qusion"
 
 module Gongren
-  # This version is intimately tied to Rails.
   class Server
     def initialize(options={})
       @options = options.inject(Hash.new) {|memo, (k,v)| memo[k.to_sym] = v; memo} # #symbolize_keys
       @logger  = options[:logger] || Logger.new(options[:log] || STDERR)
     end
 
-    # Submits a unit of work to the pool of workers.
-    def self.submit(name, unit)
-      data = Marshal.dump(unit)
-      topic.publish(data, :persistent => true, :key => "unit.#{name}")
-    end
-
     # A quick way to instantiate a server with some options.
-    def self.start(options={})
-      new(options).start
+    def self.start(options={}, &block)
+      new(options).start(&block)
     end
 
-    # Starts the reactor / event loop.
+    # Starts the reactor / event loop.  This method never returns.
+    # Must pass a block to yield to, enabling you to do useful work.
+    # The block must return a 2 element Array:
+    # <tt>["name of work unit", object]</tt>
+    #
+    # You must provide a block to which an instance of Gongren::Server will be yielded.
     def start
-      logger.info { "Gongren::Server #{Process.pid} starting" }
-      Qusion.start(@options)
-      self.class.control_topic # Instantiates the control topic, for later use
+      logger.info { "Gongren::Server #{Process.pid} starting with options: #{options.inspect}" }
+
+      AMQP.start(options) do
+        @units   = MQ.topic(exchange_name, exchange_options)
+        @control = MQ.topic(control_exchange_name, control_exchange_options)
+
+        yield self
+      end
+    end
+
+    def submit(name, message)
+      logger.debug { "Submitting #{name.inspect}: #{message.inspect}" }
+      data = Marshal.dump(message)
+      @units.publish(data, :persistent => true, :key => "unit.#{name}")
     end
 
     private
 
     attr_reader :options, :logger
 
-    def self.exchange_name
+    def exchange_name
       "gongren.work"
     end
 
-    def self.exchange_options
+    def exchange_options
       {:durable => true}
     end
 
-    def self.topic
-      Qusion.channel.topic(exchange_name, exchange_options)
-    end
-
-    def self.control_exchange_name
+    def control_exchange_name
       "gongren.worker.control"
     end
 
-    def self.control_exchange_options
+    def control_exchange_options
       {}
     end
-
-    def self.control_topic
-      Qusion.channel.topic(control_exchange_name, control_exchange_options)
-    end
   end
 end

data/lib/gongren/worker.rb

@@ -39,12 +39,12 @@ module Gongren
       @logger  = options[:logger] || Logger.new(options[:log] || STDERR)
     end
 
-    def run
-      raise ArgumentError, "#run must be called with a block" unless block_given?
+    def start
+      raise ArgumentError, "#start must be called with a block" unless block_given?
 
       logger.info { "Gongren::Worker #{worker_id} ready to work" }
 
-      EM.run do
+      AMQP.start do
         MQ.queue(control_queue_name, control_queue_options).bind(control_exchange_name, control_exchange_options) do |header, data|
           message = Marshal.load(data)
           logger.info { message.inspect }
@@ -60,7 +60,7 @@ module Gongren
           end
         end
 
-        MQ.queue(queue_name, queue_options).bind(exchange_name, exchange_options).subscribe do |header, data|
+        MQ.queue(queue_name, queue_options).bind(exchange_name, exchange_options).subscribe(:ack => true) do |header, data|
           message = Marshal.load(data)
           class << message; include Unit; end # Dynamically add our #ack method
           message.gongren_header = header
@@ -85,10 +85,12 @@ module Gongren
 
     # A quick way to run a worker. Creates an instance with the options and runs the block
     # whenever a message is received, passing the exact object that was sent from the server.
-    def self.run(options={}, &block)
-      new(options).run(&block)
+    # Never returns.
+    def self.start(options={}, &block)
+      new(options).start(&block)
     end
 
+
     module Unit
       attr_writer :gongren_header
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gongren
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 -05:00
+date: 2010-01-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,3 +112,7 @@ summary: Gongren distributes jobs to workers, with support for failed worker dae
 test_files: 
 - test/helper.rb
 - test/test_gongren.rb
+- examples/clock/consumer.rb
+- examples/clock/producer.rb
+- examples/faster_clock/consumer.rb
+- examples/faster_clock/producer.rb