machinery-tool 1.20.0 → 1.21.0

data/html/partials/patterns.html.haml

@@ -6,7 +6,7 @@
         :scope => "patterns",
         :title => "Patterns",
         :count => "#{patterns.length} #{Machinery.pluralize(patterns.length, "pattern")}"
-      - if @description.packages && @description.packages.package_system == "dpkg"
+      - if @description.patterns.patterns_system == "dpkg"
         .row
           .col-xs-1
           .col-xs-11
@@ -14,6 +14,9 @@
       .row.scope_content.collapse.in
         .col-xs-1
         .col-xs-11
+          %p
+            %strong Patterns Manager:
+            = @description.patterns.patterns_system
           - if patterns.length == 0
             There are no patterns.
           - if patterns.length > 0

data/html/partials/unmanaged_files.html.haml

@@ -20,12 +20,16 @@
                 %tr
                   %th Name
                   %th.medium Type
-                  - if unmanaged_files.has_metadata
+                  - if unmanaged_files.contains_metadata?
                     %th.medium Mode
                     %th.medium User
                     %th.medium Group
                     %th.medium Size
-                    %th.medium Files in dir.
+                    - if unmanaged_files.has_subdir_counts?
+                      %th.medium Subdirectories
+                      %th.medium Files in Directory
+                    - else
+                      %th.medium File Objects
               %tbody
                 - unmanaged_files.each do |file|
                   %tr
@@ -37,9 +41,13 @@
                         %span
                           = file.name
                     %td= file.type
-                    - if unmanaged_files.has_metadata
+                    - if unmanaged_files.contains_metadata?
                       %td= file.mode
                       %td= file.user
                       %td= file.group
                       %td= number_to_human_size(file.size)
+                    - if unmanaged_files.has_subdir_counts?
+                      %td= file.dirs
                       %td= file.files
+                    - else
+                      %td= file.file_objects

data/lib/config_task.rb

@@ -24,9 +24,15 @@ class ConfigTask
     if !key
       # show all config entries
       max_length = @config.entries.keys.map(&:length).max
-      @config.each do |key, value|
+      @config.each do |config_key, config_value|
         Machinery::Ui.puts (
-          "%-#{max_length}s %s %s %s" % [key, "=", value[:value], "(#{value[:description]})"]
+          format(
+            "%-#{max_length}s %s %s %s",
+            config_key,
+            "=",
+            config_value[:value],
+            "(#{config_value[:description]})"
+          )
         )
       end
     elsif !value_string

data/lib/exceptions.rb

@@ -65,7 +65,6 @@ module Machinery
       end
 
       def to_s
-        meta = @description[@scopes.first].meta
         hostname = @scopes.map do |s|
           @description[s].meta.hostname if @description[s].meta
         end.compact.first || "<HOSTNAME>"

data/lib/server.rb

@@ -102,6 +102,11 @@ class Server < Sinatra::Base
       "<h3>In both descriptions:</h3>"
     end
 
+    def offset_class(first_col)
+      return "" if first_col
+      "col-md-offset-6"
+    end
+
     def changed
       "<h3>In both with different attributes:</h3>"
     end
@@ -251,7 +256,7 @@ class Server < Sinatra::Base
     content
   end
 
-  get "/" do
+  def all_descriptions
     check_session_for_error
     descriptions = settings.system_description_store.list
     @all_descriptions = Hash.new
@@ -283,11 +288,21 @@ class Server < Sinatra::Base
         @errors.push(e)
       end
     end
+  end
+
+  get "/" do
+    all_descriptions
+
+    haml File.read(File.join(Machinery::ROOT, "html/homepage.html.haml"))
+  end
 
-    haml File.read(File.join(Machinery::ROOT, "html/landing_page.html.haml"))
+  get "/fonts/:font" do
+    File.read(File.join(Machinery::ROOT, "html/assets/fonts/#{params[:font]}"))
   end
 
   get "/compare/:a/:b" do
+    all_descriptions
+
     @description_a = SystemDescription.load(params[:a], settings.system_description_store)
     @description_b = SystemDescription.load(params[:b], settings.system_description_store)
 
@@ -330,6 +345,8 @@ class Server < Sinatra::Base
   end
 
   get "/:id" do
+    all_descriptions
+
     begin
       @description = SystemDescription.load(params[:id], settings.system_description_store)
     rescue Machinery::Errors::SystemDescriptionNotFound => e

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 = 9
+  CURRENT_FORMAT_VERSION = 10
   EXTRACTABLE_SCOPES = [
     "changed_managed_files",
     "changed_config_files",

data/lib/version.rb

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

data/lib/zypper.rb

@@ -94,7 +94,7 @@ class Zypper
     cmd += args
 
     with_env "ZYPP_CONF" => @zypp_config do
-      LoggedCheetah.run *cmd
+      LoggedCheetah.run(*cmd)
     end
   end
 end

data/machinery-helper/machinery_helper.go

@@ -43,6 +43,8 @@ type UnmanagedFile struct {
 	Mode       string `json:"mode,omitempty"`
 	Files      *int   `json:"files,omitempty"`
 	FilesValue int    `json:"-"`
+	Dirs       *int   `json:"dirs,omitempty"`
+	DirsValue  int    `json:"-"`
 	Size       *int64 `json:"size,omitempty"`
 	SizeValue  int64  `json:"-"`
 }
@@ -287,17 +289,21 @@ func amendMode(entry *UnmanagedFile, perm os.FileMode) {
 	}
 }
 
-func dirInfo(path string) (size int64, fileCount int) {
+func dirInfo(path string) (size int64, fileCount int, dirCount int) {
 	files, _ := readDir(path)
 
 	size = int64(0)
 	fileCount = len(files)
+	dirCount = 0
 	for _, f := range files {
 		if f.IsDir() {
+			dirCount++
+			fileCount--
 			if _, ok := IgnoreList[path + f.Name()]; !ok {
-				subSize, subCount := dirInfo(path + f.Name() + "/")
+				subSize, subFiles, subDirs := dirInfo(path + f.Name() + "/")
 				size += subSize
-				fileCount += subCount
+				fileCount += subFiles
+				dirCount += subDirs
 			}
 		} else if f.Mode()&os.ModeSymlink != os.ModeSymlink {
 			size += f.Size()
@@ -312,11 +318,13 @@ func amendSize(entry *UnmanagedFile, size int64) {
 		entry.SizeValue = size
 		entry.Size = &entry.SizeValue
 	} else if entry.Type == "dir" {
-		size, files := dirInfo(entry.Name)
+		size, files, dirs := dirInfo(entry.Name)
 		entry.SizeValue = size
 		entry.Size = &entry.SizeValue
 		entry.FilesValue = files
 		entry.Files = &entry.FilesValue
+		entry.DirsValue = dirs
+		entry.Dirs = &entry.DirsValue
 	}
 }
 

data/machinery-helper/machinery_helper_test.go

@@ -287,8 +287,12 @@ func TestAmendSize(t *testing.T) {
 	if *entry.Size != want {
 		t.Errorf("entry.Size = '%v', want '%v'", *entry.Size, want)
 	}
-	wantFiles := 6
+	wantFiles := 5
 	if *entry.Files != wantFiles {
 		t.Errorf("entry.Files = '%v', want '%v'", *entry.Files, wantFiles)
 	}
+	wantDirs := 1
+	if *entry.Dirs != wantDirs {
+		t.Errorf("entry.Dirs = '%v', want '%v'", *entry.Dirs, wantDirs)
+	}
 }

data/machinery-helper/version.go

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

data/manual/site/sitemap.xml

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

data/plugins/changed_config_files/schema/system-description-changed-config-files.schema-v10.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"
+        }
+      }
+    }
+  }
+}