jobly 0.5.9 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86e63cbb0978b92130eaa7d290327ad6b3b0e9926c6f69b7f7c739a7cf673c6e
-  data.tar.gz: c73a27dd12848d658bef7fbbf14984de572b21582ee9a2a8afb942d51e585e21
+  metadata.gz: 62fba0cb854e3268a518c5779f247f465af83e85caaacb9a4442e907685e336a
+  data.tar.gz: d671bae5e151d244c1a901eb3a353be41810bfb9d0e328e471b444ca2f7d9495
 SHA512:
-  metadata.gz: cc3986a7042c1c5d59183fdb22edd4bd9c12c494bce99c47f8100dc60e943f9593ade23bf541faa981711ea4b4e5b6ae81f868f801908c78d26770c935db8eea
-  data.tar.gz: aa8f0b09e681bcd2541a7a105090c3ed50b3e706847feb4ac37ba912b44f85fb4d9a379c972ea969b50a19bc15c754fd033362ae69e016f6f4ad4422d63d653d
+  metadata.gz: 6918115853f589511eb2e3152ecbc45eb62576e76bd82c280a93ff121522d23ec99528a029200cef5d516f7ab3d26bba5c12b80f5976d148c7ec826711cec05e
+  data.tar.gz: 592f0f2142e689fcf33b435c39649a170d92cb1c5aec69a4b8b26cbd2ac15028ff261c73c8360f451f220ea222bac4386bc3d574a8fcfc654aaeba668bcd851a

data/bin/jobly

@@ -4,11 +4,11 @@ require 'jobly'
 require 'jobly/boot'
 
 PrettyTrace.filter [
-  %r[mister_bin],
-  %r[bin/jobly],
-  %r[bin/ruby],
-  %r[lib/ruby],
-  %r[lib/jobly],
+  /mister_bin/,
+  %r{bin/jobly},
+  %r{bin/ruby},
+  %r{lib/ruby},
+  %r{lib/jobly},
 ]
 
 router = Jobly::CLI.router

data/lib/jobly/api.rb

@@ -6,7 +6,6 @@ require 'sinatra/reloader'
 require 'sinatra/custom_logger'
 
 module Jobly
-
   class API < Sinatra::Application
     helpers Sinatra::CustomLogger
     using ConvertToTyped
@@ -27,7 +26,7 @@ module Jobly
     get '/' do
       {
         version: Jobly::VERSION,
-        message: %Q["I'm gonna live till I die" - Frank Sinatra]
+        message: %["I'm gonna live till I die" - Frank Sinatra],
       }.to_json + "\n"
     end
 
@@ -45,15 +44,15 @@ module Jobly
 
   private
 
-    def add_job(job, args={})
+    def add_job(job, args = {})
       job_class = Jobs.get_class job
 
-      if !job_class
+      unless job_class
         response = {
-          status: 'error',
+          status:  'error',
           message: 'No such job',
-          job: job,
-          params: args
+          job:     job,
+          params:  args,
         }
 
         status 404
@@ -67,15 +66,15 @@ module Jobly
       else
         job_class.run_later args
       end
-      
+
       response = {
         status: 'received',
-        job: job,
+        job:    job,
         params: args,
       }
 
       logger.debug "[jobly server] Job received (#{job})"
-      response.to_json + "\n"
+      "#{response.to_json}\n"
     end
   end
 end

data/lib/jobly/cli.rb

@@ -1,15 +1,15 @@
 require 'mister_bin'
 require 'jobly/version'
-requires 'commands/base', 'commands'
+requires 'commands/base'
+requires 'commands'
 
 module Jobly
-
   # Command line interface router. This is called by bin/jobly.
   class CLI
     def self.router
       router = MisterBin::Runner.new version: Jobly::VERSION,
-        header: "Jobly",
-        footer: "Run !txtpur!jobly COMMAND --help!txtrst! for more information"
+        header: 'Jobly',
+        footer: 'Run !txtpur!jobly COMMAND --help!txtrst! for more information'
 
       router.route 'init',      to: Commands::InitCmd
       router.route 'server',    to: Commands::ServerCmd
@@ -22,5 +22,4 @@ module Jobly
       router
     end
   end
-
 end

data/lib/jobly/commands/base.rb

@@ -8,4 +8,4 @@ module Jobly
       include Colsole
     end
   end
-end
+end

data/lib/jobly/commands/config.rb

@@ -3,16 +3,17 @@ require 'pathname'
 module Jobly
   module Commands
     class ConfigCmd < Base
-      summary "Show configuration options"
-      usage "jobly config"
-      usage "jobly config (-h|--help)"
+      summary 'Show configuration options'
+      usage 'jobly config'
+      usage 'jobly config (-h|--help)'
 
       def run
-        line "custom config file", short_config_path, !Jobly.custom_config?
+        line 'custom config file', short_config_path, attention: !Jobly.custom_config?
         Jobly.options.each do |key, value|
           next unless value
+
           if key.to_s.end_with? '_path'
-            line key, value, !Dir.exist?(value)
+            line key, value, attention: !Dir.exist?(value)
           else
             line key, value
           end
@@ -25,11 +26,10 @@ module Jobly
         Jobly.config_file.sub "#{Dir.pwd}/", ''
       end
 
-      def line(key, value, attention=false)
+      def line(key, value, attention: false)
         color = attention ? '!txtred!' : '!txtgrn!'
         say "#{key.to_s.rjust 20}  #{color}#{value.to_s.strip}"
       end
-
     end
   end
 end

data/lib/jobly/commands/info.rb

@@ -3,25 +3,27 @@ require 'tty-markdown'
 module Jobly
   module Commands
     class InfoCmd < Base
-      summary "Show workspace info"
-      usage "jobly info"
-      usage "jobly info (-h|--help)"
+      summary 'Show workspace info'
+      usage 'jobly info'
+      usage 'jobly info (-h|--help)'
 
       def run
         raise InfoFileNotFound, info_file unless File.exist? info_file
+
         puts TTY::Markdown.parse(info, theme: {
-          header: [:green, :bold],
-          em: [:magenta, :bold],
-          hr: :yellow,
-          link: [:blue, :underline],
-          list: :cyan,
-          strong: [:cyan, :bold],
-          table: :yellow,
-          quote: :magenta
+          header: %i[green bold],
+          em:     %i[magenta bold],
+          hr:     :yellow,
+          link:   %i[blue underline],
+          list:   :cyan,
+          strong: %i[cyan bold],
+          table:  :yellow,
+          quote:  :magenta,
         })
       end
 
     private
+
       def info
         @info ||= File.read info_file
       end
@@ -29,7 +31,6 @@ module Jobly
       def info_file
         @info_file ||= File.expand_path 'info.md', Jobly.config_path
       end
-
     end
   end
 end

data/lib/jobly/commands/init.rb

@@ -3,13 +3,13 @@ require 'fileutils'
 module Jobly
   module Commands
     class InitCmd < Base
-      summary "Create an initial jobs workspace"
-      usage "jobly init NAME [--minimal]"
-      usage "jobly init (-h|--help)"
-      param "NAME", "The name of the folder to create"
-      option "-m --minimal", "Create a minimal workspace"
-      example "jobly init test"
-      example "jobly init myjobs --minimal"
+      summary 'Create an initial jobs workspace'
+      usage 'jobly init NAME [--minimal]'
+      usage 'jobly init (-h|--help)'
+      param 'NAME', 'The name of the folder to create'
+      option '-m --minimal', 'Create a minimal workspace'
+      example 'jobly init test'
+      example 'jobly init myjobs --minimal'
 
       def run
         raise ArgumentError, "#{target_dir} already exists" if File.exist? target_dir

data/lib/jobly/commands/run.rb

@@ -4,15 +4,15 @@ module Jobly
       using ArgumentConverters
       using ConvertToTyped
 
-      summary "Run a job locally"
-      usage "jobly run [--later] JOB [PARAMS...]"
-      usage "jobly run (-h|--help)"
-      option "-l --later", "Schedule the job to be executed later by a worker instead of running it immediately"
-      param "JOB", "Job name"
-      param "PARAMS", "Parameters to pass to the job as key:value"
-      example "jobly run Greet name:Bob"
-      example "jobly run --later Greet name:Bob"
-      example "jobly run Deploy env:stage branch:master"
+      summary 'Run a job locally'
+      usage 'jobly run [--later] JOB [PARAMS...]'
+      usage 'jobly run (-h|--help)'
+      option '-l --later', 'Schedule the job to be executed later by a worker instead of running it immediately'
+      param 'JOB', 'Job name'
+      param 'PARAMS', 'Parameters to pass to the job as key:value'
+      example 'jobly run Greet name:Bob'
+      example 'jobly run --later Greet name:Bob'
+      example 'jobly run Deploy env:stage branch:master'
 
       def run
         job = args['JOB']
@@ -26,13 +26,12 @@ module Jobly
           else
             job_class.run_later params
           end
-        
+
         else
           say "Running !txtgrn!#{job_class}"
           job_class.run params
         end
       end
-
     end
   end
 end

data/lib/jobly/commands/send.rb

@@ -5,13 +5,13 @@ module Jobly
     class SendCmd < Base
       using ArgumentConverters
 
-      summary "Send a job to the API"
-      usage "jobly send JOB [PARAMS...]"
-      usage "jobly send (-h|--help)"
-      param "JOB", "Job name"
-      param "PARAMS", "Parameters to pass to the job as key:value"
-      example "jobly send Greet name:Bob"
-      example "jobly send Deploy env:stage branch:master"
+      summary 'Send a job to the API'
+      usage 'jobly send JOB [PARAMS...]'
+      usage 'jobly send (-h|--help)'
+      param 'JOB', 'Job name'
+      param 'PARAMS', 'Parameters to pass to the job as key:value'
+      example 'jobly send Greet name:Bob'
+      example 'jobly send Deploy env:stage branch:master'
 
       def run
         job = args['JOB']
@@ -43,7 +43,6 @@ module Jobly
           HTTP
         end
       end
-
     end
   end
 end

data/lib/jobly/commands/server.rb

@@ -1,14 +1,14 @@
 module Jobly
   module Commands
     class ServerCmd < Base
-      summary "Start the server"
-      usage "jobly server [--port NUMBER]"
-      usage "jobly server (-h|--help)"
-      option "-p --port NUMBER", "Set the port number [default: 3000]"
+      summary 'Start the server'
+      usage 'jobly server [--port NUMBER]'
+      usage 'jobly server (-h|--help)'
+      option '-p --port NUMBER', 'Set the port number [default: 3000]'
 
       def run
         port = args['--port']
-        say "Starting server"
+        say 'Starting server'
         exec "rackup --env #{Jobly.environment} --port #{port} --host 0.0.0.0 #{rackup_file}"
       end
 

data/lib/jobly/commands/worker.rb

@@ -1,19 +1,20 @@
 module Jobly
   module Commands
     class WorkerCmd < Base
-      summary "Start a job worker"
-      usage "jobly worker [-c COUNT -C PATH (-q NAME)...]"
-      usage "jobly worker (-h|--help)"
-      option "-c --concurrency COUNT", "Number of parallel jobs [default: 4]"
-      option "-C --config PATH", "Specify a path to a YAML config file. The provided path should be relative to the global config_path directory and without the yml extension"
-      option "-q --queue NAME[,WEIGHT]", "Specify one or more queues that this worker should handle"
+      summary 'Start a job worker'
+      usage 'jobly worker [-c COUNT -C PATH (-q NAME)...]'
+      usage 'jobly worker (-h|--help)'
+      option '-c --concurrency COUNT', 'Number of parallel jobs [default: 4]'
+      option '-C --config PATH',
+        'Specify a path to a YAML config file. The provided path should be relative to the global config_path directory and without the yml extension'
+      option '-q --queue NAME[,WEIGHT]', 'Specify one or more queues that this worker should handle'
 
-      example "jobly worker --concurrency 10"
-      example "jobly worker -q critical -q default -q low"
-      example "jobly worker --config primary"
+      example 'jobly worker --concurrency 10'
+      example 'jobly worker -q critical -q default -q low'
+      example 'jobly worker --config primary'
 
       def run
-        say "Starting sidekiq"
+        say 'Starting sidekiq'
         exec "sidekiq #{options_from_args}"
       end
 
@@ -28,9 +29,10 @@ module Jobly
         if args['--config']
           config_file = "#{Jobly.config_path}/#{args['--config']}.yml"
           raise ArgumentError, "Config not found: #{config_file}" unless File.exist? config_file
+
           result << "--config \"#{config_file}\""
         end
-        
+
         args['--queue'].each { |q| result << "--queue #{q}" }
 
         result.join ' '

data/lib/jobly/exceptions.rb

@@ -3,4 +3,4 @@ module Jobly
   class JobNotFound < Error; end
   class InfoFileNotFound < Error; end
   class HTTPError < Error; end
-end
+end

data/lib/jobly/extensions/integer.rb

@@ -2,20 +2,20 @@ class Integer
   def seconds
     self
   end
-  alias_method :second, :seconds
+  alias second seconds
 
   def minutes
     60 * seconds
   end
-  alias_method :minute, :minutes
+  alias minute minutes
 
   def hours
     60 * minutes
   end
-  alias_method :hour, :hours
+  alias hour hours
 
   def days
     24 * hours
   end
-  alias_method :day, :days
-end
+  alias day days
+end

data/lib/jobly/helpers/logging.rb

@@ -15,7 +15,7 @@ module Jobly
         Log.new Jobly.log, self.class.name.to_slug
       end
 
-      logger.level = Jobly.log_level if logger and logger.respond_to? :level
+      logger.level = Jobly.log_level if logger && logger.respond_to?(:level)
       logger
     end
   end

data/lib/jobly/helpers/settings.rb

@@ -11,7 +11,7 @@ module Jobly
 
       files = [
         "#{Jobly.full_config_path}/settings",
-        "#{Jobly.full_config_path}/settings.#{Jobly.environment}"
+        "#{Jobly.full_config_path}/settings.#{Jobly.environment}",
       ]
 
       files.each do |file|

data/lib/jobly/helpers/shell.rb

@@ -7,9 +7,9 @@ module Jobly
     end
 
     def shell!
-      TTY::Command.new output: logger, 
+      TTY::Command.new output: logger,
         color: false,
-        dry_run: !!Jobly.shell_dry_run
+        dry_run: Jobly.shell_dry_run
     end
   end
 end

data/lib/jobly/helpers/slack.rb

@@ -29,13 +29,13 @@ module Jobly
     end
 
     def slack!
-      raise ArgumentError, "Slack webhook is not set" unless Jobly.slack_webhook
+      raise ArgumentError, 'Slack webhook is not set' unless Jobly.slack_webhook
+
       opts = {
-        channel: self.class.slack_channel,
-        username: self.class.slack_user
+        channel:  self.class.slack_channel,
+        username: self.class.slack_user,
       }
       ::Slack::Notifier.new Jobly.slack_webhook, opts
     end
-
   end
 end

data/lib/jobly/job.rb

@@ -31,7 +31,7 @@ module Jobly
 
     # This is the method sidekiq will call. We capture this call and convert
     # the hash argument which was converted to array on sidekiq's side, back
-    # to a hash so we can forward to the job's `execute` method, which may 
+    # to a hash so we can forward to the job's `execute` method, which may
     # implement keyword args.
     # If the job was marked as isolated, we will run it in its own temporary
     # directory.
@@ -63,20 +63,17 @@ module Jobly
         run_actions :after
         return false
       end
-      return true
+      true
     end
 
     def run_to_completion
       params.empty? ? execute : execute(**params.to_kwargs)
       run_actions :success
-
     rescue
       run_actions :failure
       raise
-    
     ensure
       run_actions :after
-      
     end
   end
 end

data/lib/jobly/job_extensions/actions.rb

@@ -61,7 +61,6 @@ module Jobly
           end
         end
       end
-
     end
   end
 end

data/lib/jobly/job_extensions/isolation.rb

@@ -15,9 +15,9 @@ module Jobly
         end
       end
 
-      def in_isolation
+      def in_isolation(&block)
         Dir.mktmpdir 'jobly-' do |dir|
-          Dir.chdir(dir) { yield }
+          Dir.chdir(dir, &block)
         end
       end
 

data/lib/jobly/job_extensions/option_accessors.rb

@@ -1,11 +1,10 @@
 module Jobly
   module JobExtensions
     module OptionAccessors
-
       def self.included(base)
         base.extend ClassMethods
       end
-      
+
       module ClassMethods
         def options
           sidekiq_options
@@ -28,7 +27,6 @@ module Jobly
         # sidekiq_options_hash   # is this better?
         self.class.options
       end
-
     end
   end
 end

data/lib/jobly/job_extensions/solo.rb

@@ -48,7 +48,7 @@ module Jobly
 
       def solo_lock(expire = 1.hour)
         Sidekiq.redis do |redis|
-          redis.setex(solo_full_key, expire, "1")
+          redis.setex(solo_full_key, expire, '1')
         end
       end
 
@@ -57,7 +57,6 @@ module Jobly
           redis.del solo_full_key
         end
       end
-
     end
   end
 end

data/lib/jobly/jobs.rb

@@ -27,4 +27,3 @@ module Jobly
     end
   end
 end
-

data/lib/jobly/log.rb

@@ -3,30 +3,29 @@ require 'uri'
 
 module Jobly
   module Log
-    def self.new(target = nil, tag = nil)
-      if !target or target.to_sym == :stdout or target == STDOUT
-        return Logger.new STDOUT
+    class << self
+      def new(target = nil, tag = nil)
+        if !target || (target.to_sym == :stdout) || (target == $stdout)
+          return Logger.new $stdout
+        end
+
+        target = target.to_s
+        target %= tag if tag && target.include?('%s')
+
+        if target.start_with? 'syslog://'
+          remote_syslog_logger target
+        else
+          Logger.new File.expand_path(target, Jobly.root)
+        end
       end
 
-      target = target.to_s
-      target %= tag if tag and target.include? "%s"
+    private
 
-      if target.start_with? 'syslog://'
-        remote_syslog_logger target
-      else
-        Logger.new File.expand_path(target, Jobly.root)
+      def remote_syslog_logger(target)
+        uri = URI target
+        RemoteSyslogLogger.new (uri.host || 'localhost'), (uri.port || 514),
+          local_hostname: uri.user, program: uri.password
       end
     end
-
-  private
-
-    def self.remote_syslog_logger(target)
-      uri = URI target
-      RemoteSyslogLogger.new (uri.host || 'localhost'), (uri.port || 514), 
-        local_hostname: uri.user, program: uri.password
-    end
   end
 end
-
-
-

data/lib/jobly/module_functions.rb

@@ -1,5 +1,7 @@
 module Jobly
   class << self
+    attr_reader :logger
+
     def configure
       yield self
     end
@@ -10,30 +12,30 @@ module Jobly
 
     def default_options
       {
-        root: Dir.pwd,
-        environment: ENV['JOBLY_ENVIRONMENT'] || 'development',
-        api_url: ENV['JOBLY_API_URL'] || 'http://localhost:3000/do',
-        app_path: ENV['JOBLY_APP_PATH'] || 'app',
-        jobs_path: ENV['JOBLY_JOBS_PATH'] || "jobs",
-        config_path: ENV['JOBLY_CONFIG_PATH'] || "config",
-        redis_url: ENV['JOBLY_REDIS_URL'] || "redis://localhost:6379/0",
+        root:              Dir.pwd,
+        environment:       ENV['JOBLY_ENVIRONMENT'] || 'development',
+        api_url:           ENV['JOBLY_API_URL'] || 'http://localhost:3000/do',
+        app_path:          ENV['JOBLY_APP_PATH'] || 'app',
+        jobs_path:         ENV['JOBLY_JOBS_PATH'] || 'jobs',
+        config_path:       ENV['JOBLY_CONFIG_PATH'] || 'config',
+        redis_url:         ENV['JOBLY_REDIS_URL'] || 'redis://localhost:6379/0',
         status_expiration: ENV['JOBLY_STATUS_EXPIRATION']&.to_i || 30,
-        jobs_namespace: ENV['JOBLY_JOBS_NAMESPACE'],
-        slack_webhook: ENV['JOBLY_SLACK_WEBHOOK'],
-        slack_channel: ENV['JOBLY_SLACK_CHANNEL'] || "#general",
-        slack_user: ENV['JOBLY_SLACK_USER'] || "Jobly",
-        log: ENV['JOBLY_LOG'],
-        log_level: ENV['JOBLY_LOG_LEVEL'] || 'info',
-        auth: ENV['JOBLY_AUTH'],
-        secret: ENV['JOBLY_SECRET'] || 'change-this-cookie-secret',
-        shell_dry_run: ENV['JOBLY_SHELL_DRY_RUN'],
-        mounts: nil,
+        jobs_namespace:    ENV['JOBLY_JOBS_NAMESPACE'],
+        slack_webhook:     ENV['JOBLY_SLACK_WEBHOOK'],
+        slack_channel:     ENV['JOBLY_SLACK_CHANNEL'] || '#general',
+        slack_user:        ENV['JOBLY_SLACK_USER'] || 'Jobly',
+        log:               ENV['JOBLY_LOG'],
+        log_level:         ENV['JOBLY_LOG_LEVEL'] || 'info',
+        auth:              ENV['JOBLY_AUTH'],
+        secret:            ENV['JOBLY_SECRET'] || 'change-this-cookie-secret',
+        shell_dry_run:     ENV['JOBLY_SHELL_DRY_RUN'],
+        mounts:            nil,
       }
     end
 
-    def method_missing(method, args=nil, &_block)
+    def method_missing(method, args = nil, &_block)
       key = method.to_s
-      assign = key[-1] == "="
+      assign = key[-1] == '='
       key = key.chomp('=') if assign
       key = key.to_sym
 
@@ -44,7 +46,7 @@ module Jobly
       end
     end
 
-    def respond_to_missing?(method, include_private=false)
+    def respond_to_missing?(method, include_private = false)
       key = method.to_s.chomp('=').to_sym
       options.has_key?(key) ? true : super
     end
@@ -53,22 +55,15 @@ module Jobly
       @options ||= default_options.dup
     end
 
-    def logger
-      @logger
-    end
-
     def log=(target)
       options[:log] = target
       @logger = if target.is_a? Logger
         target
       elsif target
         Log.new target, :jobly
-      else
-        nil
       end
 
-      @logger.level = log_level if @logger and @logger.respond_to? :level
-      @logger
+      @logger.level = log_level if @logger && @logger.respond_to?(:level)
     end
 
     def full_app_path

data/lib/jobly/refinements/argument_converters.rb

@@ -2,8 +2,8 @@ module Jobly
   module ArgumentConverters
     refine Array do
       def to_params
-        map { |pair| pair.split ':', 2 }.to_h.transform_keys(&:to_sym)
+        to_h { |pair| pair.split ':', 2 }.transform_keys(&:to_sym)
       end
     end
   end
-end
+end

data/lib/jobly/refinements/convert_to_typed.rb

@@ -18,10 +18,11 @@ module Jobly
 
     refine String do
       def convert_to_typed
-        return true  if ['true', 'yes'].include? self
-        return false if ['false', 'no'].include? self
+        return true  if %w[true yes].include? self
+        return false if %w[false no].include? self
+
         Integer self rescue self
       end
     end
   end
-end
+end

data/lib/jobly/refinements/keyword_args.rb

@@ -2,14 +2,14 @@ module Jobly
   module KeywordArgs
     refine Hash do
       def to_kwargs
-        to_h.transform_keys &:to_sym
+        to_h.transform_keys(&:to_sym)
       end
     end
 
     refine Array do
       def to_kwargs
-        to_h.transform_keys &:to_sym
+        to_h.transform_keys(&:to_sym)
       end
     end
   end
-end
+end

data/lib/jobly/refinements/to_slug.rb

@@ -6,4 +6,4 @@ module Jobly
       end
     end
   end
-end
+end

data/lib/jobly/server.rb

@@ -10,8 +10,8 @@ module Jobly
 
     def self.app
       mounts = {
-        '/'   => Sidekiq::Web, 
-        '/do' => Jobly::API
+        '/'   => Sidekiq::Web,
+        '/do' => Jobly::API,
       }
       mounts.merge! Jobly.mounts if Jobly.mounts
 
@@ -21,7 +21,7 @@ module Jobly
 
         if Jobly.auth
           user, pass = Jobly.auth.split ':'
-          use Rack::Auth::Basic, "Jobly" do |username, password|
+          use Rack::Auth::Basic, 'Jobly' do |username, password|
             username == user && password == pass
           end
         end
@@ -29,9 +29,5 @@ module Jobly
         run Rack::URLMap.new mounts
       end
     end
-  end  
+  end
 end
-
-
-
-

data/lib/jobly/sidekiq.rb

@@ -8,19 +8,19 @@ module Jobly
     def self.configure
       Sidekiq.configure_client do |config|
         config.redis = { url: Jobly.redis_url }
+        config.logger = Jobly.logger if Jobly.log
         Sidekiq::Status.configure_client_middleware config, expiration: 60 * 60
       end
 
       Sidekiq.configure_server do |config|
         # :nocov:
         config.redis = { url: Jobly.redis_url }
+        config.logger = Jobly.logger if Jobly.log
 
         Sidekiq::Status.configure_server_middleware config, expiration: Jobly.status_expiration * 60
         Sidekiq::Status.configure_client_middleware config, expiration: Jobly.status_expiration * 60
         # :nocov:
       end
-
-      Sidekiq.logger = Jobly.logger if Jobly.log
     end
   end
 end

data/lib/jobly/templates/full/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "foreman"
-gem "jobly"
+gem 'foreman'
+gem 'jobly'

data/lib/jobly/templates/full/app/job.rb

@@ -1,3 +1,3 @@
 class Job < Jobly::Job
   # Put your common Job methods here
-end
+end

data/lib/jobly/templates/full/app/other_class.rb

@@ -10,4 +10,4 @@ class OtherClass
   # include Jobly::Slack
   # include Jobly::Shell
   # include Jobly::Settings
-end
+end

data/lib/jobly/templates/full/config/jobly.rb

@@ -17,4 +17,4 @@ Jobly.configure do |config|
   # config.auth = 'admin:secret'
   # config.secret = 'there is no spoon'
   # config.shell_dry_run = false
-end
+end

data/lib/jobly/templates/full/jobs/hello.rb

@@ -2,15 +2,15 @@
 class Hello < Job
   def execute(name: 'Bob')
     total 2
-    
-    at 0, "Initializing"
+
+    at 0, 'Initializing'
     sleep rand 3.0..8.0
 
-    at 1, "Preparing to say Hi"
+    at 1, 'Preparing to say Hi'
     sleep rand 3.0..8.0
 
     logger.info "Hi #{name}!"
 
-    at 2, "Done"
+    at 2, 'Done'
   end
 end

data/lib/jobly/templates/minimal/Gemfile

@@ -1,3 +1,3 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "jobly"
+gem 'jobly'

data/lib/jobly/version.rb

@@ -1,3 +1,3 @@
 module Jobly
-  VERSION = "0.5.9"
-end
+  VERSION = '0.5.11'
+end

data/lib/jobly.rb

@@ -1,7 +1,6 @@
 require 'requires'
 require 'byebug' if ENV['BYEBUG']
 
-requires 'jobly/polyfills'
 requires 'jobly/extensions'
 requires 'jobly/refinements'
 requires 'jobly/job_extensions'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jobly
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.11
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colsole
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -25,53 +39,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: pretty_trace
+  name: mister_bin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: pretty_trace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: remote_syslog_logger
   requirement: !ruby/object:Gem::Requirement
@@ -92,28 +106,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.5'
 - !ruby/object:Gem::Dependency
   name: sidekiq-status
   requirement: !ruby/object:Gem::Requirement
@@ -134,28 +148,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: tty-command
   requirement: !ruby/object:Gem::Requirement
@@ -212,34 +226,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: colsole
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: mister_bin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 description: Execute background jobs and build tasks on this sidekiq-based job server
 email: db@dannyben.com
 executables:
@@ -278,7 +264,6 @@ files:
 - lib/jobly/jobs.rb
 - lib/jobly/log.rb
 - lib/jobly/module_functions.rb
-- lib/jobly/polyfills/hash.rb
 - lib/jobly/refinements/argument_converters.rb
 - lib/jobly/refinements/convert_to_typed.rb
 - lib/jobly/refinements/keyword_args.rb
@@ -306,6 +291,7 @@ metadata:
   changelog_uri: https://github.com/DannyBen/jobly/blob/master/CHANGELOG.md
   documentation_uri: https://jobly.dannyb.co/
   source_code_uri: https://github.com/dannyben/jobly
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -314,14 +300,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.25
+rubygems_version: 3.4.3
 signing_key: 
 specification_version: 4
 summary: Compact job server with API, CLI, Web UI and a Sidekiq heart

data/lib/jobly/polyfills/hash.rb

@@ -1,21 +0,0 @@
-# :nocov:
-
-# Required for Ruby < 2.4
-if !{}.respond_to? :transform_values
-  class Hash
-    def transform_values
-      self.each { |k, v| self[k] = yield v }
-    end
-  end
-end
-
-# Required for Ruby < 2.5
-if !{}.respond_to? :transform_keys
-  class Hash
-    def transform_keys
-      self.map { |k, v| [(yield k), v] }.to_h
-    end
-  end
-end
-
-# :nocov: