machinery-tool 1.18.0 → 1.19.0

data/lib/html.rb

@@ -30,17 +30,17 @@ class Html
 
         Machinery::Ui.warn <<-EOF.chomp
 Warning:
-The --public option makes the HTTP server listen on all configured IP addresses. Everyone who has access to one of those IP addresses can access all of your system descriptions stored in '~/.machinery'. Be careful if there are sensible information (such as private keys) stored in one of your descriptions.
+The --public option makes the HTTP server listen on all configured IP addresses. Everyone who has access to one of those IP addresses can access all of your system descriptions stored in '~/.machinery'. Be careful if there is sensitive information (such as private keys) stored in one of your descriptions.
 EOF
       elsif opts[:ip] == "0.0.0.0"
         Machinery::Ui.warn <<-EOF.chomp
 Warning:
-The server is listening on all configured IP addresses. Everyone who has access to one of those IP addresses can access all of your system descriptions stored in '~/.machinery'. Be careful if there are sensible information (such as private keys) stored in one of your descriptions.
+The server is listening on all configured IP addresses. Everyone who has access to one of those IP addresses can access all of your system descriptions stored in '~/.machinery'. Be careful if there is sensitive information (such as private keys) stored in one of your descriptions.
 EOF
       elsif opts[:ip] && opts[:ip] != "localhost" && opts[:ip] != "127.0.0.1"
         Machinery::Ui.warn <<-EOF.chomp
 Warning:
-You specified an IP address other than '127.0.0.1', your server may be reachable from the network. Everyone who can access that network can access your system descriptions stored in '~/.machinery'. Be careful if there are sensible information (such as private keys) stored in one of your descriptions.
+You specified an IP address other than '127.0.0.1', your server may be reachable from the network. Everyone who can access that network can access your system descriptions stored in '~/.machinery'. Be careful if there is sensitive information (such as private keys) stored in one of your descriptions.
 EOF
       elsif !opts[:ip]
         opts[:ip] = "127.0.0.1"

data/lib/inspect_task.rb

@@ -21,11 +21,11 @@ class InspectTask
     description, failed_inspections = build_description(store, name, system,
       scopes, filter, options)
 
-    if !description.attributes.empty?
+    unless description.attributes.empty?
       print_description(description, scopes) if options[:show]
     end
 
-    if !failed_inspections.empty?
+    unless failed_inspections.empty?
       Machinery::Ui.puts "\n"
       message = failed_inspections.map { |scope, msg|
         "Errors while inspecting " \
@@ -92,7 +92,7 @@ class InspectTask
       end
       description[inspector.scope].set_metadata(timestring, host)
 
-      if !description.attributes.empty?
+      unless description.attributes.empty?
         effective_filter.apply!(description)
         description.set_filter_definitions("inspect", effective_filter.to_array)
         description.save

data/lib/json_schema_monkey_patch.rb

@@ -9,10 +9,10 @@ module JSON
   class Schema
     class EnumAttribute < Attribute
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
-        if !current_schema.schema['enum'].include?(data)
+        unless current_schema.schema["enum"].include?(data)
           if options[:record_errors]
             message = "The property '#{build_fragment(fragments)}' value #{data.inspect} did not match one of the following values:"
-            current_schema.schema['enum'].each {|val|
+            current_schema.schema["enum"].each {|val|
               if val.is_a?(NilClass)
                 message += " null,"
               elsif val.is_a?(Array)

data/lib/json_validation_error_cleaner.rb

@@ -33,7 +33,7 @@ class JsonValidationErrorCleaner
 
       new_path = "The property"
       new_path += " ##{position}" if position > -1
-      new_path += " (#{details})" if !details.empty?
+      new_path += " (#{details})" unless details.empty?
 
       message.gsub(/The property '#\/.*?'/, new_path)
     end

data/lib/json_validator.rb

@@ -21,7 +21,7 @@ class JsonValidator
 
     format_version = @json_hash["meta"]["format_version"] if @json_hash["meta"]
 
-    if !format_version
+    unless format_version
       raise Machinery::Errors::SystemDescriptionValidationFailed.new(
         ["Could not determine format version"]
       )
@@ -47,7 +47,7 @@ class JsonValidator
   private
 
   def validate_scope(scope_hash, scope)
-    return [] if !@scope_schemas[scope]
+    return [] unless @scope_schemas[scope]
 
     errors = JSON::Validator.fully_validate(@scope_schemas[scope], scope_hash).map do |error|
       "In scope #{scope}: #{error}"

data/lib/kiwi_config.rb

@@ -57,6 +57,28 @@ class KiwiConfig < Exporter
 
   private
 
+  def optional_bootstrap_packages
+    [
+      "glibc-locale",
+      "module-init-tools",
+      "cracklib-dict-full",
+      "ca-certificates",
+      "ca-certificates-mozilla"
+    ]
+  end
+
+  def add_bootstrap_packages(xml)
+    xml.packages(type: "bootstrap") do
+      xml.package(name: "filesystem")
+      bootstrap_packages = @system_description.packages.select { |package|
+        optional_bootstrap_packages.include?(package.name)
+      }
+      bootstrap_packages.each do |package|
+        xml.package(name: package.name)
+      end
+    end
+  end
+
   def pre_process_config
     enable_ssh if @options[:enable_ssh]
   end
@@ -96,8 +118,8 @@ class KiwiConfig < Exporter
   end
 
   def inject_extracted_files(output_location)
-    ["changed_managed_files", "config_files"].each do |scope|
-      next if !@system_description.scope_extracted?(scope)
+    ["changed_managed_files", "changed_config_files"].each do |scope|
+      next unless @system_description.scope_extracted?(scope)
 
       output_root_path = File.join(output_location, "root")
       FileUtils.mkdir_p(output_root_path)
@@ -147,7 +169,7 @@ EOF
 
   def check_existance_of_extracted_files
     missing_scopes = []
-    ["config_files", "changed_managed_files", "unmanaged_files"].each do |scope|
+    ["changed_config_files", "changed_managed_files", "unmanaged_files"].each do |scope|
 
       if @system_description[scope] &&
          !@system_description.scope_file_store(scope).path
@@ -155,7 +177,7 @@ EOF
       end
     end
 
-    if !missing_scopes.empty?
+    unless missing_scopes.empty?
       raise Machinery::Errors::MissingExtractedFiles.new(@system_description, missing_scopes)
     end
   end
@@ -234,7 +256,9 @@ EOF
       File.join(Machinery::ROOT, "filters", "filter-packages-for-build.yaml")
     ) || []
 
-    xml.packages(type: "bootstrap") do
+    add_bootstrap_packages(xml)
+
+    xml.packages(type: "image") do
       if @system_description.packages
         @system_description.packages.each do |package|
           next if filter.include?(package.name)
@@ -268,16 +292,17 @@ EOF
             xml.source(path: repo.url)
           end
         end
-        if !repo.url.match(/^https:\/\/nu.novell.com|^https:\/\/update.suse.com/)
-          @sh << "zypper -n ar --name='#{repo.name}' "
-          @sh << "--type='#{repo.type}' " if repo.type
-          @sh << "--refresh " if repo.autorefresh
-          @sh << "--disable " unless repo.enabled
-          @sh << "'#{repo.url}' '#{repo.alias}'\n"
-          @sh << "zypper -n mr --priority=#{repo.priority} '#{repo.name}'\n"
-        end
+
+        next if repo.url =~ /^https:\/\/nu.novell.com|^https:\/\/update.suse.com/
+
+        @sh << "zypper -n ar --name='#{repo.name}' "
+        @sh << "--type='#{repo.type}' " if repo.type
+        @sh << "--refresh " if repo.autorefresh
+        @sh << "--disable " unless repo.enabled
+        @sh << "'#{repo.url}' '#{repo.alias}'\n"
+        @sh << "zypper -n mr --priority=#{repo.priority} '#{repo.name}'\n"
       end
-      if !usable_repositories
+      unless usable_repositories
         raise(
           Machinery::Errors::MissingRequirement.new(
             "The system description doesn't contain any enabled or network reachable repository." \

data/lib/list_task.rb

@@ -117,7 +117,7 @@ EOF
 
   def show_error(error_message, options)
     if options[:short]
-      Machinery::Ui.puts(error_message)
+      Machinery::Ui.puts(error_message.chomp)
     else
       Machinery::Ui.puts(" " + error_message + "\n")
     end

data/lib/local_system.rb

@@ -20,7 +20,7 @@ class LocalSystem < System
 
   class << self
     def os
-      if !@@os
+      unless @@os
         description = SystemDescription.new("localhost", SystemDescriptionMemoryStore.new)
         inspector = OsInspector.new(System.for("localhost"), description)
         inspector.inspect(nil)
@@ -57,10 +57,10 @@ Run `zypper install #{package}` to install the package.
         end
       end
 
-      if !missing_packages.empty?
+      unless missing_packages.empty?
         count = missing_packages.count
         error_string = <<-EOF
-You need the #{Machinery::pluralize(count, "package")} '#{missing_packages.join("\',\'")}'.
+You need the #{Machinery.pluralize(count, "package")} '#{missing_packages.join("\',\'")}'.
 You can install it by running `zypper install #{missing_packages.join(" ")}`.
         EOF
         raise(Machinery::Errors::MissingRequirement.new(error_string))
@@ -82,7 +82,7 @@ You can install it by running `zypper install #{package}`.
     end
 
     def validate_architecture(arch)
-      if !matches_architecture?(arch)
+      unless matches_architecture?(arch)
         raise(Machinery::Errors::UnsupportedArchitecture.new(
           "This operation is not supported on architecture '#{os.architecture}'."
         ))

data/lib/machinery.rb

@@ -74,7 +74,7 @@ require_relative "renderer_helper"
 require_relative "export_task"
 require_relative "helper"
 require_relative "deploy_task"
-require_relative "analyze_config_file_diffs_task"
+require_relative "analyze_changed_config_files_diffs_task"
 require_relative "copy_task"
 require_relative "scope"
 require_relative "ui"

data/lib/machinery_logger.rb

@@ -20,15 +20,15 @@ module Machinery
 
   def self.initialize_logger(log_file)
     # We rotate one old log file of 21 MB
-    if File.exists?(log_file) && File.size(log_file) > 21*1024*1024
+    if File.exist?(log_file) && File.size(log_file) > 21 * 1024 * 1024
       rotated_file = log_file + ".0"
-      FileUtils.rm(rotated_file) if File.exists?(rotated_file)
+      FileUtils.rm(rotated_file) if File.exist?(rotated_file)
       FileUtils.mv(log_file, rotated_file)
     end
 
-    if !File.exists?(log_file)
+    unless File.exist?(log_file)
       dirname = File.dirname(log_file)
-      if !Dir.exists?(dirname)
+      unless Dir.exist?(dirname)
         FileUtils.mkdir_p(dirname)
         File.chmod(0700, dirname)
       end

data/lib/manifest.rb

@@ -22,7 +22,7 @@ class Manifest
   attr_accessor :name, :path, :json, :hash
 
   def self.load(name, path)
-    unless File.exists?(path)
+    unless File.exist?(path)
       raise Machinery::Errors::SystemDescriptionNotFound.new(
         "Couldn't find a system description with the name '#{name}'."
       )
@@ -41,20 +41,20 @@ class Manifest
   end
 
   def validate
-    return if !compatible_json?
+    return unless compatible_json?
 
     errors = JsonValidator.new(@hash).validate
-    if !errors.empty?
+    unless errors.empty?
       Machinery::Ui.warn("Warning: System Description validation errors:")
       Machinery::Ui.warn(errors.join("\n"))
     end
   end
 
   def validate!
-    return if !compatible_json?
+    return unless compatible_json?
 
     errors = JsonValidator.new(@hash).validate
-    if !errors.empty?
+    unless errors.empty?
       raise Machinery::Errors::SystemDescriptionValidationFailed.new(errors)
     end
   end

data/lib/migration.rb

@@ -49,8 +49,8 @@
 #     EOT
 #
 #     def migrate
-#       is_extracted = Dir.exists?(File.join(@path, "config-files"))
-#       @hash["config_files"]["extracted"] = is_extracted
+#       is_extracted = Dir.exist?(File.join(@path, "config-files"))
+#       @hash["changed_config_files"]["extracted"] = is_extracted
 #     end
 #   end
 class Migration
@@ -70,7 +70,7 @@ class Migration
 
       errors = JsonValidator.new(hash).validate
       errors += FileValidator.new(hash, store.description_path(description_name)).validate
-      if !errors.empty?
+      unless errors.empty?
         if options[:force]
           Machinery::Ui.warn("Warning: System Description validation errors:")
           Machinery::Ui.warn(errors.join(", "))
@@ -80,7 +80,7 @@ class Migration
       end
 
       current_version = hash["meta"]["format_version"]
-      if !current_version
+      unless current_version
         raise Machinery::Errors::SystemDescriptionIncompatible.new(
           "The system description '#{description_name}' was generated by an old " \
           "version of machinery that is not supported by the upgrade mechanism."

data/lib/object.rb

@@ -112,16 +112,12 @@ module Machinery
         end
         key = name.to_s[0..-2]
         @attributes[key] = self.class.convert_element(key, args.first)
-      else
-        if @attributes.has_key?(name.to_s)
-          if !args.empty?
-            raise ArgumentError, "wrong number of arguments (#{args.size} for 0)"
-          end
-
-          @attributes[name.to_s]
-        else
-          nil
+      elsif @attributes.key?(name.to_s)
+        unless args.empty?
+          raise ArgumentError, "wrong number of arguments (#{args.size} for 0)"
         end
+
+        @attributes[name.to_s]
       end
     end
 
@@ -129,7 +125,7 @@ module Machinery
       if name.to_s.end_with?("=")
         true
       else
-        @attributes.has_key?(name) || super(name, include_all)
+        @attributes.key?(name) || super(name, include_all)
       end
     end
 

data/lib/remove_task.rb

@@ -41,7 +41,7 @@ class RemoveTask
       end
     end
 
-    if !errors.empty?
+    unless errors.empty?
       raise Machinery::Errors::SystemDescriptionNotFound.new(errors.join("\n"))
     end
   end

data/lib/renderer.rb

@@ -161,7 +161,7 @@ class Renderer
   end
 
   def render_comparison_common(description)
-    return if !description[scope]
+    return unless description[scope]
 
     puts "Common to both systems:"
     indent { compare_content_common(description) }
@@ -182,10 +182,10 @@ class Renderer
     @stack = []
     missing_descriptions = Array.new
 
-    if !description1[scope]
+    unless description1[scope]
       missing_descriptions << description1.name
     end
-    if !description2[scope]
+    unless description2[scope]
       missing_descriptions << description2.name
     end
 
@@ -205,7 +205,7 @@ class Renderer
   end
 
   def puts(s)
-    print_indented "#{s}"
+    print_indented Machinery.scrub(s)
   end
 
   def list(name = nil, options = {}, &block)
@@ -237,7 +237,7 @@ class Renderer
       )
     end
 
-    print_indented "* #{s}"
+    print_indented "* #{Machinery.scrub(s)}"
 
     if block_given?
       @stack << :item

data/lib/scope_file_access_archive.rb

@@ -23,7 +23,7 @@ module ScopeFileAccessArchive
 
     target = File.join(destination, "trees")
     self.select(&:directory?).each do |system_file|
-      raise Machinery::Errors::FileUtilsError if !system_file.directory?
+      raise Machinery::Errors::FileUtilsError unless system_file.directory?
 
       tarball_target = File.join(target, File.dirname(system_file.name))
 
@@ -56,7 +56,7 @@ module ScopeFileAccessArchive
   end
 
   def file_content(system_file)
-    if !extracted
+    unless extracted
       raise Machinery::Errors::FileUtilsError, "The requested file '#{system_file.name}' is not" \
         " available because files for scope '#{scope_name}' were not extracted."
     end

data/lib/scope_file_access_flat.rb

@@ -4,7 +4,7 @@ module ScopeFileAccessFlat
   end
 
   def write_file(system_file, target)
-    raise Machinery::Errors::FileUtilsError, "Not a file" if !system_file.file?
+    raise Machinery::Errors::FileUtilsError, "Not a file" unless system_file.file?
 
     target_path = File.join(target, system_file.name)
     FileUtils.mkdir_p(File.dirname(target_path))
@@ -12,13 +12,13 @@ module ScopeFileAccessFlat
   end
 
   def file_path(system_file)
-    raise Machinery::Errors::FileUtilsError, "Not a file" if !system_file.file?
+    raise Machinery::Errors::FileUtilsError, "Not a file" unless system_file.file?
 
     File.join(scope_file_store.path, system_file.name)
   end
 
   def file_content(system_file)
-    if !extracted
+    unless extracted
       raise Machinery::Errors::FileUtilsError, "The requested file '#{system_file.name}' is" \
         " not available because files for scope '#{scope_name}' were not extracted."
     end

data/lib/scope_file_store.rb

@@ -33,7 +33,7 @@ class ScopeFileStore
 
   def path
     dir = File.join(base_path, store_name)
-    Dir.exists?(dir) ? dir : nil
+    Dir.exist?(dir) ? dir : nil
   end
 
   def remove
@@ -60,14 +60,14 @@ class ScopeFileStore
 
   def new_dir_mode
     mode = 0700
-    if Dir.exists?(base_path)
+    if Dir.exist?(base_path)
       mode = File.stat(base_path).mode & 0777
     end
     mode
   end
 
   def create_dir(dir, mode = 0700)
-    unless Dir.exists?(dir)
+    unless Dir.exist?(dir)
       FileUtils.mkdir_p(dir, mode: mode)
     end
   end