hirefire-resource 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78f25c9a7eeb6260b9e218267522c46be2493e9a2a3d9e0fa08b6514a803a62b
-  data.tar.gz: 52a780c5a441f99a93bce38a496b107b6da34a0a9493c8697b497a5df7912ac3
+  metadata.gz: f395466dc5805c8bd4d686f22181e515ac14a600e15e062a8e55d582dc6a0e57
+  data.tar.gz: ad6fd4856109de19979e8a975f65c0697672f09ccbbc67ef635c1e83384533d0
 SHA512:
-  metadata.gz: 9cdedb2500afde54bc12355bb54c44ac18b572f9c427d3dd2f84a94e4c9fd912bc0fa5400b357511d9ff3329423e6eace83d57fa9ff66ec75600f4ddb2d24856
-  data.tar.gz: 6da6c56397be5a92a5afb337dfbbc57bea9e775ae62274e92d975d6dd248199557043c9cf115f7a38a5a2aa6838e956868dbe629928c7be70a4a4ca48951fdeb
+  metadata.gz: fff67ee5f1bb27f874fbb2f401681ab1fb37c6904f62ac10ab42fb38b256ba1f8638407fc78f914e3aa40c5178c6bffff95a0a40dfab4882aa2726fc815bf8a0
+  data.tar.gz: 52cc6314c95f940140afb1798e2afac18c4cbc7a494f8cc6ea4e3a111aee6fa53876dcb9f85f924a02e843eb560cbc7b755f3ed7e5522d00f1b23f7727e7c70c

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## v0.8.1/Master
+## v0.9.0/master
+
+* Add `skip_working` to Sidekiq macro
+* Use separate queries for Que 0.x and 1.x
+* Remove `# encoding: utf-8` magic comments
+* Add `# frozen_string_literal: true` magic comments
+
+## v0.8.1
 
 * Correct GoodJob macro to not count finished jobs.
 

data/Rakefile

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"

data/hirefire-resource.gemspec

@@ -1,8 +1,6 @@
-# encoding: utf-8
-
 Gem::Specification.new do |gem|
   gem.name = "hirefire-resource"
-  gem.version = "0.8.1"
+  gem.version = "0.9.0"
   gem.platform = Gem::Platform::RUBY
   gem.authors = "Michael van Rooijen"
   gem.email = "michael@hirefire.io"

data/lib/hirefire-resource.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 HIREFIRE_PATH = File.expand_path("../hirefire", __FILE__)
 

data/lib/hirefire/cli.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require "open-uri"
 require "openssl"
@@ -45,4 +45,3 @@ else
     exit 1
   end
 end
-

data/lib/hirefire/macro/bunny.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module HireFire
   module Macro

data/lib/hirefire/macro/delayed_job.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module HireFire
   module Macro
@@ -78,4 +78,3 @@ module HireFire
     end
   end
 end
-

data/lib/hirefire/macro/good_job.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module HireFire
   module Macro

data/lib/hirefire/macro/qc.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module HireFire
   module Macro
@@ -21,4 +21,3 @@ module HireFire
     end
   end
 end
-

data/lib/hirefire/macro/qu.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module HireFire
   module Macro
@@ -22,4 +22,3 @@ module HireFire
     end
   end
 end
-

data/lib/hirefire/macro/que.rb

@@ -1,12 +1,8 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module HireFire
   module Macro
     module Que
-      QUERY =  %{
-SELECT count(*) AS total
-FROM que_jobs WHERE run_at < now() }.freeze
-
       extend self
 
       # Queries the PostgreSQL database through Que in order to
@@ -20,17 +16,40 @@ FROM que_jobs WHERE run_at < now() }.freeze
       # @return [Integer] the number of jobs in the queue(s).
       #
       def queue(*queues)
-        query = case
-        when queues.none? then QUERY
-        when queues.one? then "#{QUERY} AND queue = '#{queues.first}'"
-        else
-          queue_names = queues.map { |queue| "'#{queue}'" }.join(', ')
-          %Q{#{QUERY} AND queue IN (#{queue_names})}
-        end
-
+        query   = queues.empty? && base_query || base_query + " AND queue IN (#{names(queues)})"
         results = ::Que.execute(query).first
         (results[:total] || results["total"]).to_i
       end
+
+      private
+
+      def base_query
+        return QUE_V0_QUERY if defined?(::Que::Version)
+        return QUE_V1_QUERY if defined?(::Que::VERSION)
+        raise "Couldn't find Que version"
+      end
+
+      def names(queues)
+        queues.map { |queue| "'#{queue}'" }.join(",")
+      end
+
+      def query_const(query)
+        query.gsub(/\s+/, " ").strip.freeze
+      end
+
+      QUE_V0_QUERY = query_const(<<-QUERY)
+        SELECT COUNT(*) AS total
+        FROM que_jobs
+        WHERE run_at < NOW()
+      QUERY
+
+      QUE_V1_QUERY = query_const(<<-QUERY)
+        SELECT COUNT(*) AS total
+        FROM que_jobs
+        WHERE finished_at IS NULL
+        AND expired_at IS NULL
+        AND run_at <= NOW()
+      QUERY
     end
   end
 end

data/lib/hirefire/macro/resque.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module HireFire
   module Macro

data/lib/hirefire/macro/sidekiq.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module HireFire
   module Macro
@@ -13,6 +13,7 @@ module HireFire
       #   HireFire::Macro::Sidekiq.queue("audio", "video") # audio and video queues
       #   HireFire::Macro::Sidekiq.queue("email", skip_scheduled: true) # only email, will not count scheduled queue
       #   HireFire::Macro::Sidekiq.queue("audio", skip_retries: true) # only audio, will not count the retries queue
+      #   HireFire::Macro::Sidekiq.queue("audio", skip_working: true) # only audio, will not count already queued
       #
       # @param [Array] queues provide one or more queue names, or none for "all".
       # @return [Integer] the number of jobs in the queue(s).
@@ -60,7 +61,9 @@ module HireFire
           in_retry = ::Sidekiq.redis { |c| c.zcount('retry', '-inf', Time.now.to_f) }
         end
 
-        in_progress = stats.workers_size
+        if !options[:skip_working]
+          in_progress = stats.workers_size
+        end
 
         [in_queues, in_schedule, in_retry, in_progress].compact.inject(&:+)
       end
@@ -96,15 +99,16 @@ module HireFire
 
         now = Time.now.to_i
 
-        # Objects yielded to Workers#each:
-        # https://github.com/mperham/sidekiq/blob/305ab8eedc362325da2e218b2a0e20e510668a42/lib/sidekiq/api.rb#L912
-        in_progress = ::Sidekiq::Workers.new.select do |key, tid, job|
-          queues.include?(job['queue']) && job['run_at'] <= now
-        end.size
+        if !options[:skip_working]
+          # Objects yielded to Workers#each:
+          # https://github.com/mperham/sidekiq/blob/305ab8eedc362325da2e218b2a0e20e510668a42/lib/sidekiq/api.rb#L912
+          in_progress = ::Sidekiq::Workers.new.select do |key, tid, job|
+            queues.include?(job['queue']) && job['run_at'] <= now
+          end.size
+        end
 
         [in_queues, in_schedule, in_retry, in_progress].compact.inject(&:+)
       end
     end
   end
 end
-

data/lib/hirefire/middleware.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module HireFire
   class Middleware

data/lib/hirefire/railtie.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module HireFire
   class Railtie < ::Rails::Railtie

data/lib/hirefire/resource.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module HireFire
   module Resource

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2020-10-17 00:00:00.000000000 Z
 dependencies: []
 description: Load- and schedule-based scaling for web- and worker dynos
 email: michael@hirefire.io