machinery-tool 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7bb69c63715c0f27c39688ddb791ee35a6467e4
-  data.tar.gz: a214db91229631088de485747ef4e1907d10f561
+  metadata.gz: a4b7c4fc1cda138bae3373d5557bb65bd30481a5
+  data.tar.gz: c9f706f3cb00c6eac9c8a3b01eaf0ba1a5345704
 SHA512:
-  metadata.gz: a062352d64c37f3e67e1082cdef8a0958b74b0f4f2adc8edcd1eede673686e2940994542066811b91ebe51cb55af7cf3c72a578f348331a3f9f7a65381abdb30
-  data.tar.gz: 489b549c5188697403a50e29525ece98e46e3e12bf987c71a2faaccd029e167bbd43265bae9a09b923c6981f219d5887aa94b779b5317fda4f43d41b98275d7f
+  metadata.gz: e3806f42441561cc01b2b6c927627ab69b673feb65194bacedd7d460507af95070cf8ae3d087560b40ea2d9c64f158825469030a129d78458555af6137435393
+  data.tar.gz: 2212be5d36387f90dbb05b66b31cc1af51ae829a39b9208d04b8218e93590c05ae6eb21bba91db285c3f45d8e2823f35706d6d460d69054432abcfa34235e8cd

data/.git_revision

@@ -1 +1 @@
-b333b1358568df9a508e7d92c61d3280395911d9
+f5f2a71bd21d86dcbc1b90e30b8af0f466b335bd

data/NEWS

@@ -1,6 +1,27 @@
 # Machinery Release Notes
 
 
+## Version 1.16.0 - Fri Nov 06 14:20:47 CET 2015 - thardeck@suse.de
+
+* The error message "There is already a server with the same port running" has
+  been cleaned up and is no longer misleading (gh#SUSE/machinery#1541)
+* Add OpenSUSE Leap as supported system
+* HTML comparison is now available without the experimental feature flag
+* Add error message to recommend using `--name` when a container with a slash is
+  inspected (gh#SUSE/machinery#1490)
+* Fixed crash during inspection of a folder which contains special characters
+  in its name (gh#SUSE/machinery#1580)
+* Speed up inspection of config and changed managed files
+* Fix docker inspection when specifying a docker image with tag
+  (gh#SUSE/machinery#1491)
+* GConf XML files are no longer treated as binary files in HTML view
+  (gh#SUSE/machinery#1154)
+* Add current outgoing ip and export directory to Autoyast README.md during
+  export (gh#SUSE/machinery#1543)
+* Handle invalid utf-8 characters in /etc/passwd
+* Fix: "changed" link in compare view is visible while scope is collapsed but
+  doesn't do anything (gh#SUSE/machinery#1555)
+
 ## Version 1.15.0 - Mon Oct 26 17:42:25 CET 2015 - thardeck@suse.de
 
 * No information is cut off in the HTML view

data/export_helpers/autoyast_export_readme.md

@@ -11,18 +11,18 @@ The export directory contains both the AutoYaST profile and additional data that
 is required during installation. This directory needs to be made available to
 the installer via network, e.g. by running:
 
-  cd /path/to/autoyast_export; python -m SimpleHTTPServer
+  cd <path>; python -m SimpleHTTPServer
 
 You can then point the installer to the profile by specifying the AutoYaST
 option on the kernel command line.
 
 For SLES12 and openSUSE 13.2:
 
-  autoyast2=http://192.168.121.1:8000/autoinst.xml
+  autoyast2=http://<ip>:8000/autoinst.xml
 
 For SLES11:
 
-  autoyast=http://192.168.121.1:8000/autoinst.xml netsetup=dhcp
+  autoyast=http://<ip>:8000/autoinst.xml netsetup=dhcp
 
 ## Changing permissions of the AutoYaST export
 
@@ -33,7 +33,7 @@ The installation via for example an HTTP server is only possible if all files
 and sub directories are readable by the HTTP server user.
 To make the export directory readable for all users run:
 
-  chmod -R a+rX /path/to/autoyast_export
+  chmod -R a+rX <path>
 
 ## Reference
 

data/html/assets/compare/machinery.js

@@ -70,6 +70,18 @@ $(document).ready(function () {
     return false;
   });
 
+  $(".show-changed-elements").click(function(){
+    $scope = $(this).closest(".scope");
+    if ($scope.find(".toggle").hasClass("collapsed")){
+      $scope.find(".scope_content").collapse("show");
+      $scope.find(".toggle").removeClass("collapsed");
+    }
+    if ($(this).attr("href")){
+      $('html,body').animate({scrollTop: $($(this).attr("href")).offset().top}, 'slow');
+    }
+    return false;
+  });
+
   // Unmanaged files diffs
   $("#diff-unmanaged-files").on("show.bs.modal", function(e) {
     var trigger = $(e.relatedTarget);

data/html/assets/machinery.css

@@ -223,6 +223,7 @@ h1 {
 
 .diff-unmanaged-files {
   padding-left: 10px;
+  cursor: pointer;
 }
 
 .well .dismiss{

data/html/partials/compare/services.html.haml

@@ -25,7 +25,7 @@
                 (#{@diff["services"].only_in2.init_system})
             - if @diff["services"].changed && @diff["services"].changed.length > 0
               %span.summary-part
-                %a{ href: "#services_changed" }
+                %a.show-changed-elements{ href: "#services_changed" }
                   changed
                 = ": #{pluralize_scope(@diff["services"].changed, "service", "services")}"
             - if @diff["services"].common && @diff["services"].common.length > 0

data/html/partials/compare/summary.html.haml

@@ -7,7 +7,7 @@
       #{@description_b.name}: #{pluralize_scope(@diff[scope].only_in2, singular, plural)}
   - if @diff[scope].changed && @diff[scope].changed.length > 0
     %span.summary-part
-      %a{ href: "#" + scope + "_changed" }
+      %a.show-changed-elements{ href: "#" + scope + "_changed" }
         changed
       = ": #{pluralize_scope(@diff[scope].changed, singular, plural)}"
   - if @diff[scope].common && @diff[scope].common.length > 0

data/html/partials/compare/unmanaged_files.html.haml

@@ -23,7 +23,7 @@
                 = pluralize_scope(@diff["unmanaged_files"].only_in2, "file", "files")
             - if @diff["unmanaged_files"].changed
               %span.summary-part
-                %a{ href: "#unmanaged_files_changed" }
+                %a.show-changed-elements{ href: "#unmanaged_files_changed" }
                   changed
                 = ": #{pluralize_scope(@diff["unmanaged_files"].changed, "file", "files")}"
             - if @diff["unmanaged_files"].common

data/inspect_helpers/changed_files.sh

@@ -27,24 +27,6 @@
 # Exit immediately if a command exits with a non-zero status.
 set -e
 
-scope=$1
-package=$2 # for scope config-files only
-
-if [[ -z "$scope" || "$scope" != "config-files" && "$scope" != "changed-managed-files" ]]; then
-  echo "Error: Expect scope 'config-files' or 'changed-managed-files' as first argument." >&2
-  exit 1
-fi
-
-if [[ "$scope" == "changed-managed-files" && $# != 1 ]]; then
-  echo "Error: Expect no extra arguments after changed-managed-files " >&2
-  exit 1
-fi
-
-if [[ "$scope" == "config-files" && $# != 2 ]]; then
-  echo "Error: Expect one argument with package name after config-files" >&2
-  exit 1
-fi
-
 if [ $UID -ne "0" ]; then
    sudoprefix="sudo -n"
 fi
@@ -61,45 +43,4 @@ package_contains_verify_script () {
   rpm --scripts -q $1 | grep "verify scriptlet" > /dev/null
 }
 
-check_output () {
-  # rpm returns 1 as exit code when modified config files are detected
-  # that's why we explicitly detect if sudo failed
-  regex="^sudo:.*password is required"
-  if [[ "$1" =~ $regex ]]; then
-    echo "$1" >&2
-    exit 1
-  fi
-}
-
-inspect_package () {
-  package=$1
-  output=`$sudoprefix rpm -V --nodeps --nodigest --nosignature --nomtime $noscripts $package 2>&1 || true`
-
-  check_output "$output"
-
-  if [ -z "$noscripts" ] && ( package_contains_verify_script $package ); then
-    # remove the lines printed by verify scripts, because we cannot parse these lines
-    # in certain rpm versions verify scripts cannot be turned off
-    lines=`$sudoprefix rpm -V --nodeps --nodigest --nosignature --nomtime --nofiles $package | wc -l`
-    output=`echo -e "$output" | head -n-${lines}`
-  fi
-
-  if [ -n "$output" ]; then
-    if [ $scope == "changed-managed-files" ]; then
-      echo -e "$package:\\n$output";
-    else
-      echo -e "$output"
-    fi
-  fi
-}
-
-if [ $scope == "changed-managed-files" ]; then
-  for package in `rpm -qa --queryformat "%{NAME}-%{VERSION}\\n"`; do
-    inspect_package $package
-  done
-fi
-
-if [ $scope == "config-files" ]; then
-  inspect_package $package
-fi
-
+$sudoprefix rpm -Va --nodeps --nodigest --nosignature --nomtime $noscripts || true

data/lib/autoyast.rb

@@ -43,10 +43,10 @@ class Autoyast < Exporter
       output_dir
     )
     FileUtils.chmod(0600, File.join(output_dir, "unmanaged_files_#{@name}_excludes"))
-    FileUtils.cp(
-      File.join(Machinery::ROOT, "export_helpers/autoyast_export_readme.md"),
-      File.join(output_dir, "README.md")
-    )
+    readme = File.read(File.join(Machinery::ROOT, "export_helpers/autoyast_export_readme.md"))
+    readme.gsub!("<ip>", outgoing_ip)
+    readme.gsub!("<path>", output_dir)
+    File.write(File.join(output_dir, "README.md"), readme)
     Dir["#{@system_description.description_path}/*"].each do |content|
       FileUtils.cp_r(content, output_dir, preserve: true)
     end
@@ -101,6 +101,11 @@ class Autoyast < Exporter
     builder.to_xml
   end
 
+  def outgoing_ip
+    output = Cheetah.run("ip", "route", "get", "8.8.8.8", stdout: :capture)
+    output[/ src ([\d\.:]+)\s*$/, 1] || "<ip>"
+  end
+
   private
 
   def apply_software_settings(xml)

data/lib/cli.rb

@@ -154,6 +154,16 @@ class Cli
     true
   end
 
+  def self.check_container_name!(image, name)
+    if image.include?("/") && name.include?("/")
+      raise Machinery::Errors::InvalidCommandLine.new(
+        "Error: System description name '#{name}' is invalid. By default Machinery" \
+          " uses the image name as description name if the parameter `--name` is not" \
+          " provided.\nIf the image name consist a slash the `--name=NAME` parameter" \
+          " is mandatory. Valid characters are 'a-zA-Z0-9_:.-'."
+      )
+    end
+  end
 
   on_error do |e|
     Cli.handle_error(e)
@@ -177,7 +187,8 @@ class Cli
     if scopes
       if exclude_scopes
         # scope and exclude-scope
-        raise Machinery::Errors::InvalidCommandLine.new( "You cannot provide the --scope and --exclude-scope option at the same time.")
+        raise Machinery::Errors::InvalidCommandLine.new("You cannot provide the --scope and " \
+          "--exclude-scope option at the same time.")
       else
         # scope only
         scope_list = parse_scopes(scopes)
@@ -274,8 +285,8 @@ 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: false,
+      desc: "The analyze operation to perform", arg_name: "OPERATION", default_value: "config-file-diffs"
 
     c.action do |global_options,options,args|
       name = shift_arg(args, "NAME")
@@ -347,10 +358,8 @@ class Cli
       desc: "Exclude specified scopes", arg_name: "SCOPE_LIST"
     c.switch "show-all", required: false, negatable: false,
       desc: "Show also common properties"
-    if @config.experimental_features
-      c.switch "html", required: false, negatable: false,
-        desc: "Open comparison in HTML format in your web browser."
-    end
+    c.switch "html", required: false, negatable: false,
+      desc: "Open comparison in HTML format in your web browser."
     c.switch "pager", required: false, default_value: true,
       desc: "Pipe output into a pager"
 
@@ -637,6 +646,8 @@ class Cli
 
       name, scope_list, inspect_options, filter = parse_inspect_command_options(image, options)
 
+      check_container_name!(image, name)
+
       begin
         system.start
         inspector_task.inspect_system(

data/lib/docker_system.rb

@@ -124,12 +124,8 @@ class DockerSystem < System
   private
 
   def validate_image_name(image)
-    images = LoggedCheetah.run("docker", "images", stdout: :capture).split("\n")
-
-    if !images.find { |i| i.start_with?("#{image} ") || i.index(" #{image} ") }
-      raise Machinery::Errors::InspectionFailed.new(
-        "Unknown docker image: '#{image}'"
-      )
-    end
+    LoggedCheetah.run("docker", "inspect", image)
+  rescue
+    raise Machinery::Errors::InspectionFailed.new("Unknown docker image: '#{image}'")
   end
 end

data/lib/helper.rb

@@ -21,24 +21,7 @@ module Machinery
   end
 
   def self.content_is_binary?(content)
-    # Code by http://www.thecodingforums.com/threads/test-if-file-is-binary.843447/#post-4572282
-    # Modified by SUSE Linux GmbH
-    ascii = 0
-    control = 0
-    binary = 0
-
-    content.each_byte do |byte|
-      case byte
-      when 0...32
-        control += 1
-      when 32...128
-        ascii += 1
-      else
-        binary += 1
-      end
-    end
-
-    control.to_f / ascii > 0.1 || binary.to_f / ascii > 0.05
+    !Cheetah.run("file", "-b", "-", stdout: :capture, stdin: content).include?(" text")
   end
 
   # Implementation of String#scrub for Ruby < 2.1. Assumes the string is in

data/lib/html.rb

@@ -51,7 +51,7 @@ EOF
         rescue Errno::EADDRINUSE
           servefailed_error = <<-EOF.chomp
 Port #{Server.settings.port} is already in use.
-Stop the already running server on port #{Server.settings.port} or specify a new port by using --port option.
+You have to stop the already running server on port #{Server.settings.port} first or if you're serving a description with the `serve` command, you can also use the `--port` option.
 EOF
           raise Machinery::Errors::ServeFailed, servefailed_error
         rescue SocketError => e

data/lib/inspector.rb

@@ -93,30 +93,4 @@ class Inspector
   def scope
     self.class.scope
   end
-
-  # Runs the given script on the inspected machine asynchronously and calls the callback method
-  # periodically with new output when it occurs.
-  #
-  # Example:
-  #
-  #     count = 0
-  #     raw_list = run_script_with_progress("changed_managed_files.sh") do |chunk|
-  #       count += chunk.lines.count
-  #       Machinery::Ui.progress("Found #{count} changed files...")
-  #     end
-  def run_script_with_progress(*script, &callback)
-    output = ""
-    write_io = StringIO.new(output, "a")
-    read_io = StringIO.new(output, "r")
-
-    inspect_thread = Thread.new { @system.run_script(*script, stdout: write_io) }
-
-    while inspect_thread.alive?
-      sleep 0.1
-      chunk = read_io.read
-      callback.call(chunk)
-    end
-
-    output
-  end
 end

data/lib/machinery.rb

@@ -68,7 +68,6 @@ 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"
@@ -110,6 +109,7 @@ require_relative "workload_mapper_dsl"
 require_relative "containerized_app"
 require_relative "move_task"
 require_relative "docker_system"
+require_relative "rpm_database"
 
 Dir[File.join(Machinery::ROOT, "plugins", "**", "*.rb")].each { |f| require(f) }
 

data/lib/{changed_rpm_files_helper.rb → rpm_database.rb}

@@ -15,7 +15,60 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-module ChangedRpmFilesHelper
+class RpmDatabase
+  class ChangedFile < Machinery::Object
+    attr_accessor :type
+
+    def initialize(type, attrs)
+      super(attrs)
+      @type = type
+    end
+
+    def config_file?
+      @type == "c"
+    end
+  end
+
+  def initialize(system)
+    @system = system
+  end
+
+  def changed_files(&block)
+    return @changed_files if @changed_files
+
+    out = @system.run_script_with_progress("changed_files.sh", &block)
+    result = out.each_line.map do |line|
+      line.chomp!
+      next unless line.match(/^[^ ]+[ ]+. \/.*$/)
+
+      file, changes, type = parse_rpm_changes_line(line)
+
+      package = @system.run_command("rpm", "-qf", file, stdout: :capture).split.first
+      package_name, package_version = package.scan(/(.*)-([^-]*)-[^-]/).first
+
+      ChangedFile.new(
+        type,
+        name:            file,
+        package_name:    package_name,
+        package_version: package_version,
+        status:          "changed",
+        changes:         changes
+      )
+    end.compact.uniq
+
+    paths = result.reject { |f| f.changes == Machinery::Array.new(["deleted"]) }.map(&:name)
+    path_data = get_path_data(paths)
+    result.each do |pkg|
+      next unless path_data[pkg.name]
+
+      path_data[pkg.name].each do |key, value|
+        pkg[key] = value
+      end
+    end
+
+    @changed_files = result
+  end
+
   def expected_tag?(character, position)
     if @rpm_changes[position] == character
       true
@@ -85,40 +138,40 @@ module ChangedRpmFilesHelper
 
     [path.join(":").chomp,
       {
-        mode: mode,
-        user: user,
+        mode:  mode,
+        user:  user,
         group: group,
-        type: type
+        type:  type
       }
     ]
   end
 
-  def get_link_target(system, link)
-    system.run_command(
+  def get_link_target(link)
+    @system.run_command(
       "find", link, "-prune", "-printf", "%l",
-      stdout: :capture,
+      stdout:     :capture,
       privileged: true
     ).strip
   end
 
   # get path data for list of files
   # cur_files is guaranteed to not exceed max command line length
-  def get_file_properties(system, cur_files)
+  def get_file_properties(cur_files)
     ret = {}
-    out = system.run_command(
+    out = @system.run_command(
       "stat", "--printf", "%a:%U:%G:%u:%g:%F:%n\\n",
       *cur_files,
       stdout: :capture
     )
     out.each_line do |l|
-      path, values = parse_stat_line(l)
-      ret[path] = values
-      ret[path][:target] = get_link_target(system, path) if values[:type] == "link"
+      path, values       = parse_stat_line(l)
+      ret[path]          = values
+      ret[path][:target] = get_link_target(path) if values[:type] == "link"
     end
     ret
   end
 
-  def get_path_data(system, paths)
+  def get_path_data(paths)
     ret = {}
     path_index = 0
     # arbitrary number for maximum command line length that should always work
@@ -131,12 +184,12 @@ module ChangedRpmFilesHelper
         cur_len += paths[path_index].size + 1
         path_index += 1
       else
-        ret.merge!(get_file_properties(system, cur_files))
+        ret.merge!(get_file_properties(cur_files))
         cur_files.clear
         cur_len = 0
       end
     end
-    ret.merge!(get_file_properties(system, cur_files)) unless cur_files.empty?
+    ret.merge!(get_file_properties(cur_files)) unless cur_files.empty?
     ret
   end
 end

data/lib/scope_file_access_archive.rb

@@ -74,6 +74,6 @@ module ScopeFileAccessArchive
     content = file_content(system_file)
     return false if content.empty?
 
-    Machinery.content_is_binary?(content.slice(0, 1024))
+    Machinery.content_is_binary?(content.slice(0, 4096))
   end
 end

data/lib/scope_file_access_flat.rb

@@ -30,7 +30,7 @@ module ScopeFileAccessFlat
     path = system_file.scope.file_path(system_file)
     return false if File.zero?(path)
 
-    Machinery.content_is_binary?(File.read(path))
+    Machinery.content_is_binary?(File.read(path, 4096))
   end
 
   def has_file?(name)

data/lib/system.rb

@@ -102,6 +102,40 @@ class System
     run_command("bash", "-c", script, *args)
   end
 
+  # Runs the given script on the inspected machine asynchronously and calls the callback method
+  # periodically with new output when it occurs.
+  #
+  # Example:
+  #
+  #     count = 0
+  #     raw_list = run_script_with_progress("changed_managed_files.sh") do |chunk|
+  #       count += chunk.lines.count
+  #       Machinery::Ui.progress("Found #{count} changed files...")
+  #     end
+  def run_script_with_progress(*script, &callback)
+    output = ""
+    error = ""
+    write_io = StringIO.new(output, "a")
+    error_io = StringIO.new(error, "a")
+    read_io = StringIO.new(output, "r")
+
+    inspect_thread = Thread.new do
+      run_script(*script, stdout: write_io, stderr: error_io)
+    end
+
+    while inspect_thread.alive?
+      sleep 0.1
+      chunk = read_io.read
+      callback.call(chunk) if callback
+    end
+
+    if error.include?("password is required")
+      raise Machinery::Errors::InsufficientPrivileges.new(remote_user, host)
+    end
+
+    output
+  end
+
   def has_command?(command)
     run_command("bash", "-c", "type -P #{command}", stdout: :capture)
     true
@@ -116,4 +150,8 @@ class System
   def locale
     @locale || "C"
   end
+
+  def rpm_database
+    @rpm_database ||= RpmDatabase.new(self)
+  end
 end

data/lib/tarball.rb

@@ -22,7 +22,7 @@ class Tarball
   end
 
   def list
-    output = LoggedCheetah.run("tar", "tvf", @file, stdout: :capture)
+    output = LoggedCheetah.run("tar", "tvf", @file, "--quoting-style=literal", stdout: :capture)
 
     output.lines.map do |line|
       mode, user_and_group, size, _date, _time, rest = line.split(" ", 6)

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.15.0"
+  VERSION = "1.16.0"
 
 end

data/machinery-helper/README.md

@@ -10,4 +10,4 @@ and outputs the result in the
 
 Make sure that the official Go Development environment is installed.
 
-To build the helper binary just run `go build`.
+To build the helper binary just run `rake build`.

data/machinery-helper/version.go

@@ -2,4 +2,4 @@
 
 package main
 
-const VERSION = "b333b1358568df9a508e7d92c61d3280395911d9"
+const VERSION = "f5f2a71bd21d86dcbc1b90e30b8af0f466b335bd"

data/man/generated/machinery.1.html

@@ -520,7 +520,7 @@ image under the <code>/tmp/tux/</code> directory:</p>
 
 <h3 id="SYNOPSIS">SYNOPSIS</h3>
 
-<p><code>machinery compare</code> [-s SCOPE | --scope=SCOPE] [-e EXCLUDE-SCOPE | --exclude-scope=EXCLUDE-SCOPE] [--no-pager] [--show-all] NAME1 NAME2</p>
+<p><code>machinery compare</code> [-s SCOPE | --scope=SCOPE] [-e EXCLUDE-SCOPE | --exclude-scope=EXCLUDE-SCOPE] [--no-pager] [--show-all] [--html] NAME1 NAME2</p>
 
 <p><code>machinery</code> help compare</p>
 
@@ -546,6 +546,7 @@ See the <a href="#Scopes" data-bare-link="true">Scope section</a> for more infor
 See the <a href="#Scopes" data-bare-link="true">Scope section</a> for more information.</p></dd>
 <dt><code>--no-pager</code> (optional)</dt><dd><p>Do not pipe output into a pager.</p></dd>
 <dt><code>--show-all</code> (optional)</dt><dd><p>Show also common properties of the descriptions (not only the differences).</p></dd>
+<dt><code>--html</code> (optional)</dt><dd><p>Shows the comparison of two system descriptions in the web browser.</p></dd>
 </dl>
 
 
@@ -562,6 +563,9 @@ See the <a href="#Scopes" data-bare-link="true">Scope section</a> for more infor
 list:</p>
 
 <p>$ <code>machinery</code> compare earth moon --scope=changed-managed-files --show-all</p></li>
+<li><p>Compares system descriptions and shows the result in HTML format in your web browser:</p>
+
+<p>  $ machinery compare --html earth moon</p></li>
 </ul>
 
 
@@ -901,7 +905,7 @@ via <code>ssh-copy-id</code> to the inspected host, e.g.: <code>ssh-copy-id root
 <li><p>When inspecting as non-root the user has to have the following command
 whitelist given in the sudoers file:</p>
 
-<p>machinery ALL=(ALL) NOPASSWD: /usr/bin/find,/usr/bin/cat,/bin/cat,/usr/bin/rsync,/bin/rpm -V *,/bin/tar --create *</p></li>
+<p>machinery ALL=(ALL) NOPASSWD: /usr/bin/find,/usr/bin/cat,/bin/cat,/usr/bin/rsync,/bin/rpm -Va *,/bin/tar --create *</p></li>
 <li><p>To add a remote <code>machinery</code> user run as root:</p>
 
 <h1><code>useradd -m machinery -c "remote user for machinery"</code></h1>
@@ -1376,7 +1380,7 @@ manually editing it.</p>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>October 2015</li>
+    <li class='tc'>November 2015</li>
     <li class='tr'>machinery(1)</li>
   </ol>
 

data/plugins/changed_managed_files/changed_managed_files_inspector.rb

@@ -16,7 +16,6 @@
 # you may find current contact information at www.suse.com
 
 class ChangedManagedFilesInspector < Inspector
-  include ChangedRpmFilesHelper
   has_priority 90
 
   def initialize(system, description)
@@ -69,73 +68,14 @@ class ChangedManagedFilesInspector < Inspector
 
   private
 
-  def amend_file_attributes(changed_files)
-    existing_files = changed_files.reject { |f| f.changes.nil? || f.changes.include?("deleted") }
-    file_attributes = get_path_data(@system, existing_files.map(&:name))
-    changed_files.map do |changed_file|
-      if file_attributes[changed_file.name]
-        ChangedManagedFile.new(changed_file.attributes.merge(file_attributes[changed_file.name]))
-      else
-        changed_file
-      end
-    end
-  end
-
   def changed_files
     count = 0
-    list = run_script_with_progress("changed_files.sh", "--", "changed-managed-files") do |chunk|
+    files = @system.rpm_database.changed_files do |chunk|
       count += chunk.lines.reject { |l| l.chomp.end_with?(":") || l.split(" ")[1] == "c" }.count
       Machinery::Ui.progress(" -> Found #{count} changed #{Machinery::pluralize(count, "file")}...")
     end
-
-    # The raw list lists each package followed by the changed files, e.g.
-    #
-    #   libpulse0-4.0.git.270.g9490a:
-    #   S.5......  c /etc/pulse/client.conf
-    #   ntp-4.2.6p5:
-    #   S.5......  c /etc/ntp.conf
-    #
-    # We map this to an array of files like this:
-    #
-    # [
-    #   {
-    #     name: "/etc/pulse/client.conf",
-    #     package_name: "libpulse0",
-    #     package_version: "4.0.git.270.g9490a"
-    #   },
-    #   ...
-    # ]
-    file_list = list.split("\n").slice_before(/(.*):\z/).flat_map do |package, *files|
-      package_name, package_version = package.scan(/(.*)-([^-]*):/).first
-      files.map do |changed_file|
-        if changed_file =~ /\A(\/\S+) (.*)/
-          ChangedManagedFile.new(
-            name:              $1,
-            package_name:      package_name,
-            package_version:   package_version,
-            status:            "error",
-            error_message:     $2
-          )
-        else
-          file, changes, flag = parse_rpm_changes_line(changed_file)
-
-          # Config files (flagged as 'c') are handled by the ConfigFilesInspector
-          next if flag == "c"
-
-          ChangedManagedFile.new(
-              name:              file,
-              package_name:      package_name,
-              package_version:   package_version,
-              status:            "changed",
-              changes:           changes
-          )
-        end
-        # Since errors are also recognized for config-files we have
-        # to filter them
-      end.compact.select { |item| item.changes }
-    end.uniq
-
-    amend_file_attributes(file_list)
+    files.reject(&:config_file?).map do |file|
+      ChangedManagedFile.new(file.attributes)
+    end
   end
-
 end

data/plugins/config_files/config_files_inspector.rb

@@ -16,8 +16,6 @@
 # you may find current contact information at www.suse.com
 
 class ConfigFilesInspector < Inspector
-  include ChangedRpmFilesHelper
-
   has_priority 80
   # checks if all required binaries are present
   def check_requirements(check_rsync)
@@ -27,47 +25,15 @@ class ConfigFilesInspector < Inspector
     @system.check_retrieve_files_dependencies if check_rsync
   end
 
-  # returns list of packages containing configfiles
-  def packages_with_config_files
-    # first determine packages that have config files at all
-    # rpm command provides lines with package names and subsequent
-    # lines with pathes of config files for that package
-    # e.g.
-    # apache2
-    # /etc/apache2/charset.conv
-    # /etc/apache2/default-server.conf
-    #
-    output = @system.run_command(
-      "rpm", "-qa", "--configfiles", "--queryformat",
-      "%{NAME}-%{VERSION}\n",
-      :stdout => :capture
-    )
-    # use leading slash to decide between lines containing package names
-    # and lines containing config files
-    chunks = output.split("\n").slice_before { |l| !l.start_with?("/") }
-    chunks.reject { |_pkg, *cfiles| cfiles.empty? }.map(&:first).uniq
-  end
-
   # returns a hash with entries for changed config files
   def config_file_changes(pkg)
-    out = @system.run_script("changed_files.sh", "--", "config-files", pkg, stdout: :capture)
-    parts = pkg.split("-")
-    package_name    = parts[0..-2].join("-")
-    package_version = parts.last
-
-    paths_and_changes = out.lines.map { |line| parse_rpm_changes_line(line) }
-    paths_and_changes.reject! do |path, changes, type|
-      # only consider config files and only those with changes
-      type != "c" || changes.empty?
-    end
-
-    paths_and_changes.map do |path, changes|
+    @system.changed_files.select(&:config_file?).map do |file|
       ConfigFile.new(
-        name:            path,
+        name:            file.path,
         package_name:    package_name,
         package_version: package_version,
         status:          "changed",
-        changes:         changes
+        changes:         file.changes
       )
     end.uniq
   end
@@ -82,12 +48,12 @@ class ConfigFilesInspector < Inspector
     check_requirements(do_extract)
 
     count = 0
-    result = packages_with_config_files.flat_map do |package|
-      files = config_file_changes(package)
-      count += files.length
+    files = @system.rpm_database.changed_files do |chunk|
+      count += chunk.lines.count { |l| !l.chomp.end_with?(":") && l.split(" ")[1] == "c" }
       Machinery::Ui.progress(" -> Found #{count} config #{Machinery::pluralize(count, "file")}...")
-
-      files
+    end
+    result = files.select(&:config_file?).map do |file|
+      ConfigFile.new(file.attributes)
     end
 
     if filter
@@ -95,16 +61,6 @@ class ConfigFilesInspector < Inspector
       result.delete_if { |e| file_filter.matches?(e.name) } if file_filter
     end
 
-    paths = result.reject { |f| f.changes == Machinery::Array.new(["deleted"]) }.map(&:name)
-    path_data = get_path_data(@system, paths)
-    key_list = [:user, :group, :mode, :type, :target]
-    result.each do |pkg|
-      pname = pkg.name
-      if path_data.has_key?(pname)
-        key_list.each { |k| pkg[k] = path_data[pname][k] if path_data[pname][k] }
-      end
-    end
-
     scope = ConfigFilesScope.new
     file_store = @description.scope_file_store("config_files")
     scope.scope_file_store = file_store

data/plugins/os/os_inspector.rb

@@ -94,6 +94,11 @@ class OsInspector < Inspector
       if result["pretty_name"] =~ /^openSUSE.*Tumbleweed/
         result["pretty_name"] = "openSUSE Tumbleweed"
       end
+
+      # remove Leap version from pretty name
+      if result["pretty_name"] =~ /^openSUSE.*Leap/
+        result["pretty_name"] = "openSUSE Leap"
+      end
     end
     # return pretty_name as name as it contains the actual full length
     # name instead of an abbreviation

data/plugins/os/os_model.rb

@@ -192,6 +192,20 @@ class OsOpenSuseTumbleweed < Os
   end
 end
 
+class OsOpenSuseLeap < Os
+  def display_name
+    "#{name} (#{architecture})"
+  end
+
+  def self.canonical_name
+    "openSUSE Leap"
+  end
+
+  def self.buildable_systems
+    [OsOpenSuse13_2, OsOpenSuseLeap]
+  end
+end
+
 class Rhel < Os
   def self.canonical_name
     "Red Hat Enterprise Linux Server"

data/plugins/users/users_inspector.rb

@@ -39,6 +39,7 @@ class UsersInspector < Inspector
   private
 
   def parse_users(passwd, shadow)
+    passwd = Machinery.scrub(passwd)
     users = passwd.lines.map { |l| l.split(":").first }
 
     users.map do |user|

data/tools/helper_builder.rb

@@ -22,6 +22,7 @@ class HelperBuilder
   def initialize(helper_dir)
     @helper_dir = helper_dir
     @git_revision_file = File.join(helper_dir, "..", ".git_revision")
+    @go_version_file = File.join(helper_dir, "version.go")
   end
 
   def run_build
@@ -30,7 +31,7 @@ class HelperBuilder
     return false if !go_available?
 
     # handle changed branches (where go files are older than the helper)
-    if runs_in_git? && changed_revision?
+    if runs_in_git? && (changed_revision? || !File.exist?(@go_version_file))
       write_go_version_file
       if build_machinery_helper
         write_git_revision_file
@@ -56,7 +57,7 @@ package main
 
 const VERSION = "#{git_revision}"
     EOF
-    File.write(File.join(@helper_dir, "version.go"), file)
+    File.write(@go_version_file, file)
   end
 
   def build_machinery_helper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machinery-tool
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cheetah
@@ -304,7 +304,6 @@ files:
 - lib/array.rb
 - lib/autoyast.rb
 - lib/build_task.rb
-- lib/changed_rpm_files_helper.rb
 - lib/cli.rb
 - lib/compare_task.rb
 - lib/comparison.rb
@@ -352,6 +351,7 @@ files:
 - lib/renderer.rb
 - lib/renderer_helper.rb
 - lib/rpm.rb
+- lib/rpm_database.rb
 - lib/scope.rb
 - lib/scope_file_access_archive.rb
 - lib/scope_file_access_flat.rb