disc 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 212532c0e53da43e758379c93d9af4a619df7804
-  data.tar.gz: 1f9cb86e8408906a3cdb4a8488a8c48f9e33315f
+  metadata.gz: f29a84d4cefb49cf688a2fe2fe2bc5fcfc0a29d6
+  data.tar.gz: 2314325e125adf600c3dc6f1190d9677574dc88a
 SHA512:
-  metadata.gz: 95c97856b2ad9e78c1b49730d8dde8fd639abd969fdea4e3062bb5d177df3b98b441ba469aafa54c793dae8a8a9eeab12ba113bc5cc951d5f34e3eb5282a8a23
-  data.tar.gz: 1b2ec20719f8cb13631bf3eb3502b02fc7d2f77d73d8d79f97b01f504182523c8c023eeffebe86fe567b49a11b980081c982832f370b3e40c8cc69ba18a7a8aa
+  metadata.gz: 8fa78c4be3782443580d74072aec81b09a6079630b7b22910a148f79f11d69d90ce178b3297ef42bee287a4d92676f685bc88d75f488184613ea4a846f71d9a2
+  data.tar.gz: 960d4938fe9f596f77c607a1622bda422285fdce50de362189406b684af0846846a5b51963c8d99518ed1478e242cb1c7ed80eecd8c97ef89c387b7783f1da52

data/.gems

@@ -0,0 +1,3 @@
+disque -v 0.0.6
+cutest -v 1.2.2
+byebug -v 5.0.0

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/README.md

@@ -16,7 +16,7 @@ $ gem install disc
 requie 'disc'
 
 class CreateGameGrid
-  include Disque::Job
+  include Disc::Job
   queue :urgent
 
   def perform(type)

data/bin/disc

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'disc'
+require ENV.fetch('DISC_REQUIRE')
+
+if defined?(Celluloid)
+  raise 'not implemented yet genius'
+else
+  Disc::Worker.run
+end

data/disc.gemspec

@@ -1,17 +1,15 @@
 Gem::Specification.new do |s|
   s.name              = 'disc'
-  s.version           = '0.0.1'
+  s.version           = '0.0.2'
   s.summary           = 'A simple disque and powerful job implementation'
   s.description       = ''
   s.authors           = ['pote']
   s.email             = ['pote@tardis.com.uy']
   s.homepage          = 'https://github.com/pote/disque-job'
   s.license           = 'MIT'
+  s.files             = `git ls-files`.split("\n")
 
-  s.files = `git ls-files`.split("\n")
-
-  s.add_dependency 'disque'
-  s.add_dependency 'msgpack'
-  s.add_dependency 'clap'
-  s.add_development_dependency 'cutest'
+  s.executables.push('disc')
+  s.add_dependency('disque')
+  s.add_dependency('msgpack')
 end

data/lib/disc.rb

@@ -1,9 +1,10 @@
+require 'date'
 require 'disque'
 require 'msgpack'
 
 class Disc
   attr_reader :disque,
-              :disque_timeout
+    :disque_timeout
 
   def self.disque
     @disque ||= Disque.new(
@@ -36,7 +37,7 @@ class Disc
     end
 
     def initialize(disque: nil , queues: nil, count: 1, timeout: nil)
-      @disque = client || Disc.disque
+      @disque = disque || Disc.disque
       @count, @timeout = count, timeout
       @queues = case
                 when queues.is_a?(Array)
@@ -44,9 +45,9 @@ class Disc
                 when queues.is_a?(String)
                   queues.split(',')
                 when queues.nil?
-                 ENV.fetch('QUEUES', 'default').split(',')
+                  ENV.fetch('QUEUES', 'default').split(',')
                 else
-                 raise 'Invalid Disque Queues'
+                  raise 'Invalid Disque Queues'
                 end
 
       self
@@ -54,12 +55,14 @@ class Disc
 
 
     def run
+      STDOUT.puts("Disc::Worker listening in #{queues}")
       loop do
         disque.fetch(
           from: queues,
           timeout: timeout,
           count: count
         ) do |serialized_job, _|
+          job = MessagePack.unpack(serialized_job)
           klass = Object.const_get(job['class'])
           klass.new.perform(job['arguments'])
         end
@@ -69,40 +72,53 @@ class Disc
 
   module Job
     attr_reader :arguments,
-                :queue
+                :queue,
+                :disque
 
-    def self.disque=(disque)
-      @disque = disque
+    def self.included(base)
+      base.extend(ClassMethods)
     end
 
-    def self.disque
-      defined?(@disque) ? @disque : Disc.disque
-    end
+    module ClassMethods
+      def disque
+        defined?(@disque) ? @disque : Disc.disque
+      end
 
-    def self.disc(options = {})
-      @queue ||= options.fetch(:queue, :default)
-    end
+      def disque=(disque)
+        @disque = disque
+      end
 
-    def self.enqueue(*args, at: nil)
-      job = new(args)
+      def queue
+        @queue ||= 'default'
+      end
 
-      disque.push(
-        job.queue,
-        job.serializable.to_msgpack,
-        Disc.disque_timeout,
-        delay: at.nil? ? nil : (at.to_i - Time.now.to_i)
-      )
-    end
+      def queue=(queue)
+        @queue = queue
+      end
 
-    def initialize(arguments)
-      @arguments = arguments
-    end
+      def enqueue(*args)
+        disque.push(
+          queue,
+          {
+            class: self.new.class.name,
+            arguments: args
+          }.to_msgpack,
+          Disc.disque_timeout
+        )
+      end
 
-    def serializable
-      {
-        class:      self.class.name,
-        arguments:  self.arguments
-      }
+      def enqueue_at(datetime, *args)
+        disque.push(
+          queue,
+          args.to_msgpack,
+          Disc.disque_timeout,
+          delay: at.nil? ? nil : (datetime.to_time.to_i - DateTime.now.to_time.to_i)
+        )
+      end
+
+      def disc(options = {})
+        self.queue = options.fetch(:queue, 'default')
+      end
     end
   end
 end

data/test/disc_test.rb

@@ -0,0 +1,22 @@
+$: << 'lib'
+require 'cutest'
+require 'disc'
+
+class TestJob
+  include Disc::Job
+  disc queue: 'test_urgent'
+
+  def perform(argument)
+    puts argument
+  end
+end
+
+scope do
+  test 'basic enqueuing works' do
+    original_length = Disc.disque.call('QLEN', 'test_urgent').to_i
+
+    TestJob.enqueue(random: 'data')
+
+    assert Disc.disque.call('QLEN', 'test_urgent').to_i == original_length + 1
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - pote
@@ -38,45 +38,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: clap
-  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: cutest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ''
 email:
 - pote@tardis.com.uy
-executables: []
+executables:
+- disc
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gems"
+- ".gitignore"
 - Makefile
 - README.md
+- bin/disc
 - disc.gemspec
 - lib/disc.rb
+- test/disc_test.rb
 homepage: https://github.com/pote/disque-job
 licenses:
 - MIT