machinery-tool 1.22.1 → 1.22.2

data/plugins/changed_config_files/changed_config_files_inspector.rb

@@ -15,71 +15,74 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class ChangedConfigFilesInspector < Inspector
-  has_priority 80
+module Machinery
+  class ChangedConfigFilesInspector < Machinery::Inspector
+    has_priority 80
 
-  # returns a hash with entries for changed configuration files
-  def config_file_changes(pkg)
-    @system.changed_files.select(&:config_file?).map do |file|
-      ConfigFile.new(
-        name:            file.path,
-        package_name:    package_name,
-        package_version: package_version,
-        status:          "changed",
-        changes:         file.changes
-      )
-    end.uniq
-  end
+    # returns a hash with entries for changed configuration files
+    def config_file_changes(_pkg)
+      @system.changed_files.select(&:config_file?).map do |file|
+        ConfigFile.new(
+          name:            file.path,
+          package_name:    package_name,
+          package_version: package_version,
+          status:          "changed",
+          changes:         file.changes
+        )
+      end.uniq
+    end
 
-  def initialize(system, description)
-    @system = system
-    @description = description
-  end
+    def initialize(system, description)
+      @system = system
+      @description = description
+    end
 
-  def inspect(filter, options = {})
-    do_extract = options[:extract_changed_changed_config_files]
-    system.check_retrieve_files_dependencies if do_extract
+    def inspect(filter, options = {})
+      do_extract = options[:extract_changed_changed_config_files]
+      system.check_retrieve_files_dependencies if do_extract
 
-    count = 0
-    files = @system.managed_files_database.changed_files do |chunk|
-      count += chunk.lines.count { |l| !l.chomp.end_with?(":") && l.split(" ")[1] == "c" }
-      Machinery::Ui.progress(
-        " -> Found #{Machinery.pluralize(count, "%d changed configuration file")}..."
-      )
-    end
-    result = files.select(&:config_file?).map do |file|
-      ConfigFile.new(file.attributes)
-    end
+      count = 0
+      files = @system.managed_files_database.changed_files do |chunk|
+        count += chunk.lines.count { |l| !l.chomp.end_with?(":") && l.split(" ")[1] == "c" }
+        Machinery::Ui.progress(
+          " -> Found #{Machinery.pluralize(count, "%d changed configuration file")}..."
+        )
+      end
+      result = files.select(&:config_file?).map do |file|
+        ConfigFile.new(file.attributes)
+      end
 
-    if filter
-      file_filter = filter.element_filter_for("/changed_config_files/files/name")
-      result.delete_if { |e| file_filter.matches?(e.name) } if file_filter
-    end
+      if filter
+        file_filter = filter.element_filter_for("/changed_config_files/files/name")
+        result.delete_if { |e| file_filter.matches?(e.name) } if file_filter
+      end
 
-    scope = ChangedConfigFilesScope.new
-    file_store = @description.scope_file_store("changed_config_files")
-    scope.scope_file_store = file_store
+      scope = ChangedConfigFilesScope.new
+      file_store = @description.scope_file_store("changed_config_files")
+      scope.scope_file_store = file_store
 
-    file_store.remove
-    if do_extract
-      file_store.create
-      extracted_paths = result.reject do |file|
-        file.changes == ["deleted"] ||
-        file.link? || file.directory?
-      end.map(&:name)
-      scope.retrieve_files_from_system(@system, extracted_paths)
-    end
+      file_store.remove
+      if do_extract
+        file_store.create
+        extracted_paths = result.reject do |file|
+          file.changes == ["deleted"] ||
+            file.link? ||
+            file.directory?
+        end.map(&:name)
+        scope.retrieve_files_from_system(@system, extracted_paths)
+      end
 
-    scope.extracted = !!do_extract
-    scope += result.sort_by(&:name)
+      scope.extracted = !!do_extract
+      scope += result.sort_by(&:name)
 
-    @description["changed_config_files"] = scope
-  end
+      @description["changed_config_files"] = scope
+    end
 
-  def summary
-    "#{@description.changed_config_files.extracted ? "Extracted" : "Found"} " +
-      Machinery.pluralize(
-        @description.changed_config_files.count, "%d changed configuration file"
-      ) + "."
+    def summary
+      "#{@description.changed_config_files.extracted ? "Extracted" : "Found"} " +
+        Machinery.pluralize(
+          @description.changed_config_files.count, "%d changed configuration file"
+        ) + "."
+    end
   end
 end

data/plugins/changed_config_files/changed_config_files_model.rb

@@ -15,31 +15,33 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class ConfigFile < Machinery::SystemFile
-end
+module Machinery
+  class ConfigFile < Machinery::SystemFile
+  end
 
-class ConfigFileList < Machinery::Array
-  has_elements class: ConfigFile
+  class ConfigFileList < Machinery::Array
+    has_elements class: ConfigFile
 
-  def compare_with(other)
-    only_self = self - other
-    only_other = other - self
-    common = self & other
-    changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
+    def compare_with(other)
+      only_self = self - other
+      only_other = other - self
+      common = self & other
+      changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
 
-    [
-      only_self,
-      only_other,
-      changed,
-      common
-    ].map { |e| (e && !e.empty?) ? e : nil }
+      [
+        only_self,
+        only_other,
+        changed,
+        common
+      ].map { |e| e && !e.empty? ? e : nil }
+    end
   end
-end
 
-class ChangedConfigFilesScope < FileScope
-  include Machinery::Scope
-  include ScopeFileAccessFlat
+  class ChangedConfigFilesScope < Machinery::FileScope
+    include Machinery::Scope
+    include Machinery::ScopeFileAccessFlat
 
-  has_attributes :extracted
-  has_elements class: ConfigFile
+    has_attributes :extracted
+    has_elements class: ConfigFile
+  end
 end

data/plugins/changed_config_files/changed_config_files_renderer.rb

@@ -15,76 +15,80 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class ChangedConfigFilesRenderer < Renderer
-  def content(description)
-    return unless description["changed_config_files"]
+module Machinery
+  class Ui
+    class ChangedConfigFilesRenderer < Machinery::Ui::Renderer
+      def content(description)
+        return unless description["changed_config_files"]
 
-    diffs_dir = description.scope_file_store("analyze/changed_config_files_diffs").path
+        diffs_dir = description.scope_file_store("analyze/changed_config_files_diffs").path
 
-    if !diffs_dir && @options[:show_diffs]
-      raise Machinery::Errors::SystemDescriptionError.new(
-        "Diffs can not be shown because they were not generated yet.\n" \
-        "You can generate them with `#{Hint.program_name} analyze" \
-        " --operation=changed-config-files-diffs #{description.name}`."
-      )
-    end
+        if !diffs_dir && @options[:show_diffs]
+          raise Machinery::Errors::SystemDescriptionError.new(
+            "Diffs can not be shown because they were not generated yet.\n" \
+            "You can generate them with `#{Machinery::Ui::Hint.program_name} analyze" \
+            " --operation=changed-config-files-diffs #{description.name}`."
+          )
+        end
 
-    list do
-      file_status = description["changed_config_files"].extracted
-      files = description["changed_config_files"]
+        list do
+          file_status = description["changed_config_files"].extracted
+          files = description["changed_config_files"]
 
-      if files.elements.empty?
-        puts "There are no changed configuration files."
-      elsif !file_status.nil?
-        puts "Files extracted: #{file_status ? "yes" : "no"}"
-      end
+          if files.elements.empty?
+            puts "There are no changed configuration files."
+          elsif !file_status.nil?
+            puts "Files extracted: #{file_status ? "yes" : "no"}"
+          end
 
-      if files
-        files.each do |p|
-          item_content = "#{p.name} (#{p.package_name}-#{p.package_version}, " \
-            "#{p.changes.join(", ")})"
-          if @options[:show_diffs] && p.changes.include?("md5")
-            item item_content do
-              render_diff_file(diffs_dir, p.name)
+          if files
+            files.each do |p|
+              item_content = "#{p.name} (#{p.package_name}-#{p.package_version}, " \
+                "#{p.changes.join(", ")})"
+              if @options[:show_diffs] && p.changes.include?("md5")
+                item item_content do
+                  render_diff_file(diffs_dir, p.name)
+                end
+              else
+                item item_content
+              end
             end
-          else
-            item item_content
           end
         end
       end
-    end
-  end
 
-  def display_name
-    "Changed Configuration Files"
-  end
+      def display_name
+        "Changed Configuration Files"
+      end
 
-  def compare_content_changed(changed_elements)
-    list do
-      changed_elements.each do |one, two|
-        changes = []
-        relevant_attributes = (one.attributes.keys & two.attributes.keys)
+      def compare_content_changed(changed_elements)
+        list do
+          changed_elements.each do |one, two|
+            changes = []
+            relevant_attributes = (one.attributes.keys & two.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
 
-  private
+      private
 
-  def render_diff_file(diffs_dir, name)
-    path = File.join(diffs_dir, name + ".diff")
+      def render_diff_file(diffs_dir, name)
+        path = File.join(diffs_dir, name + ".diff")
 
-    if File.exist?(path)
-      puts "Diff:\n#{File.read(path).chomp}"
-    else
-      Machinery::Ui.warn "Diff for #{name} was not found on disk."
+        if File.exist?(path)
+          puts "Diff:\n#{File.read(path).chomp}"
+        else
+          Machinery::Ui.warn "Diff for #{name} was not found on disk."
+        end
+      end
     end
   end
 end

data/plugins/changed_managed_files/changed_managed_files_inspector.rb

@@ -15,70 +15,72 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class ChangedManagedFilesInspector < Inspector
-  has_priority 90
+module Machinery
+  class ChangedManagedFilesInspector < Machinery::Inspector
+    has_priority 90
 
-  def initialize(system, description)
-    @system = system
-    @description = description
-  end
-
-  def inspect(filter, options = {})
-    system.check_retrieve_files_dependencies if options[:extract_changed_managed_files]
+    def initialize(system, description)
+      @system = system
+      @description = description
+    end
 
-    @system = system
+    def inspect(filter, options = {})
+      system.check_retrieve_files_dependencies if options[:extract_changed_managed_files]
 
-    scope = ChangedManagedFilesScope.new
-    file_store = @description.scope_file_store("changed_managed_files")
-    scope.scope_file_store = file_store
+      @system = system
 
-    result = changed_files
+      scope = ChangedManagedFilesScope.new
+      file_store = @description.scope_file_store("changed_managed_files")
+      scope.scope_file_store = file_store
 
-    if filter
-      file_filter = filter.element_filter_for("/changed_managed_files/files/name")
-      result.delete_if { |e| file_filter.matches?(e.name) } if file_filter
-    end
+      result = changed_files
 
-    file_store.remove
-    if options[:extract_changed_managed_files]
-      file_store.create
-
-      existing_files = result.reject do |f|
-        f.changes.nil? ||
-        f.changes.include?("deleted") ||
-        f.link? ||
-        f.directory? ||
-        f.name == "/"
+      if filter
+        file_filter = filter.element_filter_for("/changed_managed_files/files/name")
+        result.delete_if { |e| file_filter.matches?(e.name) } if file_filter
       end
 
-      scope.retrieve_files_from_system(@system, existing_files.map(&:name))
-    end
+      file_store.remove
+      if options[:extract_changed_managed_files]
+        file_store.create
 
-    scope.extracted = !!options[:extract_changed_managed_files]
-    scope += result.sort_by(&:name)
+        existing_files = result.reject do |f|
+          f.changes.nil? ||
+            f.changes.include?("deleted") ||
+            f.link? ||
+            f.directory? ||
+            f.name == "/"
+        end
 
-    @description["changed_managed_files"] = scope
-  end
+        scope.retrieve_files_from_system(@system, existing_files.map(&:name))
+      end
 
-  def summary
-    "#{@description.changed_managed_files.extracted ? "Extracted" : "Found"} " +
-      Machinery.pluralize(
-        @description.changed_managed_files.count, "%d changed managed file"
-      ) + "."
-  end
+      scope.extracted = !!options[:extract_changed_managed_files]
+      scope += result.sort_by(&:name)
 
-  private
+      @description["changed_managed_files"] = scope
+    end
 
-  def changed_files
-    count = 0
-    files = @system.managed_files_database.changed_files do |chunk|
-      count += chunk.lines.reject { |l| l.chomp.end_with?(":") || l.split(" ")[1] == "c" }.count
-      Machinery::Ui.progress(
-        " -> Found #{Machinery.pluralize(count, "%d changed managed file")}..."
-      )
+    def summary
+      "#{@description.changed_managed_files.extracted ? "Extracted" : "Found"} " +
+        Machinery.pluralize(
+          @description.changed_managed_files.count, "%d changed managed file"
+        ) + "."
     end
-    files.reject(&:config_file?).map do |file|
-      ChangedManagedFile.new(file.attributes)
+
+    private
+
+    def changed_files
+      count = 0
+      files = @system.managed_files_database.changed_files do |chunk|
+        count += chunk.lines.reject { |l| l.chomp.end_with?(":") || l.split(" ")[1] == "c" }.count
+        Machinery::Ui.progress(
+          " -> Found #{Machinery.pluralize(count, "%d changed managed file")}..."
+        )
+      end
+      files.reject(&:config_file?).map do |file|
+        ChangedManagedFile.new(file.attributes)
+      end
     end
   end
 end

data/plugins/changed_managed_files/changed_managed_files_model.rb

@@ -15,31 +15,33 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class ChangedManagedFile < Machinery::SystemFile
-end
+module Machinery
+  class ChangedManagedFile < Machinery::SystemFile
+  end
 
-class ChangedManagedFileList < Machinery::Array
-  has_elements class: ChangedManagedFile
+  class ChangedManagedFileList < Machinery::Array
+    has_elements class: ChangedManagedFile
 
-  def compare_with(other)
-    only_self = self - other
-    only_other = other - self
-    common = self & other
-    changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
+    def compare_with(other)
+      only_self = self - other
+      only_other = other - self
+      common = self & other
+      changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :name)
 
-    [
-      only_self,
-      only_other,
-      changed,
-      common
-    ].map { |e| (e && !e.empty?) ? e : nil }
+      [
+        only_self,
+        only_other,
+        changed,
+        common
+      ].map { |e| e && !e.empty? ? e : nil }
+    end
   end
-end
 
-class ChangedManagedFilesScope < FileScope
-  include Machinery::Scope
-  include ScopeFileAccessFlat
+  class ChangedManagedFilesScope < Machinery::FileScope
+    include Machinery::Scope
+    include Machinery::ScopeFileAccessFlat
 
-  has_attributes :extracted
-  has_elements class: ChangedManagedFile
+    has_attributes :extracted
+    has_elements class: ChangedManagedFile
+  end
 end