beehive 0.1.1 → 0.1.3

data/MANIFEST

@@ -14,8 +14,11 @@ lib/beehive.rb
 license.txt
 spec/.gitkeep
 spec/.rspec
+spec/beehive/all.rb
 spec/beehive/client.rb
+spec/beehive/setup.rb
 spec/beehive/worker.rb
 spec/helper.rb
 spec/tmp/.gitkeep
-task/build.rake
+task/build.rake
+task/test.rake

data/Rakefile

@@ -1,13 +1,6 @@
 require File.expand_path('../lib/beehive', __FILE__)
-require 'rake/testtask'
 
 # Load all the tasks
 Dir.glob(File.expand_path("../task/*.rake", __FILE__)).each do |f|
   import(f)
 end
-
-# Set the tests so they can be run with $ rake test
-Rake::TestTask.new do |t|
-  t.test_files = Dir.glob(File.expand_path('../spec/beehive/**/*.rb', __FILE__))
-  t.verbose    = true
-end

data/lib/beehive/client.rb

@@ -50,7 +50,7 @@ module Beehive
     #
     def get(job)
       job = "beehive.jobs.#{job}"
-      job = @connection.rpop(job)
+      job = @connection.lpop(job)
       
       if !job.nil?
         return JSON.load(job)

data/lib/beehive/version.rb

@@ -5,5 +5,5 @@ module Beehive
   # @author Yorick Peterse
   # @since  0.1
   #
-  Version = '0.1.1'
+  Version = '0.1.3'
 end

data/lib/beehive/worker.rb

@@ -21,7 +21,8 @@ module Beehive
       :daemonize => false,
       :jobs      => [],
       :wait      => 5,
-      :log_level => Logger::WARN
+      :log_level => Logger::WARN,
+      :pid       => File.join(Dir.pwd, 'worker.pid')
     }
 
     # Instance of Beehive::Client, used for communicating with the Redis server
@@ -50,6 +51,7 @@ module Beehive
     # reduces CPU and network usage.
     # @option worker_options :log_level The log even to use for the :logger option, set to
     # Logger::WARN by default.
+    # @option worker_options :pid Path to the location of the PID file for the worker.
     #
     def initialize(redis_options = {}, worker_options = {})
       @connection             = ::Beehive::Client.new(redis_options)
@@ -83,12 +85,16 @@ module Beehive
         Process.daemon(true)
       end
 
-      @options[:logger].info("Starting main worker, PID: #{Process.pid}")
+      @worker_pid = Process.pid
+
+      @options[:logger].info("Starting main worker, PID: #{@worker_pid}")
+      write_pid
 
       loop do
         if @shutdown === true
           @options[:logger].info('The party has ended, time to shut down')
           @connection.disconnect
+          File.unlink(@options[:pid])
           exit
         end
 
@@ -125,6 +131,12 @@ module Beehive
           end
         end
 
+        # Did the PID change for some reason?
+        if Process.pid != @worker_pid
+          @worker_pid = Process.pid
+          write_pid
+        end
+
         # Reduces CPU load and network traffic
         sleep(@options[:wait])
       end
@@ -155,5 +167,17 @@ module Beehive
         end
       end
     end
+
+    ##
+    # Writes the given PID to the PID file.
+    #
+    # @author Yorick Peterse
+    # @since  0.1.2
+    #
+    def write_pid
+      File.open(@options[:pid], 'w') do |handle|
+        handle.write(@worker_pid)
+      end
+    end
   end # Worker
 end # Beehive

data/spec/beehive/all.rb

@@ -0,0 +1,3 @@
+['setup', 'client', 'worker'].each do |f|
+  require(File.expand_path("../#{f}", __FILE__))
+end

data/spec/beehive/client.rb

@@ -2,16 +2,24 @@ require File.expand_path('../../helper', __FILE__)
 
 describe('Beehive::Client') do
 
-  it('Queue a new job') do
-    client = Beehive::Client.new
-    client.queue('video', :title => 'hello')
+  before(:all) do
+    if ENV.key?('REDIS')
+      @client = Beehive::Client.new([ENV['REDIS']])
+    else
+      @client = Beehive::Client.new
+    end
   end
 
-  it('Get the latest job') do
-    client = Beehive::Client.new
-    job    = client.get('video')
+  it('Queue a new job') do
+    @client.queue('video', :title => 'hello')
+
+    job = @client.get('video')
 
     job['title'].should === 'hello'
   end
 
+  after(:all) do
+    @client = nil
+  end
+
 end

data/spec/beehive/setup.rb

@@ -0,0 +1,31 @@
+require File.expand_path('../../helper', __FILE__)
+
+describe('Check if the environment is capable of running the tests') do
+
+  it('Check if Redis is running') do
+    # Dirty way of checking to see if Redis is running
+    output  = `ps a | grep redis-server`
+    matches = output.match(/[0-9]+\s+redis-server/)
+
+    if matches.nil?
+      fail("You need to start Redis in order to run these tests")
+    end
+  end
+
+  it('Check the default Redis settings in case the previous test missed them') do
+    client = Redis.new
+
+    begin
+      client.client.connect
+    # Default settings didn't work, check if the ENV variable REDIS is set
+    rescue
+      if !ENV.key?('REDIS')
+        message = "Failed to connect to the default Redis host and the REDIS " +
+        "environment variable wasn't set."
+
+        fail(message)
+      end
+    end
+  end
+
+end

data/spec/beehive/worker.rb

@@ -2,7 +2,11 @@ require File.expand_path('../../helper', __FILE__)
 
 describe('Beehive::Worker') do
   it('Create a new instance of Beehive::Worker') do
-    worker = Beehive::Worker.new
+    if ENV.key?('REDIS')
+      worker = Beehive::Worker.new([ENV['REDIS']])
+    else
+      worker = Beehive::Worker.new
+    end
 
     worker.options[:logger].level.should === Logger::WARN
     worker.options[:jobs].size.should    === 0
@@ -23,7 +27,12 @@ describe('Beehive::Worker') do
     end
 
     # Queue the job
-    client = Beehive::Client.new
+    if ENV.key?('REDIS')
+      client = Beehive::Client.new([ENV['REDIS']])
+    else
+      client = Beehive::Client.new
+    end
+
     client.queue('spec')
 
     pid = Process.fork do
@@ -40,4 +49,23 @@ describe('Beehive::Worker') do
     path.should === 'Hello, world!'
   end
 
+  it('Write the PID') do
+    pid_path = File.expand_path('../../tmp/worker.pid', __FILE__)
+
+    pid = Process.fork do
+      worker = Beehive::Worker.new({}, {:pid => pid_path})
+      worker.work
+    end
+
+    # Give the worker some time to boot up
+    sleep(1)
+
+    # Check if the PID is correct
+    pid_file        = File.read(pid_path, File.size(pid_path)).strip
+    pid_file.should === pid.to_s
+
+    # Close the connection
+    Process.kill('INT', pid_file.to_i)
+  end
+
 end

data/spec/helper.rb

@@ -1,3 +1,7 @@
 require File.expand_path('../../lib/beehive', __FILE__)
 require 'rspec'
 require 'rspec/autorun'
+
+RSpec.configure do |c|
+  c.fail_fast = true
+end

data/task/test.rake

@@ -0,0 +1,5 @@
+desc 'Runs all the tests'
+task :test do
+  spec_path = File.expand_path('../../spec/', __FILE__)
+  sh("cd #{spec_path}; rspec beehive/all.rb")
+end

metadata

@@ -2,7 +2,7 @@
 name: beehive
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Yorick Peterse
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 +02:00
+date: 2011-07-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,11 +82,14 @@ files:
 - license.txt
 - spec/.gitkeep
 - spec/.rspec
+- spec/beehive/all.rb
 - spec/beehive/client.rb
+- spec/beehive/setup.rb
 - spec/beehive/worker.rb
 - spec/helper.rb
 - spec/tmp/.gitkeep
 - task/build.rake
+- task/test.rake
 has_rdoc: yard
 homepage: https://github.com/yorickpeterse/beehive/
 licenses: []