berta 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8df6d853b8b26247ece5370a887b57f983f8680
-  data.tar.gz: 6c643a92a154fd50bbee3e2fd306db34273d89f3
+  metadata.gz: 4e3d5595d6f87b950bd563bf4131046970d8697d
+  data.tar.gz: f05ff671fa9187a3b6f18a366b312e893ea50fe2
 SHA512:
-  metadata.gz: 5e09339128c099ccbbf4ea5145e9c5f9a870a02a41912f0088a5d3b27f6f4f8df3b4a27a7b3ec0b1d72c9124add90de81f28d5e8c8ee222876d27e8660636860
-  data.tar.gz: fb69818b1b5e4781d8c28bd3fc441e5f5853252a77fc991e36ceb7180d0ab23056eb183cffdddc697518c348b6c859508f38dac4d9d0a53bc50225b6f15251c7
+  metadata.gz: 21df07bb8eb98444a58e5c30fe78e38805ea9816411f912a418439571bc556e620460701c27cd833f97f3a4f3c6df745433dcc24e2b99d1c58ac04010b310bf2
+  data.tar.gz: 8f66e09d3f8e66e5b3870fc7c528fd9fcd79db8c7ec6aef49ea59419f30a0e5cfc5e8891e7db6994187d5dcd271e7f188fbb06b03f56bc4ae8136f18e8b0a154

data/.travis.yml

@@ -3,11 +3,14 @@ sudo: false
 language: ruby
 rvm:
     - ruby-head
-    - 2.2.0
+    - 2.3.4
+    - 2.2.7
+    - 2.1.10
 
 matrix:
     allow_failures:
         - rvm: ruby-head
+        - rvm: 2.1.10
 fast_finish: true
 
 branches:

data/berta.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.email = 'dbaran@hotmail.sk'
   s.homepage = 'https://github.com/dudoslav/berta'
   s.license = 'Apache License, Version 2.0'
+  s.required_ruby_version = '>= 2.1'
 
   s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/berta/version.rb

@@ -1,3 +1,3 @@
 module Berta
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
 end

data/lib/berta/virtual_machine_handler.rb

@@ -18,15 +18,12 @@ module Berta
     # invalid expiration it will be deleted. Other expirations
     # are kept.
     def update
-      exps = expirations.keep_if(&:in_expiration_interval?)
-      exps << next_expiration unless default_expiration
-      if exps == expirations
-        logger.debug "No changes in expirations for vm #{handle['ID']}"
-      else
-        update_expirations(exps)
-      end
+      exps = remove_invalid(expirations)
+      exps = add_default_expiration(exps)
+      return if exps == expirations
+      update_expirations(exps)
     rescue Berta::Errors::BackendError => e
-      logger.error "#{e.message} on vm with id #{vm.handle['ID']}"
+      logger.error "#{e.message} on vm with id #{handle['ID']}"
     end
 
     # Sets notified flag value in USER_TEMPLATE to default expiration
@@ -99,6 +96,25 @@ module Berta
 
     private
 
+    def remove_invalid(exps)
+      valid = exps.select(&:in_expiration_interval?)
+      if valid.length != exps.length
+        logger.info "Removing #{exps.length - valid.length} invalid expirations on vm with" \
+                    "id=#{handle['ID']} usr=#{handle['UNAME']} grp=#{handle['GNAME']}"
+      end
+      valid
+    end
+
+    def add_default_expiration(exps)
+      unless default_expiration
+        new_default = next_expiration
+        exps << new_default
+        logger.info "Adding default expiration on vm with id=#{handle['ID']} usr=#{handle['UNAME']} grp=#{handle['GNAME']}"\
+          ", expires at #{Time.at(new_default.time)}"
+      end
+      exps
+    end
+
     # Sets array of expirations to vm, rewrites all old ones.
     # Receiving empty array wont change anything.
     #
@@ -107,7 +123,6 @@ module Berta
     def update_expirations(exps)
       template = exps.inject('') { |temp, exp| temp + exp.template }
       return if template == ''
-      logger.info "Setting expirations on vm with id=#{handle['ID']} usr=#{handle['UNAME']} grp=#{handle['GNAME']}"
       logger.debug template.delete("\n ")
       send_update(template)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berta
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Dusan Baran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -296,7 +296,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="