machinery-tool 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d95072db7db89bc9881b0f130e31fc14a4cef78
-  data.tar.gz: 01accc4637d1dc9cbad915914eeca4a7ae4ccfa3
+  metadata.gz: 3862196a560a037acde60f2864df0bde8426cd9e
+  data.tar.gz: 635959f588111bad3702a7d8eb134316ec339b13
 SHA512:
-  metadata.gz: 03b5e6b547a2dec55e3f72559db01c0cb3971c902ee622470d89f45d79f1984bdf4eb888f5210829cf848b695e41d93b8a80f3ef7efac68af91344f3c9764b63
-  data.tar.gz: 8cf84db6d3ba91a18c35ebbf6938caf2df4ae463b05af5420937e17ef4aa960f78b90ef457046c337317b677093936c7a35363db1a6cb08dca689c01000fa092
+  metadata.gz: 4fc553147b68761806a51fe5c078d792bb28c7bc38dfdf17e766c85c1fe3643dd3830122563885ccdd5d63d584114e17bb00ea880d4fb1029af24007c43c4e38
+  data.tar.gz: ab2165ca7a37ad14e4b794ea7eeefca6905b84bd3911914ee9f113e46754a2e6b2876a5b893b2145466c42d8171078f143a57ba6a0623ac26df1f8f952af3285

data/.git_revision

@@ -1 +1 @@
-8bfc2e6ccf6d9ff87a018bd15002a20182fd6709
+8df1e753fd5f3ef8a5bcfed6eb932b864acbebde

data/NEWS

@@ -1,6 +1,23 @@
 # Machinery Release Notes
 
 
+## Version 1.18.0 - Tue Mar 01 13:51:39 CET 2016 - thardeck@suse.de
+
+* Make the machinery-helper exclusive to improve inspection performance significantly
+  on all supported architectures.
+  Following this change Go is required for installing the gem for now.
+* Fix treatment of the rpm `(replaced)` flag (gh#SUSE/machinery#1897)
+* Fix repository recognition on older Debian systems
+* Inspection of unmanaged-files is now also using the faster machinery-helper
+  when a remote user is used
+* Show all available information for unmanaged files in HTML view (gh#SUSE/machinery#1905)
+* Move the machinery documentation from man page to HTML format
+* Implement "--extract-metadata" option for the unmanaged-files inspection to
+  retrieve the file meta (e.g. owner, group, size) data without extracting the
+  files.
+* Fixed counting of files in unmanaged directories (empty directories now report zero files
+  as one would expect)
+
 ## Version 1.17.0 - Mon Jan 25 16:49:58 CET 2016 - thardeck@suse.de
 
 * Fix reset button in HTML view (gh#SUSE/machinery#1899)
@@ -409,4 +426,3 @@
 ## Version 0.1.0 - Tue Dec 17 14:06:59 CET 2013 - aduffeck@suse.de
 
 * Package and repository inspection of SLES 11 systems
-

data/bin/machinery

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

data/export_helpers/merge_users_and_groups.pl.erb

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

data/html/comparison.html.haml

@@ -51,13 +51,6 @@
           .col-xs-10
             %h1
               Comparing '#{@description_a.name}' with '#{@description_b.name}'
-            %span.scope-navigation
-              Scopes:
-              - scopes.each do |scope|
-                %a.btn.btn-default.btn-sm{ :href => "##{scope}", :title => scope_title(scope),
-                  "data-toggle"=>"popover", "data-content" => scope_help(scope),
-                  :class => nav_class(scope), "ng-show" => "diff.#{scope}" }
-                  %span= scope_initials(scope)
         .row
           .col-xs-1
             %a#expand-all{:href => "#", :style => "display: none"}
@@ -65,11 +58,23 @@
             %a#collapse-all{:href => "#"}
               Collapse all
         .row
-          .col-xs-9
-            %small.pull-right.pad-top
+          .col-xs-1
+          .col-xs-10
+            %small.pull-right
               created by
               %a{:href => "http://machinery-project.org", :target => "_blank"}
                 Machinery
+              %br
+              %a{ :href => "/site/docs/", :target => "_blank" }
+                Machinery documentation
+
+            %span.scope-navigation
+              Scopes:
+              - scopes.each do |scope|
+                %a.btn.btn-default.btn-sm{ :href => "##{scope}", :title => scope_title(scope),
+                  "data-toggle"=>"popover", "data-content" => scope_help(scope),
+                  :class => nav_class(scope), "ng-show" => "diff.#{scope}" }
+                  %span= scope_initials(scope)
 
       #content_container
         %div

data/html/index.html.haml

@@ -57,11 +57,14 @@
               Expand all
             %a#collapse-all{ :href => "#" }
               Collapse all
-          .col-xs-9.nav-buttons
-            %small.pull-right.pad-top
+          .col-xs-10.nav-buttons
+            %small.pull-right
               created by
               %a{ :href => "http://machinery-project.org", :target => "_blank" }
                 Machinery
+              %br
+              %a{ :href => "/site/docs/", :target => "_blank" }
+                Machinery documentation
             .filter-input.col-md-4
               %input.col-md-8#filter{ :placeholder => "Type To Filter" }
               %a.btn.btn-default.btn-reset{ :href => "#", :title => "Reset Filter" }

data/html/landing_page.html.haml

@@ -28,10 +28,13 @@
               %span Reset
 
           .col-xs-6.nav-buttons
-            %small.pull-right.pad-top
+            %small.pull-right
               created by
               %a{ :href => "http://machinery-project.org", :target => "_blank" }
                 Machinery
+              %br
+              %a{ :href => "/site/docs/", :target => "_blank" }
+                Machinery documentation
 
 
       #content_container

data/html/partials/changed_managed_files.html.haml

@@ -10,6 +10,8 @@
       .row.scope_content.collapse.in
         .col-xs-1
         .col-xs-11
+          %p
+            <strong>Files extracted:</strong> #{changed_managed_files.extracted ? "yes" : "no"}
           - if count == 0
             There are no changed managed files.
           - if count > 0

data/html/partials/compare/alert.html.haml

@@ -3,7 +3,7 @@
     .row
       .col-xs-10.col-xs-offset-1
         .well
-          %span.text-right.dismiss{ title: "Collapse/Expand" }
+          %span.text-right.dismiss{ title: "Dismiss" }
           - if @meta[:uninspected][@description_a.name]
             %p
               Couldn't compare

data/html/partials/compare/unmanaged_file_list.html.haml

@@ -7,8 +7,20 @@
       %tr
         %th Name
         %th.small Type
+        - if list.has_metadata
+          %th.medium Mode
+          %th.medium User
+          %th.medium Group
+          %th.medium Size
+          %th.medium Files in dir.
     %tbody
       - list.each do |file|
         %tr
           %td= file.name
           %td= file.type
+          - if list.has_metadata
+            %td= file.mode
+            %td= file.user
+            %td= file.group
+            %td= number_to_human_size(file.size)
+            %td= file.files

data/html/partials/config_files.html.haml

@@ -10,6 +10,8 @@
       .row.scope_content.collapse.in
         .col-xs-1
         .col-xs-11
+          %p
+            <strong>Files extracted:</strong> #{config_files.extracted ? "yes" : "no"}
           - if count == 0
             There are no config files.
           - if count > 0

data/html/partials/landing_page/alert.html.haml

@@ -3,7 +3,7 @@
     .row
       .col-xs-10.col-xs-offset-1
         .well
-          %span.text-right.dismiss{ title: "Collapse/Expand" }
+          %span.text-right.dismiss{ title: "Dismiss" }
           - @errors.each do |error|
             %p
               = error

data/html/partials/unmanaged_files.html.haml

@@ -10,6 +10,8 @@
       .row.scope_content.collapse.in
         .col-xs-1
         .col-xs-11
+          %p
+            <strong>Files extracted:</strong> #{unmanaged_files.extracted ? "yes" : "no"}
           - if count == 0
             There are no unmanaged files.
           - if count > 0
@@ -18,6 +20,12 @@
                 %tr
                   %th Name
                   %th.medium Type
+                  - if unmanaged_files.has_metadata
+                    %th.medium Mode
+                    %th.medium User
+                    %th.medium Group
+                    %th.medium Size
+                    %th.medium Files in dir.
               %tbody
                 - unmanaged_files.each do |file|
                   %tr
@@ -29,3 +37,9 @@
                         %span
                           = file.name
                     %td= file.type
+                    - if unmanaged_files.has_metadata
+                      %td= file.mode
+                      %td= file.user
+                      %td= file.group
+                      %td= number_to_human_size(file.size)
+                      %td= file.files

data/inspect_helpers/changed_files.sh

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

data/inspect_helpers/dpkg_unmanaged_files.sh

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

data/inspect_helpers/yum_repositories.py

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

data/lib/analyze_config_file_diffs_task.rb

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

data/lib/array.rb

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

data/lib/autoyast.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as
@@ -66,41 +66,41 @@ class Autoyast < Exporter
   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_non_interactive_mode(xml)
-        apply_basic_network(xml)
-        apply_repositories(xml)
-        xml.software do
-          apply_software_settings(xml)
-          apply_packages(xml)
-          apply_patterns(xml)
-        end
-        apply_users(xml)
-        apply_groups(xml)
-        apply_services(xml)
-
-        apply_changed_files("config_files")
-        apply_changed_files("changed_managed_files")
-        apply_unmanaged_files
-        xml.scripts do
-          apply_url_extraction(xml)
-          xml.send("chroot-scripts", "config:type" => "list") do
-            xml.script do
-              xml.source do
-                xml.cdata @chroot_scripts.join("\n")
-              end
+    xml = Builder::XmlMarkup.new(indent: 2)
+    xml.instruct! :xml
+    xml.declare! :DOCTYPE, :profile
+    xml.profile(
+      "xmlns" => "http://www.suse.com/1.0/yast2ns",
+      "xmlns:config" => "http://www.suse.com/1.0/configns"
+    ) do
+      apply_non_interactive_mode(xml)
+      apply_basic_network(xml)
+      apply_repositories(xml)
+      xml.software do
+        apply_software_settings(xml)
+        apply_packages(xml)
+        apply_patterns(xml)
+      end
+      apply_users(xml)
+      apply_groups(xml)
+      apply_services(xml)
+
+      apply_changed_files("config_files")
+      apply_changed_files("changed_managed_files")
+      apply_unmanaged_files
+      xml.scripts do
+        apply_url_extraction(xml)
+        xml.tag!("chroot-scripts", "config:type" => "list") do
+          xml.script do
+            xml.source do
+              xml.cdata! @chroot_scripts.join("\n")
             end
           end
         end
       end
     end
 
-    builder.to_xml
+    xml.target!
   end
 
   def outgoing_ip
@@ -140,7 +140,7 @@ class Autoyast < Exporter
   def apply_repositories(xml)
     return if !@system_description.repositories
 
-    xml.send("add-on") do
+    xml.tag!("add-on") do
       xml.add_on_products("config:type" => "list") do
         @system_description.repositories.each do |repository|
           if repository.enabled && !repository.external_medium?
@@ -239,7 +239,7 @@ class Autoyast < Exporter
   def apply_services(xml)
     return if !@system_description.services
 
-    xml.send("services-manager") do
+    xml.tag!("services-manager") do
       xml.services("config:type" => "list") do
         @system_description.services.each do |service|
           name = service.name
@@ -268,10 +268,10 @@ class Autoyast < Exporter
   end
 
   def apply_url_extraction(xml)
-    xml.send("pre-scripts", "config:type" => "list") do
+    xml.tag!("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

data/lib/build_task.rb

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

data/lib/cli.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2015 SUSE LLC
+# Copyright (c) 2013-2016 SUSE LLC
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 3 of the GNU General Public License as
@@ -43,9 +43,9 @@ class Cli
   post do |global_options,command,options,args|
     if command.is_a?(GLI::Commands::Help) && !global_options[:version] && ARGV == ["help"]
 
-      Machinery::Ui.puts "\nFor more detailed information, open the man page by typing 'man " \
-        "machinery'.\nIf you are unable to find a solution within the man page visit our wiki " \
-        "page\nat https://github.com/SUSE/machinery/wiki"
+      Machinery::Ui.puts "\nFor more detailed information, open the documentation by typing " \
+        "'machinery man --html'.\nIf you are unable to find a solution within the man page " \
+        "visit our wiki page\nat https://github.com/SUSE/machinery/wiki"
 
       Machinery::Ui.puts "\nMachinery can show hints which guide through a typical workflow."
       if @config.hints
@@ -518,6 +518,10 @@ class Cli
         "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"
+    if @config.experimental_features
+      c.switch ["extract-metadata", :m], required: false, negatable: false,
+        desc: "Extract unmanaged files metadata without extracting the files."
+    end
     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,
@@ -556,6 +560,9 @@ class Cli
     if options["extract-files"] || options["extract-unmanaged-files"]
       inspect_options[:extract_unmanaged_files] = true
     end
+    if options["extract-metadata"]
+      inspect_options[:extract_metadata] = true
+    end
 
     filter = FilterOptionParser.parse("inspect", options)
 
@@ -710,9 +717,17 @@ class Cli
 
   LONGDESC
   command "man" do |c|
-    c.action do
+    c.switch "html", required: false, negatable: false,
+      desc: "Open documentation in HTML format in your web browser."
+
+    c.action do |_global_options, options, _args|
+      options = {
+        ip: "127.0.0.1",
+        port: @config.http_server_port
+      }.merge(options)
+
       task = ManTask.new
-      task.man
+      task.man(options)
     end
   end