disc 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe07d8d776e3658f1ce638b9e2bdbe95efd516bc
-  data.tar.gz: ef1a6ebf0fc055d8239a4133904d572fb0c48db6
+  metadata.gz: e1620d0f0752ee08feff06a19d5e83c23afbce91
+  data.tar.gz: dbaa723df114c6dead5260ec688c0cb144d60946
 SHA512:
-  metadata.gz: db1e642b0f8f685214d6bb767ff175bcb9113dbeb52f04457f54bd2f1173e581f7c17cdfae1a1310929305a150275279edba722d90e41c2d0399437f4ec4391f
-  data.tar.gz: 91a52222b2f6d68601f2911d80df230cf8722c892a41171b6c31dba8d711d2092ae39f9aeda66dd18086181f5fbbf71dc0a230c2fbfa6bc7f4b2e8f24beaa6b6
+  metadata.gz: da67f0364f6e4c0fab1289d94e0053f539c1d784981821e937315fc91f0e24893fdfdcadc37dbab15c1ac47f18695bde6f7eb17a21074af224e174f48490116a
+  data.tar.gz: b27a52e29cfe6017d6adeac0b125cbe4f0c9c555b4d7057e8c67e4234774325186ebdca1f84eab6415050fa2776f9dc0277336f8718e305de32876133d3cd7a3

data/.travis.yml

@@ -14,8 +14,6 @@ install:
   - export GEM_HOME=$PWD/gems/$RUBY_VERSION
   - export GEM_PATH=$GEM_HOME:$GEM_PATH
   - export PATH=$GEM_HOME/bin:$PWD/disque/src:$PATH
-  - mkdir -p $GEM_HOME
-  - which dep || gem install dep
-  - dep install
+  - cat .gems* | xargs gem install
 before_script: disque-server --daemonize yes
 script: make test

data/bin/disc

@@ -1,14 +1,25 @@
 #!/usr/bin/env ruby
 
-require 'disc'
-require 'clap'
-
 if ARGV.empty?
   $stdout.puts('Usage: disc -r FILE')
 
   exit(1)
 end
 
+stop = proc do
+  if defined?(Disc)
+    Disc::Worker.stop
+  else
+    exit 0
+  end
+end
+
+trap(:INT,  &stop)
+trap(:TERM, &stop)
+
+require 'clap'
+require_relative '../lib/disc'
+
 Clap.run ARGV,
   "-r" => lambda { |file| require file }
 

data/lib/disc/testing.rb

@@ -0,0 +1,9 @@
+module Disc::Job::ClassMethods
+  def mocked_queue
+    @_mocked_queue ||= []
+  end
+
+  def enqueue(args = [], at: nil, queue: nil, **options)
+    mocked_queue << { args: args, at: at, options: options }
+  end
+end

data/lib/disc/version.rb

@@ -1,3 +1,3 @@
 class Disc
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/lib/disc.rb

@@ -46,8 +46,16 @@ class Disc
                 :timeout,
                 :count
 
+    def self.current
+      @current ||= new
+    end
+
     def self.run
-      new.run
+      current.run
+    end
+
+    def self.stop
+      current.stop
     end
 
     def initialize(options = {})
@@ -73,6 +81,10 @@ class Disc
       self
     end
 
+    def stop
+      @stop = true
+    end
+
     def run
       $stdout.puts("Disc::Worker listening in #{queues}")
       loop do
@@ -87,7 +99,11 @@ class Disc
             Disc.on_error(err, job.update('id' => msgid, 'queue' => queue))
           end
         end
+
+        break if @stop
       end
+    ensure
+      disque.quit
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disc
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - pote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disque
@@ -83,6 +83,7 @@ files:
 - examples/greeter.rb
 - lib/active_job/queue_adapters/disc_adapter.rb
 - lib/disc.rb
+- lib/disc/testing.rb
 - lib/disc/version.rb
 - test/disc_test.rb
 homepage: https://github.com/pote/disc