kitchen-vmpool 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a292b2bf0b4134c9da983f663e16acbaa2f9582f
-  data.tar.gz: 1b41ec5d409d1fb0446036b1368a62b6354bfab2
+  metadata.gz: c1e59ffbabc5a41955d430e1773dc01a14a6647b
+  data.tar.gz: 6bd5deaa4b6e9a570883f06fc1f0f4de4695fecf
 SHA512:
-  metadata.gz: c8dd58b8dff118a7a95c3cee1e41859a3196eb2fb05d72cf04e0d105001cb05f68598b6d28af4d3d08c30e388d1c16632ff171abe373bb711e4e9bc88301b497
-  data.tar.gz: 7b934a2d02593fc3ba9942b3e16e90e342079b61c5fcf8ab204377eed615a405a81eba81ce17eb15c54af90f0712660af4b8dd62ad7ddfadb8073dabfdde1f9d
+  metadata.gz: 2896cefb67f74121f15d394a7d89b33393f895382968b6e284979b2d3063e05257a71c87a0c76b7609967c67715518b3b9593ea3bda0074a1aa6167bcd8b2a27
+  data.tar.gz: ddaf01bd4cbfd0a32bcfb2bdec312ba3fb5cb92d0108b85f88580829fda70b2cca61d66ffa45d37b32b26e9a59a51fc1c21da65b4bb7bff1e957c9f1490cde8d

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+## 0.5.0
+ * Fixes #4 - add ability to put systems in garbage collection array for pool
+ * Refactor test code
 ## 0.4.0
  * Adds vmpooler store for the ultimate in pool stores
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kitchen-vmpool (0.4.0)
+    kitchen-vmpool (0.5.0)
       gitlab (~> 4.2)
 
 GEM

data/README.md

@@ -233,6 +233,8 @@ module Kitchen
           if reuse_instances
             mark_unused(pool_member, pool_name)
             used_status = 'unused'
+          else
+            add_to_garbage(pool_member, pool_name)
           end
 
           block.call(pool_member, used_status)

data/lib/kitchen-vmpool/version.rb

@@ -1,3 +1,3 @@
 module KitchenVmpool
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/kitchen/driver/vmpool_stores/file_base_store.rb

@@ -23,11 +23,13 @@ module Kitchen
         # @param pool_name [String] a VM pool
         # @param reuse_instances [Boolean] whether or not to mark used VM instances as unused
         def cleanup(pool_member:, pool_name:, reuse_instances:)
-          used_status = 'used'
-
+          used_status = 'garbage'
           if reuse_instances
             mark_unused(pool_member, pool_name)
             used_status = 'unused'
+          else
+            used_hosts(pool_name).delete(pool_member)
+            add_to_garbage(pool_member, pool_name)
           end
           yield(pool_member, used_status) if block_given?
         end
@@ -38,19 +40,16 @@ module Kitchen
         end
 
         def update(content = nil)
-          #info("Updating vmpool data")
           write_content(content)
           read
         end
 
         def create
-          #info("Creating new vmpool data")
           write_content(base_content)
           read
         end
 
         def read
-          #info("Reading vmpool data")
           read_content
         end
 
@@ -59,13 +58,21 @@ module Kitchen
         end
 
         def save
-          #info("Saving vmpool data")
           write_content
           read
         end
 
         private
 
+        # @param pool_member [String]
+        # @return Array[String] - list of instances in the garbage
+        def add_to_garbage(pool_member, pool_name)
+          return if garbage_hosts(pool_name).include?(pool_member)
+          garbage_hosts(pool_name) << pool_member
+          save
+          garbage_hosts(pool_name)
+        end
+
         # @param name [String] - the hostname to mark used
         # @return Array[String] - list of used instances
         def mark_used(name, pool_name)
@@ -86,7 +93,6 @@ module Kitchen
           pool_hosts(pool_name)
         end
 
-
         # @return Array[String] - a list of pool names
         def pool_names
           pool_data.keys
@@ -108,6 +114,10 @@ module Kitchen
           pool(pool_name)['pool_instances'] ||= []
         end
 
+        def garbage_hosts(pool_name)
+          pool(pool_name)['garbage_collection'] ||= []
+        end
+
         # @return Array[String] - a list of used host names in the pool
         def used_hosts(pool_name)
           pool(pool_name)['used_instances'] ||= []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vmpool
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab