eco-helpers 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2efa416d986a9c212bc99ec69bf667778392737f0c635d54a18d19ff8bced9b
-  data.tar.gz: 7747bbfa3253f537d08b65148f8fc7418b0f4190d2754873daeb0b9fc5642b41
+  metadata.gz: d691b4d2eccce894adbff1cfa42b20adb8a24a06bbb7518e7367458f91fd7f96
+  data.tar.gz: 1fd8f054a63d1bd3204bbbc13dcebda52edee0160db37746ec4c50521b381970
 SHA512:
-  metadata.gz: 60457d180398b01377aaeb6bced7c57fb24010da7acecbca8cbdac46a16d617759a23175e6b7be8c2b8eb4ec3834119e5173d8f2ff14212493a3db35298441ed
-  data.tar.gz: 5fab0a498910811d86f63419193aa02d1aebd52d4a1c63db1d11c173d9905f651e47c1082090ef0a83236f8c1d48d2c206572d25b1881b05dddc6cbc4be69c0e
+  metadata.gz: 2b5abae5d92712bcf46f0559221679d1bb47970aa24c902bb91edeee5f40b43a2e3eb209b2980bfe228cf3bd0a47d13c64b3d4bb4ed3dba51846ab31e653d135
+  data.tar.gz: dc0d66aefeb659f8ee7d64a0462c49df1d77667584d09257c64beadd57da5cba7e6c9712419d42651c0607fc606803d57e963e00925f8966109b6a0162d369dd

data/lib/eco/api/common/session/base_session.rb

@@ -44,14 +44,26 @@ module Eco
             enviro.mailer
           end
 
+          def mailer?
+            enviro.mailer?
+          end
+          
           def sftp
             enviro.sftp
           end
-          
+
+          def sftp?
+            enviro.sftp?
+          end
+
           def s3uploader
             enviro.s3uploader
           end
 
+          def s3uploader?
+            enviro.s3uploader?
+          end
+
           def logger
             enviro.logger
           end

data/lib/eco/api/common/session/environment.rb

@@ -28,15 +28,33 @@ module Eco
           end
 
           def mailer
-            @mailer      ||= Eco::API::Common::Session::Mailer.new(enviro: self)
+            if mailer?
+              @mailer      ||= Eco::API::Common::Session::Mailer.new(enviro: self)
+            end
+          end
+
+          def mailer?
+            config.mailer.configured?
           end
 
           def sftp
-            @sftp        ||= Eco::API::Common::Session::SFTP.new(enviro: self)
+            if sftp?
+              @sftp        ||= Eco::API::Common::Session::SFTP.new(enviro: self)
+            end
+          end
+
+          def sftp?
+            config.sftp.configured?
           end
 
           def s3uploader
-            @s3uploader  ||= Eco::API::Common::Session::S3Uploader.new(enviro: self)
+            if s3uploader?
+              @s3uploader  ||= Eco::API::Common::Session::S3Uploader.new(enviro: self)
+            end
+          end
+
+          def s3uploader?
+            config.s3storage.configured?
           end
 
           def api

data/lib/eco/api/session.rb

@@ -208,7 +208,12 @@ module Eco
       # Sends an email
       # @see Eco::API::Common::Session::Mailer#mail
       def mail(**kargs)
-        mailer.mail(**kargs)
+        if mailer?
+          mailer.mail(**kargs)
+        else
+          logger.error("You are trying to use the mailer, but it's not configured")
+          nil
+        end
       end
 
       # Uploads content into a file, a file or a directory to S3
@@ -222,19 +227,24 @@ module Eco
       # @param link [Boolean] **return** _link(s)_ (`true`) or _path(s)_ (`false`: default)
       # @return [String, Array<String>] either paths to S3 objects if `link` is `false`, or _link_ otherwise
       def s3upload(content: nil, file: nil, directory: nil, recurse: false, link: false)
-        if content == :target
-          path = self.do.s3upload_targets
-        elsif content && file
-          path = s3uploader.upload(file, content)
-        elsif file
-          path = s3uploader.upload_file(file)
-        elsif directory
-          path = s3uploader.upload_directory(directory, recurse: recurse)
+        if s3uploader?
+          if content == :target
+            path = self.do.s3upload_targets
+          elsif content && file
+            path = s3uploader.upload(file, content)
+          elsif file
+            path = s3uploader.upload_file(file)
+          elsif directory
+            path = s3uploader.upload_directory(directory, recurse: recurse)
+          else
+            logger.error("To use Session.s3upload, you must specify either directory, file or content and file name")
+          end
+          return path unless link
+          s3uploader.link(path)
         else
-          logger.error("To use Session.s3upload, you must specify either directory, file or content and file name")
+          logger.error("You are trying to use S3 uploader, but it's not configured")
+          nil
         end
-        return path unless link
-        s3uploader.link(path)
       end
 
       private

data/lib/eco/api/session/batch/feedback.rb

@@ -87,9 +87,9 @@ module Eco
             requests ||= job.requests
             [].tap do |msg|
               if !requests || !requests.is_a?(Enumerable) || requests.empty?
-                msg << "#{"*" * 20} Nothing for #{signature} so far :)  #{"*" * 20}"
+                msg << "#{"*" * 10} Nothing for #{signature} so far :)  #{"*" * 10}"
               else
-                header = "#{"*"*20}  #{signature} - Feedback Sample #{"*"*20}"
+                header = "#{"*"*10}  #{signature} - Feedback Sample #{"*"*10}"
                 msg << header unless only_stats
                 unless only_stats
                   sample_length = 1
@@ -100,7 +100,7 @@ module Eco
                   end
                   msg << "#{sample.slice(0, sample_length).pretty_inspect}"
                 end
-                msg << "#{"+"*5}  STATS  (job '#{name}')  +++  #{type.to_s.upcase} length: #{requests.length}  #{"+"*5}"
+                msg << "#{"+"*3}  #{type.to_s.upcase} length: #{requests.length}  #{"+"*3}  STATS  (job '#{name}')  #{"+"*3}"
                 msg << "#{request_stats(requests).message}"
                 msg << "*" * header.length unless only_stats
               end

data/lib/eco/api/session/config/mailer.rb

@@ -4,6 +4,11 @@ module Eco
       class Config
         class Mailer < BaseConfig
 
+          def configured?
+            required = access_key_id && secret_access_key && region
+            !!required
+          end
+
           def to=(value)
             self["to"] = value
           end
@@ -11,7 +16,7 @@ module Eco
           def to
             self["to"]
           end
-          
+
           def from=(value)
             self["from"] = value
           end

data/lib/eco/api/session/config/s3_storage.rb

@@ -4,6 +4,11 @@ module Eco
       class Config
         class S3Storage < BaseConfig
 
+          def configured?
+            required = bucket_name && prefix && access_key_id && secret_access_key && region
+            !!required
+          end
+
           def bucket_name=(value)
             self["bucket_name"] = value
           end

data/lib/eco/api/session/config/sftp.rb

@@ -4,6 +4,11 @@ module Eco
       class Config
         class SFTP < BaseConfig
 
+          def configured?
+            required = host && user && key_file
+            !!required
+          end
+
           def host=(value)
             self["host"] = value
           end
@@ -51,7 +56,7 @@ module Eco
           def remote_folder
             base_path + "/" + enviro_subpath
           end
-          
+
         end
       end
     end

data/lib/eco/api/session/config/workflow.rb

@@ -237,7 +237,7 @@ module Eco
               raise i
             rescue Exception => e
               self.rescue.call(e, io) if self.rescue
-              raise e
+              raise
             end
             io
           end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Oscar Segura