machinery-tool 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d349debbcb3d723bc63b0d88e167c740eefba7d
-  data.tar.gz: 7916e14996d43eaa7573874248a41e5eb951f70c
+  metadata.gz: 19148ad851542ec6f2b171ffcab79b0d06b81486
+  data.tar.gz: ba8adee56e97a903430afd5afc57a2997191c721
 SHA512:
-  metadata.gz: 72c3fb80b1ff276026fe17984ec495ae0ac5b3f5d4f6ce09a459eacb5cd7a968196f1074024a27d0e79e94ab1d9b6bb5973afb42b6deb924bd5c7457a94c32ee
-  data.tar.gz: 11a7aa1ebd52c08682c01367814b6c114b21685424bc0b94d70c23ed4ce9f2ce711f5277ab6565d0d9f30ec97c29e991d447518566964f178569d1911dc9ed04
+  metadata.gz: c40d861d81c6c2f1a3e35a83ea26cc8d0ed4fadd0c94e9cf3a83a3b38fe5b942be7e356a86c6e3368cb1457c4767a069056ead6fb42d10a2a9abd59a17992fc3
+  data.tar.gz: 4c4e9ef61bac58ba3284368dbac84b81d43d50395a394bf523232b972c930e156a40c925478e364b087aa11f370648b643a5d3cd944c91a6c81d580a7a008227

data/.git_revision

@@ -1 +1 @@
-2b9173e39c9aa1b627b29893d7374eae4378e029
+d0bee698f4e775076d7d4f619d68bb8e347444c5

data/NEWS

@@ -1,6 +1,14 @@
 # Machinery Release Notes
 
 
+## Version 1.20.0 - Fri Apr 22 16:39:04 CEST 2016 - thardeck@suse.de
+
+* Added explanation for 'N/A' fields for each scope (gh#SUSE/machinery#1904)
+* Added support of the ARM architectures "armv6l", "armv7l" and "aarch64" to
+  our machinery-helper (This requires at least Go version 1.5)
+* Introduce format version 9 which fixes a migration issue (gh#SUSE/machinery#2041)
+  https://github.com/SUSE/machinery/blob/master/docs/System-Description-Format.md#version-9
+
 ## 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

data/html/{upgrade.html.haml → exception.html.haml}

@@ -2,7 +2,7 @@
 %html
   %head
     %title
-      Machinery Error: incompatible system description
+      Machinery Error
     %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" }
@@ -23,11 +23,7 @@
           .col-xs-1
           .col-xs-10
             %h1
-              System Description incompatible!
-        .row
-          .col-xs-1
-          .col-xs-4
-            Incompatible format version of system description
+              = render_exception_title
           .col-xs-10.nav-buttons
             %small.pull-right
               created by

data/lib/html.rb

@@ -58,12 +58,6 @@ EOF
           Server.run! do
             Thread.new { block.call }
           end
-        rescue Errno::EADDRINUSE
-          servefailed_error = <<-EOF.chomp
-Port #{Server.settings.port} is already in use.
-You have to stop the already running server on port #{Server.settings.port} first or if you're serving a description with the `serve` command, you can also use the `--port` option.
-EOF
-          raise Machinery::Errors::ServeFailed, servefailed_error
         rescue SocketError => e
           servefailed_error = <<-EOF.chomp
 Cannot start server on #{opts[:ip]}:#{Server.settings.port}.
@@ -81,6 +75,16 @@ You are not allowed to start the server on port #{Server.settings.port}. You nee
 ERROR: #{e.message}
 EOF
           raise Machinery::Errors::ServeFailed, servefailed_error
+        rescue Errno::EADDRINUSE, RuntimeError => e
+          # If eventmachine is installed it will be used for handling the server. And eventmachine
+          # raises RuntimeError instead of Errno::EADDRINUSE, so we have to handle these as well
+          raise(e) if e.is_a?(RuntimeError) && !(e.to_s.index("port is in use"))
+
+          servefailed_error = <<-EOF.chomp
+Port #{Server.settings.port} is already in use.
+You have to stop the already running server on port #{Server.settings.port} first or if you're serving a description with the `serve` command, you can also use the `--port` option.
+          EOF
+          raise Machinery::Errors::ServeFailed, servefailed_error
         end
         remove_output_redirection
       rescue => e

data/lib/renderer.rb

@@ -266,4 +266,9 @@ class Renderer
     yield
     @indent -= 2
   end
+
+  def na_note(s)
+    Machinery::Ui.puts "Note: 'N/A' represents a missing #{s} which could not\n" \
+      "be gathered during inspection.\n"
+  end
 end

data/lib/server.rb

@@ -335,9 +335,10 @@ class Server < Sinatra::Base
     rescue Machinery::Errors::SystemDescriptionNotFound => e
       session[:error] = e.to_s
       redirect "/"
-    rescue Machinery::Errors::SystemDescriptionIncompatible => e
+    rescue Machinery::Errors::SystemDescriptionIncompatible, \
+           Machinery::Errors::SystemDescriptionError => e
       @error = e
-      haml File.read(File.join(Machinery::ROOT, "html/upgrade.html.haml"))
+      haml File.read(File.join(Machinery::ROOT, "html/exception.html.haml"))
     else
       diffs_dir = @description.scope_file_store("analyze/changed_config_files_diffs").path
       if @description.changed_config_files && diffs_dir
@@ -361,4 +362,13 @@ class Server < Sinatra::Base
       session.clear
     end
   end
+
+  def render_exception_title
+    case @error
+    when Machinery::Errors::SystemDescriptionIncompatible
+      return "System Description incompatible!"
+    when Machinery::Errors::SystemDescriptionError
+      return "System Description broken!"
+    end
+  end
 end

data/lib/system_description.rb

@@ -26,7 +26,7 @@
 # The sub directories storing the data for specific scopes are handled by the
 # ScopeFileStore class.
 class SystemDescription < Machinery::Object
-  CURRENT_FORMAT_VERSION = 8
+  CURRENT_FORMAT_VERSION = 9
   EXTRACTABLE_SCOPES = [
     "changed_managed_files",
     "changed_config_files",
@@ -94,7 +94,9 @@ class SystemDescription < Machinery::Object
         if json_format_version && json_format_version != SystemDescription::CURRENT_FORMAT_VERSION
           raise Machinery::Errors::SystemDescriptionIncompatible.new(name, json_format_version)
         else
-          raise Machinery::Errors::SystemDescriptionError.new
+          raise Machinery::Errors::SystemDescriptionError.new(
+            "#{name}: This description is broken."
+          )
         end
       end
 

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.19.0"
+  VERSION = "1.20.0"
 
 end

data/machinery-helper/version.go

@@ -2,4 +2,4 @@
 
 package main
 
-const VERSION = "2b9173e39c9aa1b627b29893d7374eae4378e029"
+const VERSION = "d0bee698f4e775076d7d4f619d68bb8e347444c5"

data/manual/site/sitemap.xml

@@ -4,7 +4,7 @@
     
     <url>
      <loc>None/docs/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -13,25 +13,25 @@
         
     <url>
      <loc>None/machinery_main_general.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery_main_scopes.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery_main_usecases.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery_security_implications.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
@@ -41,109 +41,109 @@
         
     <url>
      <loc>None/machinery-analyze.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-build.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-compare.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-config.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-copy.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-deploy.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-export-autoyast.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-export-kiwi.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-inspect.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-inspect-docker.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-list.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-man.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-move.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-remove.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-serve.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-show.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-upgrade-format.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>None/machinery-validate.1/</loc>
-     <lastmod>2016-04-04</lastmod>
+     <lastmod>2016-04-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
         

data/plugins/changed_config_files/schema/system-description-changed-config-files.schema-v9.json

@@ -0,0 +1,160 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": [
+    "_elements"
+  ],
+  "properties": {
+    "_attributes": {
+      "type": "object",
+      "required": [
+        "extracted"
+      ],
+      "properties": {
+        "extracted": {
+          "type": "boolean"
+        }
+      }
+    },
+    "_elements": {
+      "type": "array",
+        "items" : {
+          "type": "object",
+          "required": ["name", "package_name", "package_version"],
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "package_name": {
+              "type": "string",
+              "minLength": 1
+            },
+            "package_version": {
+              "type": "string",
+              "minLength": 1
+            }
+          },
+          "oneOf": [
+            { "$ref": "#/definitions/file_changed" },
+            { "$ref": "#/definitions/file_error" }
+          ]
+        }
+    }
+  },
+  "definitions": {
+    "file_changed": {
+      "required": ["status"],
+      "properties": {
+        "status": {
+          "enum": ["changed"]
+        }
+      },
+      "oneOf": [
+        { "$ref": "#/definitions/file_changed_modified" },
+        { "$ref": "#/definitions/link_changed_modified" },
+        { "$ref": "#/definitions/file_changed_deleted" }
+      ]
+    },
+    "file_changed_modified": {
+      "required": ["changes", "mode", "user", "group", "type"],
+      "properties": {
+        "changes": {
+          "type": "array",
+          "items": {
+            "enum": [
+              "size",
+              "mode",
+              "md5",
+              "device_number",
+              "link_path",
+              "user",
+              "group",
+              "time",
+              "capabilities",
+              "replaced",
+              "other_rpm_changes"
+            ]
+          },
+          "minItems": 1
+        },
+        "mode": {
+          "type": "string",
+          "pattern": "^[0-7]{3,4}$"
+        },
+        "user": {
+          "type": "string",
+          "minLength": 1
+        },
+        "group": {
+          "type": "string",
+          "minLength": 1
+        },
+        "type": {
+          "enum": ["file", "dir"]
+        }
+      }
+    },
+    "link_changed_modified": {
+      "required": ["target", "changes", "mode", "user", "group", "type"],
+      "properties": {
+        "changes": {
+          "type": "array",
+          "items": {
+            "enum": [
+              "size",
+              "mode",
+              "md5",
+              "device_number",
+              "link_path",
+              "user",
+              "group",
+              "time",
+              "capabilities",
+              "replaced",
+              "other_rpm_changes"
+            ]
+          },
+          "minItems": 1
+        },
+        "mode": {
+          "type": "string",
+          "pattern": "^[0-7]{3,4}$"
+        },
+        "user": {
+          "type": "string",
+          "minLength": 1
+        },
+        "group": {
+          "type": "string",
+          "minLength": 1
+        },
+        "type": {
+          "enum": ["link"]
+        },
+        "target": {
+          "type": "string"
+        }
+      }
+    },
+    "file_changed_deleted": {
+      "required": ["changes"],
+      "properties": {
+        "changes": {
+          "enum": [["deleted"]]
+        }
+      }
+    },
+    "file_error": {
+      "required": ["status", "error_message"],
+      "properties": {
+        "status": {
+          "enum": ["error"]
+        },
+        "error_message": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}