machinery-tool 1.14.2 → 1.15.0

data/html/partials/compare/user_list.html.haml

@@ -4,8 +4,8 @@
       %th Name
       %th.small UID
       %th.small GID
-      %th Comment
-      %th Home
+      %th.medium Comment
+      %th.medium Home
       %th.small Shell
   %tbody
     - list.each do |user|

data/html/partials/compare/users.html.haml

@@ -1,52 +1,49 @@
-- if @diff["patterns"]
-  %a.scope_anchor{ id: "users" }
+- if @diff["users"]
+  - scope = "users"
+  %a.scope_anchor{ id: scope }
   .scope#users_container
     .row
       .col-xs-1
-        %a{ href: "#users" }
-          %img.over.scope_logo_big{ :src => "/assets/logo-users.png",
-            "data-toggle" => "popover",
-            :title => "Users",
-            "data-content" => "#{scope_help("users")}" }
+        %a.btn.btn-default.btn-lg.scope_logo_big{ :href => "##{scope}",
+          :title => scope_title(scope), "data-toggle"=>"popover",
+          "data-content" => scope_help(scope) }
+          %span= scope_initials(scope)
         %span.toggle{ title: "Collapse/Expand" }
       .col-xs-11
         %h2
           Users
-          .scope-summary
-            - if @diff["users"].only_in1
-              %span.summary-part
-                #{@description_a.name}: #{@diff["users"].only_in1.length} users
-            - if @diff["users"].only_in2
-              %span.summary-part
-                #{@description_b.name}: #{@diff["users"].only_in2.length} users
-            - if @diff["users"].common
-              %span.summary-part
-                %a.show-common-elements{ href: "#users_both" }<
-                  both
-                = ": #{@diff["users"].common.length} users"
+          = render_partial "compare/summary",
+            scope: "users",
+            singular: "user",
+            plural: "users"
     .row.scope_content.collapse.in
-      .row
-        .col-xs-1
-        .col-xs-5.table_container
-          - if @diff["users"].only_in1
-            = only_in_a
-            = render_partial "compare/user_list", list: @diff["users"].only_in1
-        .col-xs-1
-        .col-xs-5.table_container
-          - if @diff["users"].only_in2
-            = only_in_b
-            = render_partial "compare/user_list", list: @diff["users"].only_in2
-      - if @diff["users"].common
-        %a.both_anchor{ id: "users_both" }
+      .col-md-12
         .row
-          .col-xs-1
-          .col-xs-2
-            %a.show-common-elements{ href: "#users_both" }
-              Show common elements in users
-            %a.hide-common-elements{ href: "#", style: "display: none" }
-              Hide common elements in users
-        .row.scope_common_content.collapse
-          .col-xs-1
-          .col-xs-10.table_container
-            = in_both
-            = render_partial "compare/user_list", list: @diff["users"].common
+          .col-md-6.table_container
+            - if @diff["users"].only_in1
+              = only_in_a
+              = render_partial "compare/user_list", list: @diff["users"].only_in1
+          .col-md-6.table_container
+            - if @diff["users"].only_in2
+              = only_in_b
+              = render_partial "compare/user_list", list: @diff["users"].only_in2
+        - if @diff["users"].changed
+          %a.both_anchor{ id: "users_changed" }
+          .row
+            .col-md-12.table_container
+              = changed
+              = render_partial "compare/changes", changes: changed_elements("users",
+                key: "name",
+                attributes: ["uid", "gid", "comment", "shell", "home"])
+        - if @diff["users"].common
+          %a.both_anchor{ id: "users_both" }
+          .row
+            .col-md-12
+              %a.show-common-elements{ href: "#users_both" }
+                Show common elements in users
+              %a.hide-common-elements{ href: "#", style: "display: none" }
+                Hide common elements in users
+          .row.scope_common_content.collapse
+            .col-md-12.table_container
+              = in_both
+              = render_partial "compare/user_list", list: @diff["users"].common

data/html/partials/config_files.html.haml

@@ -20,18 +20,18 @@
                     %td.linenumber= line.new_line_number
                     %td
                       = line.content
-        .col-xs-1
-        .col-xs-11
+        .col-md-1
+        .col-md-11
           %table.table.table-striped.table-hover.table-condensed.files-table.filterable
             %thead
               %tr
                 %th Name
-                %th Package Name
-                %th Package Version
-                %th Changes
-                %th Mode
-                %th User
-                %th Group
+                %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

data/html/partials/os.html.haml

@@ -1,19 +1,22 @@
 - if os
+  - scope = "os"
   %div
-    %a.scope_anchor{ :id => "os" }
+    %a.scope_anchor{ :id => scope }
     .scope#os_container
       .row
         .col-xs-1
-          %img.scope_logo_big.over{ "src" => "assets/logo-os.png", "data-toggle" => "popover",
-            "title" => "Operating System", "data-content" => scope_help('os') }
+          %a.btn.btn-default.btn-lg.scope_logo_big{ :href => "##{scope}",
+            :title => scope_title(scope), "data-toggle"=>"popover",
+            "data-content" => scope_help(scope) }
+            %span= scope_initials(scope)
           %span.toggle{ title: "Collapse/Expand" }
         .col-xs-11
           %h2
             Operating System
             .scope-summary
-              = scope_meta_info("os")
+              = scope_meta_info(scope)
         .col-xs-1
-        .col-xs-3.scope_content.collapse.in
+        .col-xs-11.scope_content.collapse.in
           %table.table.table-striped.table-condensed
             %tr
               %th Name

data/html/partials/packages.html.haml

@@ -14,10 +14,10 @@
             %thead
               %tr
                 %th Name
-                %th Version
-                %th Release
-                %th Arch
-                %th Vendor
+                %th.medium Version
+                %th.medium Release
+                %th.medium Arch
+                %th.medium Vendor
                 %th Checksum
             %tbody
               - packages.each do |package|

data/html/partials/patterns.html.haml

@@ -13,8 +13,8 @@
             %thead
               %tr
                 %th Name
-                %th Version
-                %th Release
+                %th.medium Version
+                %th.medium Release
             %tbody
               - patterns.each do |pattern|
                 %tr

data/html/partials/repositories.html.haml

@@ -15,12 +15,12 @@
               %tr
                 %th Name
                 %th Alias
-                %th Type
+                %th.small Type
                 %th URL
-                %th Enabled
-                %th Autorefresh
-                %th GPG Check
-                %th Priority
+                %th.small Enabled
+                %th.small Autorefresh
+                %th.small GPG Check
+                %th.small Priority
             %tbody
               - repositories.each do |repo|
                 %tr

data/html/partials/scope_header.html.haml

@@ -1,12 +1,10 @@
 - meta = @description[scope].meta
 .row
   .col-xs-1
-    %img.over.scope_logo_big{ "data-content" => "<p>#{scope_help(scope)}</p>",
-      "data-toggle" => "popover",
-      "src" => "assets/logo-#{scope.tr("_", "-")}.png",
-      "title" => "",
-      "data-original-title" => title,
-      "style" => "top: 125px;" }
+    %a.btn.btn-default.btn-lg.over.scope_logo_big{ :href => "##{scope}",
+      :title => scope_title(scope), "data-toggle"=>"popover",
+      "data-content" => scope_help(scope) }
+      %span= scope_initials(scope)
     %span.toggle{ "title" => "Collapse/Expand" }
   .col-xs-11
     %h2

data/html/partials/services.html.haml

@@ -14,7 +14,7 @@
             %thead
               %tr
                 %th Name
-                %th State
+                %th.medium State
             %tbody
               - services.services.each do |service|
                 %tr

data/html/partials/unmanaged_files.html.haml

@@ -14,7 +14,7 @@
             %thead
               %tr
                 %th Name
-                %th Type
+                %th.medium Type
             %tbody
               - unmanaged_files.files.each do |file|
                 %tr

data/html/partials/users.html.haml

@@ -13,11 +13,11 @@
             %thead
               %tr
                 %th Name
-                %th UID
-                %th GID
+                %th.small UID
+                %th.small GID
                 %th Comment
-                %th Home
-                %th Shell
+                %th.medium Home
+                %th.medium Shell
             %tbody
               - users.each do |user|
                 %tr

data/lib/array.rb

@@ -62,6 +62,10 @@ module Machinery
       end
     end
 
+    def to_s
+      @elements.empty? ? "(empty)" : @elements.join(",")
+    end
+
     def ==(other)
       self.class == other.class && @elements == other.elements
     end

data/lib/cli.rb

@@ -774,15 +774,23 @@ class Cli
       inspected_filters = description.filter_definitions("inspect")
 
       if options[:verbose]
+        details = ""
+
+        if description[:environment].system_type == "docker"
+          details += "\n  Type of inspected container: #{description[:environment].system_type}\n"
+        end
+
         if !inspected_filters.empty?
-          Machinery::Ui.puts "\nThe following filters were applied during inspection:"
-          Machinery::Ui.puts inspected_filters.join("\n") + "\n\n"
+          details += "\n  The following filters were applied during inspection:"
+          details += "\n    * " + inspected_filters.join("\n    * ") + "\n\n"
         end
 
         if !filter.empty?
-          Machinery::Ui.puts "\nThe following filters were applied before showing the description:"
-          Machinery::Ui.puts filter.to_array.join("\n") + "\n\n"
+          details += "\n  The following filters were applied before showing the description:"
+          details += "\n    * " + filter.to_array.join("\n    * ") + "\n\n"
         end
+
+        Machinery::Ui.puts "# Inspection details\n" + details unless details.empty?
       end
 
       task = ShowTask.new

data/lib/file_scope.rb

@@ -24,12 +24,16 @@ class FileScope < Machinery::Object
     shared = self.class.new
 
     compare_extracted(other, only_self, only_other, shared)
-    compare_files(other, only_self, only_other, shared)
+    changed = compare_files(other, only_self, only_other, shared)
 
     only_self = nil if only_self.empty?
     only_other = nil if only_other.empty?
     shared = nil if shared.empty?
-    [only_self, only_other, nil, shared]
+    [only_self, only_other, changed, shared]
+  end
+
+  def length
+    files.try(:length) || 0
   end
 
   private
@@ -57,10 +61,12 @@ class FileScope < Machinery::Object
   end
 
   def compare_files(other, only_self, only_other, shared)
-    own_files, other_files, _changed, shared_files = files.compare_with(other.files)
+    own_files, other_files, changed, shared_files = files.compare_with(other.files)
 
     only_self.files = own_files if own_files
     only_other.files = other_files if other_files
     shared.files = shared_files if shared_files
+
+    changed
   end
 end

data/lib/html.rb

@@ -24,6 +24,7 @@ class Html
       Server.set :port, opts[:port] || Machinery::Config.new.http_server_port
       Server.set :bind, opts[:ip] || "localhost"
       Server.set :public_folder, File.join(Machinery::ROOT, "html")
+      Server.set :static_cache_control, "no-cache"
 
       if opts[:ip] != "localhost" && opts[:ip] != "127.0.0.1"
         if opts[:ip] == "0.0.0.0"

data/lib/machinery.rb

@@ -38,6 +38,7 @@ require "diffy"
 require "sinatra/base"
 require "mimemagic"
 
+require_relative "try"
 require_relative "machinery_logger"
 require_relative "zypper"
 require_relative "rpm"

data/lib/scope.rb

@@ -46,6 +46,22 @@ module Machinery
       nil
     end
 
+    def self.extract_changed_elements(a, b, primary_key)
+      changed_keys = a.map(&primary_key) & b.map(&primary_key)
+      changed = []
+
+      changed_keys.each do |key|
+        changed << [
+          a.find { |e| e.send(primary_key) == key },
+          b.find { |e| e.send(primary_key) == key },
+        ]
+        a.reject! { |e| e.send(primary_key) == key }
+        b.reject! { |e| e.send(primary_key) == key }
+      end
+
+      changed
+    end
+
     module ClassMethods
       def hidden?
         @hidden || false

data/lib/server.rb

@@ -35,12 +35,32 @@ class Server < Sinatra::Base
     end
 
     def scope_help(scope)
-      text = File.read(File.join(Machinery::ROOT, "plugins", "#{scope}/#{scope}.md"))
+      text = scope_info(scope)[:description]
       Kramdown::Document.new(text).to_html
     end
 
+    def scope_info(scope)
+      YAML.load(File.read(File.join(Machinery::ROOT, "plugins", "#{scope}/#{scope}.yml")))
+    end
+
+    def scope_title(scope)
+      scope_info(scope)[:name]
+    end
+
+    def scope_initials(scope)
+      scope_info(scope)[:initials].upcase
+    end
+
+    def nav_class(scope)
+      if @description
+        return @description[scope] ? "" : "disabled"
+      elsif @description_a && @description_b
+        return @description_a[scope] && @description_b[scope] ? "" : "disabled"
+      end
+    end
+
     def safe_length(object, attribute)
-      if object && collection = object.send(attribute)
+      if collection = object.try(attribute)
         collection.length
       else
         0
@@ -63,40 +83,58 @@ class Server < Sinatra::Base
       "<h3>In both with different attributes:</h3>"
     end
 
-    def changed_packages
+    def pluralize_scope(object, singular, plural)
+      object.length.to_s + " " + Machinery.pluralize(object.length, singular, plural)
+    end
+
+    def changed_elements(scope, opts)
+      optional_attributes = opts[:optional_attributes] || []
+
       changed = []
-      @diff["packages"].changed.each do |change|
+      @diff[scope].changed.each do |change|
         changes = []
-        relevant_attributes = ["version", "vendor", "arch"]
+        relevant_attributes = if opts[:attributes]
+          opts[:attributes].dup
+        else
+          change[0].attributes.keys & change[1].attributes.keys
+        end
 
-        if change[0].version == change[1].version
-          relevant_attributes.push("release")
-          if change[0].release == change[1].release
-            relevant_attributes.push("checksum")
+        (1..optional_attributes.length).each do |i|
+          if change[0][optional_attributes[i - 1]] ==
+              change[1][optional_attributes[i - 1]]
+            relevant_attributes.push(optional_attributes[i])
+          else
+            break
           end
         end
-
         relevant_attributes.each do |attribute|
           if change[0][attribute] != change[1][attribute]
-            changes.push(attribute + ": " + change[0][attribute] + " ↔ " + change[1][attribute])
+            changes.push(
+              attribute + ": " + human_readable_attribute(change[0], attribute) + " ↔ " +
+                human_readable_attribute(change[1], attribute)
+            )
           end
         end
 
-        changed.push(change[0].name + " (" + changes.join(", ") + ")")
+        changed.push(
+          id:       change[0][opts[:key]],
+          change:   "(" + changes.join(", ") + ")",
+          diffable: change[0].is_a?(UnmanagedFile) && change[0].is_a?(UnmanagedFile) &&
+            change[0].file? && change[1].file?
+        )
       end
       changed
     end
 
-    def diffable_unmanaged_files
-      return @diffable_unmanaged_files if @diffable_unmanaged_files
-
-      return [] if !@diff["unmanaged_files"] || !@diff["unmanaged_files"].only_in1 ||
-          !@diff["unmanaged_files"].only_in2
+    def human_readable_attribute(object, attribute)
+      value = object[attribute]
 
-      files_in_1 = @diff["unmanaged_files"].only_in1.files.select(&:file?).map(&:name)
-      files_in_2 = @diff["unmanaged_files"].only_in2.files.select(&:file?).map(&:name)
+      case object
+      when Machinery::SystemFile
+        value = number_to_human_size(value) if attribute == "size"
+      end
 
-      @diffable_unmanaged_files = files_in_1 & files_in_2
+      value.to_s
     end
 
     def diff_to_object(diff)
@@ -186,14 +224,14 @@ class Server < Sinatra::Base
     Inspector.all_scopes.each do |scope|
       if @description_a[scope] && @description_b[scope]
         @diff[scope] = Comparison.compare_scope(@description_a, @description_b, scope)
-      else
+      elsif @description_a[scope] || @description_b[scope]
         @meta[:uninspected] ||= Hash.new
 
-        if !@description_a[scope] && @description_b[scope]
+        if !@description_a[scope]
           @meta[:uninspected][@description_a.name] ||= Array.new
           @meta[:uninspected][@description_a.name] << scope
         end
-        if !@description_b[scope] && @description_a[scope]
+        if !@description_b[scope]
           @meta[:uninspected][@description_b.name] ||= Array.new
           @meta[:uninspected][@description_b.name] << scope
         end