qpush 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b7af474af17142a61d366bd6f9112b2abede127
-  data.tar.gz: 7ad15b8b50d6a129f5dff7ec7039f554fc7f11d0
+  metadata.gz: ca96ec0ea37c952b0dc88b82129fae5f60ab604a
+  data.tar.gz: f6d0ef10bf31c71e9a8a67d91830fb007500a8dd
 SHA512:
-  metadata.gz: f85e768b6f01d936fe3a156abee7a815d7a5a9965a970c9d62caffed9ca08262b74410fcef22d91c1f98cfb5b69226f8466d37e52cbae8a4c17fdc32ebb40aca
-  data.tar.gz: 86c720933d37d2bfbd3a9633c07bf5c691e8c85aaceaba3cbe280fd9bc05ec06c63948fdf755a20aa698117897f53d6ea0909acb060a061e60aa7239afb1320a
+  metadata.gz: 453061fe039e72dea482d0ba003fab94de6a20ffb18f8076ea0eb68e36fc72c3182018bafb5ee4e2f0c616c9c8cee32be3fa4765103c8b368fe69c269ec0587e
+  data.tar.gz: 32bb65924fe5b3189d5f4f7d24d46fc5cda3cd3812458e3f54d5eacc5ccd2fb7cbe147005319468cb1d87565c8fd8eb2d6fd0e06a024444cd44e0ad9eb8417c9

data/.byebug_history

@@ -1,243 +1 @@
 c
-job.valid?
-job.setup
-job
-c
-json
-c
-self.config
-config
-Server.config
-c
-Server.config
-c
-QPush::Server.config
-c
-QPush::Server.config
-c
-job.perform
-job = Job.new(JSON.parse(json))
-json
-c
-delays.count
-delays.any?
-delays
-@conn
-c
-valid?
-c
-configs
-c
-configs
-c
-valid?
-config
-c
-valid?
-@configs
-configs
-c
-configs ? true : false
-configs
-c
-valid?
-quit
-job.klass
-job.errors
-job.valid?
-c
-jobs
-c
-request.path_info
-c
-hash
-c
-@jobs.compact[@start, @count]
-@jobs.compact
-@jobs.compact!
-@count
-@start
-@jobs
-c
-@count
-@start
-@jobs
-c
- Delay.call(@job, :delay)
-c
-Delay.call(@job)
-c
-@stats.each_key { |key| puts key }
-@stats.each_key { |key| @stats[key].to_i }
-@stats
-c
-@stats
-c
-quit
-Perform.call(@job)
-c
-Perform.call(@job)
-c
-@job
-invalid_job && return unless @job.valid?
-c
-job
-c
-@fails = @fails.compact[@start, @count]
-@fails
-@Fails
-@fails.compact!
-@fails.compact![@start..@count]
-@fails.compact![@start, @count]
-@fails.any?
-@count
-@start
-@fails
-c
-@fails
-c
-@fails
-c
-percent
-quit
-y
-q
-(100.00 - ((stats[:failed].to_f / stats[:performed].to_f) * 100.00)).round(2)
-100.00 - ((stats[:failed].to_f / stats[:performed].to_f) * 100.00)
-stats[:failed].to_f / stats[:performed].to_f
-stats[:failed].to_f
-stats[:failed].to_i / stats[:performed].to_i
-(stats[:failed] / stats[:performed])
-stats[:performed]
-stats[:failed]
-percent
-c
-conn.lrange("#{QPush.config.perform_namespace}:last_10", 0, 10)
-c
-json
-c
-conn.get("#{namespace}:#{s}")
-stats
-c
-nil.to_i
-stats
-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
-puts e
-puts s
-s
-jobs.compact!
-jobs.compact![s, e]
-jobs
-quit
-jobs
-c
-jobs
-quit
-job_hash
-quit
-delayed_jobs
-delay_jobs
-c
-conn.zrange(QPush.config.delay_namespace, 0, -1, with_scores: true)
-delayed_jobs
-quit
-conn.get("#{@namespace}:#{stat}")
-"#{@namespace}:#{stat}"
-c
-name
-c
-self.name
-quit
-job
-delays.each { |job| PerformJob.call(Job.new(job)) }
-cccccccccccc
-elcccccccccccccccccccc
-delaysdelays.each {|job| PerformJob.call(Job.new(job))}
-quit
-Server.connection_pool
-Qued::QPush.redis
-QPush.redis
-c
-QueueJob.new(job).call
-job.valid? && job.queueable?
-job.valid?
-return false unless job.valid? && job.queueable?
-job
-quit
-@start_at < Time.now.to_i && !@cron.empty?
-@start_at > Time.now.to_i && @cron.empty?
-@start_at < Time.now.to_i && @cron.empty?
-QueueJob.new(self).call
-quit
-job.valid?
-job.save
-test
-quit
-job.save
-job
-job = Job.new(options)
-options
-quit
-cron?
-delay?
-queue?
-quit
-c
-job_type.call
-quit
-job_type.call
-quit
-performer
-performer = retrieve_job_type
-quit
-self
-performer.call
-performer
-performer = retrieve_job_type
-performer.call
-performer
-retrieve_job_type
-performer
-c
-quit
-performer.call
-performer
-performer = retrieve_job_type
-valid?
-c
-@job.queue?
-@job.delay?
-@job.cron?
-@job
-job_success
-measure_run_time { @job.run }
-@job.run
-c
-quit
-log_success
-job_success && log_success
-c
-@job.run
-@job = Job.new(JSON.parse(json))
-c
-@job = Job.new(JSON.parse(json))
-json
-quit
-json
-son

data/README.md

@@ -1,4 +1,4 @@
-# QPush
+#<center><img src="https://s21.postimg.org/85ce7g93b/qpush.png" alt="Drawing" width="250"/></center>
 [![Code Climate](https://codeclimate.com/github/nsweeting/qpush/badges/gpa.svg)](https://codeclimate.com/github/nsweeting/qpush)
 
 Fast and simple job queue microservice for Ruby. **Please consider it under development at the moment.**
@@ -77,12 +77,14 @@ At a minimum, we must provide the job with a 'klass'. There are many more option
 
 #### Building Jobs
 
-Jobs are simply plain old ruby objects that contain a 'call' method. If you provide a hash for the 'args' of the job, the job will be initialized with them. Below is an example of a simple mailing job utilizing the 'mail' gem.
+Jobs are simply ruby objects that include the QPush::Job module and contain a 'call' method. If you provide a hash for the 'args' of the job, the job will be initialized with them. Below is an example of a simple mailing job utilizing the 'mail' gem.
 
 ```ruby
 require 'mail'
 
 class MailJob
+  include QPush::Job
+
   def initialize(options = {})
     @mail = Mail.new(options)
   end

data/jobs/fail_job.rb

@@ -1,5 +1,5 @@
 class FailJob
-  include QPush::Server::JobRegister
+  include QPush::Job
 
   def initialize(options)
     @option = options

data/jobs/test_job.rb

@@ -1,6 +1,6 @@
 class TestJob
-  include QPush::Server::JobRegister
-
+  include QPush::Job
+  
   def call
     puts 'Hello from TestJob'
   end

data/lib/qpush/base.rb

@@ -1,5 +1,4 @@
 # External
-require 'byebug'
 require 'securerandom'
 require 'json'
 require 'redis'

data/lib/qpush/base/job.rb

@@ -3,6 +3,7 @@ module QPush
     def job(options)
       job = Client::Job.new(options)
       job.queue
+      job
     end
   end
 

data/lib/qpush/base/redis.rb

@@ -1,11 +1,42 @@
 module QPush
   module Base
     KEY = 'qpush:v1'.freeze
+    SUB_KEYS = [:delay,
+                :queue,
+                :perform,
+                :stats,
+                :heart,
+                :crons,
+                :history,
+                :morgue].freeze
 
-    class RedisPool
-      def self.create(pool, url)
-        ::ConnectionPool.new(size: pool) do
-          ::Redis.new(url: url)
+    module RedisHelper
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def redis
+          redis_pool.with do |conn|
+            yield conn
+          end
+        end
+
+        def redis_pool
+          @redis_pool ||= build_pool(config.redis_pool, config.redis_url)
+        end
+
+        def build_pool(pool, url)
+          ConnectionPool.new(size: pool) do
+            Redis.new(url: url)
+          end
+        end
+
+        def build_keys(namespace, priorities)
+          name = "#{QPush::Base::KEY}:#{namespace}"
+          keys = Hash[QPush::Base::SUB_KEYS.collect { |key| [key, "#{name}:#{key}"] }]
+          keys[:perform_list] = (1..priorities).collect { |num| "#{keys[:perform]}:#{num}" }
+          keys
         end
       end
     end

data/lib/qpush/client.rb

@@ -1,7 +1,26 @@
 # QPush Base
 require 'qpush/base'
 
-# Qpush Client Base
-require 'qpush/client/config'
-require 'qpush/client/job'
-require 'qpush/client/redis'
+module QPush
+  module Client
+    include QPush::Base::ConfigHelper
+    include QPush::Base::RedisHelper
+
+    class << self
+      def config
+        @config ||= Config.new
+      end
+    end
+
+    class Config < QPush::Base::Config; end
+
+    class Job < QPush::Base::Job
+      def queue
+        Client.redis do |conn|
+          conn.hincrby("#{QPush::Base::KEY}:#{@namespace}:stats", 'queued', 1)
+          conn.lpush("#{QPush::Base::KEY}:#{@namespace}:queue", to_json)
+        end
+      end
+    end
+  end
+end

data/lib/qpush/server.rb

@@ -2,13 +2,14 @@
 require 'sequel'
 require 'object_validator'
 require 'parse-cron'
-require 'forwardable'
+require 'logger'
 
 # QPush Base
 require 'qpush/base'
 
 # Qpush Server Base
 require 'qpush/server/apis'
+require 'qpush/server/worker'
 require 'qpush/server/config'
 require 'qpush/server/database'
 require 'qpush/server/delay'
@@ -21,8 +22,6 @@ require 'qpush/server/logger'
 require 'qpush/server/manager'
 require 'qpush/server/perform'
 require 'qpush/server/queue'
-require 'qpush/server/redis'
-require 'qpush/server/worker'
 
 # QPush Server Apis
 require 'qpush/server/apis/delay'

data/lib/qpush/server/apis/setup.rb

@@ -3,15 +3,14 @@ module QPush
     module Apis
       class Setup < Base
         def call
-          invalid_job && return unless @job.valid?
-          setup_job
+          @job.valid? ? setup_job : invalid_job
         end
 
         private
 
         def setup_job
-          Perform.call(@job) if @job.perform_job?
-          Delay.call(@job, :delay) if @job.delay_job?
+          @job.perform if @job.perform_job?
+          @job.delay if @job.delay_job?
         end
 
         def invalid_job

data/lib/qpush/server/apis/success.rb

@@ -17,9 +17,7 @@ module QPush
         end
 
         def stat_increment
-          Server.redis do |c|
-            c.hincrby(Server.keys[:stats], 'success', 1)
-          end
+          Server.redis { |c| c.hincrby(Server.keys[:stats], 'success', 1) }
         end
 
         def log_success

data/lib/qpush/server/config.rb

@@ -1,43 +1,19 @@
 module QPush
   module Server
     include QPush::Base::ConfigHelper
+    include QPush::Base::RedisHelper
 
     class << self
-      attr_accessor :worker, :keys
+      attr_accessor :keys
 
       def config
         @config ||= Config.new
       end
-
-      def build_worker
-        worker = WorkerConfig.new
-        yield worker
-        worker
-      end
-    end
-
-    class WorkerConfig
-      DEFAULTS = {
-        namespace: 'default',
-        priorities: 5,
-        queue_threads: 2,
-        perform_threads: 2,
-        delay_threads: 1 }.freeze
-
-      attr_accessor :perform_threads, :queue_threads, :delay_threads,
-                    :namespace, :priorities
-
-      def initialize(options = {})
-        options = DEFAULTS.merge(options)
-        options.each { |key, value| send("#{key}=", value) }
-      end
-
-      def for_keys
-        { namespace: @namespace, priorities: @priorities }
-      end
     end
 
     class Config < QPush::Base::Config
+      include ObjectValidator::Validate
+
       SERVER_DEFAULTS = {
         database_url: ENV['DATABASE_URL'],
         database_pool: 10,
@@ -50,6 +26,24 @@ module QPush
         super
         SERVER_DEFAULTS.each { |key, value| send("#{key}=", value) }
       end
+
+      def validate!
+        return if valid?
+        fail ServerError, errors.full_messages.join(' ')
+      end
+    end
+
+    class ConfigValidator
+      include ObjectValidator::Validator
+
+      validates :redis, with: { proc: proc { Server.redis { |c| c.ping && c.quit } },
+                                msg: 'could not be connected with' }
+      validates :workers, with: { proc: proc { |c| c.workers.is_a?(Array) && c.workers.count > 0 },
+                                  msg: 'is not a valid Array of WorkerConfigs' }
+      validates :configs, with: { proc: proc { |c| c.workers.all? { |w| w.is_a?(WorkerConfig) } },
+                                  msg: 'are not valid WorkerConfig objects' }
+      validates :jobs_path, with: { proc: proc { |c| Dir.exist?(Dir.pwd + c.jobs_path) },
+                                    msg: 'is not a valid directory' }
     end
   end
 end

data/lib/qpush/server/jobs.rb

@@ -1,14 +1,22 @@
 module QPush
+  module Job
+    class << self
+      def included(base)
+        _register_job(base)
+        Server.log.info("* Job loaded: #{base.name}")
+      end
+
+      def _register_job(base)
+        Server.jobs << base.name
+        Server.redis { |c| c.sadd("#{QPush::Base::KEY}:jobs", base.name) }
+      end
+    end
+  end
+
   module Server
-    module JobRegister
-      class << self
-        def included(base)
-          _register_job(base)
-        end
-
-        def _register_job(base)
-          Server.redis { |c| c.sadd("#{QPush::Base::KEY}:jobs", base.name) }
-        end
+    class << self
+      def jobs
+        @jobs ||= []
       end
     end
 
@@ -69,7 +77,7 @@ module QPush
       include ObjectValidator::Validator
 
       validates :klass,
-                with: { proc: proc { |j| Object.const_defined?(j.klass) },
+                with: { proc: proc { |j| Server.jobs.include?(j.klass) },
                         msg: 'has not been defined' }
       validates :cron,
                 with: { proc: proc { |j| j.cron.empty? ? true : CronParser.new(j.cron) },

data/lib/qpush/server/launcher.rb

@@ -7,11 +7,12 @@ module QPush
         @argv = argv
       end
 
-      # Parses commmand line options and starts the Manager object
+      # Provides the main entrypoint for starting a QPush server.
       #
       def start
         start_message
         setup_options
+        validate!
         setup_jobs
         boot_manager
       end
@@ -39,12 +40,21 @@ module QPush
         parser.parse!(@argv)
       end
 
+      # Validates our server and worker configuration.
+      #
+      def validate!
+        Server.config.validate!
+        Server.config.workers.each { |w| w.validate! }
+      end
+
       # Requires all base jobs as well as user jobs.
       #
       def setup_jobs
         JobLoader.call
       end
 
+      # Boots our manager
+      #
       def boot_manager
         manager = Manager.new(Server.config.workers)
         manager.start

data/lib/qpush/server/logger.rb

@@ -1,5 +1,3 @@
-require 'logger'
-
 module QPush
   module Server
     class << self

data/lib/qpush/server/manager.rb

@@ -4,8 +4,6 @@ module QPush
     # of them to start and shutdown.
     #
     class Manager
-      include ObjectValidator::Validate
-
       attr_accessor :configs
       attr_reader :forks
 
@@ -21,7 +19,6 @@ module QPush
       # sleep so that our Workers can do their thing.
       #
       def start
-        validate!
         start_messages
         flush_spaces
         create_workers
@@ -55,34 +52,12 @@ module QPush
         Server.log.info("* Worker count: #{@configs.count}")
       end
 
-      # Validates our data before starting our Workers. Also instantiates our
-      # connection pool by pinging Redis.
-      #
-      def validate!
-        return if valid?
-        fail ServerError, errors.full_messages.join(' ')
-      end
-
       # Removes the list of namespaces used by our server from Redis. This
       # prepares it for the new list that will be created by our workers.
       #
       def flush_spaces
-        Server.redis { |c| c.del(QPush::Base::KEY + ':namespaces') }
+        Server.redis { |c| c.del("#{QPush::Base::KEY}:namespaces") }
       end
     end
-
-    # The ManagerValidator ensures the data for our manager is valid before
-    # attempting to start it.
-    #
-    class ManagerValidator
-      include ObjectValidator::Validator
-
-      validates :redis, with: { proc: proc { Server.redis { |c| c.ping && c.quit } },
-                                msg: 'could not be connected with' }
-      validates :configs, with: { proc: proc { |m| m.configs.count > 0 },
-                                  msg: 'were not defined' }
-      validates :configs, with: { proc: proc { |m| m.configs.each { |c| c.is_a?(WorkerConfig) } },
-                                  msg: 'are not valid WorkerConfig objects' }
-    end
   end
 end

data/lib/qpush/server/worker.rb

@@ -1,20 +1,26 @@
-
 module QPush
   module Server
-    # The Worker manages our workers - Queue, Delay, Perform and Heartbeat.
-    # Each of these workers is alloted a number of threads. Each worker
+    class << self
+      attr_accessor :worker
+
+      # A convenience method used to create new WorkerConfig objects for use
+      # in our server configuration.
+      #
+      def build_worker
+        worker = WorkerConfig.new
+        yield worker
+        worker
+      end
+    end
+
+    # The Worker manages our actions - Queue, Delay, Perform and Heartbeat.
+    # Each of these actions is alloted a number of threads. Each action
     # object maintains control of these threads through the aptly named start
     # and shutdown methods.
     #
     class Worker
-      extend Forwardable
-      include ObjectValidator::Validate
-
       attr_reader :config, :pid, :id
 
-      def_delegators :@config, :perform_threads, :delay_threads, :queue_threads,
-                     :priorities, :base_threads, :namespace
-
       def initialize(id, config)
         @id = id
         @pid = Process.pid
@@ -27,11 +33,10 @@ module QPush
       # Starts our new worker.
       #
       def start
-        validate!
         assign_globals
         register_space
         start_message
-        build_threads
+        build_actions
         start_threads
       end
 
@@ -45,42 +50,56 @@ module QPush
 
       private
 
-      # Forks the worker and creates the actual threads (@threads) for
-      # our Queue and Retry objects. We then start them and join them to the
-      # main process.
+      # Assign the globals that are required for our worker to function.
       #
-      def start_threads
-        @actions.each do |action|
-          @threads << Thread.new { action.start }
+      def assign_globals
+        Server.keys = Server.build_keys(@config.namespace, @config.priorities)
+        Server.worker = self
+      end
+
+      # Registers our workers namespace on Redis
+      #
+      def register_space
+        Server.redis do |c|
+          c.sadd("#{QPush::Base::KEY}:namespaces", @config.namespace)
         end
-        @threads.map(&:join)
+      end
+
+      # Information about the start process
+      #
+      def start_message
+        Server.log.info("* Worker #{@id} started | pid: #{@pid} | namespace: #{@config.namespace}")
       end
 
       # Instantiates our Queue, Perform, Delay and Heartbeat objects based on
-      # the number of threads specified for each process type. We store these
+      # the number of threads specified for each action type. We store these
       # objects as an array in @actions.
       #
-      def build_threads
-        base_threads.each do |thread|
-          thread[:count].times do
-            @actions << thread[:klass].new
+      def build_actions
+        base_actions.each do |action|
+          action[:count].times do
+            @actions << action[:klass].new
           end
         end
       end
 
-      def base_threads
+      def base_actions
         [
-          { klass: Perform, count: perform_threads },
-          { klass: Queue, count: queue_threads },
-          { klass: Delay, count: delay_threads },
+          { klass: Perform, count: @config.perform_threads },
+          { klass: Queue, count: @config.queue_threads },
+          { klass: Delay, count: @config.delay_threads },
           { klass: Heartbeat, count: 1 }
         ]
       end
 
-      # Information about the start process
+      # Creates threads for each of the action objects, We then start them and
+      # join them to the main process.
       #
-      def start_message
-        Server.log.info("* Worker #{@id} started | pid: #{@pid} | namespace: #{namespace}")
+      def start_threads
+        @actions.each do |action|
+          @threads << Thread.new { action.start }
+        end
+        @threads.map(&:join)
       end
 
       # Information about the shutdown process
@@ -88,40 +107,40 @@ module QPush
       def shutdown_message
         Server.log.info("* Worker #{@id} shutdown | pid: #{@pid}")
       end
+    end
 
-      # Validates our data before starting the worker.
-      #
-      def validate!
-        return if valid?
-        fail ServerError, errors.full_messages.join(' ')
-      end
+    class WorkerConfig
+      include ObjectValidator::Validate
 
-      def assign_globals
-        Server.keys = RedisKeys.build(@config.namespace, @config.priorities)
-        Server.worker = self
+      DEFAULTS = {
+        namespace: 'default',
+        priorities: 5,
+        queue_threads: 2,
+        perform_threads: 2,
+        delay_threads: 1 }.freeze
+
+      attr_accessor :perform_threads, :queue_threads, :delay_threads,
+                    :namespace, :priorities
+
+      def initialize(options = {})
+        options = DEFAULTS.merge(options)
+        options.each { |key, value| send("#{key}=", value) }
       end
 
-      # Registers our workers namespace on Redis
-      #
-      def register_space
-        Server.redis do |c|
-          c.sadd(QPush::Base::KEY + ':namespaces', namespace)
-        end
+      def validate!
+        return if valid?
+        fail ServerError, errors.full_messages.join(' ')
       end
     end
 
-    # The WorkerValidator ensures the data for our worker is
-    # valid before attempting to use it.
-    #
-    class WorkerValidator
+    class WorkerConfigValidator
       include ObjectValidator::Validator
 
-      validates :config, type: QPush::Server::WorkerConfig
-      validates :perform_threads, type: Integer, greater_than: 0
-      validates :queue_threads, type: Integer, greater_than: 0
-      validates :delay_threads, type: Integer, greater_than: 0
       validates :namespace, type: String
-      validates :priorities, type: Integer, greater_than: 4
+      validates :priorities, greater_than: 4
+      validates :queue_threads, greater_than: 0
+      validates :perform_threads, greater_than: 0
+      validates :delay_threads, greater_than: 0
     end
   end
 end

data/lib/qpush/version.rb

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

data/lib/qpush/web.rb

@@ -7,7 +7,6 @@ require 'qpush/base'
 # Web Base
 require 'qpush/web/config'
 require 'qpush/web/get'
-require 'qpush/web/redis'
 require 'qpush/web/server'
 
 # Web Apis

data/lib/qpush/web/config.rb

@@ -1,15 +1,12 @@
 module QPush
   module Web
     include QPush::Base::ConfigHelper
+    include QPush::Base::RedisHelper
 
     class << self
       def config
         @config ||= Config.new
       end
-
-      def keys
-        @keys ||= QPush::Web::RedisKeys.new
-      end
     end
 
     class Config < QPush::Base::Config; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qpush
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Nicholas Sweeting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -200,7 +200,6 @@ files:
 - bin/qpush-server
 - bin/qpush-web
 - bin/setup
-- dump.rdb
 - jobs/fail_job.rb
 - jobs/test_job.rb
 - lib/qpush.rb
@@ -209,9 +208,6 @@ files:
 - lib/qpush/base/job.rb
 - lib/qpush/base/redis.rb
 - lib/qpush/client.rb
-- lib/qpush/client/config.rb
-- lib/qpush/client/job.rb
-- lib/qpush/client/redis.rb
 - lib/qpush/jobs/queue_delayed.rb
 - lib/qpush/server.rb
 - lib/qpush/server/apis.rb
@@ -236,7 +232,6 @@ files:
 - lib/qpush/server/manager.rb
 - lib/qpush/server/perform.rb
 - lib/qpush/server/queue.rb
-- lib/qpush/server/redis.rb
 - lib/qpush/server/worker.rb
 - lib/qpush/version.rb
 - lib/qpush/web.rb
@@ -267,7 +262,6 @@ files:
 - lib/qpush/web/public/js/app.js
 - lib/qpush/web/public/js/shims.js
 - lib/qpush/web/public/tsconfig.json
-- lib/qpush/web/redis.rb
 - lib/qpush/web/server.rb
 - lib/qpush/web/server.ru
 - qpush.gemspec

data/lib/qpush/client/config.rb

@@ -1,13 +0,0 @@
-module QPush
-  module Client
-    include QPush::Base::ConfigHelper
-
-    class << self
-      def config
-        @config ||= Config.new
-      end
-    end
-
-    class Config < QPush::Base::Config; end
-  end
-end

data/lib/qpush/client/job.rb

@@ -1,12 +0,0 @@
-module QPush
-  module Client
-    class Job < QPush::Base::Job
-      def queue
-        Client.redis do |conn|
-          conn.hincrby("#{QPush::Base::KEY}:#{@namespace}:stats", 'queued', 1)
-          conn.lpush("#{QPush::Base::KEY}:#{@namespace}:queue", to_json)
-        end
-      end
-    end
-  end
-end

data/lib/qpush/client/redis.rb

@@ -1,16 +0,0 @@
-module QPush
-  module Client
-    class << self
-      def redis
-        redis_pool.with do |conn|
-          yield conn
-        end
-      end
-
-      def redis_pool
-        @redis_pool ||= QPush::Base::RedisPool.create(Client.config.redis_pool,
-                                                      Client.config.redis_url)
-      end
-    end
-  end
-end

data/lib/qpush/server/redis.rb

@@ -1,34 +0,0 @@
-module QPush
-  module Server
-    class << self
-      def redis
-        redis_pool.with do |conn|
-          yield conn
-        end
-      end
-
-      def redis_pool
-        @redis_pool ||= QPush::Base::RedisPool.create(Server.config.redis_pool,
-                                                      Server.config.redis_url)
-      end
-    end
-
-    module RedisKeys
-      KEYS = [:delay,
-              :queue,
-              :perform,
-              :stats,
-              :heart,
-              :crons,
-              :history,
-              :morgue]
-
-      def self.build(namespace, priorities)
-        name = "#{QPush::Base::KEY}:#{namespace}"
-        keys = Hash[KEYS.collect { |key| [key, "#{name}:#{key}"] }]
-        keys[:perform_list] = (1..5).collect { |num| "#{keys[:perform]}:#{num}" }
-        keys
-      end
-    end
-  end
-end

data/lib/qpush/web/redis.rb

@@ -1,48 +0,0 @@
-module QPush
-  module Web
-    class << self
-      def redis
-        redis_pool.with do |conn|
-          yield conn
-        end
-      end
-
-      def redis_pool
-        @redis_pool ||= QPush::Base::RedisPool.create(Web.config.redis_pool,
-                                                      Web.config.redis_url)
-      end
-    end
-
-    class RedisKeys
-      KEYS = [:delay,
-              :queue,
-              :perform,
-              :stats,
-              :heart,
-              :crons,
-              :history,
-              :morgue]
-
-      attr_reader :delay, :queue, :perform, :stats, :heart,
-                  :crons, :history, :morgue
-
-      def initialize(options = {})
-        @namespace = options[:namespace] || 'default'
-        @priorities = options[:priorities] || 5
-        build_keyspaces
-      end
-
-      def perform_list
-        @perform_list ||= (1..@priorities).collect { |num| "#{perform}:#{num}" }
-      end
-
-      private
-
-      def build_keyspaces
-        KEYS.each do |key|
-          instance_variable_set("@#{key}", "#{QPush::Base::KEY}:#{@namespace}:#{key}")
-        end
-      end
-    end
-  end
-end