toiler 0.3.5 → 0.3.6

data/lib/toiler/utils/argument_parser.rb

@@ -1,50 +1,50 @@
-module Toiler
-  module Utils
-    # Parses command-line arguments
-    module ArgumentParser
-      module_function
-
-      def parse(argv)
-        opts = { queues: [] }
-
-        parser = OptionParser.new do |o|
-          o.on '-d', '--daemon', 'Daemonize process' do |arg|
-            opts[:daemon] = arg
-          end
-
-          o.on '-r', '--require [PATH|DIR]', 'Location of the worker' do |arg|
-            opts[:require] = arg
-          end
-
-          o.on '-C', '--config PATH', 'Path to YAML config file' do |arg|
-            opts[:config_file] = arg
-          end
-
-          o.on '-R', '--rails', 'Load Rails' do |arg|
-            opts[:rails] = arg
-          end
-
-          o.on '-L', '--logfile PATH', 'Path to writable logfile' do |arg|
-            opts[:logfile] = arg
-          end
-
-          o.on '-P', '--pidfile PATH', 'Path to pidfile' do |arg|
-            opts[:pidfile] = arg
-          end
-
-          o.on '-v', '--verbose', 'Print more verbose output' do |arg|
-            opts[:verbose] = arg
-          end
-        end
-
-        parser.banner = 'toiler [options]'
-        parser.on_tail '-h', '--help', 'Show help' do
-          puts parser
-          exit 1
-        end
-        parser.parse!(argv)
-        opts
-      end
-    end
-  end
-end
+module Toiler
+  module Utils
+    # Parses command-line arguments
+    module ArgumentParser
+      module_function
+
+      def parse(argv)
+        opts = { queues: [] }
+
+        parser = OptionParser.new do |o|
+          o.on '-d', '--daemon', 'Daemonize process' do |arg|
+            opts[:daemon] = arg
+          end
+
+          o.on '-r', '--require [PATH|DIR]', 'Location of the worker' do |arg|
+            opts[:require] = arg
+          end
+
+          o.on '-C', '--config PATH', 'Path to YAML config file' do |arg|
+            opts[:config_file] = arg
+          end
+
+          o.on '-R', '--rails', 'Load Rails' do |arg|
+            opts[:rails] = arg
+          end
+
+          o.on '-L', '--logfile PATH', 'Path to writable logfile' do |arg|
+            opts[:logfile] = arg
+          end
+
+          o.on '-P', '--pidfile PATH', 'Path to pidfile' do |arg|
+            opts[:pidfile] = arg
+          end
+
+          o.on '-v', '--verbose', 'Print more verbose output' do |arg|
+            opts[:verbose] = arg
+          end
+        end
+
+        parser.banner = 'toiler [options]'
+        parser.on_tail '-h', '--help', 'Show help' do
+          puts parser
+          exit 1
+        end
+        parser.parse!(argv)
+        opts
+      end
+    end
+  end
+end

data/lib/toiler/utils/environment_loader.rb

@@ -1,104 +1,104 @@
-require 'erb'
-require 'yaml'
-
-module Toiler
-  module Utils
-    # Takes care of loading componentes to get toiler ready to run
-    class EnvironmentLoader
-      attr_reader :options
-
-      def self.load(options)
-        new(options).load
-      end
-
-      def self.load_for_rails_console
-        load(config_file: (Rails.root + 'config' + 'toiler.yml'))
-      end
-
-      def initialize(options)
-        @options = options
-      end
-
-      def load
-        initialize_logger
-        load_rails if options[:rails]
-        require_workers if options[:require]
-        Toiler.options.merge!(config_file_options)
-        Toiler.options.merge!(options)
-        initialize_aws
-      end
-
-      private
-
-      def config_file_options
-        if (path = options[:config_file])
-          unless File.exist?(path)
-            Toiler.logger.warn "Config file #{path} does not exist"
-            path = nil
-          end
-        end
-
-        return {} unless path
-
-        deep_symbolize_keys YAML.load(ERB.new(File.read(path)).result)
-      end
-
-      def initialize_aws
-        return if Toiler.options[:aws].empty?
-        ::Aws.config[:region] = Toiler.options[:aws][:region]
-        set_aws_credentials
-      end
-
-      def set_aws_credentials
-        return unless Toiler.options[:aws][:access_key_id]
-        ::Aws.config[:credentials] = ::Aws::Credentials.new(
-          Toiler.options[:aws][:access_key_id],
-          Toiler.options[:aws][:secret_access_key]
-        )
-      end
-
-      def initialize_logger
-        Toiler::Utils::Logging.initialize_logger(options[:logfile])
-        Toiler.logger.level = Logger::DEBUG if options[:verbose]
-      end
-
-      def load_rails
-        require 'rails'
-        if ::Rails::VERSION::MAJOR < 4
-          load_rails_old
-        else
-          load_rails_new
-        end
-        Toiler.logger.info 'Rails environment loaded'
-      end
-
-      def load_rails_old
-        require File.expand_path('config/environment.rb')
-        ::Rails.application.eager_load!
-      end
-
-      def load_rails_new
-        require File.expand_path('config/application.rb')
-        ::Rails::Application.initializer 'toiler.eager_load' do
-          ::Rails.application.config.eager_load = true
-        end
-        require File.expand_path('config/environment.rb')
-      end
-
-      def require_workers
-        require options[:require]
-      end
-
-      def deep_symbolize_keys(h)
-        h.each_with_object({}) do |(key, value), result|
-          k = key.respond_to?(:to_sym) ? key.to_sym : key
-          result[k] = if value.is_a? Hash
-                        deep_symbolize_keys value
-                      else
-                        value
-                      end
-        end
-      end
-    end
-  end
-end
+require 'erb'
+require 'yaml'
+
+module Toiler
+  module Utils
+    # Takes care of loading componentes to get toiler ready to run
+    class EnvironmentLoader
+      attr_reader :options
+
+      def self.load(options)
+        new(options).load
+      end
+
+      def self.load_for_rails_console
+        load(config_file: (Rails.root + 'config' + 'toiler.yml'))
+      end
+
+      def initialize(options)
+        @options = options
+      end
+
+      def load
+        initialize_logger
+        load_rails if options[:rails]
+        require_workers if options[:require]
+        Toiler.options.merge!(config_file_options)
+        Toiler.options.merge!(options)
+        initialize_aws
+      end
+
+      private
+
+      def config_file_options
+        if (path = options[:config_file])
+          unless File.exist?(path)
+            Toiler.logger.warn "Config file #{path} does not exist"
+            path = nil
+          end
+        end
+
+        return {} unless path
+
+        deep_symbolize_keys YAML.load(ERB.new(File.read(path)).result)
+      end
+
+      def initialize_aws
+        return if Toiler.options[:aws].empty?
+        ::Aws.config[:region] = Toiler.options[:aws][:region]
+        set_aws_credentials
+      end
+
+      def set_aws_credentials
+        return unless Toiler.options[:aws][:access_key_id]
+        ::Aws.config[:credentials] = ::Aws::Credentials.new(
+          Toiler.options[:aws][:access_key_id],
+          Toiler.options[:aws][:secret_access_key]
+        )
+      end
+
+      def initialize_logger
+        Toiler::Utils::Logging.initialize_logger(options[:logfile])
+        Toiler.logger.level = Logger::DEBUG if options[:verbose]
+      end
+
+      def load_rails
+        require 'rails'
+        if ::Rails::VERSION::MAJOR < 4
+          load_rails_old
+        else
+          load_rails_new
+        end
+        Toiler.logger.info 'Rails environment loaded'
+      end
+
+      def load_rails_old
+        require File.expand_path('config/environment.rb')
+        ::Rails.application.eager_load!
+      end
+
+      def load_rails_new
+        require File.expand_path('config/application.rb')
+        ::Rails::Application.initializer 'toiler.eager_load' do
+          ::Rails.application.config.eager_load = true
+        end
+        require File.expand_path('config/environment.rb')
+      end
+
+      def require_workers
+        require options[:require]
+      end
+
+      def deep_symbolize_keys(h)
+        h.each_with_object({}) do |(key, value), result|
+          k = key.respond_to?(:to_sym) ? key.to_sym : key
+          result[k] = if value.is_a? Hash
+                        deep_symbolize_keys value
+                      else
+                        value
+                      end
+        end
+      end
+    end
+  end
+end

data/lib/toiler/utils/logging.rb

@@ -1,41 +1,41 @@
-require 'time'
-require 'logger'
-
-module Toiler
-  module Utils
-    # Initializes and exposes Toiler's default logger
-    module Logging
-      # Toiler's default log formatter
-      class Pretty < Logger::Formatter
-        def call(sev, time, progname, msg)
-          formatted = msg.respond_to?(:gsub) ? msg.gsub("\n", "\n\t") : msg
-          time = time.utc.iso8601
-          pid = Process.pid
-          if progname.to_s.empty?
-            "#{time} Pid:#{pid} Level:#{sev}: #{formatted}\n"
-          else
-            "#{time} Pid:#{pid} Actor:#{progname} Level:#{sev}: #{formatted}\n"
-          end
-        end
-      end
-
-      module_function
-
-      def initialize_logger(log_target = STDOUT)
-        log_target = STDOUT if log_target.nil?
-        @logger = Logger.new(log_target)
-        @logger.level = Logger::INFO
-        @logger.formatter = Pretty.new
-        @logger
-      end
-
-      def logger
-        @logger || initialize_logger
-      end
-
-      def logger=(log)
-        @logger = (log ? log : Logger.new('/dev/null'))
-      end
-    end
-  end
-end
+require 'time'
+require 'logger'
+
+module Toiler
+  module Utils
+    # Initializes and exposes Toiler's default logger
+    module Logging
+      # Toiler's default log formatter
+      class Pretty < Logger::Formatter
+        def call(sev, time, progname, msg)
+          formatted = msg.respond_to?(:gsub) ? msg.gsub("\n", "\n\t") : msg
+          time = time.utc.iso8601
+          pid = Process.pid
+          if progname.to_s.empty?
+            "#{time} Pid:#{pid} Level:#{sev}: #{formatted}\n"
+          else
+            "#{time} Pid:#{pid} Actor:#{progname} Level:#{sev}: #{formatted}\n"
+          end
+        end
+      end
+
+      module_function
+
+      def initialize_logger(log_target = STDOUT)
+        log_target = STDOUT if log_target.nil?
+        @logger = Logger.new(log_target)
+        @logger.level = Logger::INFO
+        @logger.formatter = Pretty.new
+        @logger
+      end
+
+      def logger
+        @logger || initialize_logger
+      end
+
+      def logger=(log)
+        @logger = (log ? log : Logger.new('/dev/null'))
+      end
+    end
+  end
+end

data/lib/toiler/version.rb

@@ -1,4 +1,4 @@
-# Toiler Version
-module Toiler
-  VERSION = '0.3.5'.freeze
-end
+# Toiler Version
+module Toiler
+  VERSION = '0.3.6'.freeze
+end

data/lib/toiler/worker.rb

@@ -1,62 +1,62 @@
-module Toiler
-  # Toiler's Worker behaviour
-  module Worker
-    def self.included(base)
-      base.extend(ClassMethods)
-      base.class_variable_set(:@@toiler_options, Toiler.default_options)
-    end
-
-    def log(level, message)
-      Toiler.logger.log(level, message, self.class)
-    end
-
-    def error(msg)
-      log Logger::Severity::ERROR, msg
-    end
-
-    def info(msg)
-      log Logger::Severity::INFO, msg
-    end
-
-    def debug(msg)
-      log Logger::Severity::DEBUG, msg
-    end
-
-    def warn(msg)
-      log Logger::Severity::WARN, msg
-    end
-
-    def fatal(msg)
-      log Logger::Severity::FATAL, msg
-    end
-
-    # Class methods for Workers
-    module ClassMethods
-      def toiler_options(options = {})
-        return class_variable_get(:@@toiler_options) if options.empty?
-        Toiler.worker_class_registry[options[:queue]] = self if options[:queue]
-        class_variable_get(:@@toiler_options).merge! options
-      end
-
-      def batch?
-        class_variable_get(:@@toiler_options)[:batch]
-      end
-
-      def concurrency
-        class_variable_get(:@@toiler_options)[:concurrency]
-      end
-
-      def queue
-        class_variable_get(:@@toiler_options)[:queue]
-      end
-
-      def auto_visibility_timeout?
-        class_variable_get(:@@toiler_options)[:auto_visibility_timeout]
-      end
-
-      def auto_delete?
-        class_variable_get(:@@toiler_options)[:auto_delete]
-      end
-    end
-  end
-end
+module Toiler
+  # Toiler's Worker behaviour
+  module Worker
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.class_variable_set(:@@toiler_options, Toiler.default_options)
+    end
+
+    def log(level, message)
+      Toiler.logger.log(level, message, self.class)
+    end
+
+    def error(msg)
+      log Logger::Severity::ERROR, msg
+    end
+
+    def info(msg)
+      log Logger::Severity::INFO, msg
+    end
+
+    def debug(msg)
+      log Logger::Severity::DEBUG, msg
+    end
+
+    def warn(msg)
+      log Logger::Severity::WARN, msg
+    end
+
+    def fatal(msg)
+      log Logger::Severity::FATAL, msg
+    end
+
+    # Class methods for Workers
+    module ClassMethods
+      def toiler_options(options = {})
+        return class_variable_get(:@@toiler_options) if options.empty?
+        Toiler.worker_class_registry[options[:queue]] = self if options[:queue]
+        class_variable_get(:@@toiler_options).merge! options
+      end
+
+      def batch?
+        class_variable_get(:@@toiler_options)[:batch]
+      end
+
+      def concurrency
+        class_variable_get(:@@toiler_options)[:concurrency]
+      end
+
+      def queue
+        class_variable_get(:@@toiler_options)[:queue]
+      end
+
+      def auto_visibility_timeout?
+        class_variable_get(:@@toiler_options)[:auto_visibility_timeout]
+      end
+
+      def auto_delete?
+        class_variable_get(:@@toiler_options)[:auto_delete]
+      end
+    end
+  end
+end