machinery-tool 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b519eb26d68cec4dd8a162614749acf7eded220
-  data.tar.gz: ecf34acb835a431aa8387f0d03b707cca3fd9856
+  metadata.gz: 40dd521992a7106bb58e670c885ec727c16b69a9
+  data.tar.gz: 1cce8ff538aa83a299d9034167562b3feec0fbbe
 SHA512:
-  metadata.gz: 2c5e176c9745a3311200eb299d30cf085071513db825258b7eebe9743f690d8e1fcc3aeb95ec2f09d25d89707ad42e53645f1dc5f65dd8cd15b912b159d0c538
-  data.tar.gz: ae9e56cb3cc0259f4d71789be5307a9f1c77f1dd3fc0e45b8f55d712bc1f1e3ecfeb54e79a9860660ec7dd70108e790da08f01d89c319f1a236dabe95666b420
+  metadata.gz: 15fded8c72d2b8380cb8064fe6dcc92753a93861cea791f1050cf333e53e4a255bbf959ed1874f101157319be1c9ec641263b5475428e1e1e985c6341cc21a48
+  data.tar.gz: 1c0397494c6eb3dbab3b4829201d06171442b0bb18de2a1bfd47c9778d66e2c7ef183ded8f54361e249283f7f90dd2f9413028184edb80555f018871d93c7a82

data/NEWS

@@ -1,6 +1,10 @@
 # Machinery Release Notes
 
 
+## Version 1.8.0 - Tue May 19 12:33:27 CEST 2015 - mamorales@suse.de
+
+* Improve error handling when user lacks sudo privileges
+
 ## Version 1.7.0 - Mon May 04 15:36:50 CEST 2015 - aduffeck@suse.de
 
 * Add experimental option to show comparison of two system descriptions as

data/helpers/changed_managed_files.sh

@@ -16,6 +16,8 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
+# Exit immediately if a command exits with a non-zero status.
+set -e
 
 # Print a list of each package with changed managed files followed by a list of
 # the changed files, e.g.
@@ -26,12 +28,19 @@
 #   S.5......  c /etc/ntp.conf
 
 if [ $UID -ne "0" ]; then
-   SUDOPREFIX="sudo"
+   SUDOPREFIX="sudo -n"
 fi
 
 for package in `rpm -qa --queryformat "%{NAME}-%{VERSION}\\n"`; do
-  CHANGES=`$SUDOPREFIX rpm -V --nodeps --nodigest --nosignature --nomtime --nolinkto $package`;
-  if [ -n "$CHANGES" ]; then
-    echo -e "$package:\\n$CHANGES";
+  # rpm returns 1 as exit code when modified config files are detected
+  # that's why we explicitly detect if sudo failed
+  OUTPUT=`$SUDOPREFIX rpm -V --nodeps --nodigest --nosignature --nomtime --nolinkto $package 2>&1 || true`;
+  if [ -n "$OUTPUT" ]; then
+    REGEX="^sudo:.*password is required"
+    if [[ "$OUTPUT" =~ $REGEX ]]; then
+      echo "$OUTPUT" >&2
+      exit 1
+    fi
+    echo -e "$package:\\n$OUTPUT";
   fi;
 done

data/helpers/inspector_files.rb

@@ -0,0 +1,52 @@
+# Copyright (c) 2013-2015 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
+
+
+# This script creates reference data for integration tests
+# by inspecting existing machines.
+# Therefor it generates files with information of each scope.
+
+# Usage: rake inspector_files[ip-adress,distribution]
+
+require "fileutils"
+require "cheetah"
+
+class ReferenceTestData
+  def initialize
+    @machinery = File.expand_path("../bin/machinery", File.dirname(__FILE__))
+    @test_data_path = File.expand_path("../spec/data/", File.dirname(__FILE__))
+  end
+
+  def inspect(ip_adress)
+    Cheetah.run(@machinery, "inspect", ip_adress, "-n", "referencetestdata", stdout: :capture)
+  end
+
+  def write(destination)
+    Inspector.all_scopes.each do |inspector|
+      output = Cheetah.run(
+        @machinery, "show", destination, "-s", inspector.gsub("_", "-"),
+        "referencetestdata", stdout: :capture
+      )
+      File.write(file_path(inspector, destination), output)
+    end
+  end
+
+  def file_path(inspector, destination)
+    FileUtils.mkdir_p("#{@test_data_path}/#{inspector}")
+    File.join(@test_data_path, inspector, destination)
+  end
+end

data/lib/cli.rb

@@ -40,7 +40,7 @@ class Cli
   end
 
   post do |global_options,command,options,args|
-    if command.is_a?(GLI::Commands::Help) && !global_options[:version]
+    if command.is_a?(GLI::Commands::Help) && !global_options[:version] && ARGV == ["help"]
 
       Machinery::Ui.puts "\nMachinery can show hints which guide through a typical workflow."
       if @config.hints
@@ -67,6 +67,8 @@ class Cli
   end
 
   def self.handle_error(e)
+    Machinery::Ui.kill_pager
+
     case e
     when GLI::UnknownCommandArgument, GLI::UnknownGlobalArgument,
         GLI::UnknownCommand, GLI::BadCommandLine, OptionParser::MissingArgument
@@ -128,7 +130,8 @@ class Cli
 
   def self.show_filter_note(scopes, filter)
     if scopes.any? { |scope| !filter.element_filters_for_scope(scope).empty? }
-      Machinery::Ui.puts "\nFilters are applied during inspection.\n\n"
+      Machinery::Ui.puts "\nNote: There are filters being applied during inspection. " \
+        "(Use `--verbose` option to show the filters)\n\n"
     end
   end
 

data/lib/exceptions.rb

@@ -99,6 +99,17 @@ module Machinery
       end
     end
 
+    class InsufficientPrivileges < MachineryError
+      def initialize(remote_user, host)
+        @remote_user = remote_user
+        @host = host
+      end
+
+      def to_s
+        "The remote user '#{@remote_user}' is not allowed to run 'sudo' on host '#{@host}'."
+      end
+    end
+
     class MigrationError < MachineryError; end
 
     class InvalidFilter < MachineryError; end

data/lib/generate_html_task.rb

@@ -20,5 +20,6 @@ class GenerateHtmlTask
     output = Html.generate(description)
     Machinery::Ui.puts "The generated HTML file is stored in: \n" +
       "#{output}"
+    Hint.print(:share_html_contents, directory: output)
   end
 end

data/lib/helper.rb

@@ -31,6 +31,14 @@ module Machinery
     # See also: http://stackoverflow.com/a/21315619
     s.dup.force_encoding("UTF-8").encode("UTF-16", invalid: :replace).encode("UTF-8")
   end
+
+  def self.pluralize(text, number)
+    if number > 1 || number == 0
+      text + "s"
+    else
+      text
+    end
+  end
 end
 
 def with_c_locale(&block)

data/lib/hint.rb

@@ -58,5 +58,12 @@ class Hint
       "To upgrade all system descriptions run:\n" \
        "#{$0} upgrade-format --all"
     end
+
+    def share_html_contents(options)
+      dir = options[:directory] || ""
+      index_file = File.join(dir, "index.html")
+      assets_dir = File.join(dir, "assets/")
+      "Share the file: '#{index_file}' and the directory: '#{assets_dir}' as needed."
+    end
   end
 end

data/lib/list_task.rb

@@ -28,19 +28,19 @@ class ListTask
           show_error("#{name}: incompatible format version. Can not be upgraded.\n", options)
         elsif e.format_version < SystemDescription::CURRENT_FORMAT_VERSION
           show_error("#{name}: format version #{e.format_version}, " \
-            "needs to be upgraded.\n", options)
+            "needs to be upgraded.", options)
           has_incompatible_version = true
         else
           show_error("#{name}: format version #{e.format_version}. " \
-            "Please upgrade Machinery to the latest version.\n", options)
+            "Please upgrade Machinery to the latest version.", options)
         end
         next
       rescue Machinery::Errors::SystemDescriptionValidationFailed
         show_error("#{name}: This description is broken. Use " \
-          "`#{$0} validate #{name}` to see the error message.\n", options)
+          "`#{$0} validate #{name}` to see the error message.", options)
         next
       rescue Machinery::Errors::SystemDescriptionError
-        show_error("#{name}: This description is broken.\n", options)
+        show_error("#{name}: This description is broken.", options)
         next
       end
 
@@ -76,7 +76,7 @@ class ListTask
           scopes << entry
         end
 
-        Machinery::Ui.puts " #{name}:\n   * " + scopes .join("\n   * ") + "\n\n"
+        Machinery::Ui.puts " #{name}:\n   * " + scopes .join("\n   * ") + "\n"
       end
     end
 

data/lib/migration.rb

@@ -88,8 +88,7 @@ class Migration
       end
 
       if current_version == SystemDescription::CURRENT_FORMAT_VERSION
-        Machinery::Ui.puts "System description \"#{description_name}\" is up to " \
-          "date, no upgrade necessary."
+        Machinery::Ui.puts "No upgrade necessary."
         return false
       end
 

data/lib/remote_system.rb

@@ -72,9 +72,15 @@ class RemoteSystem < System
       cheetah_class = LoggedCheetah
     end
 
-    sudo = "sudo" if options[:privileged] && remote_user != "root"
-    cmds = ["ssh", "#{remote_user}@#{host}", sudo, "LC_ALL=C", *piped_args, options].compact
+    sudo = ["sudo", "-n"] if options[:privileged] && remote_user != "root"
+    cmds = ["ssh", "#{remote_user}@#{host}", sudo, "LC_ALL=C", *piped_args, options].compact.flatten
     cheetah_class.run(*cmds)
+  rescue Cheetah::ExecutionFailed => e
+    if e.stderr.include?("password is required")
+      raise Machinery::Errors::InsufficientPrivileges.new(remote_user, host)
+    else
+      raise e
+    end
   end
 
   # Tries to connect to the remote system as root (without a password or passphrase)
@@ -97,7 +103,7 @@ class RemoteSystem < System
   def retrieve_files(filelist, destination)
     source = "#{remote_user}@#{host}:/"
     if remote_user != "root"
-      rsync_path = "sudo rsync"
+      rsync_path = "sudo -n rsync"
     else
       rsync_path = "rsync"
     end

data/lib/system.rb

@@ -37,14 +37,18 @@ class System
   end
 
   # checks if the required command can be executed on the target system
-  def check_requirement(command, *args)
-    begin
-      run_command(command, *args)
-    rescue Cheetah::ExecutionFailed
-      raise Machinery::Errors::MissingRequirement.new(
-        "Need binary '#{command}' to be available on the inspected system."
-      )
+  def check_requirement(commands, *args)
+    commands = Array(commands)
+    commands.each do |command|
+      begin
+        run_command(command, *args)
+        return command
+      rescue Cheetah::ExecutionFailed
+      end
     end
+    raise Machinery::Errors::MissingRequirement.new(
+      "Need binary '#{commands.join("' or '")}' to be available on the inspected system."
+    )
   end
 
   # Retrieves files specified in filelist from the remote system and create an archive.

data/lib/ui.rb

@@ -28,6 +28,11 @@ module Machinery
       def write_output_to_pager(output)
         @pager ||= IO.popen("$PAGER", "w")
 
+        # cache the pid because it can no longer be retrieved when the
+        # stream is closed (and we sometimes have to kill the process after
+        # it was closed)
+        @pager_pid = @pager.pid
+
         begin
           @pager.puts output
         rescue Errno::EPIPE
@@ -39,10 +44,14 @@ module Machinery
         @pager.close if @pager
       end
 
-      def puts(output)
+      def kill_pager
+        Process.kill("TERM", @pager_pid) if @pager_pid
+      end
+
+      def print(output)
         if !use_pager || !$stdout.tty?
           begin
-            STDOUT.puts output
+            STDOUT.print output
           rescue Errno::EPIPE
             # We just ignore broken pipes.
           end
@@ -54,7 +63,7 @@ module Machinery
               LocalSystem.validate_existence_of_package("less")
               write_output_to_pager(output)
             rescue Machinery::Errors::MissingRequirement
-              STDOUT.puts output
+              STDOUT.print output
             end
           else
             IO.popen("$PAGER &>/dev/null", "w") { |f| f.close }
@@ -70,6 +79,10 @@ module Machinery
         end
       end
 
+      def puts(output)
+        print output + "\n"
+      end
+
       def warn(s)
         STDERR.puts s
       end

data/lib/upgrade_format_task.rb

@@ -34,10 +34,16 @@ class UpgradeFormatTask
 
     descriptions.each do |description|
       begin
+        hash = Manifest.load(description, store.manifest_path(description)).to_hash
         Machinery.logger.info "Upgrading description \"#{description}\""
-        Machinery::Ui.puts "Upgrading description \"#{description}\""
+        Machinery::Ui.print "Reading \"#{description}\" ... "
         migrated = Migration.migrate_description(store, description, force: options[:force])
-        migrations_done += 1 if migrated
+
+        if migrated
+          migrations_done += 1
+          Machinery::Ui.puts "Successfully upgraded from version" \
+            " #{hash["meta"]["format_version"]} to #{SystemDescription::CURRENT_FORMAT_VERSION}."
+        end
       rescue StandardError => e
         errors.push("Upgrading description \"#{description}\" failed:\n#{e}")
       end
@@ -52,12 +58,13 @@ class UpgradeFormatTask
 
     if options[:all]
       if migrations_done > 0
-        Machinery::Ui.puts "Upgraded #{migrations_done} system descriptions successfully."
+        Machinery::Ui.puts(
+          "Upgraded #{migrations_done} " \
+            "#{Machinery::pluralize("system description", migrations_done)}."
+        )
       else
         Machinery::Ui.puts "No system descriptions were upgraded."
       end
-    elsif migrations_done > 0
-      Machinery::Ui.puts "System description \"#{name}\" successfully upgraded."
     end
   end
 end

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 
 end

data/man/generated/machinery.1.html

@@ -892,7 +892,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,/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 -V *,/bin/tar --create *</p></li>
 </ul>
 
 

data/plugins/services/services_inspector.rb

@@ -73,7 +73,7 @@ class ServicesInspector < Inspector
     # an error, on Red Hat it doesn't.
     #
     begin
-      @system.run_command("chkconfig", "--version")
+      @system.run_command("/sbin/chkconfig", "--version")
       services = parse_redhat_chkconfig
     rescue
       services = parse_suse_chkconfig
@@ -83,9 +83,11 @@ class ServicesInspector < Inspector
   end
 
   def parse_suse_chkconfig
-    @system.check_requirement("chkconfig", "--help")
+    # check if chkconfig is available otherwise use /sbin/chkconfig
+    # this fixes issue on sles11sp3 where chkconfig isn't in /usr/bin
+    chkconfig = @system.check_requirement(["chkconfig", "/sbin/chkconfig"], "--help")
     output = @system.run_command(
-      "chkconfig",
+      chkconfig,
       "--allservices",
       :stdout => :capture
     )
@@ -97,15 +99,14 @@ class ServicesInspector < Inspector
   end
 
   def parse_redhat_chkconfig
-    @system.check_requirement("chkconfig", "--version")
-    @system.check_requirement("runlevel")
+    @system.check_requirement("/sbin/runlevel")
     _, runlevel = @system.run_command(
-      "runlevel",
+      "/sbin/runlevel",
       stdout: :capture
     ).split(" ")
 
     output = @system.run_command(
-      "chkconfig", "--list",
+      "/sbin/chkconfig", "--list",
       stdout: :capture
     )
 

data/plugins/unmanaged_files/unmanaged_files_inspector.rb

@@ -145,7 +145,7 @@ class UnmanagedFilesInspector < Inspector
     excluded_files = []
 
     # compute command line
-    cmd = ["find", dir, "-xdev", "-maxdepth", "1", "-maxdepth", depth]
+    cmd = ["find", dir, "-xdev", "-maxdepth", "1", "-maxdepth", depth.to_s]
     cmd += ["-printf", '%y\0%P\0%l\0']
 
     out = ""

metadata

@@ -1,181 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: machinery-tool
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cheetah
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: abstract_method
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.5
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packaging_rake_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Machinery is a systems management toolkit for Linux. It supports configuration
@@ -188,11 +188,65 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- COPYING
+- NEWS
+- bin/machinery
+- export_helpers/autoyast_export_readme.md
+- export_helpers/kiwi_export_readme.md
+- export_helpers/merge_users_and_groups.pl.erb
+- export_helpers/unmanaged_files_autoyast_excludes
+- export_helpers/unmanaged_files_kiwi_excludes
+- helpers/changed_managed_files.sh
+- helpers/default_filters.json
+- helpers/filter-packages-for-build.yaml
+- helpers/inspector_files.rb
+- helpers/yum_repositories.py
+- html/assets/angular-sanitize.min.js
+- html/assets/angular.min.js
+- html/assets/arrow_down.png
+- html/assets/arrow_up.png
+- html/assets/bootstrap-popover.js
+- html/assets/bootstrap-tooltip.js
+- html/assets/bootstrap.min.css
+- html/assets/collapse.js
+- html/assets/compare/machinery-compare.js
+- html/assets/compare/machinery.js
+- html/assets/jquery-2.1.1.min.js
+- html/assets/logo-changed-managed-files-small.png
+- html/assets/logo-changed-managed-files.png
+- html/assets/logo-config-files-small.png
+- html/assets/logo-config-files.png
+- html/assets/logo-groups-small.png
+- html/assets/logo-groups.png
+- html/assets/logo-os-small.png
+- html/assets/logo-os.png
+- html/assets/logo-packages-small.png
+- html/assets/logo-packages.png
+- html/assets/logo-patterns-small.png
+- html/assets/logo-patterns.png
+- html/assets/logo-repositories-small.png
+- html/assets/logo-repositories.png
+- html/assets/logo-services-small.png
+- html/assets/logo-services.png
+- html/assets/logo-unmanaged-files-small.png
+- html/assets/logo-unmanaged-files.png
+- html/assets/logo-users-small.png
+- html/assets/logo-users.png
+- html/assets/machinery-base.css
+- html/assets/machinery.css
+- html/assets/reset.png
+- html/assets/show/machinery-show.js
+- html/assets/show/machinery.js
+- html/assets/transition.js
+- html/assets/wheels_horizontal.png
+- html/comparison.html.haml
+- html/index.html.haml
 - lib/analyze_config_file_diffs_task.rb
 - lib/array.rb
 - lib/autoyast.rb
 - lib/build_task.rb
 - lib/changed_rpm_files_helper.rb
+- lib/cli.rb
 - lib/compare_task.rb
 - lib/config.rb
 - lib/config_base.rb
@@ -243,9 +297,10 @@ files:
 - lib/ui.rb
 - lib/upgrade_format_task.rb
 - lib/validate_task.rb
-- lib/zypper.rb
-- lib/cli.rb
 - lib/version.rb
+- lib/zypper.rb
+- man/generated/machinery.1.gz
+- man/generated/machinery.1.html
 - plugins/changed_managed_files/changed_managed_files.md
 - plugins/changed_managed_files/changed_managed_files_inspector.rb
 - plugins/changed_managed_files/changed_managed_files_model.rb
@@ -316,65 +371,11 @@ files:
 - plugins/users/users_inspector.rb
 - plugins/users/users_model.rb
 - plugins/users/users_renderer.rb
-- bin/machinery
-- man/generated/machinery.1.gz
-- man/generated/machinery.1.html
-- NEWS
-- COPYING
-- helpers/changed_managed_files.sh
-- helpers/default_filters.json
-- helpers/filter-packages-for-build.yaml
-- helpers/yum_repositories.py
-- export_helpers/autoyast_export_readme.md
-- export_helpers/kiwi_export_readme.md
-- export_helpers/merge_users_and_groups.pl.erb
-- export_helpers/unmanaged_files_autoyast_excludes
-- export_helpers/unmanaged_files_kiwi_excludes
 - schema/migrations/migrate1to2.rb
 - schema/migrations/migrate2to3.rb
 - schema/system-description-global.schema-v1.json
 - schema/system-description-global.schema-v2.json
 - schema/system-description-global.schema-v3.json
-- html/assets/angular-sanitize.min.js
-- html/assets/angular.min.js
-- html/assets/arrow_down.png
-- html/assets/arrow_up.png
-- html/assets/bootstrap-popover.js
-- html/assets/bootstrap-tooltip.js
-- html/assets/bootstrap.min.css
-- html/assets/collapse.js
-- html/assets/compare/machinery-compare.js
-- html/assets/compare/machinery.js
-- html/assets/jquery-2.1.1.min.js
-- html/assets/logo-changed-managed-files-small.png
-- html/assets/logo-changed-managed-files.png
-- html/assets/logo-config-files-small.png
-- html/assets/logo-config-files.png
-- html/assets/logo-groups-small.png
-- html/assets/logo-groups.png
-- html/assets/logo-os-small.png
-- html/assets/logo-os.png
-- html/assets/logo-packages-small.png
-- html/assets/logo-packages.png
-- html/assets/logo-patterns-small.png
-- html/assets/logo-patterns.png
-- html/assets/logo-repositories-small.png
-- html/assets/logo-repositories.png
-- html/assets/logo-services-small.png
-- html/assets/logo-services.png
-- html/assets/logo-unmanaged-files-small.png
-- html/assets/logo-unmanaged-files.png
-- html/assets/logo-users-small.png
-- html/assets/logo-users.png
-- html/assets/machinery-base.css
-- html/assets/machinery.css
-- html/assets/reset.png
-- html/assets/show/machinery-show.js
-- html/assets/show/machinery.js
-- html/assets/transition.js
-- html/assets/wheels_horizontal.png
-- html/comparison.html.haml
-- html/index.html.haml
 homepage: http://machinery-project.org
 licenses:
 - GPL-3.0
@@ -385,17 +386,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Systems management toolkit