qpush 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e08de4b156873dcbca81498e49afe35576cafb71
-  data.tar.gz: 0b9d6e5884b6a1e3c5fe65a8d48a3e7042145391
+  metadata.gz: 01a15d5df46ac29fd256af5b940ea82249588729
+  data.tar.gz: 62a42bc427451e3d47f0d2a3ac38eaafcdee4020
 SHA512:
-  metadata.gz: 4ea563f306ccc06de1d3ad66daaa7f69f4c51a36540806563b8d0bd8234f42280eb14cae4820de0f9d17c69c3245249f1409d960884f6dfcb5be9d5ede467395
-  data.tar.gz: 413f68f4b6e3bea2d418eef081bb4cc7480919f6653034a572e38f7ffaf589243d3727da04a2e72a592b988d6547a81bb0da39373a324f0a3c6d16db90160530
+  metadata.gz: 283c6796ce8f178a7a5cb3722f73716c31bc50bd3522dd68ff74a70b597a7ba728094fdd688e70f74fdb4ae3f9aff8e943209f878ab60f81198fbd39a344af83
+  data.tar.gz: df33a1a4d1fd0c9efd339c17866f4db22ad0c7d05b62d6ee92f656f9adb94d6cf646fa937cca0d3f942a28fb9768cdbd1a8b7f1303e78c191639999e384fcdd4

data/.byebug_history

@@ -1,4 +1,17 @@
 quit
+Dir[Dir.pwd + "/lib/qpush/jobs/*.rb"]
+Dir[Dir.pwd + "/lib/jobs/*.rb"]
+Dir.pwd
+File.dirname(__FILE__)
+Dir["#{File.dirname(__FILE__)}/qpush/jobs/*.rb"]
+Dir[File.join(QPush.config.jobs_path, "*.rb")]
+$LOAD_PATH.unshift(QPush.config.jobs_path)
+$LOAD_PATH
+File.dirname(__FILE__)
+Dir[File.dirname(__FILE__) + "#{QPush.config.jobs_path}/*.rb"]
+QPush.config.jobs_path
+Dir["#{QPush.config.jobs_path}/*.rb"]
+quit
 puts e
 puts s
 c

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in job_que.gemspec
+# Specify your gem's dependencies in qpush.gemspec
 gemspec

data/README.md

@@ -33,7 +33,7 @@ In order to process queued jobs, we run the QPush server. This is a separate ser
 
     $ bundle exec qpush-server -c path/to/config.rb
 
-By providing a path to a configuration file, we can setup QPush with plain old ruby. At a minimum, we should provide details on our Redis server and connections. There are more configuration options available - all of which can be viewed here (to come).
+By providing a path to a configuration file, we can setup QPush with plain old ruby. At a minimum, we should provide details on our Redis server and connections. There are more configuration options available - [all of which can be viewed here](https://github.com/nsweeting/qpush/wiki/Server-Configuration).
 
 ```ruby
 # QPush server configuration
@@ -73,7 +73,7 @@ The job above would be equivalent to running the following command on the server
 Example::Job.new(example: 'Job').call
 ```
 
-At a minimum, we must provide the job with a 'klass'. There are many more options that we can provide to the job though - all of which can be viewed here (to come).
+At a minimum, we must provide the job with a 'klass'. There are many more options that we can provide to the job though - [all of which can be viewed here](https://github.com/nsweeting/qpush/wiki/Options-for-Jobs).
 
 #### Building Jobs
 
@@ -146,7 +146,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/job_que. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/nsweeting/qpush. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/{lib/qpush/jobs → jobs}/test_job.rb

@@ -1,5 +1,5 @@
 class TestJob
   def call
-    puts 'hello'
+    puts 'Hello from TestJob'
   end
 end

data/lib/qpush/base.rb

@@ -8,5 +8,3 @@ require 'qpush/config'
 require 'qpush/job'
 require 'qpush/redis'
 require 'qpush/version'
-
-require 'qpush/jobs/test_job'

data/lib/qpush/config.rb

@@ -22,20 +22,17 @@ module QPush
       redis_pool: 10,
       database_pool: 10,
       workers: 2,
-      stats_namespace: 'qpush:v1:stats',
+      namespace: 'default',
       queue_threads: 2,
-      queue_namespace: 'qpush:v1:queue',
       perform_threads: 2,
-      perform_namespace: 'qpush:v1:perform',
-      delay_threads:1,
-      delay_namespace: 'qpush:v1:delay',
-      priorities: 5
+      delay_threads: 1,
+      priorities: 5,
+      jobs_path: '/jobs'
     }.freeze
 
-    attr_accessor :workers, :queue_threads, :queue_namespace, :delay_threads,
-                  :delay_namespace, :perform_threads, :perform_namespace,
-                  :stats_namespace, :redis_url, :redis_pool, :priorities,
-                  :database_url, :database_pool, :database_adapter
+    attr_accessor :workers, :queue_threads, :namespace, :delay_threads,
+                  :perform_threads, :redis_url, :redis_pool, :priorities,
+                  :database_url, :database_pool, :jobs_path
 
     def initialize
       DEFAULTS.each { |key, value| send("#{key}=", value) }
@@ -63,6 +60,22 @@ module QPush
       }
     end
 
+    def delay_namespace
+      @delay_namespace ||= "qpush:v1:#{@namespace}:delay"
+    end
+
+    def queue_namespace
+      @queue_namespace ||= "qpush:v1:#{@namespace}:queue"
+    end
+
+    def perform_namespace
+      @perform_namespace ||= "qpush:v1:#{@namespace}:perform"
+    end
+
+    def stats_namespace
+      @stats_namespace ||= "qpush:v1:#{@namespace}:stats"
+    end
+
     def perform_lists
       (1..priorities).collect { |num| "#{perform_namespace}:#{num}" }
     end

data/lib/qpush/job.rb

@@ -1,7 +1,7 @@
 module QPush
   class << self
     def job(options)
-      job = Job::Wrapper.new(options)
+      job = Job::ClientWrapper.new(options)
       job.queue
     end
   end
@@ -19,7 +19,26 @@ module QPush
       end
     end
 
-    module Base
+    class Base
+      attr_accessor :klass, :id, :priority, :created_at, :start_at,
+                    :cron, :retry_max, :total_success, :total_fail,
+                    :run_time, :namespace
+      attr_reader :args
+
+      def initialize(options = {})
+        options = defaults.merge(options)
+        options.each { |key, value| send("#{key}=", value) }
+      end
+
+      def args=(args)
+        @args =
+          if args.is_a?(String) then JSON.parse(args)
+          else args
+          end
+      rescue JSON::ParserError
+        @args = nil
+      end
+
       def to_json
         { klass: @klass,
           id: @id,
@@ -44,27 +63,16 @@ module QPush
           cron: '',
           retry_max: 10,
           total_fail: 0,
-          total_success: 0
-        }
+          total_success: 0,
+          namespace: QPush.config.namespace }
       end
     end
 
-    class Wrapper
-      include QPush::Job::Base
-
-      attr_accessor :klass, :id, :priority, :created_at, :start_at,
-                    :cron, :retry_max, :total_success, :total_fail,
-                    :args
-
-      def initialize(options = {})
-        options = defaults.merge(options)
-        options.each { |key, value| send("#{key}=", value) }
-      end
-
+    class ClientWrapper < QPush::Job::Base
       def queue
         QPush.redis.with do |conn|
-          conn.incr("#{QPush.config.stats_namespace}:queued")
-          conn.lpush("#{QPush.config.queue_namespace}", to_json)
+          conn.incr("qpush:v1:#{@namespace}:stats:queued")
+          conn.lpush("qpush:v1:#{@namespace}:queue", to_json)
         end
       end
     end

data/lib/qpush/server/execute.rb

@@ -39,14 +39,18 @@ module QPush
       end
 
       def call
-        @job.bump_fail
-        @job.api.retry if @job.retry_job?
+        update_job
         stat_increment
         log_error
       end
 
       private
 
+      def update_job
+        @job.bump_fail
+        @job.api.retry if @job.retry_job?
+      end
+
       def stat_increment
         QPush.redis.with do |c|
           c.incr("#{QPush.config.stats_namespace}:dead") if @job.dead_job?
@@ -70,14 +74,18 @@ module QPush
       end
 
       def call
-        @job.bump_success
-        @job.api.delay if @job.delay_job?
+        update_job
         stat_increment
         log_success
       end
 
       private
 
+      def update_job
+        @job.bump_success
+        @job.api.delay if @job.delay_job?
+      end
+
       def stat_increment
         QPush.redis.with do |c|
           c.incr("#{QPush.config.stats_namespace}:success")

data/lib/qpush/server/jobs.rb

@@ -44,30 +44,16 @@ module QPush
       end
     end
 
-    class Job
-      include QPush::Job::Base
+    class Job < QPush::Job::Base
       include QPush::Server::JobHelpers
       include ObjectValidator::Validate
 
-      attr_accessor :klass, :id, :priority, :created_at, :start_at,
-                    :cron, :retry_max, :total_success, :total_fail,
-                    :run_time
-      attr_reader :args, :api
+      attr_reader :api
 
-      def initialize(options = {})
-        options = defaults.merge(options)
-        options.each { |key, value| send("#{key}=", value) }
+      def initialize(options)
+        super
         @api = JobApi.new(self)
       end
-
-      def args=(args)
-        @args =
-          if args.is_a?(String) then JSON.parse(args)
-          else args
-          end
-      rescue JSON::ParserError
-        @args = nil
-      end
     end
 
     class JobValidator
@@ -91,20 +77,12 @@ module QPush
     class JobApi
       def initialize(job)
         @job = job
-        @config = QPush.config
-      end
-
-      def delay
-        QPush.redis.with do |conn|
-          conn.incr("#{@config.stats_namespace}:delayed")
-          conn.zadd(@config.delay_namespace, @job.delay_until, @job.to_json)
-        end
       end
 
       def queue
         QPush.redis.with do |conn|
-          conn.incr("#{@config.stats_namespace}:queued")
-          conn.lpush("#{@config.queue_namespace}", @job.to_json)
+          conn.incr("#{QPush.config.stats_namespace}:queued")
+          conn.lpush("#{QPush.config.queue_namespace}", @job.to_json)
         end
       end
 
@@ -115,16 +93,17 @@ module QPush
 
       def perform
         QPush.redis.with do |conn|
-          conn.incr("#{@config.stats_namespace}:performed")
-          conn.lpush("#{@config.perform_namespace}:#{@job.priority}", @job.to_json)
+          conn.incr("#{QPush.config.stats_namespace}:performed")
+          conn.lpush("#{QPush.config.perform_namespace}:#{@job.priority}", @job.to_json)
         end
       end
 
+      def delay
+        send_to_delay('delayed', @job.delay_until)
+      end
+
       def retry
-        QPush.redis.with do |conn|
-          conn.incr("#{@config.stats_namespace}:retries")
-          conn.zadd(@config.delay_namespace, @job.retry_at, @job.to_json)
-        end
+        send_to_delay('retries', @job.retry_at)
       end
 
       def setup
@@ -134,6 +113,15 @@ module QPush
       rescue
         raise ServerError, 'Invalid job: ' + @job.errors.full_messages.join(' ')
       end
+
+      private
+
+      def send_to_delay(stat, time)
+        QPush.redis.with do |conn|
+          conn.incr("#{QPush.config.stats_namespace}:#{stat}")
+          conn.zadd(QPush.config.delay_namespace, time, @job.to_json)
+        end
+      end
     end
   end
 end

data/lib/qpush/server/launcher.rb

@@ -12,6 +12,7 @@ module QPush
       def start
         start_message
         setup_options
+        require_jobs
         boot_manager
       end
 
@@ -38,6 +39,12 @@ module QPush
         parser.parse!(@argv)
       end
 
+      def require_jobs
+        Dir[Dir.pwd + "#{QPush.config.jobs_path}/**/*.rb"].each do |file|
+          require file
+        end
+      end
+
       def boot_manager
         manager = Manager.new(QPush.config.manager_options)
         manager.start

data/lib/qpush/version.rb

@@ -1,4 +1,4 @@
 module QPush
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   CODENAME = 'Sun Soaked Salamander'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qpush
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nicholas Sweeting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -171,11 +171,11 @@ files:
 - bin/qpush-server
 - bin/qpush-web
 - bin/setup
+- jobs/test_job.rb
 - lib/qpush.rb
 - lib/qpush/base.rb
 - lib/qpush/config.rb
 - lib/qpush/job.rb
-- lib/qpush/jobs/test_job.rb
 - lib/qpush/redis.rb
 - lib/qpush/server.rb
 - lib/qpush/server/database.rb