dronejob 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4945a0a8896b7c9bf4ce1f0672c086e0a9dfe956
-  data.tar.gz: 1b41875621ed5d31aad837edd0354c089743b9db
+  metadata.gz: d289e8680b74218314d2494741bcea27c1433408
+  data.tar.gz: 9d709407b987a68b9575e9417f7b3cc876c6b626
 SHA512:
-  metadata.gz: 69466465ebaf6db5b03d0b77c461e4421385bb0abde2c90f2addb337017b6deb69850ca0a69ca6b56a01d38812fa918cc3f9f88b5d890d6073eb9671bc068fb5
-  data.tar.gz: 41c3a2ab4bb915018763550db1652621b0c2100f2b492c0cd93fb8bd1dbd435cb22ed21c8db59834c562d5ca8d71d409cc59a6b71322d11ccffce58dbba18d2b
+  metadata.gz: 3651cd2b5f05d27d785382ce476385dca08199b7fc0cc1bae9de5cd9a291ec31402a88d00a981f52c3617a3850f90f084a32b9a99cc498f221dc3b4ef643c497
+  data.tar.gz: 255e1b4a054280eb2621663835467fa60cde4f420da2b56c546458120f643ef2509eda9e20be4fcf330dbb53efc355da9caceb7681a44b4a2210244cc4ca5360

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dronejob (1.1.1)
+    dronejob (1.1.2)
       activejob (~> 4.2)
       bundler (>= 1.3.0, < 2.0)
       git (~> 1.2)

data/app.rb

@@ -0,0 +1,2 @@
+require "dronejob"
+Dronejob.start

data/lib/dronejob.rb

@@ -1,6 +1,7 @@
 require "active_support"
 require 'active_support/rails'
 require "dronejob/version"
+require "psych"
 
 require 'dronejob/railtie' if defined?(Rails)
 
@@ -8,4 +9,17 @@ module Dronejob
   extend ActiveSupport::Autoload
   autoload :Base
   autoload :Loader
+  
+  def self.start
+    require "dronejob/banner"
+    require "sidekiq-status"
+    Loader.load
+    Dronejob::Base.queue_adapter = "sidekiq"
+    Sidekiq.configure_server do |config|
+      config.redis = { url: Dronejob::Base.options.redis_url }
+      config.server_middleware do |chain|
+        chain.add Sidekiq::Status::ServerMiddleware
+      end
+    end
+  end
 end

data/lib/dronejob/banner.rb

@@ -0,0 +1,12 @@
+module Sidekiq
+  class CLI
+    def self.banner      
+      '     ___                                        _           _       ' + "\n" +
+      '    |   \     _ _    ___    _ _      ___     _ | |   ___   | |__    ' + "\n" +
+      '    | |) |   | `_|  / _ \  | ` \    / -_)   | || |  / _ \  | `_ \   ' + "\n" +
+      '    |___/   _|_|_   \___/  |_||_|   \___|   _\__/   \___/  |_.__/   ' + "\n" +
+      '  _|=====|_|=====|_|=====|_|=====|_|=====|_|=====|_|=====|_|=====|  ' + "\n" +
+      '  =`-0-0-`=`-0-0-`=`-0-0-`=`-0-0-`=`-0-0-`=`-0-0-`=`-0-0-`=`-0-0-`  '
+     end
+  end
+end

data/lib/dronejob/base.rb

@@ -13,17 +13,16 @@ require 'dronejob/modules/workspace'
 module Dronejob
   class Base < ActiveJob::Base
     DRONEJOB_TYPE = "base"
-    queue_as :dronejob
     include Modules::AttrStore
     include Modules::Callbacks
     include Modules::Core
     include Modules::Git
-    include Modules::Log
-    include Modules::Queue
     include Modules::Options
+    include Modules::Queue
     include Modules::Params
     include Modules::Phases
     include Modules::Workspace
+    include Modules::Log
     
     def uuid
       @uuid ||= "#{self.class.name.split('::').last.underscore}_#{SecureRandom.uuid}"

data/lib/dronejob/command.rb

@@ -59,19 +59,6 @@ module Dronejob
       end
     end
     
-    desc :server, "Start Dronejob Server"
-    method_option(:queue_adapter, type: :string, default: "sidekiq", enum: ["sidekiq"])
-    method_option(:jobs_path, type: :string)
-    method_option(:output_path, type: :string)
-    def server
-      Dronejob::Base.queue_adapter = options.queue_adapter if options.queue_adapter
-      Dronejob::Base.jobs_path = options.jobs_path if options.jobs_path
-      Dronejob::Base.output_path = options.output_path if options.output_path
-      
-      # Run worker
-      Dronejob::Base.run_worker!
-    end
-    
     desc :archive, "Archive Completed Jobs"
     method_option(:force, aliases: "-f", type: :boolean, default: false)
     def archive

data/lib/dronejob/modules/log.rb

@@ -4,9 +4,24 @@ module Dronejob
   module Modules
     module Log
       extend ActiveSupport::Concern
+      COLOR_BOLD = "\e[1m"
+      COLOR_RED = "\e[31m"
+      COLOR_RED_BG = "\e[41m"
+      COLOR_WHITE = "\e[38;5;15m"
+      COLOR_GREY = "\e[38;5;245m"
+      COLOR_GREY_BG = "\e[48;5;255m"
+      COLOR_END = "\e[0m"
       
       included do
-        cattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) }
+        cattr_accessor(:logger) do
+          dronejob_log = option(:dronejob_log) || "STDOUT"
+          if dronejob_log == "STDOUT"
+            custom_logger = ActiveSupport::Logger.new(STDOUT)
+          else
+            custom_logger = ActiveSupport::Logger.new(dronejob_log)
+          end
+          ActiveSupport::TaggedLogging.new(custom_logger)
+        end
       end
       
       class_methods do
@@ -41,9 +56,11 @@ module Dronejob
       
       def error(message)
         if Exception === message
-          say(" ERROR ", ["\e[38;5;15m", Thor::Shell::Color::BOLD, Thor::Shell::Color::ON_RED], false)
-          say(" #{message.class}: ", [Thor::Shell::Color::BOLD], false)
-          say("#{message.message}", [Thor::Shell::Color::BOLD, Thor::Shell::Color::RED])
+          if log_stdout?
+            log(:error, "#{COLOR_RED_BG}#{COLOR_BOLD}#{COLOR_WHITE} ERROR #{COLOR_END} #{COLOR_BOLD}#{message.class}: #{COLOR_RED}#{message.message}#{COLOR_END}")
+          else
+            log(:error, "[ERROR] #{message.class}: #{message.message}")
+          end
           backtrace(message.backtrace)
         else
           log(:error, message)
@@ -55,9 +72,11 @@ module Dronejob
           line.gsub!("#{Dir.pwd}/", '')
           (file, lineno, info) = line.split(":")
           if /ruby\/?gems/.match(line).nil?
-            say(" #{lineno.rjust(5, ' ')} ", ["\e[48;5;255m", "\e[38;5;245m"], false)
-            say(" #{file} ", [Thor::Shell::Color::RED], false)
-            say(info, ["\e[38;5;245m"], true)
+            if log_stdout?
+              log(:error, "#{COLOR_GREY_BG}#{COLOR_GREY} #{lineno.rjust(5, ' ')} #{COLOR_END} #{COLOR_RED}#{file}#{COLOR_END} #{COLOR_GREY}#{info}#{COLOR_END}")
+            else
+              log(:error, " - #{file}:#{lineno} #{info}")
+            end
           end
         end
       end
@@ -77,6 +96,14 @@ module Dronejob
       def emergency(message)
         log(:emergency, message)
       end   
+      
+      private
+      
+        def log_stdout?
+          logdev = logger.instance_variable_get("@logdev")
+          logger_source = logdev.dev if logdev.respond_to?(:dev)
+          STDOUT === logger_source
+        end      
     end
   end
 end

data/lib/dronejob/modules/queue.rb

@@ -5,21 +5,11 @@ module Dronejob
       
       included do
         attr_accessor :queue_adapter
+        queue_as option(:dronejob_queue) || :dronejob
         set_callback :phase, :before, :notify_before_phase
         set_callback :job, :after, :notify_after_job
       end
       
-      class_methods do
-        def run_worker!
-          ActiveJob::Base.queue_adapter = self.queue_adapter
-          require 'sidekiq/cli'
-          $:.push("./")
-          cli = Sidekiq::CLI.instance
-          cli.parse(["-q#{option(:dronejob_queue) || "dronejob"}", "-rlib/dronejob/server/sidekiq.rb"])
-          cli.run
-        end
-      end
-      
       def publish_status(data={}, status="working", backend=false)
         data[:action] = "update_process"
         data[:user_id] = param(:user_id)

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/dronejob/workspace_file/parse.rb

@@ -23,7 +23,6 @@ module Dronejob
       end
     
       def read_yaml
-        require "psych"
         Psych.load_file(to_s)
       end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Tobias Strebitzer
@@ -196,9 +196,11 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
+- app.rb
 - bin/dronejob
 - dronejob.gemspec
 - lib/dronejob.rb
+- lib/dronejob/banner.rb
 - lib/dronejob/base.rb
 - lib/dronejob/command.rb
 - lib/dronejob/loader.rb
@@ -214,7 +216,6 @@ files:
 - lib/dronejob/modules/workspace.rb
 - lib/dronejob/railtie.rb
 - lib/dronejob/railties/dronejob.rake
-- lib/dronejob/server/sidekiq.rb
 - lib/dronejob/version.rb
 - lib/dronejob/workspace_dir.rb
 - lib/dronejob/workspace_dir/archive.rb

data/lib/dronejob/server/sidekiq.rb

@@ -1,7 +0,0 @@
-require "sidekiq-status"
-Sidekiq.configure_server do |config|
-  config.redis = { url: Dronejob::Base.options.redis_url }
-  config.server_middleware do |chain|
-    chain.add Sidekiq::Status::ServerMiddleware
-  end
-end