machinery-tool 1.16.4 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61f95235d9694179e1978bb89447ee9cda2edf8c
-  data.tar.gz: 41f8b0796dbd7a589e4064913e0bd3aedd90c508
+  metadata.gz: 7d95072db7db89bc9881b0f130e31fc14a4cef78
+  data.tar.gz: 01accc4637d1dc9cbad915914eeca4a7ae4ccfa3
 SHA512:
-  metadata.gz: 73e002b842608df16b0b6eecbde9d8471e94006b48ec1986179a7660e32c9b670d36573806f355fe01d0187dc0d975e31ac36ee44ad2bca18c7ea71488230d20
-  data.tar.gz: cf4b647db694d47f6338b66c66819064f89be90e85c663dc0aa3f6731a7ff5958f52f26ea37fc30066a7ac2e6dc7d87d2e4a18d2b17a3d9332a4914970ae5b91
+  metadata.gz: 03b5e6b547a2dec55e3f72559db01c0cb3971c902ee622470d89f45d79f1984bdf4eb888f5210829cf848b695e41d93b8a80f3ef7efac68af91344f3c9764b63
+  data.tar.gz: 8cf84db6d3ba91a18c35ebbf6938caf2df4ae463b05af5420937e17ef4aa960f78b90ef457046c337317b677093936c7a35363db1a6cb08dca689c01000fa092

data/.git_revision

@@ -1 +1 @@
-493384074f90a69256c6fa174a1e1e05ae5ce219
+8bfc2e6ccf6d9ff87a018bd15002a20182fd6709

data/NEWS

@@ -1,6 +1,16 @@
 # Machinery Release Notes
 
 
+## 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)
+* Align config-files scope in HTML view (gh#SUSE/machinery#1814)
+* Allow closing file dialog (in WebUI) by pressing ESC
+* Support inspection of Ubuntu 14.04 systems
+* New `--ssh-identity-file` option to specify a SSH private key when inspecting
+  a remote system
+* New `--ssh-port` option to specify an SSH port when inspecting a remote system
+
 ## Version 1.16.4 - Thu Jan 14 18:35:47 CET 2016 - thardeck@suse.de
 
 * The unmanaged-files scope filter will not include "/boot" by default anymore.

data/filters/default_filters.json

@@ -1,24 +1,25 @@
 {
   "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/lock",
-    "/unmanaged_files/files/name=/var/lib/rpm",
-    "/unmanaged_files/files/name=/.snapshots",
-    "/unmanaged_files/files/name=/proc",
-    "/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"
+    "/unmanaged_files/name=/etc/passwd",
+    "/unmanaged_files/name=/etc/shadow",
+    "/unmanaged_files/name=/etc/group",
+    "/unmanaged_files/name=/tmp",
+    "/unmanaged_files/name=/var/tmp",
+    "/unmanaged_files/name=/lost+found",
+    "/unmanaged_files/name=/var/run",
+    "/unmanaged_files/name=/var/lock",
+    "/unmanaged_files/name=/var/lib/rpm",
+    "/unmanaged_files/name=/.snapshots",
+    "/unmanaged_files/name=/proc",
+    "/unmanaged_files/name=/etc/init.d/boot.d",
+    "/unmanaged_files/name=/etc/init.d/rc0.d",
+    "/unmanaged_files/name=/etc/init.d/rc1.d",
+    "/unmanaged_files/name=/etc/init.d/rc2.d",
+    "/unmanaged_files/name=/etc/init.d/rc3.d",
+    "/unmanaged_files/name=/etc/init.d/rc4.d",
+    "/unmanaged_files/name=/etc/init.d/rc5.d",
+    "/unmanaged_files/name=/etc/init.d/rc6.d",
+    "/unmanaged_files/name=/etc/init.d/rcS.d",
+    "/unmanaged_files/name=/var/lib/dpkg"
   ]
 }

data/html/assets/machinery-base.js

@@ -22,4 +22,8 @@ $(document).ready(function () {
   $(".dismiss").click(function(){
     $(this).closest(".scope").hide();
   });
+
+  $(".btn-reset").click(function(){
+    $("#filter").val("").change();
+  });
 })

data/html/index.html.haml

@@ -19,7 +19,7 @@
   %body{ "data-description" => @description.name }
     - scopes = ["os", "packages", "patterns", "repositories", "users", "groups",
        "services", "config_files", "changed_managed_files", "unmanaged_files"]
-    #file-modal.modal.fade
+    .modal.fade#file-modal{ "tabindex" => "-1" }
       .modal-dialog.modal-lg
         .modal-content
           .modal-header

data/html/partials/changed_managed_files.html.haml

@@ -2,7 +2,7 @@
   %div
     %a.scope_anchor{ id: "changed_managed_files" }
     .scope#changed_managed_files_container{ "data-scope" => "changed_managed_files" }
-      - count = changed_managed_files.files.length
+      - count = changed_managed_files.length
       = render_partial "scope_header",
         :scope => "changed_managed_files",
         :title => "Changed Managed Files",
@@ -24,7 +24,7 @@
                   %th.small User
                   %th.small Group
               %tbody
-                - changed_managed_files.files.each do |file|
+                - changed_managed_files.each do |file|
                   %tr
                     %td
                       - if file.on_disk?

data/html/partials/compare/changed_managed_file_list.html.haml

@@ -1,6 +1,6 @@
 %p
   <strong>Files extracted:</strong> #{list.extracted ? "yes" : "no"}
-- if list.files
+- unless list.elements.empty?
   %table.table.table-striped.table-hover.table-condensed.files-table
     %thead
       %tr
@@ -12,7 +12,7 @@
         %th.small User
         %th.small Group
     %tbody
-      - list.files.each do |file|
+      - list.each do |file|
         %tr
           %td= file.name
           %td= file.package_name

data/html/partials/compare/changed_managed_files.html.haml

@@ -20,12 +20,12 @@
       .col-md-12
         .row
           .col-xs-6.table_container
-            - if safe_length(@diff["changed_managed_files"].only_in1, :files) > 0
+            - if @diff["changed_managed_files"].only_in1
               = only_in_a
               = render_partial "compare/changed_managed_file_list",
                 list: @diff["changed_managed_files"].only_in1
           .col-xs-6.table_container
-            - if safe_length(@diff["changed_managed_files"].only_in2, :files) > 0
+            - if @diff["changed_managed_files"].only_in2
               = only_in_b
               = render_partial "compare/changed_managed_file_list",
                 list: @diff["changed_managed_files"].only_in2
@@ -36,7 +36,7 @@
               = changed
               = render_partial "compare/changes", changes: changed_elements("changed_managed_files",
                 key: "name")
-        - if safe_length(@diff["changed_managed_files"].common, :files) > 0
+        - if @diff["changed_managed_files"].common
           %a.both_anchor{ id: "changed_managed_files_both" }
           .row
             .col-xs-12

data/html/partials/compare/config_file_list.html.haml

@@ -1,6 +1,6 @@
 %p
   <strong>Files extracted:</strong> #{list.extracted ? "yes" : "no"}
-- if list.files
+- unless list.elements.empty?
   %table.table.table-striped.table-hover.table-condensed.files-table
     %thead
       %tr
@@ -12,7 +12,7 @@
         %th.small User
         %th.small Group
     %tbody
-      - list.files.each do |file|
+      - list.each do |file|
         %tr
           %td= file.name
           %td= file.package_name

data/html/partials/compare/config_files.html.haml

@@ -20,11 +20,11 @@
       .col-md-12
         .row
           .col-xs-6.table_container
-            - if safe_length(@diff["config_files"].only_in1, :files) > 0
+            - if @diff["config_files"].only_in1
               = only_in_a
               = render_partial "compare/config_file_list", list: @diff["config_files"].only_in1
           .col-xs-6.table_container
-            - if safe_length(@diff["config_files"].only_in2, :files) > 0
+            - if @diff["config_files"].only_in2
               = only_in_b
               = render_partial "compare/config_file_list", list: @diff["config_files"].only_in2
         - if @diff["config_files"].changed
@@ -34,7 +34,7 @@
               = changed
               = render_partial "compare/changes", changes: changed_elements("config_files",
                 key: "name")
-        - if safe_length(@diff["config_files"].common, :files) > 0
+        - if @diff["config_files"].common
           %a.both_anchor{ id: "config_files_both" }
           .row
             .col-xs-12

data/html/partials/compare/packages.html.haml

@@ -12,10 +12,27 @@
       .col-xs-11
         %h2
           Packages
-          = render_partial "compare/summary",
-            scope: "packages",
-            singular: "package",
-            plural: "packages"
+          .scope-summary
+            - if @diff["packages"].only_in1 && @diff["packages"].only_in1.length > 0
+              %span.summary-part
+                #{@description_a.name}:
+                #{pluralize_scope(@diff["packages"].only_in1, "package", "packages")}
+                (#{@diff["packages"].only_in1.package_system})
+            - if @diff["packages"].only_in2 && @diff["packages"].only_in2.length > 0
+              %span.summary-part
+                #{@description_b.name}:
+                #{pluralize_scope(@diff["packages"].only_in2, "package", "packages")}
+                (#{@diff["packages"].only_in2.package_system})
+            - if @diff["packages"].changed && @diff["packages"].changed.length > 0
+              %span.summary-part
+                %a.show-changed-elements{ href: "#packages_changed" }
+                  changed
+                = ": #{pluralize_scope(@diff["packages"].changed, "package", "packages")}"
+            - if @diff["packages"].common && @diff["packages"].common.length > 0
+              %span.summary-part
+                %a.show-common-elements{ href: "#packages_both" }<
+                  both
+                = ": #{pluralize_scope(@diff["packages"].common, "package", "packages")}"
     .row.scope_content.collapse.in
       .col-md-12
         .row

data/html/partials/compare/repositories.html.haml

@@ -22,20 +22,21 @@
           .col-md-6.table_container
             - if @diff["repositories"].only_in1
               = only_in_a
-              = render_partial "compare/repository_list", list: @diff["repositories"].only_in1
+              - repo_system = @diff["repositories"].only_in1.repository_system
+              = render_partial "compare/repository_list_#{repo_system}",
+                list: @diff["repositories"].only_in1
           .col-md-6.table_container
             - if @diff["repositories"].only_in2
               = only_in_b
-              = render_partial "compare/repository_list", list: @diff["repositories"].only_in2
+              - repo_system = @diff["repositories"].only_in2.repository_system
+              = render_partial "compare/repository_list_#{repo_system}",
+                list: @diff["repositories"].only_in2
         - if @diff["repositories"].changed
           %a.both_anchor{ id: "repositories_changed" }
           .row
             .col-md-12.table_container
               = changed
-              = render_partial "compare/changes", changes: changed_elements("repositories",
-                attributes: ["name", "url", "type", "enabled", "autorefresh", "gpgcheck",
-                  "priority"],
-                key: "alias")
+              = render_partial "compare/changes", changes: repository_changes
         - if @diff["repositories"].common
           %a.both_anchor{ id: "repositories_both" }
           .row
@@ -47,4 +48,6 @@
           .row.scope_common_content.collapse
             .col-md-12.table_container
               = in_both
-              = render_partial "compare/repository_list", list: @diff["repositories"].common
+              - repo_system = @diff["repositories"].common.repository_system
+              = render_partial "compare/repository_list_#{repo_system}",
+                list: @diff["repositories"].common

data/html/partials/compare/repository_list_apt.html.haml

@@ -0,0 +1,15 @@
+%table.table.table-striped.table-hover.table-condensed
+  %thead
+    %tr
+      %th.small Type
+      %th URL
+      %th Distribution
+      %th Components
+  %tbody
+    - list.each do |repo|
+      %tr
+        %td= repo.type
+        %td
+          %a{ href: repo.url }= repo.url
+        %td= repo.distribution
+        %td= repo.components.join(", ")

data/html/partials/compare/repository_list_yum.html.haml

@@ -0,0 +1,35 @@
+%table.table.table-striped.table-hover.table-condensed
+  %thead
+    %tr
+      %th Name
+      %th Alias
+      %th URL
+      %th Mirrorlist
+      %th.small Type
+      %th.small Enabled
+      %th.small.visible-lg GPG Check
+      %th.small.visible-lg GPG Keys
+      %th.tiny.hidden-lg
+  %tbody
+    - list.each do |repo|
+      %tr
+        %td= repo.name
+        %td= repo.alias
+        %td
+          - repo.url.each do |url|
+            %a{ href: url }= url
+            %br
+        %td
+          - unless repo.mirrorlist.empty?
+            %a{ href: repo.mirrorlist }= repo.mirrorlist
+        %td= repo.type
+        %td= repo.enabled
+        %td.visible-lg= repo.gpgcheck
+        %td.visble-lg
+          - repo.gpgkey.each do |url|
+            %a{ href: url }= url
+            %br
+        %td.hidden-lg{ title: "Name: #{repo.name}\nAlias: #{repo.alias}\nUrl: #{repo.url}\n" |
+                 "Type: #{repo.type}\nEnabled: #{repo.enabled}\n" |
+                 "GPG Check: #{repo.gpgcheck}" } |
+          | ...

data/html/partials/compare/service_list.html.haml

@@ -4,7 +4,7 @@
       %th Name
       %th.medium State
   %tbody
-    - list.services.each do |service|
+    - list.each do |service|
       %tr
         %td= service.name
         %td{ class: "#{list.init_system}_#{service.state}" }

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

@@ -37,11 +37,11 @@
       .col-md-12
         .row
           .col-md-6.table_container
-            - if safe_length(@diff["services"].only_in1, :services) > 0
+            - if @diff["services"].only_in1
               = only_in_a
               = render_partial "compare/service_list", list: @diff["services"].only_in1
           .col-md-6.table_container
-            - if safe_length(@diff["services"].only_in2, :services) > 0
+            - if @diff["services"].only_in2
               = only_in_b
               = render_partial "compare/service_list", list: @diff["services"].only_in2
         - if @diff["services"].changed
@@ -50,7 +50,7 @@
             .col-md-12.table_container
               = changed
               = render_partial "compare/changes", changes: changed_elements("services", key: "name")
-        - if safe_length(@diff["services"].common, :services) > 0
+        - if @diff["services"].common
           %a.both_anchor{ id: "services_both" }
           .row
             .col-md-12

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

@@ -1,14 +1,14 @@
 - if !list.extracted.nil?
   %p
     <strong>Files extracted:</strong> #{list.extracted ? "yes" : "no"}
-- if list.files
+- unless list.elements.empty?
   %table.table.table-striped.table-hover.table-condensed.files-table
     %thead
       %tr
         %th Name
         %th.small Type
     %tbody
-      - list.files.each do |file|
+      - list.each do |file|
         %tr
           %td= file.name
           %td= file.type

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

@@ -51,7 +51,7 @@
               = changed
               = render_partial "compare/changes", changes: changed_elements("unmanaged_files",
                 key: "name")
-        - if safe_length(@diff["unmanaged_files"].common, :files) > 0
+        - if @diff["unmanaged_files"].common
           %a.both_anchor{ id: "unmanaged_files_both" }
           .row
             .col-md-12

data/html/partials/config_files.html.haml

@@ -2,7 +2,7 @@
   %div
     %a.scope_anchor{ id: "config_files" }
     .scope#config_files_container{ "data-scope" => "config_files" }
-      - count = config_files.files.length
+      - count = config_files.length
       = render_partial "scope_header",
         :scope => "config_files",
         :title => "Config Files",
@@ -13,51 +13,49 @@
           - if count == 0
             There are no config files.
           - if count > 0
-            - config_files.files.each do |file|
+            - config_files.each do |file|
               - if file.diff
                 .diff{ style: "display: none", "data-config-file-diff" => file.diff.file }
                   %span.diff-summary
                     #{file.diff.additions} additions & #{file.diff.deletions} deletions
                   %table.diff
                     - file.diff.lines.each do |line|
-                      %tr{ class: line.type }
-                        %td.active.linenumber= line.original_line_number
-                        %td.linenumber= line.new_line_number
+                      %tr{ class: line[:type] }
+                        %td.active.linenumber= line[:original_line_number]
+                        %td.linenumber= line[:new_line_number]
                         %td
-                          = line.content
-            .col-md-1
-            .col-md-11
-              %table.table.table-striped.table-hover.table-condensed.files-table.filterable
-                %thead
+                          = line[:content]
+            %table.table.table-striped.table-hover.table-condensed.files-table.filterable
+              %thead
+                %tr
+                  %th Name
+                  %th.medium Package Name
+                  %th.medium Package Version
+                  %th.medium Changes
+                  %th.small Mode
+                  %th.small User
+                  %th.small Group
+              %tbody
+                - config_files.each do |file|
                   %tr
-                    %th Name
-                    %th.medium Package Name
-                    %th.medium Package Version
-                    %th.medium Changes
-                    %th.small Mode
-                    %th.small User
-                    %th.small Group
-                %tbody
-                  - config_files.files.each do |file|
-                    %tr
-                      %td
-                        %span
-                          - if file.on_disk?
-                            %a.file-download{ href: "#" }
-                              = file.name
-                          - else
-                            %span
-                              = file.name
-                        - if file.diff
-                          %a.diff-toggle{ "data-config-file" => file.name,
-                            "data-toggle" => "popover" }
-                            Show diff
-                      %td= file.package_name
-                      %td= file.package_version
-                      %td
-                        = file.changes.join(",")
-                        - if file.error_message
-                          %span{ title: file.error_message } (details)
-                      %td= file.mode
-                      %td= file.user
-                      %td= file.group
+                    %td
+                      %span
+                        - if file.on_disk?
+                          %a.file-download{ href: "#" }
+                            = file.name
+                        - else
+                          %span
+                            = file.name
+                      - if file.diff
+                        %a.diff-toggle{ "data-config-file" => file.name,
+                          "data-toggle" => "popover" }
+                          Show diff
+                    %td= file.package_name
+                    %td= file.package_version
+                    %td
+                      = file.changes.join(",")
+                      - if file.error_message
+                        %span{ title: file.error_message } (details)
+                    %td= file.mode
+                    %td= file.user
+                    %td= file.group