dronejob 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b1fcd8a4a999b8e3e8746ae67b74653254941148fd4bce945607033f1aab05
-  data.tar.gz: ed771927f58b0bd6b53ab86fbf5d7dcb7b36b6b1e93fb9b1b1cebde3d81e24db
+  metadata.gz: 2a63ea40c1eec60c227ff462f07e631976b3559434eee2ef791931823c7806cf
+  data.tar.gz: 8bf04ed23e899f5b65c3fa5f77d4cf9fffc1ccf8ef1428e82c51751ee26251bd
 SHA512:
-  metadata.gz: 5743f27ad219c81f592e070174f4bdd796ae6530b9d5d4f0118e9ffd9667ad8abe4e31f01fe56d60560bac398d4e3e689681a0adc7b05fa20409af2bc4855b0a
-  data.tar.gz: bad015b82d5575fd5b7769d00262d6c6fd575ed744831362def620747ef3ba5d26f0b6c2d83a4aa9e06b427ad0f57c13edfcc2719a8008d104d2765261397922
+  metadata.gz: 5513d3f5cbb14d2e3f4d7cb53d10343f441567908dd7013152ca4efb7d640d7fc1e41cde665e55882345c2a9f6d01c56de21de4e1170daeee39fbd14293945fe
+  data.tar.gz: 51be755b012d8a2e847cb70b5dfb29d0bed271fc4038a14ff8a7065b077fb0548ad9086d063dfbd7959c683a03af2ad9d3b3fb80794503a58456f5ed3453dddb

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    dronejob (3.0.0)
+    dronejob (3.0.1)
       actionpack (>= 4.0.2, < 5.0.0)
       activejob (>= 4.0.2, < 5.0.0)
-      activejob-google-cloud-pubsub (>= 0.7)
+      bigdecimal (~> 1.4)
       bundler (>= 1.12.0, < 3.0.0)
       git (>= 1.3)
       google-cloud-logging (>= 1.2)
-      pusher (>= 1.3)
       thor (>= 0.19)
       workspace (>= 2.0)
       workspace-archive (>= 2.0)
@@ -35,11 +34,6 @@ GEM
     activejob (4.2.11.3)
       activesupport (= 4.2.11.3)
       globalid (>= 0.3.0)
-    activejob-google-cloud-pubsub (0.7.3)
-      activejob
-      activesupport
-      concurrent-ruby
-      google-cloud-pubsub (>= 0.27.0)
     activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -48,6 +42,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
+    bigdecimal (1.4.4)
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.6)
@@ -76,13 +71,6 @@ GEM
       googleapis-common-protos (>= 1.3.9, < 2.0)
       googleapis-common-protos-types (>= 1.0.4, < 2.0)
       stackdriver-core (~> 1.3)
-    google-cloud-pubsub (1.8.0)
-      concurrent-ruby (~> 1.1)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.8)
-      googleapis-common-protos (>= 1.3.9, < 2.0)
-      googleapis-common-protos-types (>= 1.0.4, < 2.0)
-      grpc-google-iam-v1 (~> 0.6.9)
     google-gax (1.8.1)
       google-protobuf (~> 3.9)
       googleapis-common-protos (>= 1.3.9, < 2.0)
@@ -106,14 +94,9 @@ GEM
     grpc (1.30.1-universal-darwin)
       google-protobuf (~> 3.12)
       googleapis-common-protos-types (~> 1.0)
-    grpc-google-iam-v1 (0.6.10)
-      google-protobuf (~> 3.11)
-      googleapis-common-protos (>= 1.3.10, < 2.0)
-      grpc (~> 1.27)
     haml (5.1.2)
       temple (>= 0.8.0)
       tilt
-    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jwt (2.2.1)
@@ -143,11 +126,6 @@ GEM
       method_source (~> 1.0)
     psych (3.2.0)
     public_suffix (4.0.5)
-    pusher (1.3.3)
-      httpclient (~> 2.7)
-      multi_json (~> 1.0)
-      pusher-signature (~> 0.1.8)
-    pusher-signature (0.1.8)
     rack (1.6.13)
     rack-test (0.6.3)
       rack (>= 1.0)

data/README.md

@@ -13,7 +13,3 @@ Install gems:
 List dronejob commands:
 
 	$ bundle exec dronejob
-
-Start server:
-
-	$ bundle exec dronejob server

data/dronejob.gemspec

@@ -16,10 +16,9 @@ Gem::Specification.new do |s|
   s.add_dependency "bundler", "< 3.0.0", ">= 1.12.0"
   s.add_runtime_dependency "actionpack", ">= 4.0.2", "< 5.0.0"
   s.add_runtime_dependency "activejob", ">= 4.0.2", "< 5.0.0"
-  s.add_runtime_dependency "activejob-google-cloud-pubsub", ">= 0.7"
+  s.add_runtime_dependency "bigdecimal", "~> 1.4"
   s.add_runtime_dependency "git", ">= 1.3"
   s.add_runtime_dependency "google-cloud-logging", ">= 1.2"
-  s.add_runtime_dependency "pusher", ">= 1.3"
   s.add_runtime_dependency "thor", ">= 0.19"
   s.add_runtime_dependency "workspace", ">= 2.0"
   s.add_runtime_dependency "workspace-archive", ">= 2.0"

data/lib/dronejob.rb

@@ -1,13 +1,9 @@
-require 'activejob_google_cloud_pubsub'
 require "google/cloud/logging"
 require "active_support"
 require 'active_support/rails'
-require "dronejob/server"
 require "dronejob/version"
 require "psych"
 
-require 'dronejob/railtie' if defined?(Rails)
-
 module Dronejob
   extend ActiveSupport::Autoload
   autoload :Base

data/lib/dronejob/base.rb

@@ -9,7 +9,6 @@ require 'dronejob/modules/callbacks'
 require 'dronejob/modules/core'
 require 'dronejob/modules/git'
 require 'dronejob/modules/log'
-require 'dronejob/modules/queue'
 require 'dronejob/modules/options'
 require 'dronejob/modules/params'
 require 'dronejob/modules/phases'
@@ -23,7 +22,6 @@ module Dronejob
     include Modules::Core
     include Modules::Git
     include Modules::Options
-    include Modules::Queue
     include Modules::Params
     include Modules::Phases
     include Modules::Workspace
@@ -39,7 +37,6 @@ module Dronejob
 
     rescue_from(Exception) do |exception|
       error_rescue(exception) if respond_to?(:error_rescue)
-      publish_error(exception)
       error(exception)
     end
 

data/lib/dronejob/command.rb

@@ -4,14 +4,12 @@ require "active_job"
 module Dronejob
   class Command < Thor
     Dronejob::Loader.workers(:base).each do |identifier, worker|
-      desc identifier, "Queue #{identifier} worker"
+      desc identifier, "Run #{identifier} worker"
 
       # Worker options
-      method_option(:run, aliases: "-r", type: :boolean, default: false)
       method_option(:break, aliases: "-b", type: :boolean, default: false)
       method_option(:skip, aliases: "-s", type: :array, default: [])
       method_option(:from, aliases: "-f", type: :string)
-      method_option(:notify, aliases: "-n", type: :boolean, default: true)
       method_option(:jobs_path, type: :string)
       method_option(:output_path, type: :string)
 
@@ -24,13 +22,8 @@ module Dronejob
         Dronejob::Base.jobs_path = options.jobs_path if options.jobs_path
         Dronejob::Base.output_path = options.output_path if options.output_path
 
-        # Execute / queue job
-        if options.run
-          worker.perform_now(options)
-        else
-          job = worker.perform_later(options.to_hash)
-          Dronejob::Base.log("info", "Enqueued job #{job.job_id}")
-        end
+        # Execute job
+        worker.perform_now(options)
       end
     end
 
@@ -87,16 +80,5 @@ module Dronejob
       job_params["from"] = options.from
       worker.perform_now(job_params)
     end
-
-    desc :server, "Start Dronejob Server"
-    def server
-      server = Server.new(Dronejob::Base.options)
-      begin
-        server.start
-      rescue Interrupt
-        server.stop
-        exit
-      end
-    end
   end
 end

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Tobias Strebitzer
@@ -71,19 +71,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: activejob-google-cloud-pubsub
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -112,20 +112,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: pusher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -279,11 +265,7 @@ files:
 - lib/dronejob/modules/options.rb
 - lib/dronejob/modules/params.rb
 - lib/dronejob/modules/phases.rb
-- lib/dronejob/modules/queue.rb
 - lib/dronejob/modules/workspace.rb
-- lib/dronejob/railtie.rb
-- lib/dronejob/railties/dronejob.rake
-- lib/dronejob/server.rb
 - lib/dronejob/version.rb
 homepage: https://github.com/MagLoft/dronejob
 licenses:

data/lib/dronejob/modules/queue.rb

@@ -1,78 +0,0 @@
-require "pry"
-require "pusher"
-
-module Dronejob
-  module Modules
-    module Queue
-      extend ActiveSupport::Concern
-
-      included do
-        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 pubsub
-          emulator_host = option(:google_cloud_pubsub_emulator_host)
-          @pubsub ||= Google::Cloud::Pubsub.new(project_id: option(:google_cloud_project_id), credentials: option(:google_cloud_service_account), timeout: 60, emulator_host: emulator_host)
-        end
-
-        def queue_adapter
-          @queue_adapter ||= ActiveJob::GoogleCloudPubsub::Adapter.new(async: false, logger: logger, pubsub: pubsub)
-        end
-
-        def notify(value = true)
-          @notify = value
-        end
-
-        def notify?
-          !!@notify
-        end
-      end
-
-      def pusher_client
-        @pusher_client ||= Pusher::Client.new(
-          app_id: option(:pusher_app_id),
-          key: option(:pusher_key),
-          secret: option(:pusher_secret),
-          cluster: option(:pusher_cluster),
-          encrypted: true
-        )
-      end
-
-      def publish_status(data = {}, status = "working")
-        data[:action] = "update_process"
-        data[:user_id] = param(:user_id)
-        data[:jid] = job_id
-        data[:worker] = Loader.identifier_for(self)
-        data[:timestamp] = Time.now.to_i
-        data[:status] = status
-        return false if data[:user_id].nil?
-
-        pusher_client.trigger("private-#{data[:user_id]}", "process", data)
-      end
-
-      def publish_error(event)
-        publish_status({ title: self.title, description: event.message, phase: @phase, progress: 100 }, "failed") if should_notify?
-      end
-
-      def notify_before_phase
-        publish_status({ title: self.title, description: @phase_config[:title], phase: @phase, progress: @phase_config[:progress] }, "working") if @phase_config[:notify] and should_notify?
-      end
-
-      def notify_after_job
-        publish_status({ title: self.title, description: "Job Completed!", phase: @phase, progress: 100 }, "complete") if should_notify?
-      end
-
-      def should_notify?
-        self.class.notify? and param(:notify) and !param(:run)
-      end
-
-      def publish_progress(progress, description = nil, details = {})
-        message = { title: self.title, description: description, phase: @phase, progress: progress, details: details }
-        publish_status(message, "working") if should_notify?
-      end
-    end
-  end
-end

data/lib/dronejob/railtie.rb

@@ -1,25 +0,0 @@
-require 'global_id/railtie'
-require 'dronejob'
-
-module Dronejob
-  # = Dronejob Railtie
-  class Railtie < Rails::Railtie
-    config.dronejob = ActiveSupport::OrderedOptions.new
-
-    initializer 'dronejob.logger' do
-      ActiveSupport.on_load(:dronejob) { self.logger = ::Rails.logger }
-    end
-
-    initializer "dronejob.set_configs" do |app|
-      options = app.config.dronejob
-
-      ActiveSupport.on_load(:dronejob) do
-        options.each { |k, v| send("#{k}=", v) }
-      end
-    end
-
-    rake_tasks do
-      load "dronejob/railties/dronejob.rake"
-    end
-  end
-end

data/lib/dronejob/railties/dronejob.rake

@@ -1,5 +0,0 @@
-namespace :dronejob do
-  task server: :environment do
-    Dronejob::Base.run_worker!
-  end
-end

data/lib/dronejob/server.rb

@@ -1,19 +0,0 @@
-module Dronejob
-  class Dronejob::Server
-    attr_reader :worker, :queue
-
-    def initialize(options)
-      @queue = options.dronejob_queue || "drone"
-    end
-
-    def start
-      @worker = ActiveJob::GoogleCloudPubsub::Worker.new(queue: @queue, pubsub: Dronejob::Base.pubsub)
-      Dronejob::Base.log("info", "Starting server for queue #{@queue} ...", nil)
-      @worker.run
-    end
-
-    def stop
-      Dronejob::Base.log("info", "Stopping server ...", nil)
-    end
-  end
-end