kafo 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d66314335cab1f7223854cd213af5df4e5b87470
-  data.tar.gz: 04b4fca288a0bb82066d2f11b97dd30503b60939
+  metadata.gz: 1e97bd2473d708bd19a6a85e1e4e861420697f58
+  data.tar.gz: c3d5788d32f73a7801f0474338c6916f5ac1c354
 SHA512:
-  metadata.gz: 6c8900a003356457a5bddb2a96c1c87704b432411fccf2aebdcbb526b01ec69cea47fefdb0ab4dd44d57eaa8ed5504f7ed2ca065074fd0abc02c6dffbf0c4c78
-  data.tar.gz: a23ae53d9c4bf40cb7b6c1f3d1f80a2cca2626ce50afe6a305ce10d7ad81b797d9b0436a0e788548af1d93901c1605dca7e60471ea69689c6d4f4dd3650706ae
+  metadata.gz: e3030707d7cec780ab60a04f7b08c50ec3ae481792ff091d96ab1f823561320ccf8100064aba7583cc561966ea91f0c62dd7c3ccc8cf484aedcfe6f21d7b5695
+  data.tar.gz: 841dc1c57a6332259e51e9e63e5ff065f5159b77416b6264d54b36381177a96e4f76bc9e7102ce9a7f673c8db387c96e0d83b43e32a39828f0b84dd43a9bf1b1

data/lib/kafo/configuration.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'yaml'
+require 'tmpdir'
 require 'kafo/puppet_module'
 require 'kafo/password_manager'
 
@@ -76,8 +77,11 @@ module Kafo
 
     def params_default_values
       @params_default_values ||= begin
+        @logger.debug "Creating tmp dir within #{app[:default_values_dir]}..."
+        temp_dir = Dir.mktmpdir(nil, app[:default_values_dir])
+        KafoConfigure.register_cleanup_path temp_dir
         @logger.info "Parsing default values from puppet modules..."
-        command = PuppetCommand.new("#{includes} dump_values(#{params})").append('2>&1').command
+        command = PuppetCommand.new("$temp_dir=\"#{temp_dir}\" #{includes} dump_values(#{params})").append('2>&1').command
         @logger.debug `#{command}`
         unless $?.exitstatus == 0
           log = app[:log_dir] + '/' + app[:log_name]
@@ -86,7 +90,7 @@ module Kafo
           KafoConfigure.exit(:defaults_error)
         end
         @logger.info "... finished"
-        YAML.load_file(File.join(KafoConfigure.config.app[:default_values_dir], 'default_values.yaml'))
+        YAML.load_file(File.join(temp_dir, 'default_values.yaml'))
       end
     end
 

data/lib/kafo/kafo_configure.rb

@@ -25,12 +25,15 @@ module Kafo
   class KafoConfigure < Clamp::Command
     include StringHelper
 
-
     class << self
       attr_accessor :config, :root_dir, :config_file, :gem_root, :temp_config_file,
                     :modules_dir, :kafo_modules_dir, :verbose, :app_options, :logger
       attr_writer :hooking
 
+      def cleanup_paths
+        @cleanup_paths ||= []
+      end
+
       def hooking
         @hooking ||= Hooking.new
       end
@@ -121,6 +124,7 @@ module Kafo
     end
 
     def self.exit(code)
+      cleanup
       @exit_code = translate_exit_code(code)
       throw :exit
     end
@@ -144,6 +148,26 @@ module Kafo
       end
     end
 
+    def self.cleanup
+      # make sure default values are removed from /tmp
+      (self.cleanup_paths + ['/tmp/default_values.yaml']).each do |file|
+        logger.debug "Cleaning #{file}"
+        FileUtils.rm_rf(file)
+      end
+    end
+
+    def self.register_cleanup_path(path)
+      self.cleanup_paths<< path
+    end
+
+    def register_cleanup_path(path)
+      self.class.register_cleanup_path(path)
+    end
+
+    def cleanup_paths
+      self.class.cleanup_paths
+    end
+
     def help
       self.class.help(invocation_path, self)
     end

data/lib/kafo/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Kafo
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/modules/kafo_configure/lib/puppet/parser/functions/dump_values.rb

@@ -9,7 +9,10 @@ module Puppet::Parser::Functions
       [arg, found_value.nil? ? arg : found_value]
     end
     data = Hash[data]
-    dump_dir = YAML.load_file(lookupvar('kafo_config_file'))[:default_values_dir]
-    File.open("#{dump_dir}/default_values.yaml", 'w') { |file| file.write(YAML.dump(data)) }
+
+    dump_dir = lookupvar('temp_dir')
+    file_name = "#{dump_dir}/default_values.yaml"
+
+    File.open(file_name, File::WRONLY|File::CREAT|File::EXCL, 0600) { |file| file.write(YAML.dump(data)) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Marek Hulan