dronejob 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3279b04803e22fc7a01e3ca3c4cb46f4f202b85
-  data.tar.gz: 3811612ce2b9408bf25cfa424466257cbe579d56
+  metadata.gz: 5d5e8318926dc2e1172dd75fde843e138c07d957
+  data.tar.gz: 84d2f9eff533a50c1bbe198edf695d8f526a6216
 SHA512:
-  metadata.gz: 7fd4183d69c358ba7120e2617bdd3eb351f6afa3b091571ee127623f0fda7eb166c845e697e025e1afdc055b7556c7c22c1ab5df453b098f5df87ff8b7b7988b
-  data.tar.gz: 6b7131500b197c157d1952524f675ff79d75748eb26bc86e0cdbc9daf71ee2c270b4d760bac8286cf6d2643294c0bf05e096fbaa8d559709a8d01e2199bd5fe8
+  metadata.gz: 727c3da9be4f677294e675ebcbc4c7f41ad513e861c20d86497a94af31db90e70ba324c61b2df5f4527cd744f144f6fa549a6b998cb576e76dd2f85d80a8d94c
+  data.tar.gz: d6f86e969fbb77d7324acd26436dcef4e1b9d1557f49de0a05d953b28e59ebc6a985e8f4193db64f15e20cecd5d38b9b00c88ce7e7feccb6310765f003d9ec54

data/.rubocop.yml

@@ -20,7 +20,7 @@ Lint/UselessAssignment:
     - '**/spec/**/*'
 
 # We could potentially enable the 2 below:
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   Enabled: false
 
 Layout/AlignHash:
@@ -41,7 +41,7 @@ Style/NumericPredicate:
 Lint/HandleExceptions:
   Enabled: false
 
-Lint/RescueWithoutErrorClass:
+Style/RescueStandardError:
   Enabled: false
 
 # Cop supports --auto-correct.

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dronejob (1.5.1)
-      actionpack (>= 5.1)
-      activejob (>= 5.1)
+    dronejob (1.6.0)
+      actionpack (>= 4.0.2)
+      activejob (>= 4.0.2)
       bundler (>= 1.12.0, < 3.0.0)
       git (>= 1.3)
       google-cloud-logging (>= 1.2)
@@ -54,7 +54,7 @@ GEM
       ffi (>= 1.3.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
+    ffi (1.11.0)
     git (1.5.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -74,7 +74,7 @@ GEM
       googleauth (>= 0.6.2, < 0.10.0)
       grpc (>= 1.7.2, < 2.0)
       rly (~> 0.2.3)
-    google-protobuf (3.7.1-universal-darwin)
+    google-protobuf (3.7.1)
     googleapis-common-protos (1.3.9)
       google-protobuf (~> 3.0)
       googleapis-common-protos-types (~> 1.0)
@@ -88,10 +88,10 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
-    grpc (1.20.0-universal-darwin)
+    grpc (1.20.0)
       google-protobuf (~> 3.7)
       googleapis-common-protos-types (~> 1.0.0)
-    haml (5.0.4)
+    haml (5.1.0)
       temple (>= 0.8.0)
       tilt
     httpclient (2.8.3)
@@ -110,7 +110,7 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     os (1.0.1)
@@ -140,7 +140,7 @@ GEM
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
     rainbow (3.0.0)
-    redis (4.1.0)
+    redis (4.1.1)
     rly (0.2.3)
     rmagick (2.16.0)
     rspec (3.8.0)
@@ -156,13 +156,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.68.1)
+    rubocop (0.69.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
+      unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.0)
     rubyzip (1.2.2)
     sidekiq (5.2.7)
@@ -185,7 +185,7 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
     workspace (1.0.15)
       bundler (>= 1.12.0, < 3.0.0)
       mime-types (~> 3.1)
@@ -213,4 +213,4 @@ DEPENDENCIES
   rubocop (>= 0.50)
 
 BUNDLED WITH
-   2.0.1
+   1.16.3

data/dronejob.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dronejob/version'
 
@@ -12,23 +12,23 @@ 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.0'
+  s.required_ruby_version = '~> 2.3'
   s.required_rubygems_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 "git", ">= 1.3"
-  s.add_runtime_dependency "thor", ">= 0.19"
-  s.add_runtime_dependency "sidekiq", ">= 5.0"
-  s.add_runtime_dependency "activejob", ">= 5.1"
-  s.add_runtime_dependency "actionpack", ">= 5.1"
   s.add_runtime_dependency "google-cloud-logging", ">= 1.2"
   s.add_runtime_dependency "pusher", ">= 1.3"
+  s.add_runtime_dependency "sidekiq", ">= 5.0"
+  s.add_runtime_dependency "thor", ">= 0.19"
   s.add_runtime_dependency "workspace", ">= 1.0"
-  s.add_runtime_dependency "workspace-parse", ">= 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_development_dependency "rspec", ">= 3.3"
+  s.add_runtime_dependency "workspace-parse", ">= 1.0"
   s.add_development_dependency "pry", ">= 0.10"
+  s.add_development_dependency "rspec", ">= 3.3"
   s.add_development_dependency "rubocop", ">= 0.50"
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

data/lib/dronejob/command.rb

@@ -66,6 +66,7 @@ module Dronejob
       Workspace::Dir.new(File.join(Dir.pwd, "tmp/jobs")).each_dir do |dir|
         dronejob_variables = dir.file("dronejob.yml").read_yaml
         next unless dronejob_variables[:dronejob_completed] == true
+
         Dronejob::Base.log("info", "Archiving #{dir.name}")
         archive_file = archive_dir.file("#{dir.name}.zip")
         if archive_file.exists? and !options.force

data/lib/dronejob/modules/git.rb

@@ -75,6 +75,7 @@ module Dronejob
             info("starting from phase #{param(:from)}")
             phase = prev_phase(param(:from))
             raise("phase '#{param(:from)}' not found!") if phase.nil? or @commits[phase.to_s].nil?
+
             git_reset(phase.to_s)
           else
             git_reset

data/lib/dronejob/modules/params.rb

@@ -30,6 +30,7 @@ module Dronejob
         if (config = self.class.param_config(name))
           return Base64.strict_decode64(value) if config[:type] == :base64
           return JSON.parse(Base64.strict_decode64(value)) if config[:type] == :json64
+
           if config[:type] == :numeric
             return Integer(value) if Integer(value) rescue false
             return Float(value) if Float(value) rescue false

data/lib/dronejob/modules/phases.rb

@@ -29,6 +29,7 @@ module Dronejob
 
           # initialize phase
           fail "Phase not found: '#{phase}'" unless self.respond_to?(phase)
+
           run_callbacks :phase do
             if completed_phase?(phase) and !@phase_config[:always_run]
               info("already completed")
@@ -88,6 +89,7 @@ module Dronejob
         index = phases.index(phase.to_sym)
         return nil if index.nil?
         return "start" if index == 0
+
         phases[index - 1]
       end
     end

data/lib/dronejob/modules/queue.rb

@@ -39,11 +39,12 @@ module Dronejob
         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(e)
-        publish_status({ title: self.title, description: e.message, phase: @phase, progress: 100 }, "failed") if should_notify?
+      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

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,103 +31,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.12.0
 - !ruby/object:Gem::Dependency
-  name: git
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: activejob
+  name: google-cloud-logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: pusher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: google-cloud-logging
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: pusher
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: workspace
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: workspace-parse
+  name: workspace-archive
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,7 +157,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: workspace-archive
+  name: workspace-media
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,7 +171,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: workspace-media
+  name: workspace-net
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,7 +185,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: workspace-net
+  name: workspace-parse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,33 +199,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -285,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"