dronejob 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e08177ceade5bbe5e6cc87316b4c6c5bd797613
-  data.tar.gz: f8d6934e24e5055edd50b51c982c9c122275f8e5
+  metadata.gz: 2f5e9e2f89bca4a32b5c4d2e22355dd8119a1e35
+  data.tar.gz: efe88d06655a102c61f49ed16e14c9f93372753b
 SHA512:
-  metadata.gz: a66d0011224e6351b3cf34664ae90ef97c928cf0fd7b2fafdd1268a8c0d714ead324046cf053c35aeb81df6e8a972559a98c74d855f059b1b970cedf61100de5
-  data.tar.gz: c6a7aa834e83ed43d9c400e4f80a062875bf4f46d1f53c56547d44945c8e0397fd68374925da5253120863537bae399be8cc84a91dd7c1b7f6086c0baba6f785
+  metadata.gz: cb7465f7d2a81c1a8c515164bcb0a7588f3edd9d91ac594b13b31a1579c1e5f02dee99f729639024feda35b07844a75abe6611b0faa951dd2b26100bc358e807
+  data.tar.gz: 60f63fd603c97fbfd8122c6179f4959f87cdd910c16acc2aa411bd753d50e1d158f2f17c663f580581a5b96727d11ff9eb91e76556456963f633261b214dd4e8

data/.gitignore

@@ -3,4 +3,5 @@ app/*
 tmp/*
 plugins/*
 /archive/*
+/dronejob.yml
 .bundle/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dronejob (1.2.9)
+    dronejob (1.3.0)
       actionpack (>= 4.0)
       activejob (~> 4.2)
       bundler (>= 1.3.0, < 2.0)
@@ -10,85 +10,83 @@ PATH
       google-cloud-storage (~> 0.23)
       haml (~> 4.0)
       open_uri_redirections (~> 0.2)
+      pusher (~> 1.3)
       rubyzip (~> 1.1)
       sidekiq (~> 4.1)
-      sidekiq-status (~> 0.6)
       thor (~> 0.19)
       typhoeus (~> 1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
       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 (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
       globalid (>= 0.3.0)
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     builder (3.2.3)
     coderay (1.1.1)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
+    declarative (0.0.9)
+    declarative-option (0.1.0)
     diff-lcs (1.2.5)
     digest-crc (0.4.1)
     erubis (2.7.0)
     ethon (0.10.1)
       ffi (>= 1.3.0)
-    faraday (0.11.0)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.17)
+    ffi (1.9.18)
     git (1.3.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    google-api-client (0.9.28)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    google-api-client (0.10.2)
       addressable (~> 2.3)
       googleauth (~> 0.5)
       httpclient (~> 2.7)
       hurley (~> 0.1)
       memoist (~> 0.11)
       mime-types (>= 1.6)
-      representable (~> 2.3.0)
-      retriable (~> 2.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
     google-cloud-core (0.21.1)
       googleauth (~> 0.5.1)
-    google-cloud-logging (0.23.2)
+    google-cloud-logging (0.24.2)
       google-cloud-core (~> 0.21.1)
-      google-gax (~> 0.6.0)
-      google-protobuf (~> 3.0)
-      googleapis-common-protos (~> 1.3)
-      grpc (~> 1.0)
-      orderedhash (= 0.0.6)
+      google-gax (~> 0.8.0)
       stackdriver-core (~> 0.21.0)
-    google-cloud-storage (0.23.1)
+    google-cloud-storage (0.24.0)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.9.11)
+      google-api-client (~> 0.10.0)
       google-cloud-core (~> 0.21.0)
-    google-gax (0.6.0)
-      googleapis-common-protos (~> 1.3.1)
+    google-gax (0.8.2)
+      google-protobuf (~> 3.2)
+      googleapis-common-protos (~> 1.3.5)
       googleauth (~> 0.5.1)
       grpc (~> 1.0)
       rly (~> 0.2.3)
-    google-protobuf (3.2.0)
-    googleapis-common-protos (1.3.4)
-      google-protobuf (~> 3.0)
+    google-protobuf (3.2.0.2-universal-darwin)
+    googleapis-common-protos (1.3.5)
+      google-protobuf (~> 3.2)
       grpc (~> 1.0)
     googleauth (0.5.1)
       faraday (~> 0.9)
@@ -98,18 +96,17 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.1.2)
+    grpc (1.2.5-universal-darwin)
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
     haml (4.0.7)
       tilt
     httpclient (2.8.3)
     hurley (0.2)
-    i18n (0.8.0)
-    json (1.8.6)
+    i18n (0.8.1)
     jwt (1.5.6)
     little-plugger (1.1.4)
-    logging (2.1.0)
+    logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     loofah (2.0.3)
@@ -123,16 +120,20 @@ GEM
     minitest (5.10.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    nokogiri (1.7.0.1)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     open_uri_redirections (0.2.1)
-    orderedhash (0.0.6)
     os (0.9.6)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
+    pusher (1.3.1)
+      httpclient (~> 2.7)
+      multi_json (~> 1.0)
+      pusher-signature (~> 0.1.8)
+    pusher-signature (0.1.8)
     rack (1.6.5)
     rack-protection (1.5.3)
       rack
@@ -147,9 +148,11 @@ GEM
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     redis (3.3.3)
-    representable (2.3.0)
-      uber (~> 0.0.7)
-    retriable (2.1.0)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.0.1)
     rly (0.2.3)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
@@ -165,13 +168,11 @@ GEM
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
     rubyzip (1.2.1)
-    sidekiq (4.2.9)
+    sidekiq (4.2.10)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
-    sidekiq-status (0.6.0)
-      sidekiq (>= 2.7)
     signet (0.7.3)
       addressable (~> 2.3)
       faraday (~> 0.9)
@@ -180,13 +181,13 @@ GEM
     slop (3.6.0)
     stackdriver-core (0.21.0)
     thor (0.19.4)
-    thread_safe (0.3.5)
-    tilt (2.0.6)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
     typhoeus (1.1.2)
       ethon (>= 0.9.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    uber (0.0.15)
+    uber (0.1.0)
 
 PLATFORMS
   ruby
@@ -197,4 +198,4 @@ DEPENDENCIES
   rspec (~> 3.3)
 
 BUNDLED WITH
-   1.13.7
+   1.14.6

data/app.rb

@@ -1,2 +1,6 @@
 require "dronejob"
-Dronejob.start
+Dronejob::Loader.load
+Dronejob::Base.queue_adapter = "sidekiq"
+Sidekiq.configure_server do |config|
+  config.redis = { url: Dronejob::Base.options.redis_url }
+end

data/dronejob.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "thor", "~> 0.19"
   s.add_runtime_dependency "haml", "~> 4.0"
   s.add_runtime_dependency "sidekiq", "~> 4.1"
-  s.add_runtime_dependency "sidekiq-status", "~> 0.6"
   s.add_runtime_dependency "rubyzip", "~> 1.1"
   s.add_runtime_dependency "activejob", "~> 4.2"
   s.add_runtime_dependency "typhoeus", "~> 1.0"
@@ -27,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "open_uri_redirections", "~> 0.2"
   s.add_runtime_dependency "google-cloud-storage", "~> 0.23"
   s.add_runtime_dependency "google-cloud-logging", "~> 0.23"
+  s.add_runtime_dependency "pusher", "~> 1.3"
   s.add_development_dependency "rspec", "~> 3.3"
   s.add_development_dependency "pry", "~> 0.10"
   s.files        = `git ls-files`.split("\n")

data/lib/dronejob/modules/core.rb

@@ -10,7 +10,7 @@ module Dronejob
       def perform(params)
         @job_params = params.to_h
         @job_identifier = Dronejob::Loader.identifier_for(self)
-        set_parameters(params)
+        self.params = params
         validate_parameters!
         run_callbacks :job do
           run_phases

data/lib/dronejob/modules/params.rb

@@ -22,7 +22,7 @@ module Dronejob
         end
       end
       
-      def set_parameters(params)
+      def params=(params)
         @params = params.map{|name, value| [name, transform_parameter(name, value)]}.to_h
       end
       
@@ -30,6 +30,14 @@ 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
+          end
+          if config[:type] === :boolean
+            return true if value === "true"
+            return false if value === "false"
+          end
         end
         value
       end
@@ -39,6 +47,16 @@ module Dronejob
         @params[key.to_s]
       end
       
+      def convert_param(value, config)
+        return nil if value.nil?
+        
+        return value
+      end
+      
+      def params
+        @params
+      end
+      
       def validate_parameters!
         # Fill default parameters
         self.class.params.each do |param_name, param_config|

data/lib/dronejob/modules/queue.rb

@@ -1,3 +1,4 @@
+require "pusher"
 module Dronejob
   module Modules
     module Queue
@@ -20,19 +21,30 @@ module Dronejob
         end
       end
       
-      def publish_status(data={}, status="working", backend=false)
+      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
-        data[:secret_key] = option(:secret_key) if backend
-        Redis.new(url: option(:redis_url)).publish("processes_#{backend ? 'backend' : data[:user_id]}", data.to_json)
+        queue = option(:dronejob_queue)
+        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, backtrace: e.backtrace, progress: 100}, "failed") if should_notify?
+        publish_status({title: self.title, description: e.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.2.9"
+  VERSION = "1.3.0"
 end

data/lib/dronejob.rb

@@ -10,17 +10,4 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: sidekiq-status
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +184,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.23'
+- !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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +242,6 @@ files:
 - bin/dronejob
 - dronejob.gemspec
 - lib/dronejob.rb
-- lib/dronejob/banner.rb
 - lib/dronejob/base.rb
 - lib/dronejob/command.rb
 - lib/dronejob/loader.rb

data/lib/dronejob/banner.rb

@@ -1,12 +0,0 @@
-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