localjob 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c33dc84596d653899831a3697428d950028e0c5
-  data.tar.gz: 8547e6ca4022b618956578e8dc3f11fe65ae8b00
+  metadata.gz: 3f5d7728e5e75545f1d311af3eb4e255bcbe30df
+  data.tar.gz: 1f5fcded093681ad2a958b53b7d3736bde363143
 SHA512:
-  metadata.gz: 22eab445b06c1011c53a244a2677feec403a4f501e0dc35ca663b405d4d754f3f891914420fb811a5a840076f1fbd6af71f7afc31d5f1e9c76a297730fbf281c
-  data.tar.gz: d7ede95238c734c9ab043b2861152203197fb7606a86ee6b81083ce304c9f479cbaf50842515301518f6566733b7978a1b77dff828827df476e9dd5505191199
+  metadata.gz: dd25abafa772e5054f214a13a0143580efb81ab942a2d8406aa2ca4872881b82553dfa36bc7da50a407ce3ff77d863b581781fd5f802cdf053b6b3b6872e2439
+  data.tar.gz: 8ffec91938da80ad655ea0b95e8238b9a7eb2eeff8e44eb56bc11fdd257202677733dc4ef5ba431fa61878b2260a03dbc1ce4e4f4b905229edc3437caab9b1c0

data/README.md

@@ -2,8 +2,8 @@
 
 Localjob is a simple, self-contained background queue built on top of [POSIX
 message queues][pmq]. Workers and the app pushing to the queue must reside on
-the same machine. It's the sqlite of background queues (although sqlite scales
-further than Localjob). Here's a post about [how it works][blog].
+the same machine. It's the sqlite of background queues. Here's a post about [how
+it works][blog].
 
 Localjob is for early-development situations where you don't need a
 full-featured background queue, but just want to get started with something
@@ -17,13 +17,12 @@ parameters for your application**, please consult [posix-mqueue][pmq-gem]'s
 documentation.
 
 Localjob works on Ruby >= 2.0.0. On Linux, it will use the POSIX message queue.
-On OS X (and Windows, not tested) it will use a mock class instead of the
-message queue, to aid you in testing and running Localjob in development.
+On OS X it will use SysV message queues.
 
 Add it to your Gemfile:
 
 ```ruby
-gem 'localjob'
+gem 'localjob', "0.1.0"
 ```
 
 ## Usage

data/ext/mkrf_conf.rb

@@ -1,17 +1,4 @@
-require 'rubygems'
-require 'rubygems/command.rb'
-require 'rubygems/dependency_installer.rb' 
-begin
-  Gem::Command.build_args = ARGV
-rescue NoMethodError
-end 
+require 'rubygems/dependency_installer' 
 
-inst = Gem::DependencyInstaller.new
-
-begin
-  if RUBY_PLATFORM =~ /linux/
-    inst.install "posix-mqueue", "0.0.7"
-  end
-rescue
-  exit(1)
-end 
+gem = Gem::DependencyInstaller.new
+gem.install "posix-mqueue", "0.0.7" if RUBY_PLATFORM =~ /linux/

data/lib/localjob.rb

@@ -1,8 +1,3 @@
-begin
-  require 'posix/mqueue'
-rescue LoadError
-end
-
 require 'yaml'
 require 'logger'
 require 'forwardable'
@@ -35,8 +30,8 @@ class Localjob
       require 'localjob/linux_adapter'
       @queue = LinuxAdapter.new(@name)
     else
-      require 'localjob/mock_adapter'
-      @queue = MockAdapter.new(@name)
+      require 'localjob/sysv_adapter'
+      @queue = SysvAdapter.new(@name)
     end
   end
 

data/lib/localjob/channel.rb

@@ -11,12 +11,10 @@ class Localjob
     end
 
     def shift
-      begin
-        (queue,), = IO.select(@queues)
-        queue.shift
-      rescue POSIX::Mqueue::QueueEmpty
-        retry
-      end
+      (queue,), = IO.select(@queues)
+      queue.shift
+    rescue POSIX::Mqueue::QueueEmpty
+      retry
     end
 
     private

data/lib/localjob/linux_adapter.rb

@@ -1,3 +1,5 @@
+require 'posix/mqueue'
+
 class Localjob
   class LinuxAdapter
     attr_reader :mqueue

data/lib/localjob/sysv_adapter.rb

@@ -0,0 +1,45 @@
+require 'SysVIPC'
+
+class Localjob
+  class Channel
+    def shift
+      raise "SysV adapter does not support multiple queues" if @queues.size > 1
+      @queues.first.shift
+    end
+  end
+
+  class SysvAdapter
+    include SysVIPC
+    attr_reader :mqueue
+
+    def initialize(name)
+      @filename = "/tmp/#{name}"
+      File.open(@filename, "w") { }
+      key = ftok(@filename, 0)
+
+      @mq = MessageQueue.new(key, IPC_CREAT | 0600)
+    end
+
+    def receive
+      @mq.receive(0, 8024)
+    end
+
+    def send(message)
+      @mq.send(1, message)
+    end
+
+    def size
+      @mq.ipc_stat.msg_qnum
+    end
+
+    def destroy
+      File.delete(@filename)
+      @mq.rm
+    end
+
+    private
+    def fix_queue_name(name)
+      name.start_with?('/') ? name : "/#{name}"
+    end
+  end
+end

data/lib/localjob/version.rb

@@ -1,3 +1,3 @@
 class Localjob
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/localjob.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.extensions    = ["ext/mkrf_conf.rb"]
 
   spec.add_dependency "thor", "0.18.1"
+  spec.add_dependency "SysVIPC"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/worker_test.rb

@@ -42,23 +42,6 @@ class WorkerTest < LocaljobTestCase
     assert_equal 0, @localjob.size
   end
 
-  def test_workers_listen_on_multiple_queues
-    @localjob << WalrusJob.new("move")
-
-    other = queue("other-queue")
-    other << WalrusJob.new("dance")
-
-    @worker.channel << 'other-queue'
-
-    a = Thread.start { @worker.work }
-
-    sleep 0.01
-    a.kill
-
-    assert_equal 0, @localjob.size
-    assert_equal 0, other.size
-  end
-
   def test_worker_doesnt_die_on_bad_serialization
     @localjob.queue.send "--- !ruby/object:Whatever {}\n"
 
@@ -67,8 +50,10 @@ class WorkerTest < LocaljobTestCase
     sleep 0.01
     a.kill
   end
- 
+
   on_platform 'linux' do
+    # This won't work on OS X because the SysV IPC gem apparently doesnt give us
+    # interrupt syscalls to give us signals.
     def test_sigquit_terminates_the_worker
       @localjob << WalrusJob.new("move")
 
@@ -76,10 +61,30 @@ class WorkerTest < LocaljobTestCase
 
       pid = fork { @worker.work }
 
+      # Hack to account for race condition, 0.01s should be plenty
+      sleep 0.1
+
       Process.kill("QUIT", pid)
       Process.wait
 
       assert_equal 0, @localjob.size
     end
+
+    def test_workers_listen_on_multiple_queues
+      @localjob << WalrusJob.new("move")
+
+      other = queue("other-queue")
+      other << WalrusJob.new("dance")
+
+      @worker.channel << 'other-queue'
+
+      a = Thread.start { @worker.work }
+
+      sleep 0.01
+      a.kill
+
+      assert_equal 0, @localjob.size
+      assert_equal 0, other.size
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: localjob
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Simon Eskildsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: SysVIPC
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +102,7 @@ files:
 - lib/localjob/cli.rb
 - lib/localjob/linux_adapter.rb
 - lib/localjob/mock_adapter.rb
+- lib/localjob/sysv_adapter.rb
 - lib/localjob/version.rb
 - lib/localjob/worker.rb
 - localjob.gemspec
@@ -127,3 +142,4 @@ test_files:
 - test/mock_adapter.rb
 - test/test_helper.rb
 - test/worker_test.rb
+has_rdoc: