machinery-tool 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53f3e1829f050fd550e3440debba26aa7a809d02
-  data.tar.gz: 5826ca3868fbadec1b75b6ecd43b179653818abd
+  metadata.gz: 184d1ef94950678ea43a32a035f1b49393fcaa3a
+  data.tar.gz: 4e4135549b3a332ae78c453100797d8bcc121ecf
 SHA512:
-  metadata.gz: 63953c2f507e6191a4c7bced722aeb749469d4c549efabb1d60709fca0162bb09a807501e001c8ee38167c530cc0095a980f0b8ba8b635d5f82b5ed0fca1b88f
-  data.tar.gz: d5ea80efa210b5a35ac2d696e065f52fd2749636949ddef90f64fe8ff39ec30e79fe51555a197176d5ea38b619547e7d6176b86bfb8e41e650ed4836e281c67a
+  metadata.gz: 19f792e485da42fa7e8dad80d822cd0890f92ffc9cb96a89621bb86b8830388b061b8db39e96fd0afe86d3fe1d3f3a1f7728f8dc9d5788b756619831970b4e65
+  data.tar.gz: e692387ddaf55efb16418c5b2db7ff7be53b7d5f0ffb46a2cae6297e0ce4ad090b1455140fef1f4500d7223111f8e1ce9c705b19054cc8ed553f8d8b6e7f1ed1

data/NEWS

@@ -1,6 +1,13 @@
 # Machinery Release Notes
 
 
+## Version 1.5.0 - Fri Mar 13 13:03:47 CET 2015 - thardeck@suse.de
+
+* Fix issue with changes of managed files on RHEL (gh#SUSE/machinery#636)
+* Add `--short` option to list command for showing a short list of all descriptions
+* Improve error output for system descriptions which have outdated formats
+* Add `--skip-files` option to `inspect` command for unmanaged files
+
 ## Version 1.4.0 - Wed Feb 18 16:51:43 CET 2015 - thardeck@suse.de
 
 * Support inspection of Red Hat Enterprise Linux 6 systems

data/bin/machinery

@@ -22,7 +22,9 @@ require_relative '../lib/machinery'
 begin
   LocalSystem.validate_machinery_compatibility
   Machinery.initialize_logger(ENV["MACHINERY_LOG_FILE"] || Machinery::DEFAULT_LOG_FILE)
-  Machinery.logger.info "Executing '#{$0} #{ARGV.join(" ")}'"
+  command_log = "Executing (Version #{Machinery::VERSION}) '#{$0} #{ARGV.join(" ")}'"
+  command_log += " (store: #{ENV["MACHINERY_DIR"]})" if ENV["MACHINERY_DIR"]
+  Machinery.logger.info command_log
   Cli.run(ARGV)
 rescue Machinery::Errors::IncompatibleHost => e
   puts e

data/helpers/default_filters.json

@@ -0,0 +1,24 @@
+{
+  "inspect": [
+    "/unmanaged_files/files/name=/etc/passwd",
+    "/unmanaged_files/files/name=/etc/shadow",
+    "/unmanaged_files/files/name=/etc/group",
+    "/unmanaged_files/files/name=/tmp",
+    "/unmanaged_files/files/name=/var/tmp",
+    "/unmanaged_files/files/name=/lost+found",
+    "/unmanaged_files/files/name=/var/run",
+    "/unmanaged_files/files/name=/var/lib/rpm",
+    "/unmanaged_files/files/name=/.snapshots",
+    "/unmanaged_files/files/name=/proc",
+    "/unmanaged_files/files/name=/boot",
+    "/unmanaged_files/files/name=/etc/init.d/boot.d",
+    "/unmanaged_files/files/name=/etc/init.d/rc0.d",
+    "/unmanaged_files/files/name=/etc/init.d/rc1.d",
+    "/unmanaged_files/files/name=/etc/init.d/rc2.d",
+    "/unmanaged_files/files/name=/etc/init.d/rc3.d",
+    "/unmanaged_files/files/name=/etc/init.d/rc4.d",
+    "/unmanaged_files/files/name=/etc/init.d/rc5.d",
+    "/unmanaged_files/files/name=/etc/init.d/rc6.d",
+    "/unmanaged_files/files/name=/etc/init.d/rcS.d"
+  ]
+}

data/helpers/yum_repositories.py

@@ -17,7 +17,10 @@
 # you may find current contact information at www.suse.com
 
 import yum
-import json
+try:
+  import json
+except:
+  import simplejson as json
 
 yb = yum.YumBase()
 
@@ -28,7 +31,10 @@ for repo in yb.repos.sort():
   repo_dict["alias"] = repo.id
   repo_dict["name"] = repo.name
   repo_dict["type"] = "rpm-md"
-  repo_dict["url"] = repo.baseurl[0] if repo.baseurl else ""
+  if repo.baseurl:
+    repo_dict["url"] = repo.baseurl[0]
+  else:
+    repo_dict["url"] = ""
   repo_dict["enabled"] = repo.enabled
   repo_dict["gpgcheck"] = repo.gpgcheck
   repo_dict["package_manager"] = "yum"

data/lib/autoyast.rb

@@ -74,6 +74,7 @@ class Autoyast < Exporter
         apply_basic_network(xml)
         apply_repositories(xml)
         xml.software do
+          apply_software_settings(xml)
           apply_packages(xml)
           apply_patterns(xml)
         end
@@ -102,6 +103,10 @@ class Autoyast < Exporter
 
   private
 
+  def apply_software_settings(xml)
+    xml.install_recommended "false", "config:type" => "boolean"
+  end
+
   def apply_non_interactive_mode(xml)
     xml.general do
       xml.mode do
@@ -250,7 +255,7 @@ class Autoyast < Exporter
     xml.send("pre-scripts", "config:type" => "list") do
       xml.script do
         xml.source do
-          xml.cdata 'sed -n \'/.*autoyast2\?=\(.*\)\/.*[^\s]*/s//\1/p\'' \
+          xml.cdata 'sed -n \'/.*autoyast2\?=\([^ ]*\)\/.*[^\s]*/s//\1/p\'' \
             ' /proc/cmdline > /tmp/description_url'
         end
       end
@@ -286,7 +291,7 @@ class Autoyast < Exporter
       !@system_description.unmanaged_files.extracted
 
     base = Pathname(@system_description.scope_file_store("unmanaged_files").path)
-    @chroot_scripts << <<-EOF
+    @chroot_scripts << <<-EOF.chomp.gsub(/^\s+/, "")
       curl -o '/mnt/tmp/filter' "`cat /tmp/description_url`/unmanaged_files_#{@name}_excludes"
     EOF
 
@@ -297,7 +302,7 @@ class Autoyast < Exporter
       tarball_name = File.basename(path)
       url = "`cat /tmp/description_url`#{URI.escape(File.join("/unmanaged_files", relative_path))}"
 
-      @chroot_scripts << <<-EOF
+      @chroot_scripts << <<-EOF.chomp.gsub(/^\s+/, "")
         curl -o '/mnt/tmp/#{tarball_name}' "#{url}"
         tar -C /mnt/ -X '/mnt/tmp/filter' -xf '#{File.join("/mnt/tmp", tarball_name)}'
         rm '#{File.join("/mnt/tmp", tarball_name)}'

data/lib/changed_rpm_files_helper.rb

@@ -16,10 +16,21 @@
 # you may find current contact information at www.suse.com
 
 module ChangedRpmFilesHelper
+  def expected_tag?(character, position)
+    if @rpm_changes[position] == character
+      true
+    else
+      @unknown_tag ||= ![".", "?"].include?(@rpm_changes[position])
+      false
+    end
+  end
+
   def parse_rpm_changes_line(line)
     # rpm provides lines per config file where first 9 characters indicate which
     # properties of the file are modified
-    rpm_changes, *fields = line.split(" ")
+    @rpm_changes, *fields = line.split(" ")
+    # nine rpm changes are known
+    @unknown_tag = @rpm_changes.size > 9
 
     # For config or documentation files there's an additional field which
     # contains "c" or "d"
@@ -27,17 +38,33 @@ module ChangedRpmFilesHelper
     path = fields.join(" ")
 
     changes = []
-    if rpm_changes == "missing"
+    if @rpm_changes == "missing"
       changes << "deleted"
-    elsif rpm_changes == "........." && path.end_with?(" (replaced)")
+    elsif @rpm_changes == "........." && path.end_with?(" (replaced)")
       changes << "replaced"
       path.slice!(/ \(replaced\)$/)
     else
-      changes << "mode" if rpm_changes[1] == "M"
-      changes << "md5" if rpm_changes[2] == "5"
-      changes << "user" if rpm_changes[5] == "U"
-      changes << "group" if rpm_changes[6] == "G"
+      changes << "size" if expected_tag?("S", 0)
+      changes << "mode" if expected_tag?("M", 1)
+      changes << "md5" if expected_tag?("5", 2)
+      changes << "device_number" if expected_tag?("D", 3)
+      changes << "link_path" if expected_tag?("L", 4)
+      changes << "user" if expected_tag?("U", 5)
+      changes << "group" if expected_tag?("G", 6)
+      changes << "time" if expected_tag?("T", 7)
+      changes << "capabilities" if @rpm_changes.size > 8 && expected_tag?("P", 8)
     end
+
+    if @unknown_tag
+      changes << "other_rpm_changes"
+    end
+
+    if @rpm_changes.include?("?")
+      message = "Could not perform all tests on rpm changes for file '#{path}'."
+      Machinery.logger.warn(message)
+      Machinery::Ui.warn("Warning: #{message}")
+    end
+
     [path, changes, type]
   end
 

data/lib/cli.rb

@@ -22,9 +22,9 @@ class Cli
   preserve_argv(true)
   @version = Machinery::VERSION + " (system description format version " +
     "#{SystemDescription::CURRENT_FORMAT_VERSION})"
-  switch :version, :negatable => false, :desc => "Show version"
-  switch :debug, :negatable => false, :desc => "Enable debug mode"
-  switch [:help, :h], :negatable => false, :desc => "Show help"
+  switch :version, negatable: false, desc: "Show version"
+  switch :debug, negatable: false, desc: "Enable debug mode"
+  switch [:help, :h], negatable: false, desc: "Show help"
 
   sort_help :manually
   pre do |global_options,command,options,args|
@@ -197,13 +197,12 @@ class Cli
   LONGDESC
   arg "NAME"
   command :analyze do |c|
-    c.flag [:operation, :o], :type => String, :required => true,
-      :desc => "The analyze operation to perform", :arg_name => "OPERATION"
+    c.flag [:operation, :o], type: String, required: true,
+      desc: "The analyze operation to perform", arg_name: "OPERATION"
 
     c.action do |global_options,options,args|
       name = shift_arg(args, "NAME")
-      store = SystemDescriptionStore.new
-      description = SystemDescription.load(name, store)
+      description = SystemDescription.load(name, system_description_store)
 
       case options[:operation]
         when "config-file-diffs"
@@ -228,20 +227,22 @@ class Cli
   LONGDESC
   arg "NAME"
   command :build do |c|
-    c.flag ["image-dir", :i], :type => String, :required => true,
-      :desc => "Store the image under the specified path", :arg_name => "DIRECTORY"
-    c.switch ["enable-dhcp", :d], :required => false, :negatable => false,
-      :desc => "Enable DCHP client on first network card of built image"
-    c.switch ["enable-ssh", :s], :required => false, :negatable => false,
-      :desc => "Enable SSH service in built image"
+    c.flag ["image-dir", :i], type: String, required: true,
+      desc: "Store the image under the specified path", arg_name: "DIRECTORY"
+    c.switch ["enable-dhcp", :d], required: false, negatable: false,
+      desc: "Enable DCHP client on first network card of built image"
+    c.switch ["enable-ssh", :s], required: false, negatable: false,
+      desc: "Enable SSH service in built image"
 
     c.action do |global_options,options,args|
       name = shift_arg(args, "NAME")
-      store = SystemDescriptionStore.new
-      description = SystemDescription.load(name, store)
+      description = SystemDescription.load(name, system_description_store)
 
       task = BuildTask.new
-      task.build(description, File.expand_path(options["image-dir"]), {:enable_dhcp => options["enable-dhcp"], :enable_ssh => options["enable-ssh"]})
+      task.build(
+        description, File.expand_path(options["image-dir"]),
+        enable_dhcp: options["enable-dhcp"], enable_ssh: options["enable-ssh"]
+      )
     end
   end
 
@@ -259,19 +260,19 @@ class Cli
   arg "NAME1"
   arg "NAME2"
   command :compare do |c|
-    c.flag [:scope, :s], :type => String, :required => false,
-      :desc => "Compare specified scopes", :arg_name => "SCOPE_LIST"
-    c.flag ["exclude-scope", :e], :type => String, :required => false,
-      :desc => "Exclude specified scopes", :arg_name => "SCOPE_LIST"
-    c.switch "show-all", :required => false, :negatable => false,
-      :desc => "Show also common properties"
-    c.switch "pager", :required => false, :default_value => true,
-      :desc => "Pipe output into a pager"
+    c.flag [:scope, :s], type: String, required: false,
+      desc: "Compare specified scopes", arg_name: "SCOPE_LIST"
+    c.flag ["exclude-scope", :e], type: String, required: false,
+      desc: "Exclude specified scopes", arg_name: "SCOPE_LIST"
+    c.switch "show-all", required: false, negatable: false,
+      desc: "Show also common properties"
+    c.switch "pager", required: false, default_value: true,
+      desc: "Pipe output into a pager"
 
     c.action do |global_options,options,args|
       name1 = shift_arg(args, "NAME1")
       name2 = shift_arg(args, "NAME2")
-      store = SystemDescriptionStore.new
+      store = system_description_store
       description1 = SystemDescription.load(name1, store)
       description2 = SystemDescription.load(name2, store)
       scope_list = process_scope_option(options[:scope], options["exclude-scope"])
@@ -298,9 +299,8 @@ class Cli
     c.action do |global_options,options,args|
       from = shift_arg(args, "FROM_NAME")
       to = shift_arg(args, "TO_NAME")
-      store = SystemDescriptionStore.new
       task = CopyTask.new
-      task.copy(store, from, to)
+      task.copy(system_description_store, from, to)
     end
   end
 
@@ -315,19 +315,18 @@ class Cli
   LONGDESC
   arg "NAME"
   command :deploy do |c|
-    c.flag ["cloud-config", :c], :type => String, :required => true, :arg_name => "FILE",
-      :desc => "Path to file where the cloud config (openrc.sh) is located"
-    c.flag ["image-dir", :i], :type => String, :required => false,
-      :desc => "Directory where the image is located", :arg_name => "DIRECTORY"
-    c.switch [:insecure, :s], :required => false, :negatable => false,
-      :desc => "Explicitly allow glanceclient to perform 'insecure SSL' (https) requests."
-    c.flag ["cloud-image-name", :n], :type => String, :required => false,
-      :desc => "Name of the image in the cloud", :arg_name => "NAME"
+    c.flag ["cloud-config", :c], type: String, required: true, arg_name: "FILE",
+      desc: "Path to file where the cloud config (openrc.sh) is located"
+    c.flag ["image-dir", :i], type: String, required: false,
+      desc: "Directory where the image is located", arg_name: "DIRECTORY"
+    c.switch [:insecure, :s], required: false, negatable: false,
+      desc: "Explicitly allow glanceclient to perform 'insecure SSL' (https) requests."
+    c.flag ["cloud-image-name", :n], type: String, required: false,
+      desc: "Name of the image in the cloud", arg_name: "NAME"
 
     c.action do |global_options,options,args|
       name = shift_arg(args, "NAME")
-      store = SystemDescriptionStore.new
-      description = SystemDescription.load(name, store)
+      description = SystemDescription.load(name, system_description_store)
 
       task = DeployTask.new
       opts = {
@@ -350,15 +349,14 @@ class Cli
   LONGDESC
   arg "NAME"
   command "export-kiwi" do |c|
-    c.flag ["kiwi-dir", :k], :type => String, :required => true,
-      :desc => "Location where the description will be stored", :arg_name => "DIRECTORY"
-    c.switch :force, :default_value => false, :required => false, :negatable => false,
-      :desc => "Overwrite existing description"
+    c.flag ["kiwi-dir", :k], type: String, required: true,
+      desc: "Location where the description will be stored", arg_name: "DIRECTORY"
+    c.switch :force, default_value: false, required: false, negatable: false,
+      desc: "Overwrite existing description"
 
     c.action do |global_options,options,args|
       name = shift_arg(args, "NAME")
-      store = SystemDescriptionStore.new
-      description = SystemDescription.load(name, store)
+      description = SystemDescription.load(name, system_description_store)
       exporter = KiwiConfig.new(description)
 
       task = ExportTask.new(exporter)
@@ -387,8 +385,7 @@ class Cli
 
     c.action do |_global_options, options, args|
       name = shift_arg(args, "NAME")
-      store = SystemDescriptionStore.new
-      description = SystemDescription.load(name, store)
+      description = SystemDescription.load(name, system_description_store)
       exporter = Autoyast.new(description)
 
       task = ExportTask.new(exporter)
@@ -412,26 +409,28 @@ class Cli
   LONGDESC
   arg "HOSTNAME"
   command :inspect do |c|
-    c.flag [:name, :n], :type => String, :required => false, :arg_name => "NAME",
-      :desc => "Store system description under the specified name"
-    c.flag [:scope, :s], :type => String, :required => false,
-      :desc => "Show specified scopes", :arg_name => "SCOPE_LIST"
-    c.flag ["exclude-scope", :e], :type => String, :required => false,
-      :desc => "Exclude specified scopes", :arg_name => "SCOPE_LIST"
-    c.switch ["extract-files", :x], :required => false, :negatable => false,
-      :desc => "Extract changed configuration files and unmanaged files from inspected system"
-    c.switch "extract-changed-config-files", :required => false, :negatable => false,
-      :desc => "Extract changed configuration files from inspected system"
-    c.switch "extract-unmanaged-files", :required => false, :negatable => false,
-      :desc => "Extract unmanaged files from inspected system"
-    c.switch "extract-changed-managed-files", :required => false, :negatable => false,
-      :desc => "Extract changed managed files from inspected system"
-    c.switch :show, :required => false, :negatable => false,
-      :desc => "Print inspection result"
+    c.flag [:name, :n], type: String, required: false, arg_name: "NAME",
+      desc: "Store system description under the specified name"
+    c.flag [:scope, :s], type: String, required: false,
+      desc: "Show specified scopes", arg_name: "SCOPE_LIST"
+    c.flag ["exclude-scope", :e], type: String, required: false,
+      desc: "Exclude specified scopes", arg_name: "SCOPE_LIST"
+    c.flag "skip-files", required: false, negatable: false,
+      desc: "Do not consider given files or directories during inspection. " \
+        "Either provide one file or directory name or a list of names separated by commas."
+    c.switch ["extract-files", :x], required: false, negatable: false,
+      desc: "Extract changed configuration files and unmanaged files from inspected system"
+    c.switch "extract-changed-config-files", required: false, negatable: false,
+      desc: "Extract changed configuration files from inspected system"
+    c.switch "extract-unmanaged-files", required: false, negatable: false,
+      desc: "Extract unmanaged files from inspected system"
+    c.switch "extract-changed-managed-files", required: false, negatable: false,
+      desc: "Extract changed managed files from inspected system"
+    c.switch :show, required: false, negatable: false,
+      desc: "Print inspection result"
 
     c.action do |global_options,options,args|
       host = shift_arg(args, "HOSTNAME")
-      store = SystemDescriptionStore.new
       inspector_task = InspectTask.new
       scope_list = process_scope_option(options[:scope], options["exclude-scope"])
       name = options[:name] || host
@@ -456,14 +455,27 @@ class Cli
         inspect_options[:extract_unmanaged_files] = true
       end
 
+      if options["skip-files"] && !(scope_list & ["config_files", "changed_managed_files"]).empty?
+        Machinery::Ui.warn("Warning: The --skip-files option is currently only supported for the " \
+          "\"unmanaged-files\" scope")
+      end
+
+      filter = prepare_filter("inspect", options)
+
       inspector_task.inspect_system(
-        store, host, name, CurrentUser.new, scope_list, inspect_options
+        system_description_store,
+        host,
+        name,
+        CurrentUser.new,
+        scope_list,
+        filter,
+        inspect_options
       )
 
-      Hint.show_data(:name => name)
+      Hint.show_data(name: name)
 
       if !options["extract-files"] || Inspector.all_scopes.count != scope_list.count
-        Hint.do_complete_inspection(:name => name, :host => host)
+        Hint.do_complete_inspection(name: name, host: host)
       end
     end
   end
@@ -478,13 +490,14 @@ class Cli
     option.
   LONGDESC
   command :list do |c|
-    c.switch :verbose, :required => false, :negatable => false,
-      :desc => "Display additional information about origin of scopes"
+    c.switch :verbose, required: false, negatable: false,
+      desc: "Display additional information about origin of scopes"
+    c.switch :short, required: false, negatable: false,
+      desc: "List only description names"
 
     c.action do |global_options,options,args|
-      store = SystemDescriptionStore.new
       task = ListTask.new
-      task.list(store, options)
+      task.list(system_description_store, options)
     end
   end
 
@@ -498,16 +511,14 @@ class Cli
   LONGDESC
   arg "NAME..."
   command :remove do |c|
-    c.switch :all, :negatable => false,
-      :desc => "Remove all system descriptions"
-    c.switch :verbose, :required => false, :negatable => false,
-      :desc => "Explain what is being done"
+    c.switch :all, negatable: false,
+      desc: "Remove all system descriptions"
+    c.switch :verbose, required: false, negatable: false,
+      desc: "Explain what is being done"
 
     c.action do |global_options,options,args|
-
-      store = SystemDescriptionStore.new
       task = RemoveTask.new
-      task.remove(store, args, :verbose => options[:verbose], :all => options[:all])
+      task.remove(system_description_store, args, verbose: options[:verbose], all: options[:all])
     end
   end
 
@@ -524,25 +535,23 @@ class Cli
   LONGDESC
   arg "NAME"
   command :show do |c|
-    c.flag [:scope, :s], :type => String, :required => false,
-      :desc => "Show specified scopes", :arg_name => "SCOPE_LIST"
-    c.flag ["exclude-scope", :e], :type => String, :required => false,
-      :desc => "Exclude specified scopes", :arg_name => "SCOPE_LIST"
-    c.switch "pager", :required => false, :default_value => true,
-      :desc => "Pipe output into a pager"
-    c.switch "show-diffs", :required => false, :negatable => false,
-      :desc => "Show diffs of configuration files changes."
-    c.switch "html", :required => false, :negatable => false,
-      :desc => "Open system description in HTML format in your web browser."
+    c.flag [:scope, :s], type: String, required: false,
+      desc: "Show specified scopes", arg_name: "SCOPE_LIST"
+    c.flag ["exclude-scope", :e], type: String, required: false,
+      desc: "Exclude specified scopes", arg_name: "SCOPE_LIST"
+    c.switch "pager", required: false, default_value: true,
+      desc: "Pipe output into a pager"
+    c.switch "show-diffs", required: false, negatable: false,
+      desc: "Show diffs of configuration files changes."
+    c.switch "html", required: false, negatable: false,
+      desc: "Open system description in HTML format in your web browser."
 
     c.action do |global_options,options,args|
       name = shift_arg(args, "NAME")
       if name == "localhost" && !CurrentUser.new.is_root?
         Machinery::Ui.puts "You need root rights to access the system description of your locally inspected system."
       end
-
-      store = SystemDescriptionStore.new
-      description = SystemDescription.load(name, store)
+      description = SystemDescription.load(name, system_description_store)
       scope_list = process_scope_option(options[:scope], options["exclude-scope"])
 
 
@@ -569,9 +578,8 @@ class Cli
         Machinery::Ui.puts "You need root rights to access the system description of your locally inspected system."
       end
 
-      store = SystemDescriptionStore.new
       task = ValidateTask.new
-      task.validate(store, name)
+      task.validate(system_description_store, name)
     end
   end
 
@@ -581,21 +589,20 @@ class Cli
   LONGDESC
   arg "NAME"
   command "upgrade-format" do |c|
-    c.switch :all, :negatable => false,
-      :desc => "Upgrade all system descriptions"
-    c.switch :force, :default_value => false, :required => false, :negatable => false,
-      :desc => "Keep backup after migration and ingnore validation errors"
+    c.switch :all, negatable: false,
+      desc: "Upgrade all system descriptions"
+    c.switch :force, default_value: false, required: false, negatable: false,
+      desc: "Keep backup after migration and ingnore validation errors"
 
     c.action do |global_options,options,args|
       name = shift_arg(args, "NAME") if !options[:all]
 
-      store = SystemDescriptionStore.new
       task = UpgradeFormatTask.new
       task.upgrade(
-        store,
+        system_description_store,
         name,
-        :all => options[:all],
-        :force => options[:force]
+        all: options[:all],
+        force: options[:force]
       )
     end
   end
@@ -609,8 +616,7 @@ class Cli
     c.action do |global_options,options,args|
       name = shift_arg(args, "NAME")
 
-      store = SystemDescriptionStore.new
-      description = SystemDescription.load(name, store)
+      description = SystemDescription.load(name, system_description_store)
       task = GenerateHtmlTask.new
       task.generate(description)
     end
@@ -638,4 +644,46 @@ class Cli
       end
     end
   end
+
+  def self.system_description_store
+    if ENV.has_key?("MACHINERY_DIR")
+      SystemDescriptionStore.new(ENV["MACHINERY_DIR"])
+    else
+      SystemDescriptionStore.new
+    end
+  end
+
+
+  def self.prepare_filter(command, options)
+    filter = Filter.from_default_definition(command)
+
+    skip_files = options.delete("skip-files")
+    if skip_files
+      files = skip_files.split(/(?<!\\),/) # Do not split on escaped commas
+      files = files.flat_map do |file|
+        if file.start_with?("@")
+          filename = File.expand_path(file[1..-1])
+
+          if !File.exists?(filename)
+            raise Machinery::Errors::MachineryError.new(
+              "The filter file '#{filename}' does not exist."
+            )
+          end
+          File.read(filename).lines.map(&:strip)
+        else
+          file
+        end
+      end
+
+      files.reject!(&:empty?) # Ignore empty filters
+      files.map! { |file| file.gsub("\\@", "@") } # Unescape escaped @s
+      files.map! { |file| file.chomp("/") } # List directories without the trailing /, in order to
+                                            # not confuse the unmanaged files inspector
+      files.each do |file|
+        filter.add_element_filter_from_definition("/unmanaged_files/files/name=#{file}")
+      end
+    end
+
+    filter
+  end
 end