kafo 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 831fee1d8773e349d7967d6b8e2197cb017d30b0
-  data.tar.gz: 46c3bc4a21f25b8d8f5f70c18d6d3730dd22f10d
+  metadata.gz: 619bbc3ca7bf0903d275c18afa0541c59cc42dc4
+  data.tar.gz: 23943836e1d29c01b69217e73ec2f4c26e1e9ab3
 SHA512:
-  metadata.gz: e5aa20ffadf4cbf9f0942bab11aa7382611b07b3150de7887caa0a3d16f25aa86cdb5431c4598c63370c6788d6d0cb6ece3ed965fbc1d040a2872539b598629d
-  data.tar.gz: cec32896880413196709850e0480b72f26c3807f07a7a1bea0794ddf590f3d617bb38de2c9757a961dcd5e64cc7d028058b48aa9d9a33a164733da36edeb3e64
+  metadata.gz: 0541b1cef27dfbb2b564f69eac183031b24204fc50a52fc83f61cb3b4c3429a8001fa3716fa3bbe2c7bcc019136cd2f035b2da7e4f649f42e1721fef6c2efbe0
+  data.tar.gz: b1de2aabd4201aee9db9f2665598cab7bae50534dd9e46ca6a916dca60e689f23f46bb084ed37ad2e5b970451980349a835816171b19f92f46a4d53bd33bef3c

data/README.md

@@ -314,7 +314,7 @@ provided by Kafo can be used and customized to satisfy your needs
 
 ### Scenario as an installer plugin
 
-Scenarios were designed to make it possible to package them separately as optional installer extension.  
+Scenarios were designed to make it possible to package them separately as optional installer extension.
 Config files are located in separate directory which makes packaging of additional scenarios easy.
 Configuration of paths to modules, checks and hooks accepts multiple directories
 so it is possible to bundle your scenario with additional modules, hooks and checks.
@@ -325,7 +325,7 @@ As your project grows you may need to change your installer modules or add new o
 Kafo has support for scenario migrations. Migrations are ruby scripts similar to hooks and are located
 in `<config>/installer-scenarios.d/your-scenario.migrations/` so each scenario has its own set of independent migrations.
 During its initialization the installer checks for migrations that were not applied yet. It happens exactly between execution of `pre-migrations` and `boot` hooks.
-The installer stores names of applied migrations in `<config>/installer-scenarios.d/your-scenario.migrations/.applied` to avoid runnig the migrations multiple times.  
+The installer stores names of applied migrations in `<config>/installer-scenarios.d/your-scenario.migrations/.applied` to avoid runnig the migrations multiple times.
 It is recommended to prefix the migration names with `date +%y%m%d%H%M%S` to avoid migration ordering issues.
 
 In a migration you can modify the scenario configuration as well as the answer file. The changed configs are stored immediately after all the migrations were applied.
@@ -965,7 +965,7 @@ not persisted between runs.
 
 ## Parser cache
 
-A cache of parsed Puppet modules and manifests can be created to skip the use
+One or more caches of parsed Puppet modules and manifests can be created to skip the use
 of kafo_parsers at runtime. This is useful when kafo_parsers doesn't support the
 version of Puppet in use, and may also provide a small performance benefit.
 
@@ -973,7 +973,13 @@ Create the cache with `kafo-export-params -f parsercache --no-parser-cache` and
 configure it in config/kafo.yaml with:
 
 ```yaml
+# single cache
 :parser_cache_path: ./parser_cache.yaml
+
+# multiple caches
+:parser_cache_path:
+  - ./parser_cache.yaml
+  - ./another_parser_cache.yaml
 ```
 
 The cache will be skipped if the file modification time of the manifest is
@@ -1028,7 +1034,7 @@ Other exit codes that can be returned:
 * '24' means that your answer file asks for puppet module that you did not provide
 * '25' means that kafo could not get default values from puppet
 * '26' means that kafo could not find the specified scenario
-* '27' means that kafo found found scenario configuration error that prevents installation from continuing  
+* '27' means that kafo found found scenario configuration error that prevents installation from continuing
 * '130' user interrupt (^C)
 
 ## Running Puppet Profiling

data/config/kafo.yaml.example

@@ -16,8 +16,10 @@
 # :module_dirs: /usr/share/kafo/modules
 # Similar as modules_dir but for kafo internal modules, leave nil if you don't need to change it
 # :kafo_modules_dir:
-# Location of an optional cache of parsed module data, generate with kafo-export-params -f parsercache
-# :parser_cache_path: /usr/share/kafo/parser_cache.yaml
+# Location of one or more optional caches of parsed module data, generate with kafo-export-params -f parsercache
+# :parser_cache_path:
+#   - /usr/share/kafo/parser_cache.yaml
+#   - /usr/share/kafo/another_parser_cache.yaml
 # Enable colors? If you don't touch this, we'll autodetect terminal capabilities
 # :colors: true
 # Color scheme, we support :bright and :dark (first is better for white background, dark for black background)

data/lib/kafo/exit_handler.rb

@@ -16,7 +16,7 @@ module Kafo
           :no_answer_file => 23,
           :unknown_module => 24,
           :defaults_error => 25,
-          :unknown_scenario => 26,
+          :unset_scenario => 26,
           :scenario_error => 27
       }
     end

data/lib/kafo/parser_cache_reader.rb

@@ -1,24 +1,35 @@
 module Kafo
   class ParserCacheReader
-    def self.new_from_file(cache_path)
-      if cache_path.nil? || cache_path.empty?
-        logger.debug "No parser cache configured in :parser_cache_path, skipping setup"
+    def self.new_from_file(cache_paths)
+      cache_paths = [cache_paths].compact unless cache_paths.is_a?(Array)
+      if cache_paths.empty?
+        logger.debug "No parser cache(s) configured in :parser_cache_path, skipping setup"
         return nil
       end
 
-      unless File.exist?(cache_path)
-        logger.warn "Parser cache configured at #{cache_path} is missing, skipping setup"
+      non_existent = cache_paths.select { |path| !File.exist?(path) }
+      unless non_existent.empty?
+        logger.warn "Parser cache(s) configured at #{non_existent.join(", ")} are missing, skipping setup"
         return nil
       end
 
-      parsed = YAML.load(File.read(cache_path))
-      if !parsed.is_a?(Hash) || parsed[:version] != 1 || !parsed[:files].is_a?(Hash)
-        logger.warn "Parser cache is from a different version of Kafo, skipping setup"
-        return nil
+      parsed = cache_paths.map { |path| YAML.load(File.read(path)) }
+
+      parsed.each_with_index do |cache, i|
+        if !cache.is_a?(Hash) || cache[:version] != PARSER_CACHE_VERSION || !cache[:files].is_a?(Hash)
+          logger.warn "Parser cache #{cache_paths[i]} is from a different version of Kafo, skipping setup"
+          return nil
+        end
       end
 
-      logger.debug "Using #{cache_path} cache with parsed modules"
-      new(parsed)
+      logger.debug "Using #{cache_paths.join(", ")} cache with parsed modules"
+
+      merged_cache = {
+        :version => PARSER_CACHE_VERSION,
+        :files => parsed.map { |cache| cache[:files] }.reduce({}) { |ret, files| ret.merge!(files) }
+      }
+
+      new(merged_cache)
     end
 
     def self.logger

data/lib/kafo/scenario_manager.rb

@@ -82,7 +82,7 @@ module Kafo
       if parsed
         scenario_file = File.join(config_dir, "#{parsed[3]}.yaml")
         return scenario_file if File.exists?(scenario_file)
-        fail_now("Scenario (#{scenario_file}) was not found, can not continue", :unknown_scenario)
+        fail_now("Scenario (#{scenario_file}) was not found, can not continue", :unset_scenario)
       end
     end
 
@@ -93,7 +93,7 @@ module Kafo
       if scenario.nil?
         fail_now("No installation scenario was selected, the installer can not continue.\n" +
           "       Even --help content is dependent on selected scenario.\n" +
-          "       Select scenario with --scenario SCENARIO or list available scenarios with --list-scenarios.", :unknown_scenario)
+          "       Select scenario with --scenario SCENARIO or list available scenarios with --list-scenarios.", :unset_scenario)
       elsif !scenario_enabled?(scenario)
         fail_now("Selected scenario is DISABLED, can not continue.\n" +
           "       Use --list-scenarios to list available options.\n" +

data/lib/kafo/version.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
 module Kafo
-  VERSION = "0.9.2"
+  PARSER_CACHE_VERSION = 1
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler