refinery 0.10.8 → 0.10.9

data/Rakefile

@@ -6,10 +6,10 @@ desc 'Default: run tests.'
 task :default => [:test]
 
 desc 'Run tests.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+task :test do
+  Dir.glob('test/**/*_test.rb') do |f|
+    require f
+  end
 end
 
 desc 'Generate documentation.'

data/VERSION

@@ -1 +1 @@
-0.10.8
+0.10.9

data/lib/refinery/daemon.rb

@@ -74,10 +74,8 @@ module Refinery #:nodoc:
     def execute
       logger.debug "Running daemon thread: #{name} (settings: #{settings.inspect})"
       
-      begin
-        require 'java'
+      if defined?(java.lang.Thread)
         java.lang.Thread.current_thread.name = "#{name} Daemon"
-      rescue LoadError => e
       end
       
       while(running?)

data/lib/refinery/heartbeat.rb

@@ -11,10 +11,8 @@ module Refinery #:nodoc:
       queue_prefix = config['prefix'] || ''
       @server = server
       @thread = Thread.new do
-        begin
-          require 'java'
+        if defined?(java.lang.Thread)
           java.lang.Thread.current_thread.name = 'Heartbeat'
-        rescue Exception => e
         end
         
         loop do

data/lib/refinery/processor.rb

@@ -26,10 +26,8 @@ module Refinery #:nodoc:
     def execute
       queue_prefix = config['prefix'] || ''
       
-      begin
-        require 'java'
+      if defined?(java.lang.Thread)
         java.lang.Thread.current_thread.name = "#{key} Processor"
-      rescue Exception => e
       end
       
       logger.debug "Creating daemons for #{key}"

data/lib/refinery/publisher.rb

@@ -35,7 +35,7 @@ module Refinery #:nodoc:
     # Publish the given message to the queue. The message will be converted 
     # to JSON and pushed into the queue associated with the publisher.
     def publish_to_queue(queue, message)
-      logger.debug "Publisher #{self.class.name} sending message: #{message.to_json}"
+      logger.debug "Publisher #{self.class.name} sending message: #{message.to_json} to queue #{queue.url}"
       queue.send_message(Base64.encode64(message.to_json))
     end
   end

data/lib/refinery/queueable.rb

@@ -23,11 +23,18 @@ module Refinery #:nodoc:
     # Get the queue provider. Defaults to RightAws::SqsGen2 running
     # in multi-thread mode.
     def queue_provider
-      @queue_provider ||= RightAws::SqsGen2.new(
-        config['aws']['credentials']["access_key_id"], 
-        config['aws']['credentials']["secret_access_key"],
-        {:multi_thread => true}
-      )
+      if defined?(Typica)
+        @queue_provider ||= Typica::Sqs::QueueService.new(
+          config['aws']['credentials']["access_key_id"], 
+          config['aws']['credentials']["secret_access_key"]
+        )
+      else
+        @queue_provider ||= RightAws::SqsGen2.new(
+          config['aws']['credentials']["access_key_id"], 
+          config['aws']['credentials']["secret_access_key"],
+          {:multi_thread => true}
+        )
+      end
     end
   end
 end

data/lib/refinery.rb

@@ -34,13 +34,20 @@ module Refinery
   def self.require_optional_library(short_name, display_name)
     begin
       require short_name
+      puts "#{short_name} optional library was loaded"
+      true
     rescue LoadError
+      puts "#{short_name} optional library not loaded"
     end
   end
   
   def self.require_optional_libraries
     require_optional_library('sequel', 'Sequel gem')
     require_optional_library('ramaze', 'Ramaze')
+    
+    if require_optional_library('java', 'JRuby')
+      require_optional_library('typica', 'JRuby Typica wrapper')
+    end
   end
   
   # Require internal code files

data/refinery.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{refinery}
-  s.version = "0.10.8"
+  s.version = "0.10.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Eden"]
-  s.date = %q{2009-08-11}
+  s.date = %q{2009-08-12}
   s.description = %q{Process data in a distributed fashion.}
   s.email = %q{anthonyeden@gmail.com}
   s.executables = ["epub", "monitor", "pubnow", "refinery"]

data/test/unit/daemon_test.rb

@@ -9,13 +9,15 @@ class DaemonTest < Test::Unit::TestCase
       @error_queue = stub('Queue(error)')
       @done_queue = stub('Queue(done)')
       
-      Refinery::Daemon.any_instance.stubs(:require).with('java').raises(LoadError)
-      Refinery::Daemon.any_instance.stubs(:queue).with(
-      'sample_waiting').returns(@waiting_queue)
-      Refinery::Daemon.any_instance.stubs(:queue).with(
-      'sample_error').returns(@error_queue)
-      Refinery::Daemon.any_instance.stubs(:queue).with(
-      'sample_done').returns(@done_queue)
+      @provider = stub('QueueProvider')
+      if defined?(Typica)
+        Typica::Sqs::QueueService.stubs(:new).returns(@provider)
+      else
+        RightAws::SqsGen2.stubs(:new).returns(@provider)
+      end
+      @provider.stubs(:queue).with('sample_waiting').returns(@waiting_queue)
+      @provider.stubs(:queue).with('sample_error').returns(@error_queue)
+      @provider.stubs(:queue).with('sample_done').returns(@done_queue)
     end
     should "be startable" do
       @waiting_queue.stubs(:receive)
@@ -29,12 +31,12 @@ class DaemonTest < Test::Unit::TestCase
       assert_not_nil daemon.logger
     end
     should "allow visibility setting" do
-      @waiting_queue.expects(:receive).with(600)
+      @waiting_queue.stubs(:receive).with(600)
       daemon = Refinery::Daemon.new(@processor, 'sample', '', {'visibility' => 600})
     end
     should "have a queue name" do
       @waiting_queue.stubs(:receive)
-      Refinery::Daemon.any_instance.expects(:queue).with(
+      @provider.stubs(:queue).with(
       'prefix_sample_waiting').returns(@waiting_queue)
       daemon = Refinery::Daemon.new(@processor, 'sample', 'prefix_')
       assert_equal 'prefix_sample', daemon.queue_name

data/test/unit/heartbeat_test.rb

@@ -9,11 +9,13 @@ class HeartbeatTest < Test::Unit::TestCase
       
       heartbeat_queue = stub('heartbeat queue')
       heartbeat_queue.stubs(:send_message)
-      queue_provider = stub('queue provider')
-      queue_provider.expects(:queue).with('heartbeat').returns(heartbeat_queue)
-      RightAws::SqsGen2.stubs(:new).with(
-        'aki', 'sak', {:multi_thread => true}
-      ).returns(queue_provider)
+      provider = stub('queue provider')
+      provider.stubs(:queue).with('heartbeat').returns(heartbeat_queue)
+      if defined?(Typica)
+        Typica::Sqs::QueueService.stubs(:new).returns(provider)
+      else
+        RightAws::SqsGen2.stubs(:new).returns(provider)
+      end
     end
     should "be initializable" do
       Refinery::Heartbeat.new(@server)

data/test/unit/processor_test.rb

@@ -13,13 +13,15 @@ class ProcessorTest < Test::Unit::TestCase
       @error_queue = stub('Queue(error)')
       @done_queue = stub('Queue(done)')
       
-      Refinery::Daemon.any_instance.stubs(:require).with('java').raises(LoadError)
-      Refinery::Daemon.any_instance.stubs(:queue).with(
-      'sample_waiting').returns(@waiting_queue)
-      Refinery::Daemon.any_instance.stubs(:queue).with(
-      'sample_error').returns(@error_queue)
-      Refinery::Daemon.any_instance.stubs(:queue).with(
-      'sample_done').returns(@done_queue)
+      provider = stub('QueueProvider')
+      if defined?(Typica)
+        Typica::Sqs::QueueService.stubs(:new).returns(provider)
+      else
+        RightAws::SqsGen2.stubs(:new).returns(provider)
+      end
+      provider.stubs(:queue).with('sample_waiting').returns(@waiting_queue)
+      provider.stubs(:queue).with('sample_error').returns(@error_queue)
+      provider.stubs(:queue).with('sample_done').returns(@done_queue)
     end
     should "initialize" do
       assert_nothing_raised do

data/test/unit/queueable_test.rb

@@ -11,11 +11,13 @@ class QueueableTest < Test::Unit::TestCase
       setup_default_config
       
       queue = stub('queue')
-      queue_provider = stub('queue provider')
-      queue_provider.expects(:queue).with('a_queue').returns(queue)
-      RightAws::SqsGen2.expects(:new).with(
-        'aki', 'sak', {:multi_thread => true}
-      ).returns(queue_provider)
+      provider = stub('queue provider')
+      provider.expects(:queue).with('a_queue').returns(queue)
+      if defined?(Typica)
+        Typica::Sqs::QueueService.expects(:new).returns(provider)
+      else
+        RightAws::SqsGen2.expects(:new).with('aki', 'sak', {:multi_thread => true}).returns(provider)
+      end
       
       queueable = QueueMe.new
       assert_not_nil queueable.queue('a_queue')

data/test/unit/server_test.rb

@@ -20,7 +20,7 @@ class ServerTest < Test::Unit::TestCase
     should "be runnable" do
       setup_default_config
       
-      Refinery::Heartbeat.expects(:new)
+      #Refinery::Heartbeat.expects(:new)
       
       assert_nothing_raised do
         thread = Thread.new do

data/test/unit/statistics_test.rb

@@ -1,41 +1,44 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class StatisticsTest < Test::Unit::TestCase
-  context "a statistics instance" do
-    should "record a done message" do
-      dataset = stub('dataset')
-      dataset.expects(:<<) # TODO: improve this expectation
+if defined?(Sequel)
+  class StatisticsTest < Test::Unit::TestCase
+    context "a statistics instance" do
+      should "record a done message" do
       
-      db = stub('db')
-      db.stubs(:table_exists?).returns(true)
-      db.stubs(:[]).with(:completed_jobs).returns(dataset)
+        dataset = stub('dataset')
+        dataset.expects(:<<) # TODO: improve this expectation
       
-      Sequel.expects(:connect).with('sqlite://stats.db').returns(db)
+        db = stub('db')
+        db.stubs(:table_exists?).returns(true)
+        db.stubs(:[]).with(:completed_jobs).returns(dataset)
       
-      message = {
-        'host_info' => {'hostname' => 'test', 'pid' => 1},
-        'run_time' => 1,
-        'original' => ''
-      }
-      Refinery::Statistics.new.record_done(message)
-    end
+        Sequel.expects(:connect).with('sqlite://stats.db').returns(db)
+      
+        message = {
+          'host_info' => {'hostname' => 'test', 'pid' => 1},
+          'run_time' => 1,
+          'original' => ''
+        }
+        Refinery::Statistics.new.record_done(message)
+      end
     
-    should "record an error message" do
-      dataset = stub('dataset')
-      dataset.expects(:<<) # TODO: improve this expectation
+      should "record an error message" do
+        dataset = stub('dataset')
+        dataset.expects(:<<) # TODO: improve this expectation
       
-      db = stub('db')
-      db.stubs(:table_exists?).returns(true)
-      db.stubs(:[]).with(:errors).returns(dataset)
+        db = stub('db')
+        db.stubs(:table_exists?).returns(true)
+        db.stubs(:[]).with(:errors).returns(dataset)
       
-      Sequel.expects(:connect).with('sqlite://stats.db').returns(db)
+        Sequel.expects(:connect).with('sqlite://stats.db').returns(db)
       
-      message = {
-        'host_info' => {'hostname' => 'test', 'pid' => 1},
-        'error' => {'class' => 'Error', 'message' => 'An error occurred.'},
-        'original' => ''
-      }
-      Refinery::Statistics.new.record_error(message)
+        message = {
+          'host_info' => {'hostname' => 'test', 'pid' => 1},
+          'error' => {'class' => 'Error', 'message' => 'An error occurred.'},
+          'original' => ''
+        }
+        Refinery::Statistics.new.record_error(message)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinery
 version: !ruby/object:Gem::Version 
-  version: 0.10.8
+  version: 0.10.9
 platform: ruby
 authors: 
 - Anthony Eden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-11 00:00:00 -10:00
+date: 2009-08-12 00:00:00 -10:00
 default_executable: 
 dependencies: []