machinery-tool 1.18.0 → 1.19.0

data/schema/migrations/migrate2to3.rb

@@ -33,7 +33,7 @@ class Migrate2To3 < Migration
       FileUtils.mv(old_path, new_path)
     end
 
-    if @hash.has_key?("repositories")
+    if @hash.key?("repositories")
       @hash["repositories"].each do |repository|
         repository["package_manager"] = "zypp"
       end

data/schema/migrations/migrate3to4.rb

@@ -23,16 +23,16 @@ class Migrate3To4 < Migration
 
   def migrate
     ["changed_managed_files", "config_files"].each do |scope|
-      if @hash.has_key?(scope)
-        @hash[scope]["files"].each do |file|
-          next if file["changes"] == ["deleted"]
+      next unless @hash.key?(scope)
 
-          path = File.join(@path, scope, file["name"])
-          file["type"] = if File.directory?(path) || path.end_with?("/")
-            "dir"
-          else
-            "file"
-          end
+      @hash[scope]["files"].each do |file|
+        next if file["changes"] == ["deleted"]
+
+        path = File.join(@path, scope, file["name"])
+        file["type"] = if File.directory?(path) || path.end_with?("/")
+          "dir"
+        else
+          "file"
         end
       end
     end

data/schema/migrations/migrate7to8.rb

@@ -0,0 +1,47 @@
+# Copyright (c) 2013-2014 SUSE LLC
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 3 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE about this file by physical or electronic mail,
+# you may find current contact information at www.suse.com
+
+class Migrate7To8 < Migration
+  desc <<-EOT
+    Format version 8 renames the scope config-files to changed-config-files.
+
+    Following this change the config_file_diff dir is also renamed to
+    changed_config_files_diffs.
+  EOT
+
+  def migrate
+    if File.directory?(File.join(@path, "config_files"))
+      FileUtils.mv(File.join(@path, "config_files"), File.join(@path, "changed_config_files"))
+    end
+
+    if File.directory?(File.join(@path, "analyze", "config_file_diffs"))
+      FileUtils.mv(
+        File.join(@path, "analyze", "config_file_diffs"),
+        File.join(@path, "analyze", "changed_config_files_diffs")
+      )
+    end
+
+    if @hash.key?("config_files")
+      @hash["changed_config_files"] = @hash.delete("config_files")
+    end
+
+    meta = @hash["meta"]
+    if meta.key?("config_files")
+      meta["changed_config_files"] = meta.delete("config_files")
+    end
+  end
+end

data/schema/system-description-global.schema-v8.json

@@ -0,0 +1,43 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": ["meta"],
+  "properties": {
+    "meta": {
+      "required": ["format_version"],
+      "properties": {
+        "format_version": {
+          "type": "integer",
+          "minimum": 1
+        },
+        "filters": {
+          "type": "object",
+          "required": ["inspect"],
+          "properties": {
+            "inspect": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      },
+      "additionalProperties": {
+        "type": "object",
+        "required": ["modified", "hostname"],
+        "properties": {
+          "modified": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "hostname": {
+            "type": "string",
+            "format": "hostname"
+          }
+        }
+      }
+    }
+  }
+}

data/workload_mapper/rails/setup/setup.rb.erb

@@ -41,7 +41,7 @@ def build_image(path, name)
 end
 
 puts "Setting up #{db_workload}"
-if File.exists?("#{Dir.pwd}/#{db_workload}/data/configured.txt")
+if File.exist?("#{Dir.pwd}/#{db_workload}/data/configured.txt")
   puts "Exiting as database has already been configured.\n" \
     "If you want to re run the configuration just remove the files in #{Dir.pwd}/#{db_workload}/data/"
   exit 1

data/workload_mapper/wordpress/setup/setup.rb.erb

@@ -41,7 +41,7 @@ def build_image(path, name)
 end
 
 puts "Setting up #{db_workload}"
-if File.exists?("#{Dir.pwd}/#{db_workload}/data/configured.txt")
+if File.exist?("#{Dir.pwd}/#{db_workload}/data/configured.txt")
   puts "Exiting as database has already been configured.\n" \
     "If you want to re run the configuration just remove the files in #{Dir.pwd}/#{db_workload}/data/"
   exit 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machinery-tool
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cheetah
@@ -265,13 +265,14 @@ files:
 - html/comparison.html.haml
 - html/index.html.haml
 - html/landing_page.html.haml
+- html/partials/changed_config_files.html.haml
 - html/partials/changed_managed_files.html.haml
 - html/partials/compare/alert.html.haml
+- html/partials/compare/changed_config_files.html.haml
+- html/partials/compare/changed_config_files_list.html.haml
 - html/partials/compare/changed_managed_file_list.html.haml
 - html/partials/compare/changed_managed_files.html.haml
 - html/partials/compare/changes.html.haml
-- html/partials/compare/config_file_list.html.haml
-- html/partials/compare/config_files.html.haml
 - html/partials/compare/group_list.html.haml
 - html/partials/compare/groups.html.haml
 - html/partials/compare/os.html.haml
@@ -291,7 +292,6 @@ files:
 - html/partials/compare/unmanaged_files.html.haml
 - html/partials/compare/user_list.html.haml
 - html/partials/compare/users.html.haml
-- html/partials/config_files.html.haml
 - html/partials/groups.html.haml
 - html/partials/landing_page/alert.html.haml
 - html/partials/os.html.haml
@@ -305,10 +305,11 @@ files:
 - html/partials/services.html.haml
 - html/partials/unmanaged_files.html.haml
 - html/partials/users.html.haml
+- html/upgrade.html.haml
 - inspect_helpers/changed_files.sh
 - inspect_helpers/dpkg_unmanaged_files.sh
 - inspect_helpers/yum_repositories.py
-- lib/analyze_config_file_diffs_task.rb
+- lib/analyze_changed_config_files_diffs_task.rb
 - lib/array.rb
 - lib/autoyast.rb
 - lib/build_task.rb
@@ -555,6 +556,18 @@ files:
 - manual/site/mkdocs/search_index.json
 - manual/site/sitemap.xml
 - manual/site/wheels.png
+- plugins/changed_config_files/changed_config_files.yml
+- plugins/changed_config_files/changed_config_files_inspector.rb
+- plugins/changed_config_files/changed_config_files_model.rb
+- plugins/changed_config_files/changed_config_files_renderer.rb
+- plugins/changed_config_files/schema/system-description-changed-config-files.schema-v1.json
+- plugins/changed_config_files/schema/system-description-changed-config-files.schema-v2.json
+- plugins/changed_config_files/schema/system-description-changed-config-files.schema-v3.json
+- plugins/changed_config_files/schema/system-description-changed-config-files.schema-v4.json
+- plugins/changed_config_files/schema/system-description-changed-config-files.schema-v5.json
+- plugins/changed_config_files/schema/system-description-changed-config-files.schema-v6.json
+- plugins/changed_config_files/schema/system-description-changed-config-files.schema-v7.json
+- plugins/changed_config_files/schema/system-description-changed-config-files.schema-v8.json
 - plugins/changed_managed_files/changed_managed_files.yml
 - plugins/changed_managed_files/changed_managed_files_inspector.rb
 - plugins/changed_managed_files/changed_managed_files_model.rb
@@ -566,23 +579,14 @@ files:
 - plugins/changed_managed_files/schema/system-description-changed-managed-files.schema-v5.json
 - plugins/changed_managed_files/schema/system-description-changed-managed-files.schema-v6.json
 - plugins/changed_managed_files/schema/system-description-changed-managed-files.schema-v7.json
-- plugins/config_files/config_files.yml
-- plugins/config_files/config_files_inspector.rb
-- plugins/config_files/config_files_model.rb
-- plugins/config_files/config_files_renderer.rb
-- plugins/config_files/schema/system-description-config-files.schema-v1.json
-- plugins/config_files/schema/system-description-config-files.schema-v2.json
-- plugins/config_files/schema/system-description-config-files.schema-v3.json
-- plugins/config_files/schema/system-description-config-files.schema-v4.json
-- plugins/config_files/schema/system-description-config-files.schema-v5.json
-- plugins/config_files/schema/system-description-config-files.schema-v6.json
-- plugins/config_files/schema/system-description-config-files.schema-v7.json
+- plugins/changed_managed_files/schema/system-description-changed-managed-files.schema-v8.json
 - plugins/environment/environment.md
 - plugins/environment/environment_inspector.rb
 - plugins/environment/environment_model.rb
 - plugins/environment/schema/system-description-environment.schema-v5.json
 - plugins/environment/schema/system-description-environment.schema-v6.json
 - plugins/environment/schema/system-description-environment.schema-v7.json
+- plugins/environment/schema/system-description-environment.schema-v8.json
 - plugins/groups/groups.yml
 - plugins/groups/groups_inspector.rb
 - plugins/groups/groups_model.rb
@@ -594,6 +598,7 @@ files:
 - plugins/groups/schema/system-description-groups.schema-v5.json
 - plugins/groups/schema/system-description-groups.schema-v6.json
 - plugins/groups/schema/system-description-groups.schema-v7.json
+- plugins/groups/schema/system-description-groups.schema-v8.json
 - plugins/os/os.yml
 - plugins/os/os_inspector.rb
 - plugins/os/os_model.rb
@@ -605,6 +610,7 @@ files:
 - plugins/os/schema/system-description-os.schema-v5.json
 - plugins/os/schema/system-description-os.schema-v6.json
 - plugins/os/schema/system-description-os.schema-v7.json
+- plugins/os/schema/system-description-os.schema-v8.json
 - plugins/packages/packages.yml
 - plugins/packages/packages_inspector.rb
 - plugins/packages/packages_model.rb
@@ -616,6 +622,7 @@ files:
 - plugins/packages/schema/system-description-packages.schema-v5.json
 - plugins/packages/schema/system-description-packages.schema-v6.json
 - plugins/packages/schema/system-description-packages.schema-v7.json
+- plugins/packages/schema/system-description-packages.schema-v8.json
 - plugins/patterns/patterns.yml
 - plugins/patterns/patterns_inspector.rb
 - plugins/patterns/patterns_model.rb
@@ -627,6 +634,7 @@ files:
 - plugins/patterns/schema/system-description-patterns.schema-v5.json
 - plugins/patterns/schema/system-description-patterns.schema-v6.json
 - plugins/patterns/schema/system-description-patterns.schema-v7.json
+- plugins/patterns/schema/system-description-patterns.schema-v8.json
 - plugins/repositories/repositories.yml
 - plugins/repositories/repositories_inspector.rb
 - plugins/repositories/repositories_model.rb
@@ -638,6 +646,7 @@ files:
 - plugins/repositories/schema/system-description-repositories.schema-v5.json
 - plugins/repositories/schema/system-description-repositories.schema-v6.json
 - plugins/repositories/schema/system-description-repositories.schema-v7.json
+- plugins/repositories/schema/system-description-repositories.schema-v8.json
 - plugins/services/schema/system-description-services.schema-v1.json
 - plugins/services/schema/system-description-services.schema-v2.json
 - plugins/services/schema/system-description-services.schema-v3.json
@@ -645,6 +654,7 @@ files:
 - plugins/services/schema/system-description-services.schema-v5.json
 - plugins/services/schema/system-description-services.schema-v6.json
 - plugins/services/schema/system-description-services.schema-v7.json
+- plugins/services/schema/system-description-services.schema-v8.json
 - plugins/services/services.yml
 - plugins/services/services_inspector.rb
 - plugins/services/services_model.rb
@@ -656,6 +666,7 @@ files:
 - plugins/unmanaged_files/schema/system-description-unmanaged-files.schema-v5.json
 - plugins/unmanaged_files/schema/system-description-unmanaged-files.schema-v6.json
 - plugins/unmanaged_files/schema/system-description-unmanaged-files.schema-v7.json
+- plugins/unmanaged_files/schema/system-description-unmanaged-files.schema-v8.json
 - plugins/unmanaged_files/unmanaged_files.yml
 - plugins/unmanaged_files/unmanaged_files_inspector.rb
 - plugins/unmanaged_files/unmanaged_files_model.rb
@@ -667,6 +678,7 @@ files:
 - plugins/users/schema/system-description-users.schema-v5.json
 - plugins/users/schema/system-description-users.schema-v6.json
 - plugins/users/schema/system-description-users.schema-v7.json
+- plugins/users/schema/system-description-users.schema-v8.json
 - plugins/users/users.yml
 - plugins/users/users_inspector.rb
 - plugins/users/users_model.rb
@@ -677,6 +689,7 @@ files:
 - schema/migrations/migrate4to5.rb
 - schema/migrations/migrate5to6.rb
 - schema/migrations/migrate6to7.rb
+- schema/migrations/migrate7to8.rb
 - schema/system-description-global.schema-v1.json
 - schema/system-description-global.schema-v2.json
 - schema/system-description-global.schema-v3.json
@@ -684,6 +697,7 @@ files:
 - schema/system-description-global.schema-v5.json
 - schema/system-description-global.schema-v6.json
 - schema/system-description-global.schema-v7.json
+- schema/system-description-global.schema-v8.json
 - tools/go.rb
 - tools/helper_builder.rb
 - workload_mapper/docker-registry/clue.rb

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

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