machinery-tool 1.18.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3862196a560a037acde60f2864df0bde8426cd9e
-  data.tar.gz: 635959f588111bad3702a7d8eb134316ec339b13
+  metadata.gz: 2d349debbcb3d723bc63b0d88e167c740eefba7d
+  data.tar.gz: 7916e14996d43eaa7573874248a41e5eb951f70c
 SHA512:
-  metadata.gz: 4fc553147b68761806a51fe5c078d792bb28c7bc38dfdf17e766c85c1fe3643dd3830122563885ccdd5d63d584114e17bb00ea880d4fb1029af24007c43c4e38
-  data.tar.gz: ab2165ca7a37ad14e4b794ea7eeefca6905b84bd3911914ee9f113e46754a2e6b2876a5b893b2145466c42d8171078f143a57ba6a0623ac26df1f8f952af3285
+  metadata.gz: 72c3fb80b1ff276026fe17984ec495ae0ac5b3f5d4f6ce09a459eacb5cd7a968196f1074024a27d0e79e94ab1d9b6bb5973afb42b6deb924bd5c7457a94c32ee
+  data.tar.gz: 11a7aa1ebd52c08682c01367814b6c114b21685424bc0b94d70c23ed4ce9f2ce711f5277ab6565d0d9f30ec97c29e991d447518566964f178569d1911dc9ed04

data/.git_revision

@@ -1 +1 @@
-8df1e753fd5f3ef8a5bcfed6eb932b864acbebde
+2b9173e39c9aa1b627b29893d7374eae4378e029

data/NEWS

@@ -1,6 +1,23 @@
 # Machinery Release Notes
 
 
+## Version 1.19.0 - Mon Apr 04 17:06:37 CEST 2016 - thardeck@suse.de
+
+* Rename config-files inspector to changed-config-files inspector to be more
+  intuitive
+* Following the previous change the analyze operation was also renamed to
+  changed-config-files-diffs
+* Add explanation for patterns-tasks relationship for Debian based
+  systems (gh#SUSE/machinery#1820)
+* Public serve task now prints hostname for sharing (gh#SUSE/machinery#1699)
+* Fix export of description with no repositories scope to Autoyast (gh#SUSE/machinery#2024)
+* Only use required packages for bootstrap in Kiwi export
+* Fix regression which prevented changed-config-file diffs from being shown
+  in the HTML output
+* Hint now mentions remote-user option (gh#SUSE/machinery#1813)
+* Hint is printed when `machinery` is called without options (gh#SUSE/machinery#1286)
+* Rename --exclude-scope option to --ignore-scope (gh#SUSE/machinery#897)
+
 ## 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

data/bin/machinery

@@ -21,8 +21,16 @@ require_relative '../lib/machinery'
 
 begin
   if Dir.exist?(File.join(Machinery::ROOT, ".git"))
-    Dir.chdir(File.join(Machinery::ROOT, "machinery-helper")) do
-      Cheetah.run("rake", "build")
+    begin
+      Dir.chdir(File.join(Machinery::ROOT, "machinery-helper")) do
+        Cheetah.run("rake", "build")
+      end
+    rescue
+      STDERR.puts(
+        "ERROR: The official Go compiler is not available on this system which prevents the" \
+          " machinery-helper binaries from being built."
+      )
+      exit
     end
   end
 

data/html/comparison.html.haml

@@ -22,7 +22,7 @@
 
   %body{ "data-description-a" => @description_a.name, "data-description-b" => @description_b.name }
     - scopes = ["os", "packages", "patterns", "repositories", "users", "groups",
-       "services", "config_files", "changed_managed_files", "unmanaged_files"]
+       "services", "changed_config_files", "changed_managed_files", "unmanaged_files"]
     #diff-unmanaged-files.modal.fade
       .modal-dialog.modal-lg
         .modal-content

data/html/index.html.haml

@@ -18,7 +18,7 @@
 
   %body{ "data-description" => @description.name }
     - scopes = ["os", "packages", "patterns", "repositories", "users", "groups",
-       "services", "config_files", "changed_managed_files", "unmanaged_files"]
+       "services", "changed_config_files", "changed_managed_files", "unmanaged_files"]
     .modal.fade#file-modal{ "tabindex" => "-1" }
       .modal-dialog.modal-lg
         .modal-content
@@ -109,7 +109,7 @@
             .row
               .col-xs-1
               .col-xs-11
-                - if !@description.filter_definitions("inspect").empty?
+                - unless @description.filter_definitions("inspect").empty?
                   %ul
                     - @description.filter_definitions("inspect").each do |filter|
                       %li.filter

data/html/partials/{config_files.html.haml → changed_config_files.html.haml}

@@ -1,21 +1,21 @@
-- if config_files
+- if changed_config_files
   %div
-    %a.scope_anchor{ id: "config_files" }
-    .scope#config_files_container{ "data-scope" => "config_files" }
-      - count = config_files.length
+    %a.scope_anchor{ id: "changed_config_files" }
+    .scope#changed_config_files_container{ "data-scope" => "changed_config_files" }
+      - count = changed_config_files.length
       = render_partial "scope_header",
-        :scope => "config_files",
-        :title => "Config Files",
+        :scope => "changed_config_files",
+        :title => "Changed Configuration Files",
         :count => "#{count} #{Machinery.pluralize(count, "file")}"
       .row.scope_content.collapse.in
         .col-xs-1
         .col-xs-11
           %p
-            <strong>Files extracted:</strong> #{config_files.extracted ? "yes" : "no"}
+            <strong>Files extracted:</strong> #{changed_config_files.extracted ? "yes" : "no"}
           - if count == 0
-            There are no config files.
+            There are no changed configuration files.
           - if count > 0
-            - config_files.each do |file|
+            - changed_config_files.each do |file|
               - if file.diff
                 .diff{ style: "display: none", "data-config-file-diff" => file.diff.file }
                   %span.diff-summary
@@ -38,7 +38,7 @@
                   %th.small User
                   %th.small Group
               %tbody
-                - config_files.each do |file|
+                - changed_config_files.each do |file|
                   %tr
                     %td
                       %span

data/html/partials/compare/changed_config_files.html.haml

@@ -0,0 +1,48 @@
+- if @diff["changed_config_files"]
+  - scope = "changed_config_files"
+  %a.scope_anchor{ id: scope }
+  .scope#changed_config_files_container
+    .row
+      .col-xs-1
+        %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
+          Changed Config Files
+          = render_partial "compare/summary",
+            scope: "changed_config_files",
+            singular: "file",
+            plural: "files"
+    .row.scope_content.collapse.in
+      .col-md-12
+        .row
+          .col-xs-6.table_container
+            - if @diff["changed_config_files"].only_in1
+              = only_in_a
+              = render_partial "compare/changed_config_files_list", list: @diff["changed_config_files"].only_in1
+          .col-xs-6.table_container
+            - if @diff["changed_config_files"].only_in2
+              = only_in_b
+              = render_partial "compare/changed_config_files_list", list: @diff["changed_config_files"].only_in2
+        - if @diff["changed_config_files"].changed
+          %a.both_anchor{ id: "changed_config_files_changed" }
+          .row
+            .col-xs-12.table_container
+              = changed
+              = render_partial "compare/changes", changes: changed_elements("changed_config_files",
+                key: "name")
+        - if @diff["changed_config_files"].common
+          %a.both_anchor{ id: "changed_config_files_both" }
+          .row
+            .col-xs-12
+              %a.show-common-elements{ href: "#changed_config_files_both" }
+                Show common elements in changed-config-files
+              %a.hide-common-elements{ href: "#", style: "display: none" }
+                Hide common elements in changed-config-files
+          .row.scope_common_content.collapse
+            .col-xs-12.table_container
+              = in_both
+              = render_partial "compare/changed_config_files_list", list: @diff["changed_config_files"].common

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

@@ -1,4 +1,4 @@
-- if !list.extracted.nil?
+- unless list.extracted.nil?
   %p
     <strong>Files extracted:</strong> #{list.extracted ? "yes" : "no"}
 - unless list.elements.empty?

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

@@ -26,7 +26,7 @@
                 %a.show-changed-elements{ href: "#unmanaged_files_changed" }
                   changed
                 = ": #{pluralize_scope(@diff["unmanaged_files"].changed, "file", "files")}"
-            - if @diff["unmanaged_files"].common
+            - unless @diff["unmanaged_files"].common.elements.empty?
               %span.summary-part
                 %a.show-common-elements{ href: "#unmanaged_files_both" }<
                   both
@@ -51,7 +51,7 @@
               = changed
               = render_partial "compare/changes", changes: changed_elements("unmanaged_files",
                 key: "name")
-        - if @diff["unmanaged_files"].common
+        - unless @diff["unmanaged_files"].common.elements.empty?
           %a.both_anchor{ id: "unmanaged_files_both" }
           .row
             .col-md-12

data/html/partials/patterns.html.haml

@@ -6,6 +6,11 @@
         :scope => "patterns",
         :title => "Patterns",
         :count => "#{patterns.length} #{Machinery.pluralize(patterns.length, "pattern")}"
+      - if @description.packages && @description.packages.package_system == "dpkg"
+        .row
+          .col-xs-1
+          .col-xs-11
+            Note: Tasks on Debian-like systems are treated as patterns.
       .row.scope_content.collapse.in
         .col-xs-1
         .col-xs-11

data/html/upgrade.html.haml

@@ -0,0 +1,49 @@
+!!!
+%html
+  %head
+    %title
+      Machinery Error: incompatible system description
+    %meta{ :charset => 'utf-8' }
+    %link{ :href => "assets/machinery-base.css", :rel => "stylesheet", :type => "text/css" }
+    %link{ :href => "assets/machinery.css", :rel => "stylesheet", :type => "text/css" }
+    %script{ :src => "assets/jquery-2.1.1.min.js" }
+    %script{ :src => "assets/transition.js" }
+    %script{ :src => "assets/collapse.js" }
+    %script{ :src => "assets/modal.js" }
+    %script{ :src => "assets/jquery.searcher.min.js" }
+    %script{ :src => "assets/machinery-base.js" }
+    %script{ :src => "assets/show/machinery.js" }
+    %script{ :src => "assets/bootstrap-tooltip.js" }
+    %script{ :src => "assets/bootstrap-popover.js" }
+
+  %body
+    .container-fluid
+      #nav-bar
+        .row
+          .col-xs-1
+          .col-xs-10
+            %h1
+              System Description incompatible!
+        .row
+          .col-xs-1
+          .col-xs-4
+            Incompatible format version of system description
+          .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
+      #content_container
+        .row
+          .col-xs-11
+            - if @error
+              .scope#alert_container
+                .row
+                  .col-xs-10.col-xs-offset-1
+                    .well
+                      %span
+                        %p
+                          = @error

data/lib/{analyze_config_file_diffs_task.rb → analyze_changed_config_files_diffs_task.rb}

@@ -23,23 +23,23 @@ class AnalyzeConfigFileDiffsTask
     description.validate_analysis_compatibility
     description.assert_scopes(
       "repositories",
-      "config_files"
+      "changed_config_files"
     )
 
-    if !description["repositories"].any? { |repo| repo.enabled && !repo.external_medium? }
+    unless description["repositories"].any? { |repo| repo.enabled && !repo.external_medium? }
       raise Machinery::Errors::AnalysisFailed,
         "Can not analyze the system description because it does not contain any online repository"
     end
 
-    if !description.scope_extracted?("config_files")
-      raise Machinery::Errors::MissingExtractedFiles.new(description, ["config_files"])
+    unless description.scope_extracted?("changed_config_files")
+      raise Machinery::Errors::MissingExtractedFiles.new(description, ["changed_config_files"])
     end
 
     with_repositories(description) do |zypper|
-      file_store = description.scope_file_store("analyze/config_file_diffs")
+      file_store = description.scope_file_store("analyze/changed_config_files_diffs")
       file_store.create
       diffs_path = file_store.path
-      extracted_files_path = description.scope_file_store("config_files").path
+      extracted_files_path = description.scope_file_store("changed_config_files").path
 
       Machinery::Ui.puts "Generating diffs..."
       cnt = 1
@@ -95,7 +95,7 @@ class AnalyzeConfigFileDiffsTask
   #   }
   # ]
   def files_by_package(description)
-    files = description["config_files"].
+    files = description["changed_config_files"].
       select { |f| f.changes.include?("md5") }
 
     files.inject({}) do |result, file|
@@ -137,7 +137,7 @@ class AnalyzeConfigFileDiffsTask
           raise if e.status.exitstatus == 7
 
           # Refreshing repositories might fail for various other reasons, but we
-          # still stick to the plan because the relevant config files might be
+          # still stick to the plan because the relevant configuration files might be
           # available from the other repositories.
           # If they aren't an error message will then be generated for each of
           # the actually missing files instead.

data/lib/autoyast.rb

@@ -24,11 +24,10 @@ class Autoyast < Exporter
     @system_description = description
     @system_description.assert_scopes(
       "os",
-      "repositories",
       "packages"
     )
     check_exported_os
-    if !description.users
+    unless description.users
       Machinery::Ui.puts(
         "\nWarning: Exporting a description without the scope 'users' as AutoYaST" \
         " profile will result in a root account without a password which prevents" \
@@ -85,7 +84,7 @@ class Autoyast < Exporter
       apply_groups(xml)
       apply_services(xml)
 
-      apply_changed_files("config_files")
+      apply_changed_files("changed_config_files")
       apply_changed_files("changed_managed_files")
       apply_unmanaged_files
       xml.scripts do
@@ -138,7 +137,7 @@ class Autoyast < Exporter
   end
 
   def apply_repositories(xml)
-    return if !@system_description.repositories
+    return unless @system_description.repositories
 
     xml.tag!("add-on") do
       xml.add_on_products("config:type" => "list") do
@@ -158,7 +157,7 @@ class Autoyast < Exporter
       if !repository.enabled || repository.external_medium?
         zypper_ar = "zypper -n ar --name='#{repository.name}'"
         zypper_ar << " --type='#{repository.type}'" if repository.type
-        zypper_ar << " --disable" if !repository.enabled
+        zypper_ar << " --disable" unless repository.enabled
         zypper_ar << " '#{repository.url}' '#{repository.alias}'"
         @chroot_scripts << zypper_ar.strip
       end
@@ -175,7 +174,7 @@ class Autoyast < Exporter
   end
 
   def apply_packages(xml)
-    return if !@system_description.packages
+    return unless @system_description.packages
 
     xml.packages("config:type" => "list") do
       @system_description.packages.each do |package|
@@ -185,7 +184,7 @@ class Autoyast < Exporter
   end
 
   def apply_patterns(xml)
-    return if !@system_description.patterns
+    return unless @system_description.patterns
 
     xml.patterns("config:type" => "list") do
       @system_description.patterns.each do |pattern|
@@ -195,7 +194,7 @@ class Autoyast < Exporter
   end
 
   def apply_users(xml)
-    return if !@system_description.users
+    return unless @system_description.users
 
     xml.users("config:type" => "list") do
       @system_description.users.each do |user|
@@ -221,7 +220,7 @@ class Autoyast < Exporter
   end
 
   def apply_groups(xml)
-    return if !@system_description.groups
+    return unless @system_description.groups
 
     xml.groups("config:type" => "list") do
       @system_description.groups.each do |group|
@@ -237,7 +236,7 @@ class Autoyast < Exporter
   end
 
   def apply_services(xml)
-    return if !@system_description.services
+    return unless @system_description.services
 
     xml.tag!("services-manager") do
       xml.services("config:type" => "list") do
@@ -245,7 +244,7 @@ class Autoyast < Exporter
           name = service.name
           if @system_description.services.init_system == "systemd"
             # Yast can only handle services right now
-            next if !(name =~ /\.service$/)
+            next unless name =~ /\.service$/
             name = name.gsub(/\.service$/, "")
           end
           # systemd service states like "masked" and "static" are
@@ -279,7 +278,7 @@ class Autoyast < Exporter
   end
 
   def apply_changed_files(scope)
-    return if !@system_description.scope_extracted?(scope)
+    return unless @system_description.scope_extracted?(scope)
 
     @system_description[scope].each do |file|
       if file.deleted?
@@ -308,7 +307,7 @@ EOF
   end
 
   def apply_unmanaged_files
-    return if !@system_description.scope_extracted?("unmanaged_files")
+    return unless @system_description.scope_extracted?("unmanaged_files")
 
     base = Pathname(@system_description.scope_file_store("unmanaged_files").path)
     @chroot_scripts << <<-EOF.chomp.gsub(/^\s+/, "")

data/lib/build_task.rb

@@ -68,7 +68,7 @@ class BuildTask
 
           Machinery::Ui.warn "Cleaning up temporary files..."
           [tmp_config_dir, tmp_image_dir].each do |path|
-            LoggedCheetah.run("sudo", "rm", "-r", path) if Dir.exists?(path)
+            LoggedCheetah.run("sudo", "rm", "-r", path) if Dir.exist?(path)
           end
         end
         raise
@@ -89,7 +89,7 @@ class BuildTask
 
     image_file = Dir.glob(File.join(output_path, "*.#{img_extension}")).first
 
-    if !image_file
+    unless image_file
       raise(Machinery::Errors::BuildFailed, "The image build process failed. Check " \
         "build log '#{tmp_image_dir}/kiwi-terminal-output.log' for more " \
         "details."