vgh 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGJlNGNjOGExZTk4MzI3Y2UzNzU5ZGNmYTEwY2M3ZjllYjEyZjQ5Mw==
+    YWMxODg1NjcyZTRkZjM2MWIyMjJhMTM4ZDVmMjdjMzE2ODgyYjI0Yg==
   data.tar.gz: !binary |-
-    OTAyZGQ1MTk5YzcyNGM0NjQyZTM1YmIzMWIyOGY0N2NiNDU3MGJlYw==
+    ZDFiNjkwNDIwNjA4NWMwZjI4ZGQ5ZDJjM2E4YTVlOGZkMDcyMDZjOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTI4N2EwZGEyMzM5OWZlYjg1ZWE5NWM0ZjVlMzliNTBlYjk0NDBkZTBkMDNk
-    MmY3NWZiMGM4Njg3NzQxMTkzMjQ4NGVjM2M5ZDNhMDdmYjEyZWViNGUxNGVj
-    NTkzYjZmYWMxODM0ZGFiYzVlOWE1YTYwZjM5MDM3MzM5Yjc2ZTA=
+    NTY3ZmEzZTM4ODdmZTBlOWM1NWM0NzI5N2RmNmQxNDVlNDQyYmM2Y2MxYWE5
+    MGI1ZGExYzJjNmUzZjc4YzY1ZWQyNGMzNjEwNjgwOGJkNWY1ZWNkMDc3ZDVm
+    ZThlNGFhMmNiZTRkYmJlOTQ3MTBhZDI2YmFmM2VjNWNmNGE5M2E=
   data.tar.gz: !binary |-
-    YWJmOWU0MTdmYjQwODA2ZjFhMzZiYTcyOGI5MzVmZjY5Mzc1NTM1ODk4NWQy
-    NWI3MDBiMjhiMDhiMDQ3ZmIxNzQ0NjY3OGFiMjUyMjE4NDU4MGM5ZDYyOGU5
-    MjgxYmEzNmJiMjQwZmNhMDJmYjBmY2Y1Mzg4ODViZDRmMzNkNmM=
+    NDBhMWJiN2Y3MmMzNDQ4MWEyZDRhODRlYWI2NWU5NDc3MTFkZTliYzNmOWNl
+    NDgzN2YwZTBiMGQzYzJlYWU5YjExNjgwNTViMWJkZmVlYTA2NDk0MWVlNjdm
+    OGEyOTBhMmU5OTBhMGFjYjY0ODdmOGEzNTM0OWFhNWNiNGI3ZjA=

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 0.2.5
+[Bugs]
+  - Improve snapshot deletion process
+
 === 0.2.4
 [Bugs]
   - Fix cli tests

data/lib/vgh/apps/checkpoint.rb

@@ -38,7 +38,7 @@ module APPS
             'CHECKPOINT' => "#{vid}"
           }
         )
-        snapshot.purge_checkpoints_for vid
+        snapshot.purge_checkpoints
       }
 
       System.unlock

data/lib/vgh/apps/ec2_backup.rb

@@ -38,7 +38,7 @@ module APPS
             'BACKUP' => "#{vid}"
           }
         )
-        snapshot.purge_backups_for vid
+        snapshot.purge_backups
       }
 
       System.unlock

data/lib/vgh/ec2/snapshot.rb

@@ -55,16 +55,16 @@ class Snapshot
   end
 
   # Purges expired snapshots
-  def purge_backups_for(*args)
-    expired_backups_for(*args).each do |snap|
+  def purge_backups
+    expired_backups.each do |snap|
       message.info "Deleting expired snapshot (#{snap.id})"
       snap.delete
     end
   end
 
   # Purges expired snapshots
-  def purge_checkpoints_for(*args)
-    expired_checkpoints_for(*args).each do |snap|
+  def purge_checkpoints
+    expired_checkpoints.each do |snap|
       message.info "Deleting checkpoint (#{snap.id})"
       snap.delete
     end
@@ -73,9 +73,10 @@ class Snapshot
   # Creates a list of expired snapshots according to the expiration time
   # specified in the app's configuration file
   # @return [Array] An array of expired snapshot objects
-  def expired_backups_for(vid)
+  def expired_backups
     @expired_backups = []
-    all_backups.tagged('BACKUP').tagged_values(vid).
+    all_backups.tagged('BACKUP').
+      tagged('Name').tagged_values(fqdn).
       each {|snap|
         if snap.start_time < (Time.now - backup_expiration*24*60*60)
           @expired_backups.push snap
@@ -86,9 +87,10 @@ class Snapshot
 
   # Creates a list of checkpoints that should be purged
   # @return [Array] An array of snapshot objects
-  def expired_checkpoints_for(vid)
+  def expired_checkpoints
     @expired_checkpoints = all_backups.
-      tagged('CHECKPOINT').tagged_values(vid).
+      tagged('CHECKPOINT').
+      tagged('Name').tagged_values(fqdn).
       sort_by(&:start_time).reverse.
       drop(checkpoints_to_keep)
   end

data/lib/vgh/version.rb

@@ -1,6 +1,6 @@
 module VGH
   # Version number
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 
   # Returns the version number
   def version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vgh
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Vlad Ghinea