cloudtasker 0.12.rc11 → 0.13.rc1

data/gemfiles/rails_6.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    cloudtasker (0.12.rc11)
+    cloudtasker (0.13.rc1)
       activesupport
       connection_pool
       fugit
@@ -68,111 +68,86 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.1, >= 2.1.8)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.4.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    async (1.29.1)
-      console (~> 1.10)
-      nio4r (~> 2.3)
-      timers (~> 4.1)
-    async-http (0.56.3)
-      async (~> 1.25)
-      async-io (~> 1.28)
-      async-pool (~> 0.2)
-      protocol-http (~> 0.22.0)
-      protocol-http1 (~> 0.14.0)
-      protocol-http2 (~> 0.14.0)
-    async-http-faraday (0.11.0)
-      async-http (~> 0.42)
-      faraday
-    async-io (1.32.1)
-      async (~> 1.14)
-    async-pool (0.3.7)
-      async (~> 1.25)
     builder (3.2.4)
     concurrent-ruby (1.1.9)
     connection_pool (2.2.5)
-    console (1.13.1)
-      fiber-local
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     erubi (1.10.0)
-    et-orbi (1.2.4)
+    et-orbi (1.2.6)
       tzinfo
-    faraday (1.4.3)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
-    faraday-http-cache (2.2.0)
-      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    fiber-local (1.0.0)
-    fugit (1.5.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    fugit (1.5.2)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    github_changelog_generator (1.16.4)
-      activesupport
-      async (>= 1.25.0)
-      async-http-faraday
-      faraday-http-cache
-      multi_json
-      octokit (~> 4.6)
-      rainbow (>= 2.2.1)
-      rake (>= 10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
     google-cloud-tasks (1.5.1)
       google-gax (~> 1.8)
       googleapis-common-protos (>= 1.3.9, < 2.0)
       googleapis-common-protos-types (>= 1.0.4, < 2.0)
       grpc-google-iam-v1 (~> 0.6.9)
-    google-gax (1.8.1)
+    google-gax (1.8.2)
       google-protobuf (~> 3.9)
       googleapis-common-protos (>= 1.3.9, < 2.0)
+      googleapis-common-protos-types (>= 1.0.4, < 2.0)
       googleauth (~> 0.9)
       grpc (~> 1.24)
       rly (~> 0.2.3)
-    google-protobuf (3.17.3)
-    googleapis-common-protos (1.3.11)
+    google-protobuf (3.19.1-x86_64-darwin)
+    googleapis-common-protos (1.3.12)
       google-protobuf (~> 3.14)
-      googleapis-common-protos-types (>= 1.0.6, < 2.0)
+      googleapis-common-protos-types (~> 1.2)
       grpc (~> 1.27)
-    googleapis-common-protos-types (1.0.6)
+    googleapis-common-protos-types (1.3.0)
       google-protobuf (~> 3.14)
-    googleauth (0.16.2)
+    googleauth (0.17.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
-    grpc (1.38.0)
-      google-protobuf (~> 3.15)
+      signet (~> 0.15)
+    grpc (1.42.0-x86_64-darwin)
+      google-protobuf (~> 3.18)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (0.6.11)
       google-protobuf (~> 3.14)
       googleapis-common-protos (>= 1.3.11, < 2.0)
       grpc (~> 1.27)
     hashdiff (1.0.1)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
-    jwt (2.2.3)
-    loofah (2.10.0)
+    jwt (2.3.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -184,32 +159,22 @@ GEM
     mimemagic (0.3.10)
       nokogiri (~> 1)
       rake
-    mini_mime (1.1.0)
-    mini_portile2 (2.5.3)
-    minitest (5.14.4)
+    mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
+    minitest (5.15.0)
     multi_json (1.15.0)
     multipart-post (2.1.1)
-    nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nio4r (2.5.8)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    octokit (4.21.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    os (1.1.1)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    os (1.1.4)
+    parallel (1.21.0)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
-    protocol-hpack (1.4.2)
-    protocol-http (0.22.4)
-    protocol-http1 (0.14.1)
-      protocol-http (~> 0.22)
-    protocol-http2 (0.14.2)
-      protocol-hpack (~> 1.4)
-      protocol-http (~> 0.18)
     public_suffix (4.0.6)
     raabro (1.4.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -231,7 +196,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     railties (6.0.0)
       actionpack (= 6.0.0)
@@ -240,8 +205,8 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
-    rake (13.0.3)
-    redis (4.3.1)
+    rake (13.0.6)
+    redis (4.5.1)
     retriable (3.1.2)
     rexml (3.2.5)
     rly (0.2.3)
@@ -258,7 +223,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (5.0.1)
+    rspec-rails (5.0.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -266,7 +231,7 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     rubocop (0.76.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -277,40 +242,35 @@ GEM
     rubocop-rspec (1.37.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    sawyer (0.8.2)
-      addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    semantic_logger (4.8.0)
+    ruby2_keywords (0.0.5)
+    semantic_logger (4.9.0)
       concurrent-ruby (~> 1.0)
-    signet (0.15.0)
-      addressable (~> 2.3)
+    signet (0.16.0)
+      addressable (~> 2.8)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
     thor (1.1.0)
     thread_safe (0.3.6)
     timecop (0.9.4)
-    timers (4.3.3)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.1)
-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby
@@ -319,7 +279,6 @@ DEPENDENCIES
   appraisal
   bundler (~> 2.0)
   cloudtasker!
-  github_changelog_generator
   rails (= 6.0)
   rake (>= 12.3.3)
   rspec (~> 3.0)
@@ -328,9 +287,8 @@ DEPENDENCIES
   rubocop (= 0.76.0)
   rubocop-rspec (= 1.37.0)
   semantic_logger
-  sqlite3
   timecop
   webmock
 
 BUNDLED WITH
-   2.2.9
+   2.3.4

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "6.1"
+gem "rspec-rails"
+
+gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "7.0"
+gem "rspec-rails"
+
+gemspec path: "../"

data/gemfiles/semantic_logger_3.4.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "activesupport", "6.1"
 gem "semantic_logger", "3.4.1"
 
 gemspec path: "../"

data/gemfiles/semantic_logger_4.6.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "activesupport", "6.1"
 gem "semantic_logger", "4.6.1"
 
 gemspec path: "../"

data/gemfiles/semantic_logger_4.7.0.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "activesupport", "6.1"
 gem "semantic_logger", "4.7.0"
 
 gemspec path: "../"

data/gemfiles/semantic_logger_4.7.2.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "activesupport", "6.1"
 gem "semantic_logger", "4.7.2"
 
 gemspec path: "../"

data/lib/cloudtasker/backend/google_cloud_task.rb

@@ -12,28 +12,32 @@ module Cloudtasker
       #
       # Create the queue configured in Cloudtasker if it does not already exist.
       #
-      # @param [String] queue_name The relative name of the queue.
+      # @param [String] :name The queue name
+      # @param [Integer] :concurrency The queue concurrency
+      # @param [Integer] :retries The number of retries for the queue
       #
       # @return [Google::Cloud::Tasks::V2beta3::Queue] The queue
       #
-      def self.setup_queue(**opts)
+      def self.setup_queue(name: nil, concurrency: nil, retries: nil)
         # Build full queue path
-        queue_name = opts[:name] || Cloudtasker::Config::DEFAULT_JOB_QUEUE
+        queue_name = name || Cloudtasker::Config::DEFAULT_JOB_QUEUE
         full_queue_name = queue_path(queue_name)
 
         # Try to get existing queue
         client.get_queue(full_queue_name)
       rescue Google::Gax::RetryError
         # Extract options
-        concurrency = (opts[:concurrency] || Cloudtasker::Config::DEFAULT_QUEUE_CONCURRENCY).to_i
-        retries = (opts[:retries] || Cloudtasker::Config::DEFAULT_QUEUE_RETRIES).to_i
+        queue_concurrency = (concurrency || Cloudtasker::Config::DEFAULT_QUEUE_CONCURRENCY).to_i
+        queue_retries = (retries || Cloudtasker::Config::DEFAULT_QUEUE_RETRIES).to_i
 
         # Create queue on 'not found' error
         client.create_queue(
           client.location_path(config.gcp_project_id, config.gcp_location_id),
-          name: full_queue_name,
-          retry_config: { max_attempts: retries },
-          rate_limits: { max_concurrent_dispatches: concurrency }
+          {
+            name: full_queue_name,
+            retry_config: { max_attempts: queue_retries },
+            rate_limits: { max_concurrent_dispatches: queue_concurrency }
+          }
         )
       end
 

data/lib/cloudtasker/backend/memory_task.rb

@@ -62,7 +62,7 @@ module Cloudtasker
         payload = payload.merge(schedule_time: payload[:schedule_time].to_i)
 
         # Save task
-        task = new(payload.merge(id: id))
+        task = new(**payload.merge(id: id))
         queue << task
 
         # Execute task immediately if in testing and inline mode enabled

data/lib/cloudtasker/backend/redis_task.rb

@@ -89,7 +89,7 @@ module Cloudtasker
         # Save job
         redis.write(key(id), payload)
         redis.sadd(key, id)
-        new(payload.merge(id: id))
+        new(**payload.merge(id: id))
       end
 
       #
@@ -103,7 +103,7 @@ module Cloudtasker
         gid = key(id)
         return nil unless (payload = redis.fetch(gid))
 
-        new(payload.merge(id: id))
+        new(**payload.merge(id: id))
       end
 
       #
@@ -172,8 +172,12 @@ module Cloudtasker
       # Retry the task later.
       #
       # @param [Integer] interval The delay in seconds before retrying the task
+      # @param [Hash] opts Additional options
+      # @option opts [Boolean] :is_error Increase number of retries. Default to true.
       #
-      def retry_later(interval, is_error: true)
+      def retry_later(interval, opts = {})
+        is_error = opts.to_h.fetch(:is_error, true)
+
         redis.write(
           gid,
           retries: is_error ? retries + 1 : retries,

data/lib/cloudtasker/cloud_task.rb

@@ -37,7 +37,7 @@ module Cloudtasker
     #
     def self.find(id)
       payload = backend.find(id)&.to_h
-      payload ? new(payload) : nil
+      payload ? new(**payload) : nil
     end
 
     #
@@ -51,7 +51,7 @@ module Cloudtasker
       raise MaxTaskSizeExceededError if payload.to_json.bytesize > Config::MAX_TASK_SIZE
 
       resp = backend.create(payload)&.to_h
-      resp ? new(resp) : nil
+      resp ? new(**resp) : nil
     end
 
     #

data/lib/cloudtasker/cron/schedule.rb

@@ -62,7 +62,7 @@ module Cloudtasker
       def self.load_from_hash!(hash)
         schedules = hash.map do |id, config|
           schedule_config = JSON.parse(config.to_json, symbolize_names: true).merge(id: id.to_s)
-          create(schedule_config)
+          create(**schedule_config)
         end
 
         # Remove existing schedules which are not part of the list
@@ -79,7 +79,7 @@ module Cloudtasker
       def self.create(**opts)
         redis.with_lock(key(opts[:id])) do
           config = find(opts[:id]).to_h.merge(opts)
-          new(config).tap(&:save)
+          new(**config).tap(&:save)
         end
       end
 
@@ -93,7 +93,7 @@ module Cloudtasker
       def self.find(id)
         return nil unless (schedule_config = redis.fetch(key(id)))
 
-        new(schedule_config)
+        new(**schedule_config)
       end
 
       #
@@ -251,9 +251,9 @@ module Cloudtasker
       #
       # Buld edit the object attributes.
       #
-      # @param [Hash] **opts The attributes to edit.
+      # @param [Hash] opts The attributes to edit.
       #
-      def assign_attributes(**opts)
+      def assign_attributes(opts)
         opts
           .select { |k, _| instance_variables.include?("@#{k}".to_sym) }
           .each { |k, v| instance_variable_set("@#{k}", v) }
@@ -262,9 +262,9 @@ module Cloudtasker
       #
       # Edit the object attributes and save the object in Redis.
       #
-      # @param [Hash] **opts The attributes to edit.
+      # @param [Hash] opts The attributes to edit.
       #
-      def update(**opts)
+      def update(opts)
         assign_attributes(opts)
         save
       end

data/lib/cloudtasker/local_server.rb

@@ -69,7 +69,7 @@ module Cloudtasker
 
       # Process tasks
       while @threads[queue].count < max_threads && (task = Cloudtasker::Backend::RedisTask.pop(queue))
-        @threads[queue] << Thread.new { process_task(task) }
+        @threads[queue] << Thread.new(task) { |t| process_task(t) }
       end
     end
 

data/lib/cloudtasker/redis_client.rb

@@ -132,22 +132,47 @@ module Cloudtasker
       list
     end
 
-    #
-    # Delegate all methods to the redis client.
-    #
-    # @param [String, Symbol] name The method to delegate.
-    # @param [Array<any>] *args The list of method arguments.
-    # @param [Proc] &block Block passed to the method.
-    #
-    # @return [Any] The method return value
-    #
-    def method_missing(name, *args, &block)
-      if Redis.method_defined?(name)
-        client.with { |c| c.send(name, *args, &block) }
-      else
-        super
+    # rubocop:disable Style/MissingRespondToMissing
+    if RUBY_VERSION < '3'
+      #
+      # Delegate all methods to the redis client.
+      # Old delegation method.
+      #
+      # @param [String, Symbol] name The method to delegate.
+      # @param [Array<any>] *args The list of method positional arguments.
+      # @param [Hash<any>] *kwargs The list of method keyword arguments.
+      # @param [Proc] &block Block passed to the method.
+      #
+      # @return [Any] The method return value
+      #
+      def method_missing(name, *args, &block)
+        if Redis.method_defined?(name)
+          client.with { |c| c.send(name, *args, &block) }
+        else
+          super
+        end
+      end
+    else
+      #
+      # Delegate all methods to the redis client.
+      # Ruby 3 delegation method style.
+      #
+      # @param [String, Symbol] name The method to delegate.
+      # @param [Array<any>] *args The list of method positional arguments.
+      # @param [Hash<any>] *kwargs The list of method keyword arguments.
+      # @param [Proc] &block Block passed to the method.
+      #
+      # @return [Any] The method return value
+      #
+      def method_missing(name, *args, **kwargs, &block)
+        if Redis.method_defined?(name)
+          client.with { |c| c.send(name, *args, **kwargs, &block) }
+        else
+          super
+        end
       end
     end
+    # rubocop:enable Style/MissingRespondToMissing
 
     #
     # Check if the class respond to a certain method.

data/lib/cloudtasker/unique_job/job.rb

@@ -14,10 +14,11 @@ module Cloudtasker
       # Build a new instance of the class.
       #
       # @param [Cloudtasker::Worker] worker The worker at hand
+      # @param [Hash] worker The worker options
       #
-      def initialize(worker, **kwargs)
+      def initialize(worker, opts = {})
         @worker = worker
-        @call_opts = kwargs
+        @call_opts = opts
       end
 
       #

data/lib/cloudtasker/unique_job/middleware/client.rb

@@ -3,9 +3,10 @@
 module Cloudtasker
   module UniqueJob
     module Middleware
+      # TODO: kwargs to job otherwise it won't get the time_at
       # Client middleware, invoked when jobs are scheduled
       class Client
-        def call(worker, **_kwargs)
+        def call(worker, _opts = {})
           Job.new(worker).lock_instance.schedule { yield }
         end
       end

data/lib/cloudtasker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cloudtasker
-  VERSION = '0.12.rc11'
+  VERSION = '0.13.rc1'
 end

data/lib/cloudtasker/worker.rb

@@ -47,7 +47,7 @@ module Cloudtasker
       return nil unless worker_klass.include?(self)
 
       # Return instantiated worker
-      worker_klass.new(payload.slice(:job_queue, :job_args, :job_id, :job_meta, :job_retries, :task_id))
+      worker_klass.new(**payload.slice(:job_queue, :job_args, :job_id, :job_meta, :job_retries, :task_id))
     rescue NameError
       nil
     end
@@ -121,7 +121,7 @@ module Cloudtasker
       # @return [Cloudtasker::CloudTask] The Google Task response
       #
       def schedule(args: nil, time_in: nil, time_at: nil, queue: nil)
-        new(job_args: args, job_queue: queue).schedule({ interval: time_in, time_at: time_at }.compact)
+        new(job_args: args, job_queue: queue).schedule(**{ interval: time_in, time_at: time_at }.compact)
       end
 
       #
@@ -239,7 +239,7 @@ module Cloudtasker
     #
     def schedule(**args)
       # Evaluate when to schedule the job
-      time_at = schedule_time(args)
+      time_at = schedule_time(**args)
 
       # Schedule job through client middlewares
       Cloudtasker.config.client_middleware.invoke(self, time_at: time_at) do
@@ -361,7 +361,7 @@ module Cloudtasker
     # @return [Boolean] True if the arguments are missing.
     #
     def arguments_missing?
-      job_args.empty? && [0, -1].exclude?(method(:perform).arity)
+      job_args.empty? && ![0, -1].include?(method(:perform).arity)
     end
 
     #

data/lib/cloudtasker/worker_wrapper.rb

@@ -27,7 +27,7 @@ module Cloudtasker
     #
     def initialize(worker_name:, **opts)
       @worker_name = worker_name
-      super(opts)
+      super(**opts)
     end
 
     #

data/lib/cloudtasker.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/object/try'
 
 require 'cloudtasker/version'
 require 'cloudtasker/config'