machinery-tool 1.17.0 → 1.18.0

data/lib/compare_task.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/comparison.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/config.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/config_base.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/config_task.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/constants.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as
@@ -21,5 +21,5 @@ module Machinery
   DEFAULT_LOG_FILE = File.join(DEFAULT_CONFIG_DIR, "machinery.log")
   DEFAULT_CONFIG_FILE = File.join(DEFAULT_CONFIG_DIR, "machinery.config")
   IMAGE_META_DATA_FILE = "machinery.meta"
-  HELPER_REMOTE_PATH = "/root"
+  HELPER_REMOTE_PATH = "~".freeze
 end

data/lib/containerize_task.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/containerized_app.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/copy_task.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/current_user.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/deploy_task.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/docker_system.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as
@@ -95,10 +95,9 @@ class DockerSystem < System
     created = !File.exists?(archive)
     out = File.open(archive, "w")
     begin
-      run_command(
-        File.join(
-          Machinery::HELPER_REMOTE_PATH, "machinery-helper"
-        ), "tar", "--create", "--gzip", "--null", "--files-from=-",
+      helper = MachineryHelper.new(self)
+      helper.run_helper_subcommand(
+        "tar", "--create", "--gzip", "--null", "--files-from=-",
         *exclude.flat_map { |f| ["--exclude", f] },
         stdout: out,
         stdin: Array(file_list).join("\0"),

data/lib/dpkg_database.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as
@@ -18,7 +18,7 @@
 class DpkgDatabase < ManagedFilesDatabase
   def managed_files_list(&block)
     message = "The list of changed config and managed files is not complete on dpkg systems."\
-     " The reason for this is missing verifcation data:" \
+     " The reason for this is missing verification data:" \
      " https://github.com/SUSE/machinery/wiki/Ubuntu-Inspection"
 
     Machinery.logger.warn(message)

data/lib/element_filter.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/exceptions.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as
@@ -121,7 +121,7 @@ module Machinery
       def to_s
         "sudo isn't configured on the inspected host '#{@host}' for user '#{@remote_user}' to " \
         "give all required commands enough privileges. See 'PREREQUISITES' section in the " \
-        "machinery man page for a description on how to configure sudo on the inspected host."
+        "machinery documentation for a description on how to configure sudo on the inspected host."
       end
     end
 

data/lib/export_task.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/exporter.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/file_diff.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/file_scope.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/file_validator.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/filter.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/filter_option_parser.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/helper.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/hint.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/html.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/inspect_task.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/inspector.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/json_schema_monkey_patch.rb

@@ -0,0 +1,35 @@
+# Quick and dirty monkey patch for a performance bug we saw with certain
+# schema constellations
+#
+# The performance issues are that
+#   * `build_fragment` joins the elements in `fragments` even though the
+#     error message it is used in is never used
+#   * the `fragment` array constantly grows
+module JSON
+  class Schema
+    class EnumAttribute < Attribute
+      def self.validate(current_schema, data, fragments, processor, validator, options = {})
+        if !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|
+              if val.is_a?(NilClass)
+                message += " null,"
+              elsif val.is_a?(Array)
+                message += " (array),"
+              elsif val.is_a?(Hash)
+                message += " (object),"
+              else
+                message += " #{val.to_s},"
+              end
+            }
+            message.chop!
+            validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
+          else
+            raise ValidationError.new("", [], nil, current_schema)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/json_validation_error_cleaner.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/json_validator.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as

data/lib/kiwi_config.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as
@@ -16,7 +16,7 @@
 # you may find current contact information at www.suse.com
 
 class KiwiConfig < Exporter
-  attr_accessor :xml, :sh
+  attr_accessor :xml_text, :sh
   attr_accessor :name
 
   def initialize(system_description, options = {})
@@ -41,8 +41,8 @@ class KiwiConfig < Exporter
 
     @sh << "baseCleanMount\n"
     @sh << "exit 0\n"
-    File.write(File.join(output_location, "config.xml") , @xml.to_xml)
-    File.write(File.join(output_location, "config.sh") , @sh)
+    File.write(File.join(output_location, "config.xml"), xml_text)
+    File.write(File.join(output_location, "config.sh"), @sh)
     FileUtils.cp(
        File.join(Machinery::ROOT, "export_helpers/kiwi_export_readme.md"),
        File.join(output_location, "README.md")
@@ -192,41 +192,41 @@ suseImportBuildKey
 suseConfig
 EOF
 
-    builder = Nokogiri::XML::Builder.new do |xml|
-      xml.image(schemaversion: "5.8", name: @system_description.name) do
-        xml.description(type: "system") do
-          xml.author "Machinery"
-          xml.contact ""
-          xml.specification "Description of system '#{@system_description.name}' exported by Machinery"
-        end
+    xml = Builder::XmlMarkup.new(indent: 2)
+    xml.instruct! :xml
+    xml.image(schemaversion: "5.8", name: @system_description.name) do
+      xml.description(type: "system") do
+        xml.author "Machinery"
+        xml.contact ""
+        xml.specification "Description of system '#{@system_description.name}' exported by Machinery"
+      end
 
-        xml.preferences do
-          xml.packagemanager "zypper"
-          xml.version "0.0.1"
-          xml.type_(
-            image: "vmx",
-            filesystem: "ext3",
-            installiso: "true",
-            boot: @system_description.os.kiwi_boot,
-            format: "qcow2", bootloader: @system_description.os.kiwi_bootloader
-          )
-        end
+      xml.preferences do
+        xml.packagemanager "zypper"
+        xml.version "0.0.1"
+        xml.type(
+          image: "vmx",
+          filesystem: "ext3",
+          installiso: "true",
+          boot: @system_description.os.kiwi_boot,
+          format: "qcow2", bootloader: @system_description.os.kiwi_bootloader
+        )
+      end
 
-        xml.users(group: "root") do
-          xml.user(password: "$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0",
-            home: "/root", name: "root")
-        end
+      xml.users(group: "root") do
+        xml.user(password: "$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0",
+          home: "/root", name: "root")
+      end
 
 
-        apply_repositories(xml)
-        apply_packages(xml)
-        apply_services
-      end
+      apply_repositories(xml)
+      apply_packages(xml)
+      apply_services
     end
 
     pre_process_config
 
-    @xml = builder.doc
+    @xml_text = xml.target!
   end
 
   def apply_packages(xml)
@@ -294,46 +294,48 @@ EOF
       init_system = @system_description["services"].init_system
 
       case init_system
-        when "sysvinit"
-          @system_description["services"].each do |service|
+      when "sysvinit"
+        @system_description["services"].each do |service|
+          @sh <<
             if service.state == "on"
-              @sh << "chkconfig #{service.name} on\n"
+              "chkconfig #{service.name} on\n"
             else
-              @sh << "chkconfig #{service.name} off\n"
-            end
-          end
-
-        when "systemd"
-          # possible systemd service states:
-          # http://www.freedesktop.org/software/systemd/man/systemctl.html#Unit%20File%20Commands
-          @system_description["services"].each do |service|
-            case service.state
-              when "enabled"
-                @sh << "systemctl enable #{service.name}\n"
-              when "disabled"
-                @sh << "systemctl disable #{service.name}\n"
-              when "masked"
-                @sh << "systemctl mask #{service.name}\n"
-              when "static"
-                # Don't do anything because the unit is not meant to be
-                # enabled/disabled manually.
-              when "linked"
-                # Don't do anything because linking doesn't mean enabling
-                # nor disabling.
-              when "enabled-runtime"
-              when "linked-runtime"
-              when "masked-runtime"
-                # Don't do anything because these states are not supposed
-                # to be permanent.
-              else
-                raise Machinery::Errors::ExportFailed.new(
-                  "The systemd unit state #{service.state} is unknown."
-                )
+              "chkconfig #{service.name} off\n"
             end
+        end
+      when "systemd"
+        # possible systemd service states:
+        # http://www.freedesktop.org/software/systemd/man/systemctl.html#Unit%20File%20Commands
+        @system_description["services"].each do |service|
+          case service.state
+          when "enabled"
+            @sh << "systemctl enable #{service.name}\n"
+          when "disabled"
+            @sh << "systemctl disable #{service.name}\n"
+          when "masked"
+            @sh << "systemctl mask #{service.name}\n"
+          when "static"
+            # Don't do anything because the unit is not meant to be
+            # enabled/disabled manually.
+          when "linked"
+            # Don't do anything because linking doesn't mean enabling
+            # nor disabling.
+          when "enabled-runtime"
+          when "linked-runtime"
+          when "masked-runtime"
+            # Don't do anything because these states are not supposed
+            # to be permanent.
+          else
+            raise Machinery::Errors::ExportFailed.new(
+              "The systemd unit state #{service.state} is unknown."
+            )
           end
-
-        else
-          raise "Unsupported init system: #{init_system.inspect}."
+        end
+      else
+        Machinery::Ui.warn(
+          "Warning: Containers do not have an init system, so the default service" \
+            " configuration provided by the packages will be used for the image."
+        )
       end
     end
   end