kafo 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03c36bfb4348602957dcfdff37b490fa9b3155be
-  data.tar.gz: 7c5199e8fc59fec355df391f66822c179ab0cbd2
+  metadata.gz: 426538f59aa0198c703fa2aef6172b06e3297bf9
+  data.tar.gz: ca884204fb99cac059c8aaa41d6a6f4baadcfa40
 SHA512:
-  metadata.gz: 72409d27691da2d30e6203e7414a820ac53d4a5595d5017c337460c82332ec50a5e6f71b90508e00286bc360534207c38dc3995ac64b997a19b8f90a77858f9c
-  data.tar.gz: ecbbe03cad1f876825ba53a5500ebf08fb26b5488e3c9d534cfd84bf8039663e06cc9802b1a85da5e44d4d8bd26e5758bbf9254e1766cff64b69a77faf50c246
+  metadata.gz: 6d474f25575e38ceedbe7726450168bad1225737fe32d22a5c58ce15f39cef8d1bde03899e7f3a556b915defbfb5632094b800c25d27b9e06cf56a5e47ef2f55
+  data.tar.gz: d1e54d17cfb71fa7493ce77ea1aff6b5d544895daf8573141da6ea205ef6a5b339abc05ce1b703fcf830bc96e0cf0fcc9e785d12d522bc02c69fa13399407c98

data/lib/kafo/configuration.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'yaml'
+require 'tmpdir'
 require 'kafo/puppet_module'
 require 'kafo/password_manager'
 
@@ -74,8 +75,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]
@@ -84,7 +88,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

@@ -17,12 +17,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
@@ -105,6 +108,7 @@ module Kafo
     end
 
     def self.exit(code)
+      cleanup
       @exit_code = translate_exit_code(code)
       throw :exit
     end
@@ -128,6 +132,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.3.16"
+  VERSION = "0.3.17"
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler