berta 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f303b270d4d0dd7c702ed6aef25ce65d0819be0b
-  data.tar.gz: e1ea28fdb1e5be5a1435b51b574eb76f6fca1d3e
+  metadata.gz: 82c2cf0ec358add6bb0761c552826a77786f56e9
+  data.tar.gz: c1361678b6f0207229a8c02683313c753bf2a467
 SHA512:
-  metadata.gz: '09648726d9344859d11820f357cb99393d65ba33a2dd1120198417b73d9f8a45199df01fe26288e5f6a5e1baceeae525eace70cf4f801b6ee13ea0e159fe005e'
-  data.tar.gz: fd7ba4a8c48194ef9768f7522d3d8be46d664ec88e74c0acd45d2e70af472a363ba9a466de07b9be4209951621364fd6963a3e15fc965ee9907e73c487b08696
+  metadata.gz: 823f3e32829e096a4ac82f0a2a1de3da87759aae0133cb9639c1d9ffbae2f6cf1d61a8e8a8229efdc507dd7a7f31282b9d463b4d076f3c4ae7af21d8c5084845
+  data.tar.gz: 41fc6aea27a9662444ba370aaf161ad756bc66fbaad307cb704b722f0ad21dea5a4443038e71dca3f634e3d3cdf0eb95af62d842e12cede84ed9e94f6b4de95a

data/config/berta.yml

@@ -19,3 +19,7 @@ berta:
   dry-run: false                   # Berta won't change anything on running instance of OpenNebula
   debug: false                     # Debug mode
   email-template:                  # Email template to use for notification
+  email-type: smtp                 # What delivery method to use
+  smtp:
+    address:
+    port:

data/lib/berta/cli.rb

@@ -64,6 +64,16 @@ module Berta
                  required: true,
                  default: safe_fetch(%w[email-template]),
                  type: :string
+    class_option :'email-type',
+                 required: true,
+                 default: safe_fetch(%w[email-type]),
+                 type: :string
+    class_option :'smtp-address',
+                 default: safe_fetch(%w[smtp address]),
+                 type: :string
+    class_option :'smtp-port',
+                 default: safe_fetch(%w[smtp port]),
+                 type: :numeric
 
     desc 'cleanup', 'Task that sets all expiration to all vms and notifies users'
     def cleanup
@@ -105,6 +115,9 @@ module Berta
       settings['logging']['file'] = options['logging-file']
       settings['logging']['level'] = options['logging-level']
       settings['email-template'] = options['email-template']
+      settings['email-type'] = options['email-type']
+      settings['smtp']['address'] = options['smtp-address']
+      settings['smtp']['port'] = options['smtp-port']
       Berta::Settings.merge!(settings)
     end
 
@@ -129,7 +142,10 @@ module Berta
     end
 
     def initialize_email
-      Mail.defaults { delivery_method :sendmail }
+      email_type = Berta::Settings['email-type']
+      params = {}
+      params = Berta::Settings[email_type].each_with_object({}) { |(k, v), h| h[k.to_sym] = v } if Berta::Settings[email_type]
+      Mail.defaults { delivery_method email_type.to_sym, params }
     end
   end
 end

data/lib/berta/notification.rb

@@ -20,7 +20,7 @@ module Berta
       text = template.render(Object.new, name: name, email: email, type: type, vms: vms_hash(vms))
       logger.info "Sending mail to entity: #{name} on email: #{email}"
       logger.debug { text }
-      Mail.new(text).deliver unless Berta::Settings['dry-run']
+      Mail.deliver(text) unless Berta::Settings['dry-run']
     end
 
     def vms_hash(vms)

data/lib/berta/utils/opennebula/helper.rb

@@ -21,9 +21,7 @@ module Berta
           # @raise [Berta::Errors::OpenNebula::ResourceStateError]
           # @raise [Berta::Errors::OpenNebula::ResourceRetrievalError]
           def handle_error
-            unless block_given?
-              raise Berta::Errors::OpenNebula::StubError, 'OpenNebula service-wrapper was called without a block!'
-            end
+            raise Berta::Errors::OpenNebula::StubError, 'OpenNebula service-wrapper was called without a block!' unless block_given?
             return_value = yield
             return return_value unless ::OpenNebula.is_error?(return_value)
             raise decode_error(return_value.errno), return_value.message

data/lib/berta/version.rb

@@ -1,3 +1,3 @@
 module Berta
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berta
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Dusan Baran
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler