dronejob 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e55da2deb1f0420ab6ea93b7812d61c5c26ed9
-  data.tar.gz: ed3d1cf01b2187da443ec31bf9901506098ceb2b
+  metadata.gz: 3a053063871d054184346aa3ea1acbb3c6f92dca
+  data.tar.gz: c5a3c8fb448ba5a0053535c77b1f80cfdc4c0673
 SHA512:
-  metadata.gz: 1393f73c798ca97090f1a64c156b43197e0f126b3e937ce6d921aa961b458e0be36421f8e510f834c8ec5edb67ddecb3ad597f098c779b94c8f661fe845e94f8
-  data.tar.gz: 08330299e5a45b88b5887d35099f81b1d7bd9a4dd955f237baa0154906b0b19a24fffbdf7dfdbf69240a26f17e5eb397aa4d4aad6c1d94447f913396e289f493
+  metadata.gz: 04dd42e28b428bb1262c457987ebcae4b23ba1b4b182b1b590ff3ae7cb301e2732dfadfb51314c3369604cd17108968d278ce7f3c5a2d3b30bb4326547cfd2f4
+  data.tar.gz: 8549ea35cf607779092d917024f3a354ed342e2c2fa7039900969eb1f3910f6865bd486107426bfa9d3f02594f2c610a6f6775dc60d4f34a06cc97c956908156

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dronejob (1.2.6)
+    dronejob (1.2.7)
       actionpack (>= 4.0)
       activejob (~> 4.2)
       bundler (>= 1.3.0, < 2.0)
@@ -173,4 +173,4 @@ DEPENDENCIES
   rspec (~> 3.3)
 
 BUNDLED WITH
-   1.13.2
+   1.13.6

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

data/lib/dronejob/workspace_file.rb

@@ -88,5 +88,10 @@ module Dronejob
       FileUtils.mv(to_s, dir.file(filename).to_s) if exists?
       @path = dir.file(filename).path
     end
+    
+    def valid_p12?(password="")
+      require "openssl"
+      OpenSSL::PKCS12::new(contents, password).certificate.not_after > DateTime.now rescue false
+    end
   end
 end

data/lib/dronejob/workspace_file/net.rb

@@ -18,9 +18,19 @@ module Dronejob
         bucket = storage.bucket(options[:bucket])
         bucket.create_file(to_s, key, acl: "public", content_type: options[:content_type])
       end
-    
-      def cdn_download(key)
-        download("#{Dronejob::Base.option(:cdn_scheme)}://#{Dronejob::Base.option(:cdn_bucket)}/#{key}")
+      
+      def cdn_download(key, cdn_bucket: nil, project_id: nil, secure: false)
+        cdn_bucket ||= Dronejob::Base.option(:cdn_bucket)
+        project_id ||= Dronejob::Base.option(:google_cloud_project_id)
+        if secure
+          require "google/cloud/storage"
+          storage = Google::Cloud::Storage.new(project: project_id, keyfile: File.expand_path("~/gcloud-service-account.json"))
+          bucket = storage.bucket(cdn_bucket)
+          bucket.file(key)&.download(to_s)
+          self
+        else
+          download("#{Dronejob::Base.option(:cdn_scheme)}://#{cdn_bucket}/#{key}")
+        end
       end
     
       def queue_download(url, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Tobias Strebitzer