kondate 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee86599c07e6b8ab7d455f0547e1332be08ce04
-  data.tar.gz: 644a9d48e73a01679e55bec6fae04d8d074b2cb2
+  metadata.gz: 84fbadf47b428eeb9842d1676c064afc8f747d0c
+  data.tar.gz: deffef184f5a2739801fd486722a9d103a4999c1
 SHA512:
-  metadata.gz: 330c1056afd6e8ee5723d61f1bacd39bb65357b37f5a44c37be195b16ea5775d3110f23661e06fb5f0386abab07e3f99baefd6f9b97f913cfa598fc67203c6bf
-  data.tar.gz: f832e67244d4326b7cbc381f66062a4ca0f27b9755683a24ea7c879f585608404ce2bd4a3b7c938a2baa7fd23455fa6513dc419c75efef092d439a17a73438e7
+  metadata.gz: 4c03b7ca0525454cdb06a014cc66a315beba424eb40b9dacd97d021bdae42406ab1206418f61414d566c23116c60588d7fddef6f4cc44c2192cb579fa27bbb01
+  data.tar.gz: 0543bde5cf1b8a5d08906c701017655a58665e0c2a4a98fbb4aea843d3f9a6fc7f037c8180dd9351e54c50346362416db8fbfe0b3f973f65e2518256755eeada

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.1 (2016-11-18)
+
+Fixes:
+
+* Fix to remove temporary property files properly
+
 # 0.3.0 (2016-11-18)
 
 Enhancements:

data/lib/kondate/cli.rb

@@ -57,8 +57,12 @@ module Kondate
     option :recipe_graph,                :type => :string,  :default => nil, :desc => "[EXPERIMENTAL] Write recipe dependency graph in DOT", :banner => "PATH"
     def itamae(host)
       property_files = build_property_files(host)
-      if proceed?(property_files)
-        exit(-1) unless do_itamae(host, property_files)
+      begin
+        if proceed?(property_files)
+          exit(-1) unless do_itamae(host, property_files)
+        end
+      ensure
+        clean_property_files(property_files)
       end
     end
 
@@ -81,11 +85,15 @@ module Kondate
       $stdout.puts "Target hosts are [#{hosts.join(", ")}]"
 
       property_files_of_hosts, summarized_property_files, hosts_of_roles = build_property_files_of_hosts(hosts)
-      if proceed?(summarized_property_files, hosts_of_roles)
-        successes = Parallel.map(hosts, in_processes: @options[:parallel]) do |host|
-          do_itamae(host, property_files_of_hosts[host])
+      begin
+        if proceed?(summarized_property_files, hosts_of_roles)
+          successes = Parallel.map(hosts, in_processes: @options[:parallel]) do |host|
+            do_itamae(host, property_files_of_hosts[host])
+          end
+          exit(-1) unless successes.all?
         end
-        exit(-1) unless successes.all?
+      ensure
+        clean_property_files_of_hosts(property_files_of_hosts)
       end
     end
 
@@ -97,8 +105,12 @@ module Kondate
     option :vagrant,                     :type => :boolean, :default => false
     def serverspec(host)
       property_files = build_property_files(host)
-      if proceed?(property_files)
-        exit(-1) unless do_serverspec(host, property_files)
+      begin
+        if proceed?(property_files)
+          exit(-1) unless do_serverspec(host, property_files)
+        end
+      ensure
+        clean_property_files(property_files)
       end
     end
 
@@ -119,11 +131,15 @@ module Kondate
       $stdout.puts "Target hosts are [#{hosts.join(", ")}]"
 
       property_files_of_hosts, summarized_property_files, hosts_of_roles = build_property_files_of_hosts(hosts)
-      if proceed?(summarized_property_files, hosts_of_roles)
-        successes = Parallel.map(hosts, in_processes: @options[:parallel]) do |host|
-          do_serverspec(host, property_files_of_hosts[host])
+      begin
+        if proceed?(summarized_property_files, hosts_of_roles)
+          successes = Parallel.map(hosts, in_processes: @options[:parallel]) do |host|
+            do_serverspec(host, property_files_of_hosts[host])
+          end
+          exit(-1) unless successes.all?
         end
-        exit(-1) unless successes.all?
+      ensure
+        clean_property_files_of_hosts(property_files_of_hosts)
       end
     end
 
@@ -217,6 +233,18 @@ module Kondate
       end
     end
 
+    def clean_property_files(property_files)
+      property_files.values.each do |file|
+        File.unlink(file) rescue nil
+      end
+    end
+
+    def clean_property_files_of_hosts(property_files_of_hosts)
+      property_files_of_hosts.values.each do |property_files|
+        clean_property_files(property_files)
+      end
+    end
+
     # @return [Hash] key value pairs whoses keys are roles and values are path (or nil)
     def build_property_files(host)
       builder = PropertyBuilder.new(host)

data/lib/kondate/property_builder.rb

@@ -136,10 +136,10 @@ module Kondate
       if property['attributes'].empty?
         nil
       else
-        fp = Tempfile.open("kondate_")
+        fp = Tempfile.create("kondate_")
         YAML.dump(property, fp)
         fp.close
-        fp.path # should be removed when process finishes
+        fp.path
       end
     end
   end

data/lib/kondate/version.rb

@@ -1,3 +1,3 @@
 module Kondate
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kondate
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - sonots