kafo 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d72a4ee27bfb7b43960efdca85631bf83423fc0
-  data.tar.gz: 80f0f06eaf07cabde8a67df2d5e231511fc2d50f
+  metadata.gz: d8d91c1c416307f1a338f208ff5eff030d1b848a
+  data.tar.gz: c8b4d0291b2ab3afc351ebcd22e12b7326d96d3b
 SHA512:
-  metadata.gz: dc3d55c99f389d35e425e5fd9ede4cc09dd559ca84a51c6fea66fe7fef49168240424b6e7d1756404b9fab4e9a9dca16769d612327fe25bbd9a33f626702c9c1
-  data.tar.gz: 2b6d1cecef96812457b9749e65e1b84b4cba5fa772d489fbdc0a11cb851dcc4dca0287b0f08bd6e861879e8167c15ea4fe0bda09facbbc0d878513ba3c013f45
+  metadata.gz: 3ddd5d143247c1a437f6f6ea3afe287f9a53caed1b0a966aabd763184545706e34ac4428b2bff835893e8a6c62507deb8d9292f0ee5906a11e0a667ebb19de3d
+  data.tar.gz: d07f78c6a86c1eb71617e127264bb39411ffd8f5077b9963725fd4c59d869f45b8a9edcd66ea8ddfda481b4d81967f84e675783dfe775602d06533ec6decd1fe

data/Rakefile

@@ -2,9 +2,18 @@ require 'rake/testtask'
 require "bundler/gem_tasks"
 load 'tasks/jenkins.rake'
 
-Rake::TestTask.new do |t|
+Rake::TestTask.new('test:unit') do |t|
   t.libs << 'lib' << 'test'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList['test/kafo/**/*_test.rb']
   t.verbose = true
 end
 
+Rake::TestTask.new('test:acceptance') do |t|
+  t.libs << 'lib' << 'test'
+  t.test_files = FileList['test/acceptance/*_test.rb']
+  t.verbose = true
+end
+
+CLEAN.include 'test/tmp'
+
+task :test => ['test:unit', 'test:acceptance']

data/lib/kafo/configuration.rb

@@ -4,6 +4,7 @@ require 'tmpdir'
 require 'kafo/puppet_module'
 require 'kafo/password_manager'
 require 'kafo/color_scheme'
+require 'kafo/data_type_parser'
 
 module Kafo
   class Configuration
@@ -86,7 +87,10 @@ module Kafo
     end
 
     def modules
-      @modules ||= @data.keys.map { |mod| PuppetModule.new(mod, PuppetModule.find_parser, self).parse }.sort
+      @modules ||= begin
+        register_data_types
+        @data.keys.map { |mod| PuppetModule.new(mod, PuppetModule.find_parser, self).parse }.sort
+      end
     end
 
     def module(name)
@@ -303,5 +307,13 @@ module Kafo
     def load_yaml_file(filename)
       YAML.load_file(filename)
     end
+
+    def register_data_types
+      module_dirs.each do |module_dir|
+        Dir[File.join(module_dir, '*', 'types', '**', '*.pp')].each do |type_file|
+          DataTypeParser.new(File.read(type_file)).register
+        end
+      end
+    end
   end
 end

data/lib/kafo/data_type.rb

@@ -2,30 +2,25 @@ module Kafo
   class DataType
     def self.new_from_string(str)
       keyword_re = /\A([\w:]+)(?:\[(.*)\])?\z/m.match(str)
-      if keyword_re
-        if (type = @keywords[keyword_re[1]])
-          args = if keyword_re[2]
-                   hash_re = keyword_re[2].match(/\A\s*{(.*)}\s*\z/m)
-                   if hash_re
-                     [parse_hash(hash_re[1])]
-                   else
-                     split_arguments(keyword_re[2])
-                   end
+      raise ConfigurationException, "data type not recognized #{str}" unless keyword_re
+
+      type = @keywords[keyword_re[1]]
+      raise ConfigurationException, "unknown data type #{keyword_re[1]}" unless type
+
+      if type.is_a?(String)
+        new_from_string(type)
+      else
+        args = if keyword_re[2]
+                 hash_re = keyword_re[2].match(/\A\s*{(.*)}\s*\z/m)
+                 if hash_re
+                   [parse_hash(hash_re[1])]
                  else
-                   []
+                   split_arguments(keyword_re[2])
                  end
-          type.new(*args)
-        elsif ['Data'].include?(keyword_re[1])
-          DataTypes::Any.new
-        elsif keyword_re[1] == 'Default'
-          DataTypes::Enum.new('default')
-        elsif @keywords[keyword_re[1].capitalize]  # pre-Puppet 4 data types
-          DataTypes::Optional.new(keyword_re[1].capitalize)
-        else
-          raise ConfigurationException, "unknown data type #{keyword_re[1]}"
-        end
-      else
-        raise ConfigurationException, "data type not recognized #{str}"
+               else
+                 []
+               end
+        type.new(*args)
       end
     end
 
@@ -79,6 +74,7 @@ module Kafo
   end
 end
 
+require 'kafo/data_types/aliases'
 require 'kafo/data_types/any'
 require 'kafo/data_types/array'
 require 'kafo/data_types/boolean'

data/lib/kafo/data_type_parser.rb

@@ -0,0 +1,26 @@
+require 'kafo/data_type'
+
+module Kafo
+  class DataTypeParser
+    TYPE_DEFINITION = /^type\s+([^\s=]+)\s*=\s*(.+?)(\s+#.*)?\s*$/
+
+    attr_reader :types
+
+    def initialize(manifest)
+      @logger = KafoConfigure.logger
+      @types = {}
+      manifest.each_line do |line|
+        if (type = TYPE_DEFINITION.match(line))
+          @types[type[1]] = type[2]
+        end
+      end
+    end
+
+    def register
+      @types.each do |name,target|
+        @logger.debug("Registering extended data type #{name}")
+        DataType.register_type(name, target)
+      end
+    end
+  end
+end

data/lib/kafo/data_types/aliases.rb

@@ -0,0 +1,14 @@
+require 'kafo/data_type'
+
+module Kafo
+  DataType.register_type('Data', 'Any')
+  DataType.register_type('Default', 'Enum["default"]')
+
+  # pre-Puppet 4 Kafo data types
+  DataType.register_type('array', 'Optional[Array]')
+  DataType.register_type('boolean', 'Optional[Boolean]')
+  DataType.register_type('hash', 'Optional[Hash]')
+  DataType.register_type('integer', 'Optional[Integer]')
+  DataType.register_type('password', 'Optional[String]')
+  DataType.register_type('string', 'Optional[String]')
+end

data/lib/kafo/scenario_manager.rb

@@ -91,7 +91,7 @@ module Kafo
         (available_scenarios.keys.count == 1 && available_scenarios.keys.first) ||
         select_scenario_interactively
       if scenario.nil?
-        fail_now("No installation scenario was selected, the installer can not continue.\n" +
+        fail_now("No installation scenario was selected, the installer cannot continue.\n" +
           "       Even --help content is dependent on selected scenario.\n" +
           "       Select scenario with --scenario SCENARIO or list available scenarios with --list-scenarios.", :unset_scenario)
       elsif !scenario_enabled?(scenario)
@@ -148,7 +148,7 @@ module Kafo
         show_scenario_diff(@previous_scenario, new_scenario)
 
         wizard = KafoWizards.wizard(:cli, 'Confirm installation scenario selection',
-          :description => "You are trying to replace existing installation with different scenario. This may lead to unpredictable states. Please confirm that you want to proceed.")
+          :description => "You are trying to replace an existing installation with a different scenario. This may lead to unpredictable states. Please confirm that you want to proceed.")
         wizard.entries << wizard.factory.button(:proceed, :label => 'Proceed with selected installation scenario', :default => false)
         wizard.entries << wizard.factory.button(:cancel, :label => 'Cancel Installation', :default => true)
         result = wizard.run
@@ -198,8 +198,8 @@ module Kafo
     def link_last_scenario(config_file)
       link_path = last_scenario_link
       if last_scenario_link
-        File.delete(last_scenario_link) if File.exist?(last_scenario_link)
-        File.symlink(config_file, last_scenario_link)
+        File.delete(last_scenario_link) if File.symlink?(last_scenario_link)
+        File.symlink(File.basename(config_file), last_scenario_link)
       end
     end
 

data/lib/kafo/system_checker.rb

@@ -2,6 +2,8 @@
 
 module Kafo
   class SystemChecker
+    attr_reader :checkers
+
     def self.check
       KafoConfigure.check_dirs.all? do |dir|
         new(File.join(dir, '*')).check
@@ -9,7 +11,7 @@ module Kafo
     end
 
     def initialize(path)
-      @checkers = Dir.glob(path)
+      @checkers = Dir.glob(path).sort
     end
 
     def logger

data/lib/kafo/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 module Kafo
   PARSER_CACHE_VERSION = 1
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -207,6 +207,8 @@ files:
 - lib/kafo/condition.rb
 - lib/kafo/configuration.rb
 - lib/kafo/data_type.rb
+- lib/kafo/data_type_parser.rb
+- lib/kafo/data_types/aliases.rb
 - lib/kafo/data_types/any.rb
 - lib/kafo/data_types/array.rb
 - lib/kafo/data_types/boolean.rb