machinery-tool 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 551ee9539d7129929b744957a8dd0ac26c6ae192
-  data.tar.gz: ee438023ee53265b39100377a44fd9a424af341a
+  metadata.gz: c161742e300133d4d5a6514ddfe3e4284fc29b52
+  data.tar.gz: 28c974344534d7ad4df48e43dce31b60125bb1b1
 SHA512:
-  metadata.gz: 056cc96bb640691c3fdb20f95a2d1adf62b5f22354dfa13d108c7cabddba2880ae657b56d2d14ccdbc15847268e236473aa64ab09d1f12e653935f944f17669f
-  data.tar.gz: 43900b48ef6ed9739efbfbd239fac78c4f9e7c1add2bd2f36349f716ed333a51771b8627574f59e3fb285aabfabeffa214fc31b417f073a6252bbc46ec2fac2f
+  metadata.gz: ddd663cea68dfa8a41b8cd8921c91436a5e70a049439ee5b628b4d628f427ef4375923f9b33e967e4d6604ba487950cad0ebed0e2b62291ba66fed49ebfa1087
+  data.tar.gz: 285ed630148abb78038681ed823dd2079501a18ecd64d0882e642300c8d6f648b62dfb7f672e8efd4dcdfc1fc3131401cf82e88f09c6d3cdb6c886423f69302f

data/NEWS

@@ -1,6 +1,12 @@
 # Machinery Release Notes
 
 
+## Version 1.1.1 - Tue Dec 02 13:24:38 CET 2014 - thardeck@suse.de
+
+* Skip Gnome Virtual File System mounts on inspection (issue #393)
+* Skip special file systems like proc, devtmpfs and so on (issue #384)
+* Show names of packages where changed config files come from (issue #392)
+
 ## Version 1.1.0 - Mon Nov 17 16:30:44 CET 2014 - thardeck@suse.de
 
 * File extraction status is now shown in the comparison output

data/lib/autoyast.rb

@@ -0,0 +1,149 @@
+# Copyright (c) 2013-2014 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
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE about this file by physical or electronic mail,
+# you may find current contact information at www.suse.com
+
+class Autoyast
+  def initialize(description)
+    @system_description = description
+  end
+
+  def write(output_dir)
+    File.write(File.join(output_dir, "autoinst.xml"), profile)
+  end
+
+  def profile
+    builder = Nokogiri::XML::Builder.new do |xml|
+      xml.doc.create_internal_subset("profile", nil, nil)
+      xml.profile(
+        "xmlns" => "http://www.suse.com/1.0/yast2ns",
+        "xmlns:config" => "http://www.suse.com/1.0/configns"
+      ) do
+        apply_repositories(xml)
+        xml.software do
+          apply_packages(xml)
+          apply_patterns(xml)
+        end
+        apply_users(xml)
+        apply_groups(xml)
+        apply_services(xml)
+      end
+    end
+
+    builder.to_xml
+  end
+
+  private
+
+  def apply_repositories(xml)
+    return if !@system_description.repositories
+
+    xml.send("add-on") do
+      xml.add_on_products("config:type" => "list") do
+        @system_description.repositories.each do |repository|
+          xml.listentry do
+            xml.media_url repository.url
+            xml.name repository.alias
+          end
+        end
+      end
+    end
+  end
+
+  def apply_packages(xml)
+    return if !@system_description.packages
+
+    xml.packages("config:type" => "list") do
+      @system_description.packages.each do |package|
+        xml.package package.name
+      end
+    end
+  end
+
+  def apply_patterns(xml)
+    return if !@system_description.patterns
+
+    xml.patterns("config:type" => "list") do
+      @system_description.patterns.each do |pattern|
+        xml.pattern pattern.name
+      end
+    end
+  end
+
+  def apply_users(xml)
+    return if !@system_description.users
+
+    xml.users("config:type" => "list") do
+      @system_description.users.each do |user|
+        xml.user do
+          xml.username user.name
+          xml.user_password user.encrypted_password
+          xml.encrypted "true", "config:type" => "boolean"
+          xml.uid user.uid
+          xml.gid user.gid
+          xml.home user.home
+          xml.shell user.shell
+          xml.fullname user.comment
+          xml.password_settings do
+            xml.min user.min_days
+            xml.max user.max_days
+            xml.warn user.warn_days
+            xml.inact user.disable_days
+            xml.expire user.disabled_date
+          end
+        end
+      end
+    end
+  end
+
+  def apply_groups(xml)
+    return if !@system_description.groups
+
+    xml.groups("config:type" => "list") do
+      @system_description.groups.each do |group|
+        xml.group do
+          xml.encrypted "true", "config:type" => "boolean"
+          xml.gid group.gid
+          xml.groupname group.name
+          xml.group_password group.password
+          xml.userlist group.users.join(",")
+        end
+      end
+    end
+  end
+
+  def apply_services(xml)
+    xml.send("services-manager") do
+      xml.services do
+        @system_description.services.services.each do |service|
+          # systemd service states like "masked" and "static" are
+          # not supported by Autoyast
+          if service.enabled?
+            xml.service do
+              xml.service_name service.name
+              xml.service_status "enable"
+            end
+          end
+          if service.disabled?
+            xml.service do
+              xml.service_name service.name
+              xml.service_status "disable"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cli.rb

@@ -359,9 +359,42 @@ class Cli
       name = shift_arg(args, "NAME")
       store = SystemDescriptionStore.new
       description = store.load(name)
+      exporter = KiwiConfig.new(description)
 
-      task = KiwiExportTask.new
-      task.export(description, File.expand_path(options["kiwi-dir"]), force: options[:force])
+      task = ExportTask.new(exporter)
+      task.export(
+        File.expand_path(options["kiwi-dir"]),
+        force: options[:force]
+      )
+    end
+  end
+
+
+
+  desc "Export system description as AutoYaST profile"
+  long_desc <<-LONGDESC
+    Export system description as AutoYaST profile
+
+    The profile will be placed in the location given by the 'autoyast-dir' option.
+  LONGDESC
+  arg "NAME"
+  command "export-autoyast" do |c|
+    c.flag ["autoyast-dir", :a], type: String, required: true,
+      desc: "Location where the autoyast profile will be stored", arg_name: "DIRECTORY"
+    c.switch :force, default_value: false, required: false, negatable: false,
+      desc: "Overwrite existing profile"
+
+    c.action do |_global_options, options, args|
+      name = shift_arg(args, "NAME")
+      store = SystemDescriptionStore.new
+      description = store.load(name)
+      exporter = Autoyast.new(description)
+
+      task = ExportTask.new(exporter)
+      task.export(
+        File.expand_path(options["autoyast-dir"]),
+        force: options[:force]
+      )
     end
   end
 
@@ -446,6 +479,8 @@ class Cli
   command :list do |c|
     c.switch :verbose, :required => false, :negatable => false,
       :desc => "Display additional information about origin of scopes"
+    c.switch :quick, :required => false, :negatable => false,
+      :desc => "Show quick list without details"
 
     c.action do |global_options,options,args|
       store = SystemDescriptionStore.new

data/lib/exceptions.rb

@@ -103,7 +103,7 @@ module Machinery
     class BuildFailed < MachineryError; end
     class DeployFailed < MachineryError; end
     class InspectionFailed < MachineryError; end
-    class KiwiExportFailed < MachineryError; end
+    class ExportFailed < MachineryError; end
 
     class SshConnectionFailed < MachineryError; end
     class RsyncFailed < MachineryError; end

data/lib/{kiwi_export_task.rb → export_task.rb}

@@ -15,22 +15,25 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class KiwiExportTask
-  def export(description, kiwi_dir, options)
-    if File.exists?(kiwi_dir)
+class ExportTask
+  def initialize(exporter)
+    @exporter = exporter
+  end
+
+  def export(output_dir, options)
+    if File.exists?(output_dir)
       if options[:force]
-        FileUtils.rm_r(kiwi_dir)
+        FileUtils.rm_r(output_dir)
       else
-        raise Machinery::Errors::KiwiExportFailed.new(
-          "The output directory '#{kiwi_dir}' already exists." \
+        raise Machinery::Errors::ExportFailed.new(
+          "The output directory '#{output_dir}' already exists." \
           " You can force overwriting it with the '--force' option."
         )
       end
     end
 
-    FileUtils.mkdir_p(kiwi_dir) unless Dir.exists?(kiwi_dir)
+    FileUtils.mkdir_p(output_dir) unless Dir.exists?(output_dir)
 
-    config = KiwiConfig.new(description)
-    config.write(kiwi_dir)
+    @exporter.write(output_dir)
   end
 end

data/lib/kiwi_config.rb

@@ -140,7 +140,7 @@ suseSetupProduct
 suseImportBuildKey
 suseConfig
 EOF
-    case @system_description.os_object
+    case @system_description.os
       when OsOpenSuse13_1
         boot = "vmxboot/suse-13.1"
         bootloader = "grub2"
@@ -151,9 +151,9 @@ EOF
         boot = "vmxboot/suse-SLES11"
         bootloader = "grub"
       else
-        raise Machinery::Errors::KiwiExportFailed.new(
+        raise Machinery::Errors::ExportFailed.new(
           "Building is not possible because the operating system " \
-          "'#{@system_description.os_object.name}' is not supported."
+          "'#{@system_description.os.canonical_name}' is not supported."
         )
     end
 
@@ -194,7 +194,7 @@ EOF
     build_filter = YAML.load_file(File.join(
       Machinery::ROOT, "helpers", "filter-packages-for-build.yaml")
     )
-    filter = build_filter[@system_description.os_object.name] || []
+    filter = build_filter[@system_description.os.canonical_name] || []
 
     xml.packages(type: "bootstrap") do
       if @system_description.packages
@@ -298,7 +298,7 @@ EOF
                 # Don't do anything because these states are not supposed
                 # to be permanent.
               else
-                raise Machinery::Errors::KiwiExportFailed.new(
+                raise Machinery::Errors::ExportFailed.new(
                   "The systemd unit state #{service.state} is unknown."
                 )
             end
@@ -311,7 +311,7 @@ EOF
   end
 
   def enable_dhcp(output_location)
-    case @system_description.os_object
+    case @system_description.os
       when OsSles11
         write_dhcp_network_config(output_location, "eth0")
       when OsSles12

data/lib/list_task.rb

@@ -19,46 +19,52 @@ class ListTask
   def list(store, options = {})
     descriptions = store.list.sort
 
-    descriptions.each do |name|
-      name = File.basename(name)
-      begin
-        description = store.load(name)
-      rescue Machinery::Errors::SystemDescriptionError
-        Machinery::Ui.puts " #{name}:\n"
-        Machinery::Ui.puts "   This description has an incompatible data format or is broken.\n" \
-             "   Use `#{$0} validate #{name}` to see the error message.\n\n"
-        next
+    if options[:quick]
+      descriptions.each do |name|
+        Machinery::Ui.puts(" #{name}")
       end
-      scopes = []
+    else
+      descriptions.each do |name|
+        name = File.basename(name)
+        begin
+          description = store.load(name)
+        rescue Machinery::Errors::SystemDescriptionError
+          Machinery::Ui.puts " #{name}:\n"
+          Machinery::Ui.puts "   This description has an incompatible data format or is broken.\n" \
+              "   Use `#{$0} validate #{name}` to see the error message.\n\n"
+          next
+        end
+        scopes = []
 
-      description.scopes.each do |scope|
-        entry = Machinery::Ui.internal_scope_list_to_string(scope)
-        if SystemDescription::EXTRACTABLE_SCOPES.include?(scope)
-          if description.scope_extracted?(scope)
-            entry += " (extracted)"
-          else
-            entry += " (not extracted)"
+        description.scopes.each do |scope|
+          entry = Machinery::Ui.internal_scope_list_to_string(scope)
+          if SystemDescription::EXTRACTABLE_SCOPES.include?(scope)
+            if description.scope_extracted?(scope)
+              entry += " (extracted)"
+            else
+              entry += " (not extracted)"
+            end
           end
-        end
 
-        if options["verbose"]
-          meta = description[scope].meta
-          if meta
-            time = Time.parse(meta.modified).getlocal
-            date = time.strftime "%Y-%m-%d %H:%M:%S"
-            hostname = meta.hostname
-          else
-            date = "unknown"
-            hostname = "Unknown hostname"
+          if options["verbose"]
+            meta = description[scope].meta
+            if meta
+              time = Time.parse(meta.modified).getlocal
+              date = time.strftime "%Y-%m-%d %H:%M:%S"
+              hostname = meta.hostname
+            else
+              date = "unknown"
+              hostname = "Unknown hostname"
+            end
+            entry += "\n      Host: [#{hostname}]"
+            entry += "\n      Date: (#{date})"
           end
-          entry += "\n      Host: [#{hostname}]"
-          entry += "\n      Date: (#{date})"
+
+          scopes << entry
         end
 
-        scopes << entry
+        Machinery::Ui.puts " #{name}:\n   * " + scopes .join("\n   * ") + "\n\n"
       end
-
-      Machinery::Ui.puts " #{name}:\n   * " + scopes .join("\n   * ") + "\n\n"
     end
   end
 end

data/lib/local_system.rb

@@ -17,18 +17,18 @@
 
 class LocalSystem < System
   class << self
-    def os_object
+    def os
       description = SystemDescription.new("localhost")
       inspector = OsInspector.new
       inspector.inspect(System.for("localhost"), description)
-      description.os_object
+      description.os
     end
 
     def validate_existence_of_package(package)
       begin
         Cheetah.run("rpm", "-q", package)
       rescue
-        needed_module = os_object.module_required_by_package(package)
+        needed_module = os.module_required_by_package(package)
         if needed_module
           raise(Machinery::Errors::MissingRequirement.new("You need the package '#{package}' from module '#{needed_module}'. You can install it as follows:\n" \
             "If you haven't selected the module '#{needed_module}' before, run `yast2 scc` and choose 'Select Extensions' and activate '#{needed_module}'.\nRun `zypper install #{package}` to install the package."))
@@ -39,14 +39,8 @@ class LocalSystem < System
     end
 
     def validate_machinery_compatibility
-      begin
-        os = os_object
-      rescue Machinery::Errors::SystemDescriptionError
-        os = nil
-      end
-
-      if !os || !os.can_run_machinery?
-        supported_oses = Os.supported_host_systems.map { |o| o.new.name }.
+      if !os.can_run_machinery?
+        supported_oses = Os.supported_host_systems.map { |o| o.canonical_name }.
           sort.join(", ")
         message = "Running Machinery is not supported on this system.\n" \
           "Supported operating systems are: #{supported_oses}"
@@ -56,8 +50,8 @@ class LocalSystem < System
     end
 
     def validate_build_compatibility(system_description)
-      if !os_object.can_build?(system_description.os_object)
-        message = "Building '#{system_description.os_object.name}' images is " \
+      if !os.can_build?(system_description.os)
+        message = "Building '#{system_description.os.canonical_name}' images is " \
           "not supported on this distribution.\n" \
           "Check the 'BUILD SUPPORT MATRIX' section in our man page for " \
           "further information which build targets are supported."

data/lib/machinery.rb

@@ -15,12 +15,12 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-require 'ostruct'
-require 'json'
+require "ostruct"
+require "json"
 require "abstract_method"
 require "cheetah"
 require "tmpdir"
-require 'tempfile'
+require "tempfile"
 require "time"
 require "logger"
 require "erb"
@@ -31,55 +31,55 @@ require "json-schema"
 require "haml"
 require "kramdown"
 
-require_relative 'machinery_logger'
-require_relative 'zypper'
-require_relative 'rpm'
-require_relative 'array'
-require_relative 'object'
-require_relative 'constants'
-require_relative 'system_description'
-require_relative 'system_description_validator'
-require_relative 'version'
-require_relative 'tarball'
-require_relative 'exceptions'
-require_relative 'inspector'
-require_relative 'system'
-require_relative 'local_system'
-require_relative 'remote_system'
-require_relative 'current_user'
-require_relative 'inspect_task'
-require_relative 'inspector'
-require_relative 'build_task'
-require_relative 'kiwi_config'
-require_relative 'renderer'
-require_relative 'show_task'
-require_relative 'compare_task'
-require_relative 'remove_task'
-require_relative 'list_task'
-require_relative 'system_description_store'
-require_relative 'logged_cheetah'
-require_relative 'renderer_helper'
-require_relative 'changed_rpm_files_helper'
-require_relative 'kiwi_export_task'
-require_relative 'helper'
-require_relative 'deploy_task'
-require_relative 'analyze_config_file_diffs_task'
-require_relative 'copy_task'
-require_relative 'scope_mixin'
-require_relative 'os'
-require_relative 'ui'
-require_relative 'validate_task'
-require_relative 'migration'
-require_relative 'upgrade_format_task'
-require_relative 'html'
-require_relative 'generate_html_task'
-require_relative 'hint'
-require_relative 'mountpoints'
-require_relative 'config_base'
-require_relative 'config'
-require_relative 'config_task'
+require_relative "machinery_logger"
+require_relative "zypper"
+require_relative "rpm"
+require_relative "array"
+require_relative "object"
+require_relative "constants"
+require_relative "system_description"
+require_relative "system_description_validator"
+require_relative "version"
+require_relative "tarball"
+require_relative "exceptions"
+require_relative "inspector"
+require_relative "system"
+require_relative "local_system"
+require_relative "remote_system"
+require_relative "current_user"
+require_relative "inspect_task"
+require_relative "inspector"
+require_relative "build_task"
+require_relative "kiwi_config"
+require_relative "renderer"
+require_relative "show_task"
+require_relative "compare_task"
+require_relative "remove_task"
+require_relative "list_task"
+require_relative "system_description_store"
+require_relative "logged_cheetah"
+require_relative "renderer_helper"
+require_relative "changed_rpm_files_helper"
+require_relative "export_task"
+require_relative "helper"
+require_relative "deploy_task"
+require_relative "analyze_config_file_diffs_task"
+require_relative "copy_task"
+require_relative "scope_mixin"
+require_relative "ui"
+require_relative "validate_task"
+require_relative "migration"
+require_relative "upgrade_format_task"
+require_relative "html"
+require_relative "generate_html_task"
+require_relative "hint"
+require_relative "mountpoints"
+require_relative "config_base"
+require_relative "config"
+require_relative "config_task"
+require_relative "autoyast"
 
 Dir[File.join(Machinery::ROOT, "plugins", "**", "*.rb")].each { |f| require(f) }
 
 # this file needs be loaded last, because it immediately collects the loaded inspectors
-require_relative 'cli'
+require_relative "cli"

data/lib/mountpoints.rb

@@ -24,6 +24,9 @@
 # remote()  returns an array containing the mount points of all mounted
 #           file systems that are remote file systems (e.g. nfs, cifs)
 #
+# special() returns an array containing the mount points of all mounted
+#            special file systems, e.g. /proc
+#
 # local()   returns an array containing the mount points of all mounted
 #           local file systems with permanent data (e.g. ext3, btrfs, xfs)
 
@@ -31,17 +34,22 @@
 class MountPoints
   attr_reader :mounts
   REMOTE_FILE_SYSTEMS = ["autofs", "cifs", "nfs", "nfs4"]
+  SPECIAL_FILE_SYSTEMS = ["proc", "sysfs", "devtmpfs", "tmpfs", "fuse.gvfs-fuse-daemon"]
   LOCAL_FILE_SYSTEMS  = ["ext2", "ext3", "ext4", "reiserfs", "btrfs", "vfat", "xfs", "jfs"]
   def initialize(system)
     @mounts = parse_mounts(system.read_file("/proc/mounts"))
   end
 
+  def special
+    @mounts.select { |_fs_file, fs_vfstype| special_fs?(fs_vfstype) }.keys
+  end
+
   def remote
-    @mounts.select { |fs_file,fs_vfstype| remote_fs?(fs_vfstype) }.keys
+    @mounts.select { |_fs_file, fs_vfstype| remote_fs?(fs_vfstype) }.keys
   end
 
   def local
-    @mounts.select { |fs_file,fs_vfstype| local_fs?(fs_vfstype) }.keys
+    @mounts.select { |_fs_file, fs_vfstype| local_fs?(fs_vfstype) }.keys
   end
 
   def all
@@ -56,12 +64,16 @@ class MountPoints
     # we store the latest entry only, because that's the relevant one
     mounts = Hash.new
     proc_mounts.each_line do |line|
-      fs_spec, fs_file, fs_vfstype, fs_mntops, fs_freq, fs_passno = line.split(' ')
+      _fs_spec, fs_file, fs_vfstype, _fs_mntops, _fs_freq, _fs_passno = line.split(" ")
       mounts[fs_file] = fs_vfstype
     end
     mounts
   end
 
+  def special_fs?(fs)
+    SPECIAL_FILE_SYSTEMS.include?(fs)
+  end
+
   def remote_fs?(fs)
     REMOTE_FILE_SYSTEMS.include?(fs)
   end

data/lib/object.rb

@@ -23,7 +23,7 @@ module Machinery
         @property_classes[name.to_sym] = options[:class]
       end
 
-      def from_json(json)
+      def object_hash_from_json(json)
         return nil unless json
 
         entries = json.map do |key, value|
@@ -43,13 +43,21 @@ module Machinery
           [key, value_converted]
         end
 
-        new(Hash[entries])
+        Hash[entries]
+      end
+
+      def from_json(json)
+        new(object_hash_from_json(json))
       end
     end
 
     attr_reader :attributes
 
     def initialize(attrs = {})
+      set_attributes(attrs)
+    end
+
+    def set_attributes(attrs)
       @attributes = attrs.inject({}) do |attributes, (key, value)|
         key = key.to_sym if key.respond_to?(:to_sym)
 

data/lib/scope_mixin.rb

@@ -17,6 +17,24 @@
 
 module Machinery
   module ScopeMixin
+    def self.included(mod)
+      @scopes ||= []
+      @scopes.push(mod)
+    end
+
+    def self.all_scopes
+      @scopes
+    end
+
+    def self.class_for(scope_name)
+      all_scopes.each do |scope|
+        if scope.new.scope_name == scope_name
+          return scope
+        end
+      end
+      nil
+    end
+
     attr_accessor :meta
 
     def set_metadata(timestring, host)

data/lib/system_description.rb

@@ -62,7 +62,7 @@ class SystemDescription < Machinery::Object
       end
 
       begin
-        description = self.new(name, self.create_attrs(json_hash), store)
+        description = self.new(name, create_scopes(json_hash), store)
       rescue NameError
         raise Machinery::Errors::SystemDescriptionIncompatible.new(name)
       end
@@ -73,22 +73,22 @@ class SystemDescription < Machinery::Object
       description
     end
 
-    def create_attrs(hash)
-      entries = hash.map do |key, value|
-        next if key == "meta"
+    def create_scopes(hash)
+      scopes = hash.map do |scope_name, scope_json|
+        next if scope_name == "meta"
 
-        class_name = "#{key.split("_").map(&:capitalize).join}Scope"
-        value_converted = Object.const_get(class_name).from_json(value)
+        scope_class = Machinery::ScopeMixin.class_for(scope_name)
+        scope_object = scope_class.from_json(scope_json)
 
         # Set metadata
-        if hash["meta"] && hash["meta"][key]
-          value_converted.meta = Machinery::Object.from_json(hash["meta"][key])
+        if hash["meta"] && hash["meta"][scope_name]
+          scope_object.meta = Machinery::Object.from_json(hash["meta"][scope_name])
         end
 
-        [key, value_converted]
+        [scope_name, scope_object]
       end.compact
 
-      Hash[entries]
+      Hash[scopes]
     end
 
     private
@@ -172,16 +172,6 @@ class SystemDescription < Machinery::Object
     self[scope] && self[scope].is_extractable? && self[scope].extracted
   end
 
-  def os_object
-    assert_scopes("os")
-
-    begin
-      Os.for(self.os.name)
-    rescue Machinery::Errors::UnknownOs => e
-      raise Machinery::Errors::SystemDescriptionError.new(e)
-    end
-  end
-
   def missing_files(scope, file_list)
     file_list.map! { |file| File.join(file_store(scope), file) }
 

data/lib/upgrade_format_task.rb

@@ -49,7 +49,11 @@ class UpgradeFormatTask
         Machinery::Ui.puts "No system descriptions were upgraded."
       end
     else
-      Machinery::Ui.puts "System description \"#{name}\" successfully upgraded." if migrations_done > 1
+      if migrations_done > 0
+        Machinery::Ui.puts "System description \"#{name}\" successfully upgraded."
+      else
+        Machinery::Ui.puts "System description \"#{name}\" is up to date, no upgrade necessary."
+      end
     end
   end
 end

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 
 end

data/plugins/docs/unmanaged_files.md

@@ -1,9 +1,10 @@
   Contains the names and contents of all files which are not part of any RPM
   package. The list of unmanaged files contains only plain files and
   directories. Special files like device nodes, named pipes and Unix domain
-  sockets are ignored. The directories `/tmp`,  `/var/tmp`, `/sys`, `/dev`,
-  `/.snapshots/`, and `/var/run` are ignored, too. If a directory is in this
-  list, no file or directory below it belongs to a RPM package.
+  sockets are ignored. The directories `/tmp`,  `/var/tmp`, `/.snapshots/`,
+  `/var/run` and special mounts like procfs and sysfs are ignored, too.
+  If a directory is in this list, no file or directory below it belongs to a
+  RPM package.
 
   Meta data information of unmanaged files is only available if the files were
   extracted during inspection.

data/plugins/inspect/os_inspector.rb

@@ -47,8 +47,7 @@ class OsInspector < Inspector
       os.version += get_additional_version(system)
       summary = "Found operating system '#{os.name}' version '#{os.version}'."
     else
-      os = OsScope.new(name: nil, version: nil, architecture: nil)
-      summary = "Could not determine the operating system."
+      raise Machinery::Errors::UnknownOs
     end
 
     description.os = os
@@ -84,10 +83,9 @@ class OsInspector < Inspector
     end
     # return pretty_name as name as it contains the actual full length
     # name instead of an abbreviation
-    OsScope.new(
-      name:         result["pretty_name"],
-      version:      result["version"]
-    )
+    os = Os.for(result["pretty_name"])
+    os.version = result["version"]
+    os
   end
 
   # checks for old suse standard: /etc/SuSE-release
@@ -111,6 +109,8 @@ class OsInspector < Inspector
     if result["version"] && !patch.nil?
       result["version"] = "#{result["version"]} SP#{patch}"
     end
-    OsScope.new(result)
+    os = Os.for(result["name"])
+    os.version = result["version"]
+    os
   end
 end

data/plugins/inspect/unmanaged_files_inspector.rb

@@ -154,14 +154,21 @@ class UnmanagedFilesInspector < Inspector
     # "REPLACEMENT CHARACTER" (U+FFFD). That way we have both the raw data
     # (which is needed in order to be able to access the files) and the cleaned
     # string which can be safely used.
-    out = system.run_command(
-      "/bin/bash",
-      {
-        :stdin           => cmd,
-        :stdout          => :capture,
-        :disable_logging => true
-      }
-    ).force_encoding("binary")
+    out = ""
+    begin
+      out = system.run_command(
+        "/bin/bash",
+        stdin:           cmd,
+        stdout:          :capture,
+        disable_logging: true
+      ).force_encoding("binary")
+    rescue Cheetah::ExecutionFailed => e
+      out = e.stdout
+      message = "Warning: The command find of the unmanaged-file inspector" \
+       " ran into an issue. The error output was:\n#{e.stderr}"
+      Machinery.logger.warn(message)
+      Machinery::Ui.warn(message)
+    end
 
 
     # find creates three field per path
@@ -216,7 +223,7 @@ class UnmanagedFilesInspector < Inspector
 
     tmp_file_store = "unmanaged_files.tmp"
     final_file_store = "unmanaged_files"
-
+    mount_points = MountPoints.new(system)
 
     ignore_list = [
       "tmp",
@@ -226,7 +233,8 @@ class UnmanagedFilesInspector < Inspector
       "var/lib/rpm",
       ".snapshots",
       description.store.base_path.sub(/^\//, ""),
-      "proc"
+      "proc",
+      "boot"
     ]
 
     # Information about users and groups are extracted by the according inspector
@@ -253,29 +261,38 @@ class UnmanagedFilesInspector < Inspector
 
     rpm_files, rpm_dirs = extract_rpm_database(system)
 
-    mount_points = MountPoints.new(system)
     mounts = mount_points.local
     unmanaged_files = []
     unmanaged_trees = []
     excluded_files = []
     unmanaged_links = {}
     remote_dirs = mount_points.remote
+    special_dirs = mount_points.special
     ignore_list.each do |ignore|
       remote_dirs.delete_if { |e| e.start_with?(File.join("/", ignore, "/")) }
     end
-    dirs_todo = [ "/" ]
-    start = start_depth
-    max = max_depth
-    find_count = 0
-    sub_tree_containing_remote_fs = []
     excluded_files += remote_dirs
+    excluded_files += special_dirs
 
     if !remote_dirs.empty?
-      warning = "The content of the following remote directories is ignored: #{remote_dirs.uniq.join(", ")}."
+      warning = "The content of the following remote directories is ignored:" \
+        "#{remote_dirs.uniq.join(", ")}."
+      Machinery.logger.warn(warning)
+      Machinery::Ui.warn(warning)
+    end
+    if !special_dirs.empty?
+      warning = "The content of the following special directories is ignored:" \
+        " #{special_dirs.uniq.join(", ")}."
       Machinery.logger.warn(warning)
       Machinery::Ui.warn(warning)
     end
 
+    dirs_todo = ["/"]
+    start = start_depth
+    max = max_depth
+    find_count = 0
+    sub_tree_containing_remote_fs = []
+
     while !dirs_todo.empty?
       find_dir = dirs_todo.first
 
@@ -305,6 +322,9 @@ class UnmanagedFilesInspector < Inspector
       while !unmanaged.empty?
         dir = unmanaged.shift
 
+        # Ignore special mounts, e.g. procfs mounts in a chroot
+        next if special_dirs.include?(find_dir + dir)
+
         # save into list of unmanaged trees
         if !remote_dirs.include?(find_dir + dir)
           unmanaged_trees << find_dir + dir

data/plugins/model/os_model.rb

@@ -15,6 +15,117 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class OsScope < Machinery::Object
+class Os < Machinery::Object
   include Machinery::ScopeMixin
+
+  def self.descendants
+    ObjectSpace.each_object(::Class).select { |klass| klass < self }
+  end
+
+  def self.for(os_name)
+    descendants.each do |os_class|
+      if os_name == os_class.canonical_name
+        os = os_class.new
+        os.name = os_name
+        return os
+      end
+    end
+    OsUnknown.new
+  end
+
+  def self.from_json(json)
+    scope_object = self.for(json["name"])
+    scope_object.set_attributes(object_hash_from_json(json))
+    scope_object
+  end
+
+  def scope_name
+    "os"
+  end
+
+  def self.buildable_systems
+    []
+  end
+
+  def self.module_dependencies
+    {}
+  end
+
+  def self.can_run_machinery?
+    true
+  end
+
+  def self.supported_host_systems
+    descendants.select { |os| os.can_run_machinery? }
+  end
+
+  def can_run_machinery?
+    self.class.can_run_machinery?
+  end
+
+  def can_build?(os)
+    self.class.buildable_systems.include?(os.class)
+  end
+
+  def module_required_by_package(package)
+    self.class.module_dependencies[package]
+  end
+
+  def canonical_name
+    self.class.canonical_name
+  end
+end
+
+class OsUnknown < Os
+  def self.canonical_name
+    "Unknown OS"
+  end
+
+  def self.can_run_machinery?
+    false
+  end
+end
+
+class OsSles11 < Os
+  def self.canonical_name
+    "SUSE Linux Enterprise Server 11"
+  end
+
+  def self.can_run_machinery?
+    false
+  end
+end
+
+class OsSles12 < Os
+  def self.canonical_name
+    "SUSE Linux Enterprise Server 12"
+  end
+
+  def self.buildable_systems
+    [OsSles12]
+  end
+
+  def self.module_dependencies
+    { "python-glanceclient" => "Public Cloud Module" }
+  end
+end
+
+class OsOpenSuse13_1 < Os
+  def self.canonical_name
+    "openSUSE 13.1 (Bottle)"
+  end
+
+  def self.buildable_systems
+    [OsSles11, OsOpenSuse13_1]
+  end
+end
+
+class OsOpenSuse13_2 < Os
+  def self.canonical_name
+    "openSUSE 13.2 (Harlequin)"
+  end
+
+  def self.buildable_systems
+    [OsSles11, OsOpenSuse13_1, OsOpenSuse13_2]
+  end
 end

data/plugins/model/services_model.rb

@@ -17,6 +17,15 @@
 
 
 class Service < Machinery::Object
+  def enabled?
+    # systemd vs sysvinit
+    state == "enabled" || state == "on"
+  end
+
+  def disabled?
+    # systemd vs sysvinit
+    state == "disabled" || state == "off"
+  end
 end
 
 class ServiceList < Machinery::Array

data/plugins/model/unmanaged_files_model.rb

@@ -54,4 +54,13 @@ end
 class UnmanagedFilesScope < FileScope
   include Machinery::ScopeMixin
   has_property :files, class: UnmanagedFileList
+
+  def compare_with(other)
+    if extracted != other.extracted
+      Machinery::Ui.warn("Warning: Comparing extracted with unextracted" \
+        " unmanaged files. Only common attributes are considered.")
+    end
+
+    super
+  end
 end

data/plugins/show/config_files_renderer.rb

@@ -39,12 +39,14 @@ class ConfigFilesRenderer < Renderer
       files = @system_description["config_files"].files
       if files
         files.each do |p|
+          item_content = "#{p.name} (#{p.package_name}-#{p.package_version}, " \
+            "#{p.changes.join(", ")})"
           if @options[:show_diffs] && p.changes.include?("md5")
-            item "#{p.name} (#{p.changes.join(", ")})" do
+            item item_content do
               render_diff_file(diffs_dir, p.name)
             end
           else
-            item ("#{p.name} (#{p.changes.join(", ")})")
+            item item_content
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machinery-tool
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cheetah
@@ -202,7 +202,6 @@ files:
 - lib/logged_cheetah.rb
 - lib/renderer.rb
 - lib/remote_system.rb
-- lib/kiwi_export_task.rb
 - lib/kiwi_config.rb
 - lib/upgrade_format_task.rb
 - lib/tarball.rb
@@ -211,7 +210,6 @@ files:
 - lib/renderer_helper.rb
 - lib/analyze_config_file_diffs_task.rb
 - lib/config.rb
-- lib/os.rb
 - lib/version.rb
 - lib/system.rb
 - lib/object.rb
@@ -219,6 +217,7 @@ files:
 - lib/config_task.rb
 - lib/remove_task.rb
 - lib/system_description.rb
+- lib/autoyast.rb
 - lib/zypper.rb
 - lib/constants.rb
 - lib/mountpoints.rb
@@ -226,6 +225,7 @@ files:
 - lib/rpm.rb
 - lib/array.rb
 - lib/changed_rpm_files_helper.rb
+- lib/export_task.rb
 - lib/copy_task.rb
 - lib/build_task.rb
 - lib/local_system.rb

data/lib/os.rb

@@ -1,90 +0,0 @@
-# Copyright (c) 2013-2014 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
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, contact SUSE LLC.
-#
-# To contact SUSE about this file by physical or electronic mail,
-# you may find current contact information at www.suse.com
-
-class Os
-  attr_reader :can_build, :name
-
-  def self.descendants
-    ObjectSpace.each_object(::Class).select { |klass| klass < self }
-  end
-
-  def self.for(os_name)
-    descendants.each do |os_class|
-      os_object = os_class.new
-      if os_name == os_object.name
-        return os_object
-      end
-    end
-    raise Machinery::Errors::UnknownOs.new("Unknown OS: '#{os_name}'")
-  end
-
-  def self.supported_host_systems
-    descendants.select { |os| os.new.can_run_machinery? }
-  end
-
-  def can_build?(os)
-    if os.is_a?(Class)
-      return @can_build.include?(os)
-    else
-      return @can_build.include?(os.class)
-    end
-  end
-
-  def module_required_by_package(package)
-    if @module_required_by_package
-      return @module_required_by_package[package]
-    end
-  end
-
-  def can_run_machinery?
-    @can_run_machinery
-  end
-end
-
-class OsSles11 < Os
-  def initialize
-    @can_build = []
-    @name = "SUSE Linux Enterprise Server 11"
-  end
-end
-
-class OsSles12 < Os
-  def initialize
-    @can_build = [OsSles12]
-    @name = "SUSE Linux Enterprise Server 12"
-    @module_required_by_package = {
-      "python-glanceclient" => "Public Cloud Module"
-    }
-    @can_run_machinery = true
-  end
-end
-
-class OsOpenSuse13_1 < Os
-  def initialize
-    @can_build = [OsSles11, OsOpenSuse13_1]
-    @name = "openSUSE 13.1 (Bottle)"
-    @can_run_machinery = true
-  end
-end
-
-class OsOpenSuse13_2 < Os
-  def initialize
-    @can_build = [OsSles11, OsOpenSuse13_1, OsOpenSuse13_2]
-    @name = "openSUSE 13.2 (Harlequin)"
-    @can_run_machinery = true
-  end
-end