jobly 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e109a2e288e0d56bf80e4a02a16cb9204bdcdfae3ce2eb5c8738965e3615d4
-  data.tar.gz: e0d84850f934656c1a63ed7ca54c31109c7554cfd5af0e61d4450b2066abb647
+  metadata.gz: bdebbdae8332039a2a9e2d2ca269d22b62bd9e98218facda2cde2c3adbc0f3c7
+  data.tar.gz: d79979c42b1c4f531261ccc10ee1474abe1cb3db3f0dcdda42bb43e2d493bc9a
 SHA512:
-  metadata.gz: 43836699c613de62c9149a90493c1f139d543b9f1bed028c36c123b2b8f1520a91b75f66f216f359f0874ea5e56f898949e49cdcb7250e6e37658c0814986df9
-  data.tar.gz: 5fd4e5998e387f495423e5121a940ebecdf0d723dfc4127f8b35117681437145ca0c9cb86c846da71c8d12de43fda8b13ad9b7776f6cc9105d3a48fcb8dc6e30
+  metadata.gz: 322b257413156fdced8f3b0c50e4c68702bf2f079ae9180ada468749356b8452526c067bf3a84b2cfb6361545f4c7cfeaf10cf15102e068b93fdd46579d0ee50
+  data.tar.gz: e9933a533455045f3df1d90c1127d983cc9b0865f763e70af975674041f5328de548ff78f43c34293cdbb2ba278c840877d0fb10b4893a9a0ff1cccf3f687c97

data/lib/jobly/helpers/logging.rb

@@ -7,13 +7,16 @@ module Jobly
     end
 
     def logger!
-      if !Jobly.log
+      logger = if !Jobly.log
         Sidekiq.logger
       elsif Jobly.log.is_a? Logger
         Jobly.log
       else
         Log.new Jobly.log, self.class.name.to_slug
       end
+
+      logger.level = Jobly.log_level if logger and logger.respond_to? :level
+      logger
     end
   end
 end

data/lib/jobly/log.rb

@@ -14,7 +14,7 @@ module Jobly
       if target.start_with? 'syslog://'
         remote_syslog_logger target
       else
-        Logger.new target
+        Logger.new File.expand_path(target, Jobly.root)
       end
     end
 

data/lib/jobly/module_functions.rb

@@ -1,85 +1,92 @@
 module Jobly
-  def self.configure
-    yield self
-  end
+  class << self
+    def configure
+      yield self
+    end
 
-  def self.load_custom_config
-    require config_file if File.exist? config_file
-  end
+    def load_custom_config
+      require config_file if File.exist? config_file
+    end
 
-  def self.default_options
-    {
-      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'],
-      auth: ENV['JOBLY_AUTH'],
-      mounts: nil,
-    }
-  end
+    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",
+        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'],
+        mounts: nil,
+      }
+    end
 
-  def self.method_missing(method, args=nil, &_block)
-    key = method.to_s
-    assign = key[-1] == "="
-    key = key.chomp('=') if assign
-    key = key.to_sym
+    def method_missing(method, args=nil, &_block)
+      key = method.to_s
+      assign = key[-1] == "="
+      key = key.chomp('=') if assign
+      key = key.to_sym
 
-    if options.has_key? key
-      assign ? options[key] = args : options[key]
-    else
-      super
+      if options.has_key? key
+        assign ? options[key] = args : options[key]
+      else
+        super
+      end
     end
-  end
 
-  def self.respond_to_missing?(method, include_private=false)
-    key = method.to_s.chomp('=').to_sym
-    options.has_key?(key) ? true : super
-  end
+    def respond_to_missing?(method, include_private=false)
+      key = method.to_s.chomp('=').to_sym
+      options.has_key?(key) ? true : super
+    end
 
-  def self.options
-    @options ||= default_options.dup
-  end
+    def options
+      @options ||= default_options.dup
+    end
 
-  def self.logger
-    @logger
-  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
 
-  def self.log=(target)
-    options[:log] = target
-    @logger = if target.is_a? Logger
-      target
-    elsif target
-      Log.new target, :jobly
-    else
-      nil
+      @logger.level = log_level if @logger and @logger.respond_to? :level
+      @logger
     end
-  end
 
-  def self.full_app_path
-    File.expand_path app_path
-  end
+    def full_app_path
+      File.expand_path app_path, root
+    end
 
-  def self.full_jobs_path
-    File.expand_path jobs_path
-  end
+    def full_jobs_path
+      File.expand_path jobs_path, root
+    end
 
-  def self.full_config_path
-    File.expand_path config_path
-  end
+    def full_config_path
+      File.expand_path config_path, root
+    end
 
-  def self.config_file
-    File.expand_path 'jobly.rb', self.config_path
-  end
+    def config_file
+      File.expand_path 'jobly.rb', full_config_path
+    end
 
-  def self.custom_config?
-    File.exist? config_file
+    def custom_config?
+      File.exist? config_file
+    end
   end
 end

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

@@ -10,6 +10,7 @@ Jobly.configure do |config|
   # config.status_expiration = 30
   # config.jobs_namespace = 'Jobs'
   # config.log = 'log/%s.log'
+  # config.log_level = 'info'
   # config.slack_webhook = 'https://hooks.slack.com/services/...'
   # config.slack_channel = '#debug'
   # config.slack_user = 'Botly'

data/lib/jobly/version.rb

@@ -1,3 +1,3 @@
 module Jobly
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobly
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http