machinery-tool 1.22.1 → 1.22.2

data/plugins/services/services_model.rb

@@ -15,47 +15,48 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
+module Machinery
+  class Service < Machinery::Object
+    def enabled?
+      # systemd vs sysvinit
+      state == "enabled" || state == "on"
+    end
 
-class Service < Machinery::Object
-  def enabled?
-    # systemd vs sysvinit
-    state == "enabled" || state == "on"
+    def disabled?
+      # systemd vs sysvinit
+      state == "disabled" || state == "off"
+    end
   end
 
-  def disabled?
-    # systemd vs sysvinit
-    state == "disabled" || state == "off"
-  end
-end
-
-class ServicesScope < Machinery::Array
-  include Machinery::Scope
-
-  has_attributes :init_system
-  has_elements class: Service
-
-  def compare_with(other)
-    if self.init_system != other.init_system
-      [self, other, nil, nil]
-    else
-      only_self = self - other
-      only_other = other - self
-      common = self & other
-      changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
-      changed = nil if changed.empty?
-
-      [
-        service_list_to_scope(only_self),
-        service_list_to_scope(only_other),
-        changed,
-        service_list_to_scope(common)
-      ].map { |e| (e && !e.empty?) ? e : nil }
+  class ServicesScope < Machinery::Array
+    include Machinery::Scope
+
+    has_attributes :init_system
+    has_elements class: Service
+
+    def compare_with(other)
+      if init_system != other.init_system
+        [self, other, nil, nil]
+      else
+        only_self = self - other
+        only_other = other - self
+        common = self & other
+        changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
+        changed = nil if changed.empty?
+
+        [
+          service_list_to_scope(only_self),
+          service_list_to_scope(only_other),
+          changed,
+          service_list_to_scope(common)
+        ].map { |e| e && !e.empty? ? e : nil }
+      end
     end
-  end
 
-  private
+    private
 
-  def service_list_to_scope(services)
-    self.class.new(services, init_system: init_system) unless services.elements.empty?
+    def service_list_to_scope(services)
+      self.class.new(services, init_system: init_system) unless services.elements.empty?
+    end
   end
 end

data/plugins/services/services_renderer.rb

@@ -15,38 +15,42 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class ServicesRenderer < Renderer
-  def content(description)
-    return unless description["services"]
+module Machinery
+  class Ui
+    class ServicesRenderer < Machinery::Ui::Renderer
+      def content(description)
+        return unless description["services"]
 
-    if description["services"].elements.empty?
-      puts "There are no services."
-    end
+        if description["services"].elements.empty?
+          puts "There are no services."
+        end
 
-    list do
-      description["services"].each do |p|
-        item "#{p.name}: #{p.state}"
+        list do
+          description["services"].each do |p|
+            item "#{p.name}: #{p.state}"
+          end
+        end
       end
-    end
-  end
 
-  def display_name
-    "Services"
-  end
+      def display_name
+        "Services"
+      end
 
-  def compare_content_changed(changed_elements)
-    list do
-      changed_elements.each do |one, two|
-        changes = []
-        relevant_attributes = one.attributes.keys
+      def compare_content_changed(changed_elements)
+        list do
+          changed_elements.each do |one, two|
+            changes = []
+            relevant_attributes = one.attributes.keys
 
-        relevant_attributes.each do |attribute|
-          if one[attribute] != two[attribute]
-            changes << "#{attribute}: #{one[attribute]} <> #{two[attribute]}"
+            relevant_attributes.each do |attribute|
+              if one[attribute] != two[attribute]
+                changes << "#{attribute}: #{one[attribute]} <> #{two[attribute]}"
+              end
+            end
+
+            item "#{one.name} (#{changes.join(", ")})"
           end
         end
-
-        item "#{one.name} (#{changes.join(", ")})"
       end
     end
   end

data/plugins/unmanaged_files/unmanaged_files_inspector.rb

@@ -15,125 +15,128 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class UnmanagedFilesInspector < Inspector
-  has_priority 100
-
-  # checks if all required binaries are present
-  def check_requirements(check_tar)
-    @system.check_requirement(["rpm", "dpkg"], "--version")
-    @system.check_create_archive_dependencies if check_tar
-  end
-
-  def initialize(system, description)
-    @system = system
-    @description = description
-  end
-
-  def inspect(filter, options = {})
-    do_extract = options[:extract_unmanaged_files]
-    check_requirements(do_extract)
+module Machinery
+  class UnmanagedFilesInspector < Machinery::Inspector
+    has_priority 100
+
+    # checks if all required binaries are present
+    def check_requirements(check_tar)
+      @system.check_requirement(["rpm", "dpkg"], "--version")
+      @system.check_create_archive_dependencies if check_tar
+    end
 
-    scope = UnmanagedFilesScope.new
+    def initialize(system, description)
+      @system = system
+      @description = description
+    end
 
-    file_store_tmp = @description.scope_file_store("unmanaged_files.tmp")
-    file_store_final = @description.scope_file_store("unmanaged_files")
+    def inspect(filter, options = {})
+      do_extract = options[:extract_unmanaged_files]
+      check_requirements(do_extract)
 
-    scope.scope_file_store = file_store_tmp
+      scope = UnmanagedFilesScope.new
 
-    file_filter = filter.element_filter_for("/unmanaged_files/name").dup if filter
-    file_filter ||= ElementFilter.new("/unmanaged_files/name")
-    file_filter.add_matchers("=", @description.store.base_path)
+      file_store_tmp = @description.scope_file_store("unmanaged_files.tmp")
+      file_store_final = @description.scope_file_store("unmanaged_files")
 
-    # Add a recursive pendant to each ignored element
-    file_filter.matchers.each do |operator, matchers|
-      file_filter.add_matchers(operator, matchers.map { |entry| File.join(entry, "/*") })
-    end
+      scope.scope_file_store = file_store_tmp
 
-    helper = MachineryHelper.new(@system)
+      file_filter = filter.element_filter_for("/unmanaged_files/name").dup if filter
+      file_filter ||= Machinery::ElementFilter.new("/unmanaged_files/name")
+      file_filter.add_matchers("=", @description.store.base_path)
 
-    if helper_usable?(helper)
-      helper_options = {}
-      helper_options[:do_extract] = do_extract
-      helper_options[:extract_metadata] = options[:extract_metadata]
+      # Add a recursive pendant to each ignored element
+      file_filter.matchers.each do |operator, matchers|
+        file_filter.add_matchers(operator, matchers.map { |entry| File.join(entry, "/*") })
+      end
 
-      run_helper_inspection(helper, file_filter, file_store_tmp, file_store_final,
-        scope, helper_options)
-    else
-      raise Machinery::Errors::MissingRequirement.new(
-        "There is no machinery-helper available for the remote system architecture #{@system.arch}."
-      )
-    end
-  end
+      helper = MachineryHelper.new(@system)
 
-  def helper_usable?(helper)
-    helper.can_help?
-  end
+      if helper_usable?(helper)
+        helper_options = {}
+        helper_options[:do_extract] = do_extract
+        helper_options[:extract_metadata] = options[:extract_metadata]
 
-  def run_helper_inspection(helper, filter, file_store_tmp, file_store_final, scope, options)
-    begin
-      helper.inject_helper
-      unless helper.has_compatible_version?
-        raise Machinery::Errors::UnsupportedHelperVersion.new(
-          "Error: machinery-helper is not compatible with this Machinery version." \
-            "\nTry to reinstall the package or gem to fix the issue."
+        run_helper_inspection(helper, file_filter, file_store_tmp, file_store_final,
+          scope, helper_options)
+      else
+        raise Machinery::Errors::MissingRequirement.new(
+          "There is no machinery-helper available for the "\
+          "remote system architecture #{@system.arch}."
         )
       end
+    end
 
-      args = []
-      args.push("--extract-metadata") if options[:extract_metadata] || options[:do_extract]
-
-      helper.run_helper(scope, *args)
-      scope.delete_if { |f| filter.matches?(f.name) }
-
-      if options[:do_extract]
-        mount_points = MountPoints.new(@system)
-        excluded_trees = mount_points.remote + mount_points.special
-
-        file_store_tmp.remove
-        file_store_tmp.create
-
-        files = scope.select { |f| f.file? || f.link? }.map(&:name)
-        scope.retrieve_files_from_system_as_archive(@system, files, [])
-        show_extraction_progress(files.count)
+    def helper_usable?(helper)
+      helper.can_help?
+    end
 
-        scope.retrieve_trees_from_system_as_archive(@system,
-          scope.select(&:directory?).map(&:name), excluded_trees) do |count|
-          show_extraction_progress(files.count + count)
+    def run_helper_inspection(helper, filter, file_store_tmp, file_store_final, scope, options)
+      begin
+        helper.inject_helper
+        unless helper.has_compatible_version?
+          raise Machinery::Errors::UnsupportedHelperVersion.new(
+            "Error: machinery-helper is not compatible with this Machinery version." \
+              "\nTry to reinstall the package or gem to fix the issue."
+          )
         end
 
-        file_store_final.remove
-        file_store_tmp.rename(file_store_final.store_name)
-        scope.scope_file_store = file_store_final
-        scope.extracted = true
-        scope.has_metadata = true
-      else
-        file_store_final.remove
-        scope.extracted = false
-        scope.has_metadata = !!options[:extract_metadata]
+        args = []
+        args.push("--extract-metadata") if options[:extract_metadata] || options[:do_extract]
+
+        helper.run_helper(scope, *args)
+        scope.delete_if { |f| filter.matches?(f.name) }
+
+        if options[:do_extract]
+          mount_points = Machinery::MountPoints.new(@system)
+          excluded_trees = mount_points.remote + mount_points.special
+
+          file_store_tmp.remove
+          file_store_tmp.create
+
+          files = scope.select { |f| f.file? || f.link? }.map(&:name)
+          scope.retrieve_files_from_system_as_archive(@system, files, [])
+          show_extraction_progress(files.count)
+
+          scope.retrieve_trees_from_system_as_archive(@system,
+            scope.select(&:directory?).map(&:name), excluded_trees) do |count|
+            show_extraction_progress(files.count + count)
+          end
+
+          file_store_final.remove
+          file_store_tmp.rename(file_store_final.store_name)
+          scope.scope_file_store = file_store_final
+          scope.extracted = true
+          scope.has_metadata = true
+        else
+          file_store_final.remove
+          scope.extracted = false
+          scope.has_metadata = !!options[:extract_metadata]
+        end
+      ensure
+        helper.remove_helper
       end
-    ensure
-      helper.remove_helper
-    end
 
-    @description["unmanaged_files"] = scope
-  end
+      @description["unmanaged_files"] = scope
+    end
 
-  def summary
-    "#{@description.unmanaged_files.extracted ? "Extracted" : "Found"} " +
-      Machinery.pluralize(
-        @description.unmanaged_files.count,
-        "%d unmanaged file or tree.",
-        "%d unmanaged files and/or trees."
-      )
-  end
+    def summary
+      "#{@description.unmanaged_files.extracted ? "Extracted" : "Found"} " +
+        Machinery.pluralize(
+          @description.unmanaged_files.count,
+          "%d unmanaged file or tree.",
+          "%d unmanaged files and/or trees."
+        )
+    end
 
-  private
+    private
 
-  def show_extraction_progress(count)
-    progress = Machinery.pluralize(
-      count, " -> Extracted %d unmanaged file or tree...",
-        " -> Extracted %d unmanaged files and/or trees..."
-    )
-    Machinery::Ui.progress(progress)
+    def show_extraction_progress(count)
+      progress = Machinery.pluralize(
+        count, " -> Extracted %d unmanaged file or tree...",
+          " -> Extracted %d unmanaged files and/or trees..."
+      )
+      Machinery::Ui.progress(progress)
+    end
   end
 end

data/plugins/unmanaged_files/unmanaged_files_model.rb

@@ -15,78 +15,86 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class UnmanagedFile < Machinery::SystemFile
-end
+module Machinery
+  class UnmanagedFile < Machinery::SystemFile
+  end
 
-class UnmanagedFileList < Machinery::Array
-end
+  class UnmanagedFileList < Machinery::Array
+  end
 
-class UnmanagedFilesScope < FileScope
-  include Machinery::Scope
-  include ScopeFileAccessArchive
+  class UnmanagedFilesScope < Machinery::FileScope
+    include Machinery::Scope
+    include Machinery::ScopeFileAccessArchive
 
-  has_attributes :extracted, :has_metadata
-  has_elements class: UnmanagedFile
+    has_attributes :extracted, :has_metadata
+    has_elements class: UnmanagedFile
 
-  def compare_with(other)
-    if extracted != other.extracted
-      Machinery::Ui.warn("Warning: Comparing extracted with unextracted" \
-        " unmanaged files. Only common attributes are considered.")
-    end
+    def compare_with(other)
+      if extracted != other.extracted
+        Machinery::Ui.warn("Warning: Comparing extracted with unextracted" \
+          " unmanaged files. Only common attributes are considered.")
+      end
 
-    self_hash = elements.inject({}) { |hash, e| hash[e.name] = e; hash }
-    other_hash = other.elements.inject({}) { |hash, e| hash[e.name] = e; hash }
+      self_hash = elements.inject({}) do |hash, e|
+        hash[e.name] = e
+        hash
+      end
+      other_hash = other.elements.inject({}) do |hash, e|
+        hash[e.name] = e
+        hash
+      end
+
+      both = []
+      only_self = []
+      elements.each do |element|
+        if other_hash.key?(element.name) && files_match(element, other_hash[element.name])
+          both << element
+        else
+          only_self << element
+        end
+      end
+      only_other = other.elements.reject do |element|
+        self_hash.key?(element.name) && files_match(element, self_hash[element.name])
+      end
+      changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
 
-    both = []
-    only_self = []
-    elements.each do |element|
-      if other_hash.key?(element.name) && files_match(element, other_hash[element.name])
-        both << element
+      if attributes == other.attributes
+        common_attributes = attributes
       else
-        only_self << element
+        only_self_attributes = attributes
+        only_other_attributes = other.attributes
       end
-    end
-    only_other = other.elements.reject do |element|
-      self_hash.key?(element.name) && files_match(element, self_hash[element.name])
-    end
-    changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
 
-    if self.attributes == other.attributes
-      common_attributes = self.attributes
-    else
-      only_self_attributes = self.attributes
-      only_other_attributes = other.attributes
-    end
+      comparison = [
+        self.class.new(only_self, only_self_attributes || {}),
+        self.class.new(only_other, only_other_attributes || {}),
+        changed
+      ].map { |e| e.empty? ? nil : e }
 
-    comparison = [
-      self.class.new(only_self, only_self_attributes || {}),
-      self.class.new(only_other, only_other_attributes || {}),
-      changed
-    ].map { |e| e.empty? ? nil : e }
+      common = if both.empty? && common_attributes && common_attributes.empty?
+        nil
+      else
+        self.class.new(both, common_attributes || {})
+      end
 
-    common = if both.empty? && common_attributes && common_attributes.empty?
-      nil
-    else
-      self.class.new(both, common_attributes || {})
+      comparison.push(common)
     end
 
-    comparison.push(common)
-  end
-
-  def contains_metadata?
-    @metadata ||= has_metadata || elements.any?(&:user)
-  end
+    def contains_metadata?
+      @metadata ||= has_metadata || elements.any?(&:user)
+    end
 
-  def has_subdir_counts?
-    @has_subdirs ||= elements.any?(&:files)
-  end
+    def has_subdir_counts?
+      @has_subdirs ||= elements.any?(&:files)
+    end
 
-  private
+    private
 
-  def files_match(a, b)
-    common_attributes = a.attributes.keys & b.attributes.keys
-    common_attributes.all? do |attribute|
-      a[attribute] == b[attribute]
+    def files_match(a, b)
+      common_attributes = a.attributes.keys & b.attributes.keys
+      common_attributes.all? do |attribute|
+        a[attribute] == b[attribute]
+      end
     end
   end
 end