berta 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91063490154b9f650a1fb3e09f1f7b26a813750a
-  data.tar.gz: 03c2636a66ee408f3c1242c7513d0095d72320c5
+  metadata.gz: ececb77853659dd54a17d796131da207313ae58d
+  data.tar.gz: a884181a2657eacfc072097d672fbae909abf4ef
 SHA512:
-  metadata.gz: 974a9efb0a0e3fee64b9e4339012a223ab12b5c991de92b7568c9e23bc6b3e7138b1eafda9fbbd24a17060cd196d427b2c98055b473a0bd25aec81f3e1354512
-  data.tar.gz: 8fecd681443d6b73202be53b00ad1dcb428dde17c6298579b87a6dccad1e113f854cd6fdd152a41b84543ee55762059f4b437de5bbbc4da4b454e21260e9095d
+  metadata.gz: 2ccddda1fb68d8c57cadec7240257de7f87f01efa89149718920b7aaa2ab4b1803630543d851e933c6eea22dea0705a5cd384e3298146c4e17bc69d81fadb9f0
+  data.tar.gz: a19d4303d08b671a4deb6c18475ba39a00887b5191cca89790c89bca1e94ce2241028e41b60e62d6d4d658753c584641d2ce5d90415456dd0dcb6757264a0f8b

data/berta.gemspec

@@ -1,6 +1,12 @@
+# coding: utf-8
+
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'berta/version'
+
 Gem::Specification.new do |s|
   s.name = 'berta'
-  s.version = '1.1.1'
+  s.version = Berta::VERSION
   s.summary = 'Berta VM expiration tool'
   s.description = 'Berta will check all VMs on OpenNebula cloud for expiration date'
   s.authors = ['Dusan Baran']

data/config/berta.yml

@@ -13,7 +13,7 @@ berta:
     groups:           # VMs in this groups will be ignored
     clusters:         # VMs in this clusters will be ignored
   logging:
-    file: /var/log/berta/berta.log # File ro write log to. To turn off file logging leave this field empty
+    file: /var/log/berta/berta.log # File to write log to. To turn off file logging leave this field empty
     level: error # Logging level
-  dry-run: false # Berta wont change anything on running instance of OpenNebula
+  dry-run: false # Berta won't change anything on running instance of OpenNebula
   debug: false # Debug mode

data/config/email.erb

@@ -1,4 +1,4 @@
-<%# Avaliable parametes: %>
+<%# Available parameters: %>
 <%# [String] user_name   %>
 <%# [String] user_email  %>
 <%# [Array<Hash>] vms, Array of Hashes with values: %>

data/lib/berta.rb

@@ -1,5 +1,6 @@
 # Main Berta module
 module Berta
+  autoload :Version, 'berta/version'
   autoload :Service, 'berta/service'
   autoload :VirtualMachineHandler, 'berta/virtual_machine_handler'
   autoload :ExpirationManager, 'berta/expiration_manager'

data/lib/berta/cli.rb

@@ -63,6 +63,12 @@ module Berta
       initialize_logger(options)
       Berta::CommandExecutor.cleanup
     end
+
+    desc 'version', 'Prints berta version'
+    def version
+      $stdout.puts Berta::VERSION
+    end
+
     default_task :cleanup
 
     private

data/lib/berta/notification_manager.rb

@@ -79,10 +79,10 @@ module Berta
       user_name = user['NAME']
       raise Berta::Errors::Entities::NoUserEmailError, "User: #{user_name} with id: #{user['ID']} has no email set" \
         unless user_email
-      mail = Mail.new(email_template.render(Hash,
-                                            user_email: user_email,
-                                            user_name: user_name,
-                                            vms: vms_data(vms)))
+      email_text = email_template.render(Hash, user_email: user_email, user_name: user_name, vms: vms_data(vms))
+      logger.debug "Sending mail to user: #{user_name} with email: #{user_email}:\n#{email_text}"
+      return if Berta::Settings['dry-run']
+      mail = Mail.new(email_text)
       mail.delivery_method :sendmail
       mail.deliver
     end

data/lib/berta/version.rb

@@ -0,0 +1,3 @@
+module Berta
+  VERSION = '1.1.2'.freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berta
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Dusan Baran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -278,6 +278,7 @@ files:
 - lib/berta/utils.rb
 - lib/berta/utils/opennebula.rb
 - lib/berta/utils/opennebula/helper.rb
+- lib/berta/version.rb
 - lib/berta/virtual_machine_handler.rb
 homepage: https://github.com/dudoslav/berta
 licenses:
@@ -299,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Berta VM expiration tool