machinery-tool 1.2.0 → 1.4.0

data/lib/mountpoints.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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

data/lib/object.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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
@@ -20,15 +20,15 @@ module Machinery
     class << self
       def has_property(name, options)
         @property_classes ||= {}
-        @property_classes[name.to_sym] = options[:class]
+        @property_classes[name.to_s] = options[:class]
       end
 
       def object_hash_from_json(json)
         return nil unless json
 
         entries = json.map do |key, value|
-          value_converted = if @property_classes && @property_classes[key.to_sym]
-            @property_classes[key.to_sym].from_json(value)
+          value_converted = if @property_classes && @property_classes[key.to_s]
+            @property_classes[key.to_s].from_json(value)
           else
             case value
               when ::Array
@@ -59,7 +59,7 @@ module Machinery
 
     def set_attributes(attrs)
       @attributes = attrs.inject({}) do |attributes, (key, value)|
-        key = key.to_sym if key.respond_to?(:to_sym)
+        key = key.to_s if key.is_a?(Symbol)
 
         attributes[key] = value
         attributes
@@ -80,11 +80,11 @@ module Machinery
     end
 
     def [](key)
-      @attributes[key.to_sym]
+      @attributes[key.to_s]
     end
 
     def []=(key, value)
-      @attributes[key.to_sym] = value
+      @attributes[key.to_s] = value
     end
 
     def empty?
@@ -96,15 +96,14 @@ module Machinery
         if args.size != 1
           raise ArgumentError, "wrong number of arguments (#{args.size} for 1)"
         end
-
-        @attributes[name.to_s[0..-2].to_sym] = args.first
+        @attributes[name.to_s[0..-2].to_s] = args.first
       else
-        if @attributes.has_key?(name)
+        if @attributes.has_key?(name.to_s)
           if !args.empty?
             raise ArgumentError, "wrong number of arguments (#{args.size} for 0)"
           end
 
-          @attributes[name]
+          @attributes[name.to_s]
         else
           nil
         end

data/lib/remote_system.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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

data/lib/remove_task.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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
@@ -16,28 +16,33 @@
 # you may find current contact information at www.suse.com
 
 class RemoveTask
-  def remove(store, name, options = {})
-    if !options[:all] && !store.list.include?(name)
-        raise Machinery::Errors::SystemDescriptionNotFound.new(
-          "System description \"#{name}\" does not exist."
-        )
-    end
-
+  def remove(store, names, options = {})
     if options[:all]
       removed_descriptions = store.list
       removed_descriptions.each do |name|
         store.remove(name)
       end
-    else
-      store.remove(name)
-    end
 
-    if options[:verbose]
-      if options[:all]
+      if options[:verbose]
         Machinery::Ui.puts "Removed #{removed_descriptions.length} system descriptions successfully."
+      end
+    end
+
+    errors = []
+
+    Array(names).each do |name|
+      if !store.list.include?(name)
+        errors.push("System description \"#{name}\" does not exist.")
       else
-        Machinery::Ui.puts "System description \"#{name}\" successfully removed."
+        store.remove(name)
+        if options[:verbose]
+          Machinery::Ui.puts "System description \"#{name}\" successfully removed."
+        end
       end
     end
+
+    if !errors.empty?
+      raise Machinery::Errors::SystemDescriptionNotFound.new(errors.join("\n"))
+    end
   end
 end

data/lib/renderer.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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
@@ -148,16 +148,17 @@ class Renderer
     @stack = []
     missing_descriptions = Array.new
 
-    @buffer += "# #{display_name}\n"
-
-   if !description1[scope]
+    if !description1[scope]
       missing_descriptions << description1.name
     end
     if !description2[scope]
       missing_descriptions << description2.name
     end
 
-    indent { puts "Unable to compare, no data in '#{missing_descriptions.join("', '")}'" }
+    if missing_descriptions.count == 1
+      @buffer += "# #{display_name}\n"
+      indent { puts "Unable to compare, no data in '#{missing_descriptions.join("', '")}'" }
+    end
     @buffer += "\n" unless @buffer.empty? || @buffer.end_with?("\n\n")
 
     @buffer

data/lib/renderer_helper.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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

data/lib/rpm.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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

data/lib/scope_file_store.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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

data/lib/scope_mixin.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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

data/lib/show_task.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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

data/lib/system.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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
@@ -55,7 +55,7 @@ class System
     out = File.open(archive, "w")
     begin
       run_command(
-        "tar", "--directory=/", "--create", "--gzip", "--null", "--files-from=-",
+        "tar", "--create", "--gzip", "--null", "--files-from=-",
         *exclude.flat_map { |f| ["--exclude", f]},
         :stdout => out,
         :stdin => filelist
@@ -78,4 +78,11 @@ class System
 
     run_command("bash", "-c", script, *args)
   end
+
+  def has_command?(command)
+    run_command("bash", "-c", "type -P #{command}", stdout: :capture)
+    true
+  rescue Cheetah::ExecutionFailed
+    false
+  end
 end

data/lib/system_description.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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
@@ -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 = 2
+  CURRENT_FORMAT_VERSION = 3
   EXTRACTABLE_SCOPES = [
     "changed_managed_files",
     "config_files",
@@ -41,13 +41,17 @@ class SystemDescription < Machinery::Object
     # Load the system description with the given name
     #
     # If there are file validation errors the call fails with an exception
-    def load!(name, store)
+    def load!(name, store, options = {})
       manifest = Manifest.load(name, store.manifest_path(name))
-      manifest.validate
+      manifest.validate!
 
       description = from_hash(name, store, manifest.to_hash)
-      description.validate_compatibility
-      description.validate_file_data
+      description.validate_file_data!
+
+      if !options[:skip_format_compatibility]
+        description.validate_format_compatibility
+      end
+
       description
     end
 
@@ -55,18 +59,15 @@ class SystemDescription < Machinery::Object
     #
     # If there are file validation errors these are put out as warnings but the
     # loading of the system description succeeds.
-    def load(name, store)
+    def load(name, store, options = {})
       manifest = Manifest.load(name, store.manifest_path(name))
-      manifest.validate
+      manifest.validate if !options[:skip_validation]
 
       description = from_hash(name, store, manifest.to_hash)
-      description.validate_compatibility
-      begin
-        description.validate_file_data
-      rescue Machinery::Errors::SystemDescriptionValidationFailed => e
-        Machinery::Ui.warn("Warning: File validation errors:")
-        Machinery::Ui.warn(e.to_s)
-      end
+      description.validate_file_data if !options[:skip_validation]
+
+      description.validate_format_compatibility if !options[:skip_format_compatibility]
+
       description
     end
 
@@ -133,12 +134,26 @@ class SystemDescription < Machinery::Object
       format_version == SystemDescription::CURRENT_FORMAT_VERSION
   end
 
-  def validate_compatibility
+  def validate_format_compatibility
     if !compatible?
       raise Machinery::Errors::SystemDescriptionIncompatible.new(self.name)
     end
   end
 
+  def validate_analysis_compatibility
+    if !os.can_be_analyzed?
+      raise Machinery::Errors::AnalysisFailed.new("Analysis of operating " +
+        "system '#{os.display_name}' is not supported.")
+    end
+  end
+
+  def validate_export_compatibility
+    if !os.can_be_exported?
+      raise Machinery::Errors::ExportFailed.new("Export of operating " +
+        "system '#{os.display_name}' is not supported.")
+    end
+  end
+
   def to_hash
     meta = {}
     meta["format_version"] = self.format_version if self.format_version
@@ -200,50 +215,25 @@ class SystemDescription < Machinery::Object
     ScopeFileStore.new(description_path, store_name)
   end
 
-  def missing_files(scope, file_list)
-    file_list.map! { |file| File.join(scope_file_store(scope).path, file) }
-
-    file_list.select { |file| !File.exists?(file) }
-  end
-
-  def additional_files(scope, file_list)
-    file_store = scope_file_store(scope)
-    file_list.map! { |file| File.join(file_store.path, file) }
-    files = file_store.list_content
-
-    files - file_list
+  def validate_file_data
+    errors = FileValidator.new(to_hash, description_path).validate
+    if !errors.empty?
+      Machinery::Ui.warn("Warning: File validation errors:")
+      Machinery::Ui.warn("Error validating description '#{@name}'\n\n")
+      Machinery::Ui.warn(errors)
+    end
   end
 
-  def validate_file_data
-    SystemDescriptionValidator.new(self).validate_file_data
+  def validate_file_data!
+    errors = FileValidator.new(to_hash, description_path).validate
+    if !errors.empty?
+      e = Machinery::Errors::SystemDescriptionValidationFailed.new(errors)
+      e.header = "Error validating description '#{@name}'"
+      raise e
+    end
   end
 
   def description_path
     @store.description_path(name)
   end
-
-  # Filestore handling
-  def initialize_file_store(store_name)
-    @store.initialize_file_store(self.name, store_name)
-  end
-
-  def file_store(store_name)
-    @store.file_store(self.name, store_name)
-  end
-
-  def remove_file_store(store_name)
-    @store.remove_file_store(self.name, store_name)
-  end
-
-  def rename_file_store(old_name, new_name)
-    @store.rename_file_store(self.name, old_name, new_name)
-  end
-
-  def list_file_store_content(store_name)
-    @store.list_file_store_content(self.name, store_name)
-  end
-
-  def create_file_store_sub_dir(store_name, sub_dir)
-    @store.create_file_store_sub_dir(self.name, store_name, sub_dir)
-  end
 end

data/lib/system_description_memory_store.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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

data/lib/system_description_store.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 SUSE LLC
+# Copyright (c) 2013-2015 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
@@ -67,28 +67,16 @@ class SystemDescriptionStore
   def copy(from, to)
     SystemDescription.validate_name(from)
     SystemDescription.validate_name(to)
-    if !list.include?(from)
-      raise Machinery::Errors::SystemDescriptionNotFound.new(
-        "System description \"#{from}\" does not exist."
-      )
-    end
 
-    if list.include?(to)
-      raise Machinery::Errors::SystemDescriptionError.new(
-        "A System description with the name \"#{to}\" does already exist."
-      )
-    end
+    validate_existence_of_description(from)
+    validate_nonexistence_of_description(to)
 
     FileUtils.cp_r(description_path(from), description_path(to))
   end
 
   def backup(description_name)
     SystemDescription.validate_name(description_name)
-    if !list.include?(description_name)
-      raise Machinery::Errors::SystemDescriptionNotFound.new(
-        "System description \"#{description_name}\" does not exist."
-      )
-    end
+    validate_existence_of_description(description_name)
 
     backup_name = get_backup_name(description_name)
 
@@ -99,55 +87,22 @@ class SystemDescriptionStore
   def rename(from, to)
     SystemDescription.validate_name(from)
     SystemDescription.validate_name(to)
-    if !list.include?(from)
-      raise Machinery::Errors::SystemDescriptionNotFound.new(
-        "System description \"#{from}\" does not exist."
-      )
-    end
 
-    if list.include?(to)
-      raise Machinery::Errors::SystemDescriptionError.new(
-        "A System description with the name \"#{to}\" does already exist."
-      )
-    end
+    validate_existence_of_description(from)
+    validate_nonexistence_of_description(to)
 
     FileUtils.mv(description_path(from), description_path(to))
   end
 
-  def initialize_file_store(description_name, store_name)
-    file_store = ScopeFileStore.new(description_path(description_name),
-      store_name)
-    file_store.create
-  end
+  def swap(description_name_1, description_name_2)
+    validate_existence_of_description(description_name_1)
+    validate_existence_of_description(description_name_2)
 
-  def file_store(description_name, store_name)
-    file_store = ScopeFileStore.new(description_path(description_name),
-      store_name)
-    file_store.path
-  end
+    tmp_description_name = "#{description_name_1}-#{Time.now.to_i}-#{rand(1000)}"
 
-  def remove_file_store(description_name, store_name)
-    file_store = ScopeFileStore.new(description_path(description_name),
-      store_name)
-    file_store.remove
-  end
-
-  def rename_file_store(description_name, store_old, store_new)
-    file_store = ScopeFileStore.new(description_path(description_name),
-      store_old)
-    file_store.rename(store_new)
-  end
-
-  def create_file_store_sub_dir(description_name, store_name, sub_dir)
-    file_store = ScopeFileStore.new(description_path(description_name),
-      store_name)
-    file_store.create_sub_directory(sub_dir)
-  end
-
-  def list_file_store_content(description_name, store_name)
-    file_store = ScopeFileStore.new(description_path(description_name),
-      store_name)
-    file_store.list_content
+    FileUtils.mv(description_path(description_name_1), description_path(tmp_description_name))
+    FileUtils.mv(description_path(description_name_2), description_path(description_name_1))
+    FileUtils.mv(description_path(tmp_description_name), description_path(description_name_2))
   end
 
   def directory_for(name)
@@ -175,4 +130,20 @@ class SystemDescriptionStore
 
     backup_name
   end
+
+  def validate_existence_of_description(description_name)
+    if !list.include?(description_name)
+      raise Machinery::Errors::SystemDescriptionNotFound.new(
+        "System description \"#{description_name}\" does not exist."
+      )
+    end
+  end
+
+  def validate_nonexistence_of_description(description_name)
+    if list.include?(description_name)
+      raise Machinery::Errors::SystemDescriptionError.new(
+        "A System description with the name \"#{description_name}\" does already exist."
+      )
+    end
+  end
 end