dronejob 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06339a1fef10bf3f164d9eff6565c05a4208c315
-  data.tar.gz: 67b287c477a60ca2962c264d38050cbf71dc51b9
+  metadata.gz: 5f5df12fd8e611f67180596502d7779bfdf2256c
+  data.tar.gz: e6c626d975c8f4041628715085e6c7bef1ae72c4
 SHA512:
-  metadata.gz: 4fd156af7248545a3a2cc140bc14a44ae628cd5c063c4aaa110d09ef99b6f9130e2dffe7f0d36c88f5ca458970893f621762717dbe285229545ebb2dda6f6242
-  data.tar.gz: 4a44ffac4db1a1cef18221ad6d8b44d5bf1d9c452799b0d15e887ca519f86d06cc1dffdd05aa983bea6811dbc5c2267b028828359aa84d91094e193a521a7278
+  metadata.gz: c1772f75b8d08eb2b3689a344fe188f6385b9249661291453979aed9eb2ff22d3e2e65069e9c0a3efca6e0d51c80369548d00f05c750256e5041049944f2f730
+  data.tar.gz: f02a43b2ce9a4b512175ef085191d18e093be5540a0bbc92f2b09a721748be3a61fea62ad202372403f0ce18cb9144dadb39762fee3b5c109bae94d46e5f2553

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dronejob (1.0.5)
+    dronejob (1.0.6)
       activejob (~> 4.2)
       bundler (~> 1.11)
       git (~> 1.2)

data/lib/dronejob/base.rb

@@ -11,6 +11,7 @@ require 'dronejob/modules/workspace'
 
 module Dronejob
   class Base < ActiveJob::Base
+    DRONEJOB_TYPE = "base"
     queue_as :dronejob
     include Modules::AttrStore
     include Modules::Core

data/lib/dronejob/command.rb

@@ -3,7 +3,7 @@ require "active_job"
 module Dronejob
   class Command < Thor
     
-    Dronejob::Loader.workers.each do |identifier, worker|
+    Dronejob::Loader.workers(:base).each do |identifier, worker|
       desc identifier, "Queue #{identifier} worker"
       
       # Pub/Sub options
@@ -56,6 +56,18 @@ module Dronejob
       end
     end
     
+    Dronejob::Loader.workers(:one_off).each do |identifier, worker|
+      desc identifier, "Run #{identifier} one-off worker"
+      method_option(:break, aliases: "-b", type: :boolean, default: false)
+      method_option(:skip, aliases: "-s", type: :array, default: [])
+      worker.params.each do |key, config|
+        method_option(key, required: config[:required], type: config[:type], default: config[:default])
+      end
+      define_method(identifier) do
+        worker.new.perform(options)
+      end
+    end
+    
     desc :server, "Start Dronejob Server"
     method_option(:queue_adapter, type: :string, default: "sidekiq", enum: ["sidekiq"])
     method_option(:jobs_path, type: :string)
@@ -91,7 +103,8 @@ module Dronejob
     end
     
     desc :unarchive, "Unarchive Completed Job"
-    archives = WorkspaceDir.new("archive").children.map{|file| file.name.gsub(/\.zip$/, "")}
+    archives_dir = WorkspaceDir.new("archive")
+    archives = archives_dir.exists? ? archives_dir.children.map{|file| file.name.gsub(/\.zip$/, "")} : []
     method_option(:archive, type: :string, required: true, enum: archives)
     method_option(:force, aliases: "-f", type: :boolean, default: false)
     def unarchive

data/lib/dronejob/loader.rb

@@ -19,8 +19,10 @@ module Dronejob
       self.workers.key(worker.class)
     end
     
-    def self.workers
+    def self.workers(type="base")
+      type = type.to_s
       @@workers ||= load
+      result = @@workers.select{|key, worker| worker::DRONEJOB_TYPE == type}
     end
   end
 end

data/lib/dronejob/modules/workspace.rb

@@ -33,44 +33,6 @@ module Dronejob
       def asset_file(path)
         WorkspaceDir.new("app/assets").file(path)
       end
-
-      # def file_replace_contents(target_path, &block)
-      #   binding.pry
-      #   contents = File.open(target_path).read
-      #   contents = block.call(contents)
-      #   file_write(target_path, contents)
-      # end
-      # 
-      # def file_delete_path(*args)
-      #   binding.pry
-      #   path = File.join(*args)
-      #   FileUtils.rm_rf(path)
-      #   path
-      # end
-      # 
-      # def file_parse_haml(haml_path, output_path, options={})
-      #   binding.pry
-      #   engine = Haml::Engine.new(haml_path)
-      #   open(output_path, 'wb') do |file|
-      #     file << engine.render(Object.new, options)
-      #   end
-      # end
-      # 
-      # def file_root_dir
-      #   binding.pry
-      #   File.expand_path("../../../", __FILE__)
-      # end
-      # 
-      # def file_data_path(target_path)
-      #   binding.pry
-      #   File.join(Gem.datadir("app-drone"), target_path)
-      # end
-      # 
-      # def file_data_contents(target_path)
-      #   binding.pry
-      #   path = file_data_path(target_path)
-      #   File.open(path).read
-      # end
     end
   end
 end

data/lib/dronejob/one_off.rb

@@ -0,0 +1,77 @@
+require "active_job"
+require 'dronejob/modules/core'
+require 'dronejob/modules/log'
+require 'dronejob/modules/options'
+require 'dronejob/modules/params'
+require 'dronejob/modules/phases'
+
+module Dronejob
+  class OneOff
+    DRONEJOB_TYPE = "one_off"
+    include Modules::Core
+    include Modules::Log
+    include Modules::Options
+    include Modules::Params
+    include Modules::Phases
+    
+    def perform(params)
+      @params = params
+      validate_parameters!
+      
+      # Run through phases
+      each_phase do |phase, config|
+        begin
+          phase_result = public_send(phase)
+        rescue Exception => e
+          error(e.message)
+          error(e.backtrace.join("\n"))
+          return false
+        end
+      end
+    end
+    
+    def each_phase(&block)
+      self.class.phases.each do |phase, config|
+        fail "Phase not found: '#{phase}'" unless self.respond_to?(phase)
+        @phase = phase
+        before_phase(phase, config) if self.respond_to?(:before_phase)
+        
+        logger.tagged(phase) do
+          if completed_phase?(phase) and !config[:always_run]
+            info("already completed")
+          elsif skip_phase?(phase)
+            info("skipping...")
+          else
+            # Require libraries
+            if !config[:require].nil?
+              config[:require].each do |library|
+                require library
+              end
+            end
+
+            # Include helpers
+            if !config[:helpers].nil?
+              config[:helpers].each do |helper|
+                helper_path = "helpers/#{helper}"
+                require "./app/#{helper_path}"
+                self.class.include helper_path.camelcase.constantize
+              end
+            end
+            
+            block.call(phase, config)
+          end
+        end
+        
+        after_phase(phase, config) if self.respond_to?(:after_phase)
+      end
+      
+      info("JOB COMPLETED")
+    end
+    
+    def completed_phase?(phase)
+      false
+    end
+    
+    ActiveSupport.run_load_hooks(:dronejob, self)
+  end
+end

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/dronejob/workspace_file.rb

@@ -92,7 +92,6 @@ module Dronejob
       end
       return self
     rescue StandardError => e
-      binding.pry
       return false
     end
     

data/lib/dronejob.rb

@@ -7,5 +7,6 @@ require 'dronejob/railtie' if defined?(Rails)
 module Dronejob
   extend ActiveSupport::Autoload
   autoload :Base
+  autoload :OneOff
   autoload :Loader
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Tobias Strebitzer
@@ -205,6 +205,7 @@ files:
 - lib/dronejob/modules/phases.rb
 - lib/dronejob/modules/queue.rb
 - lib/dronejob/modules/workspace.rb
+- lib/dronejob/one_off.rb
 - lib/dronejob/railtie.rb
 - lib/dronejob/railties/dronejob.rake
 - lib/dronejob/server/sidekiq.rb
@@ -231,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '2.4'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: DroneJob Drone Factory