dronejob 2.0.2 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6bff9afaf42c47bfef7c92aa1bdb85ddeaea4b95
-  data.tar.gz: c2501b9caf0652c31961330d0a3e01d1fe4a46a1
+SHA256:
+  metadata.gz: 2a63ea40c1eec60c227ff462f07e631976b3559434eee2ef791931823c7806cf
+  data.tar.gz: 8bf04ed23e899f5b65c3fa5f77d4cf9fffc1ccf8ef1428e82c51751ee26251bd
 SHA512:
-  metadata.gz: 9e350ca252faff036e8e0b5c12f8a9992a1fa5302bae81f920cb342f773240471ebcf08cff6c1928ba1ca73442a8d84a5dbf1e50c3d1eaa40a0e9460d0268544
-  data.tar.gz: ce1ed5b23071458a2269b1451cc91ca56f8338279220293a7237131beda50eb0c620a0b660413ba6aebd0767e6801bc6210548f2570e01cc231fa875b2538dca
+  metadata.gz: 5513d3f5cbb14d2e3f4d7cb53d10343f441567908dd7013152ca4efb7d640d7fc1e41cde665e55882345c2a9f6d01c56de21de4e1170daeee39fbd14293945fe
+  data.tar.gz: 51be755b012d8a2e847cb70b5dfb29d0bed271fc4038a14ff8a7065b077fb0548ad9086d063dfbd7959c683a03af2ad9d3b3fb80794503a58456f5ed3453dddb

data/.rubocop.yml

@@ -6,10 +6,6 @@ Style/SymbolArray:
 Style/ClassCheck:
   EnforcedStyle: kind_of?
 
-# It's better to be more explicit about the type
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 Style/TernaryParentheses:
   Enabled: true
   EnforcedStyle: require_parentheses_when_complex
@@ -20,10 +16,10 @@ Lint/UselessAssignment:
     - '**/spec/**/*'
 
 # We could potentially enable the 2 below:
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Enabled: false
 
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: false
 
 # HoundCI doesn't like this rule
@@ -38,10 +34,7 @@ Style/NumericPredicate:
   Enabled: false
 
 # Sometimes we allow a rescue block that doesn't contain code
-Lint/HandleExceptions:
-  Enabled: false
-
-Style/RescueStandardError:
+Lint/SuppressedException:
   Enabled: false
 
 # Cop supports --auto-correct.
@@ -74,7 +67,7 @@ Metrics/CyclomaticComplexity:
   Enabled: false
 
 Metrics/BlockNesting:
-  Max: 5
+  Max: 4
 
 Metrics/BlockLength:
   Enabled: false
@@ -185,8 +178,91 @@ Style/ClassVars:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Naming/FileName:
+  Enabled: false
+
+Naming/MethodParameterName:
+  Enabled: false
+
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/DuplicateElsifCondition:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/AccessorGrouping:
+  Enabled: true
+
+Style/ArrayCoercion:
+  Enabled: true
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/CaseLikeIf:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashAsLastArrayItem:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashLikeCase:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/RedundantAssignment:
+  Enabled: true
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true
+
 AllCops:
-  TargetRubyVersion: "2.3.3"
+  TargetRubyVersion: "2.4.0"
   Exclude:
+    - './vendor/**/*'
+    - './db/**/*'
     - './tmp/**/*'
+    - './log/**/*'
+    - './public/**/*'
+    - './bin/**/*'
     - './Gemfile'

data/Gemfile.lock

@@ -1,211 +1,207 @@
 PATH
   remote: .
   specs:
-    dronejob (2.0.2)
-      actionpack (>= 4.0.2)
-      activejob (>= 4.0.2)
-      activejob-google_cloud_pubsub (>= 0.7)
+    dronejob (3.0.1)
+      actionpack (>= 4.0.2, < 5.0.0)
+      activejob (>= 4.0.2, < 5.0.0)
+      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 (>= 1.0)
-      workspace-archive (>= 1.0)
-      workspace-media (>= 1.0)
-      workspace-net (>= 1.0)
-      workspace-parse (>= 1.0)
+      workspace (>= 2.0)
+      workspace-archive (>= 2.0)
+      workspace-media (>= 2.0)
+      workspace-net (>= 2.0)
+      workspace-parse (>= 2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
+    actionpack (4.2.11.3)
+      actionview (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+    actionview (4.2.11.3)
+      activesupport (= 4.2.11.3)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
-      globalid (>= 0.3.6)
-    activejob-google_cloud_pubsub (0.7.1)
-      activejob
-      activesupport
-      concurrent-ruby
-      google-cloud-pubsub (>= 0.27.0)
-    activesupport (5.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+    activejob (4.2.11.3)
+      activesupport (= 4.2.11.3)
+      globalid (>= 0.3.0)
+    activesupport (4.2.11.3)
+      i18n (~> 0.7)
       minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
-    builder (3.2.3)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    erubi (1.8.0)
+    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)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubis (2.7.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    faraday (0.15.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.0)
-    git (1.5.0)
+    ffi (1.13.1)
+    git (1.7.0)
+      rchardet (~> 1.8)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-cloud-core (1.3.0)
+    google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
-    google-cloud-env (1.0.5)
-      faraday (~> 0.11)
-    google-cloud-logging (1.6.3)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.3.3)
+      faraday (>= 0.17.3, < 2.0)
+    google-cloud-errors (1.0.1)
+    google-cloud-logging (1.10.9)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.2)
-      google-gax (~> 1.3)
-      googleapis-common-protos-types (>= 1.0.2)
+      google-gax (~> 1.8)
+      googleapis-common-protos (>= 1.3.9, < 2.0)
+      googleapis-common-protos-types (>= 1.0.4, < 2.0)
       stackdriver-core (~> 1.3)
-    google-cloud-pubsub (0.35.0)
-      concurrent-ruby (~> 1.0)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.3)
-      grpc-google-iam-v1 (~> 0.6.9)
-    google-gax (1.5.0)
-      google-protobuf (~> 3.2)
-      googleapis-common-protos (>= 1.3.5, < 2.0)
-      googleauth (>= 0.6.2, < 0.10.0)
-      grpc (>= 1.7.2, < 2.0)
+    google-gax (1.8.1)
+      google-protobuf (~> 3.9)
+      googleapis-common-protos (>= 1.3.9, < 2.0)
+      googleauth (~> 0.9)
+      grpc (~> 1.24)
       rly (~> 0.2.3)
-    google-protobuf (3.7.1-universal-darwin)
-    googleapis-common-protos (1.3.9)
-      google-protobuf (~> 3.0)
-      googleapis-common-protos-types (~> 1.0)
-      grpc (~> 1.0)
-    googleapis-common-protos-types (1.0.4)
-      google-protobuf (~> 3.0)
-    googleauth (0.8.1)
-      faraday (~> 0.12)
+    google-protobuf (3.12.2-universal-darwin)
+    googleapis-common-protos (1.3.10)
+      google-protobuf (~> 3.11)
+      googleapis-common-protos-types (>= 1.0.5, < 2.0)
+      grpc (~> 1.27)
+    googleapis-common-protos-types (1.0.5)
+      google-protobuf (~> 3.11)
+    googleauth (0.13.0)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.7)
-    grpc (1.20.0-universal-darwin)
-      google-protobuf (~> 3.7)
-      googleapis-common-protos-types (~> 1.0.0)
-    grpc-google-iam-v1 (0.6.9)
-      googleapis-common-protos (>= 1.3.1, < 2.0)
-      grpc (~> 1.0)
-    haml (5.1.0)
+      signet (~> 0.14)
+    grpc (1.30.1-universal-darwin)
+      google-protobuf (~> 3.12)
+      googleapis-common-protos-types (~> 1.0)
+    haml (5.1.2)
       temple (>= 0.8.0)
       tilt
-    httpclient (2.8.3)
-    i18n (1.6.0)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    jwt (2.1.0)
-    loofah (2.2.3)
+    jwt (2.2.1)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    memoist (0.16.0)
-    method_source (0.9.2)
-    mime-types (3.2.2)
+    memoist (0.16.2)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
+    minitest (5.14.1)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.3)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    os (1.0.1)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
+    os (1.1.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     piet (0.2.6)
       png_quantizator
     png_quantizator (0.2.1)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.0.3)
-    pusher (1.3.2)
-      httpclient (~> 2.7)
-      multi_json (~> 1.0)
-      pusher-signature (~> 0.1.8)
-    pusher-signature (0.1.8)
-    rack (2.0.7)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    psych (3.2.0)
+    public_suffix (4.0.5)
+    rack (1.6.13)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     rainbow (3.0.0)
+    rchardet (1.8.0)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
     rly (0.2.3)
-    rmagick (3.1.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rmagick (3.2.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.69.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rubocop (0.88.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.0)
-    rubyzip (1.2.2)
-    signet (0.11.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.2.0)
+      parser (>= 2.7.0.1)
+    ruby-progressbar (1.10.1)
+    rubyzip (2.3.0)
+    signet (0.14.0)
       addressable (~> 2.3)
-      faraday (~> 0.9)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    stackdriver-core (1.3.3)
+    stackdriver-core (1.4.0)
       google-cloud-core (~> 1.2)
-    temple (0.8.1)
-    thor (0.20.3)
+    temple (0.8.2)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tilt (2.0.9)
-    typhoeus (1.3.1)
+    tilt (2.0.10)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-    workspace (1.0.16)
+    unicode-display_width (1.7.0)
+    workspace (2.0.2)
       bundler (>= 1.12.0, < 3.0.0)
       mime-types (~> 3.2)
-    workspace-archive (1.0.16)
-      rubyzip (~> 1.2)
-      workspace (~> 1.0)
-    workspace-media (1.0.16)
+    workspace-archive (2.0.2)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      workspace (~> 2.0)
+    workspace-media (2.0.2)
       piet (~> 0.2)
       rmagick (~> 3.1)
-      workspace (~> 1.0)
-    workspace-net (1.0.16)
+      workspace (~> 2.0)
+    workspace-net (2.0.2)
       typhoeus (~> 1.3)
-      workspace (~> 1.0)
-    workspace-parse (1.0.16)
+      workspace (~> 2.0)
+    workspace-parse (2.0.2)
       haml (~> 5.0)
-      workspace (~> 1.0)
+      psych (~> 3.2)
+      workspace (~> 2.0)
 
 PLATFORMS
   ruby
@@ -217,4 +213,4 @@ DEPENDENCIES
   rubocop (>= 0.50)
 
 BUNDLED WITH
-   1.16.3
+   2.1.4

data/README.md

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

data/dronejob.gemspec

@@ -12,21 +12,19 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/MagLoft/dronejob"
   s.summary     = "DroneJob Drone Factory"
   s.description = "Scalable worker factory for ruby"
-  s.required_ruby_version = '~> 2.3'
-  s.required_rubygems_version = '~> 2.4'
+  s.required_ruby_version = '>= 2.4'
   s.add_dependency "bundler", "< 3.0.0", ">= 1.12.0"
-  s.add_runtime_dependency "actionpack", ">= 4.0.2"
-  s.add_runtime_dependency "activejob", ">= 4.0.2"
-  s.add_runtime_dependency "activejob-google_cloud_pubsub", ">= 0.7"
+  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 "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", ">= 1.0"
-  s.add_runtime_dependency "workspace-archive", ">= 1.0"
-  s.add_runtime_dependency "workspace-media", ">= 1.0"
-  s.add_runtime_dependency "workspace-net", ">= 1.0"
-  s.add_runtime_dependency "workspace-parse", ">= 1.0"
+  s.add_runtime_dependency "workspace", ">= 2.0"
+  s.add_runtime_dependency "workspace-archive", ">= 2.0"
+  s.add_runtime_dependency "workspace-media", ">= 2.0"
+  s.add_runtime_dependency "workspace-net", ">= 2.0"
+  s.add_runtime_dependency "workspace-parse", ">= 2.0"
   s.add_development_dependency "pry", ">= 0.10"
   s.add_development_dependency "rspec", ">= 3.3"
   s.add_development_dependency "rubocop", ">= 0.50"

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/modules/git.rb

@@ -7,6 +7,7 @@ module Dronejob
 
       included do
         attr_reader :git, :commits
+
         set_callback :job, :before, :git_init_job, if: :stateful?
         set_callback(:phase, :after, if: :stateful?) { git_commit(@phase) }
       end

data/lib/dronejob/modules/log.rb

@@ -16,9 +16,10 @@ module Dronejob
       included do
         cattr_accessor(:logger) do
           dronejob_log = option(:dronejob_log) || "STDOUT"
-          if dronejob_log == "STDOUT"
+          case dronejob_log
+          when "STDOUT"
             custom_logger = ActiveSupport::Logger.new(STDOUT)
-          elsif dronejob_log == "google"
+          when "google"
             logging = Google::Cloud::Logging.new(project: option(:google_cloud_project_id))
             resource = logging.resource("gce_instance", { zone: option(:google_cloud_zone), instance_id: option(:google_cloud_instance_id) })
             custom_logger = logging.logger(option(:dronejob_queue), resource)

data/lib/dronejob/modules/phases.rb

@@ -6,6 +6,7 @@ module Dronejob
 
       included do
         attr_accessor :phase, :phase_config
+
         set_callback(:phase, :around) { |r, block| logger.tagged(@phase, &block) }
       end
 

data/lib/dronejob/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.1
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -37,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +57,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,20 +67,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
+    - - "<"
+      - !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
@@ -100,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
@@ -134,70 +132,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: workspace-archive
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: workspace-media
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: workspace-net
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: workspace-parse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -267,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:
@@ -283,17 +277,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: DroneJob Drone Factory

data/lib/dronejob/modules/queue.rb

@@ -1,76 +0,0 @@
-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
-          @pubsub ||= Google::Cloud::Pubsub.new(project_id: option(:google_cloud_project_id), credentials: option(:google_cloud_service_account))
-        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,21 +0,0 @@
-module Dronejob
-  class Dronejob::Server
-    attr_reader :worker, :queue, :min_threads, :max_threads
-
-    def initialize(options)
-      @queue = options.dronejob_queue || "drone"
-      @min_threads = options.min_threads || 1
-      @max_threads = options.max_threads || 1
-    end
-
-    def start
-      @worker = ActiveJob::GoogleCloudPubsub::Worker.new(queue: @queue, pubsub: Dronejob::Base.pubsub, min_threads: self.min_threads, max_threads: self.max_threads)
-      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