machinery-tool 1.22.1 → 1.22.2

data/plugins/packages/packages_model.rb

@@ -15,45 +15,46 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
+module Machinery
+  class Package < Machinery::Object
+  end
 
-class Package < Machinery::Object
-end
-
-class RpmPackage < Package
-end
+  class RpmPackage < Package
+  end
 
-class DpkgPackage < Package
-end
+  class DpkgPackage < Package
+  end
 
-class PackagesScope < Machinery::Array
-  include Machinery::Scope
-
-  has_attributes :package_system
-  has_elements class: DpkgPackage, if: { package_system: "dpkg" }
-  has_elements class: RpmPackage, if: { package_system: "rpm" }
-
-  def compare_with(other)
-    if self.package_system != other.package_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?
-
-      [
-        package_list_to_scope(only_self),
-        package_list_to_scope(only_other),
-        changed,
-        package_list_to_scope(common)
-      ].map { |e| (e && !e.empty?) ? e : nil }
+  class PackagesScope < Machinery::Array
+    include Machinery::Scope
+
+    has_attributes :package_system
+    has_elements class: DpkgPackage, if: { package_system: "dpkg" }
+    has_elements class: RpmPackage, if: { package_system: "rpm" }
+
+    def compare_with(other)
+      if package_system != other.package_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?
+
+        [
+          package_list_to_scope(only_self),
+          package_list_to_scope(only_other),
+          changed,
+          package_list_to_scope(common)
+        ].map { |e| e && !e.empty? ? e : nil }
+      end
     end
-  end
 
-  private
+    private
 
-  def package_list_to_scope(packages)
-    self.class.new(packages, package_system: package_system) unless packages.elements.empty?
+    def package_list_to_scope(packages)
+      self.class.new(packages, package_system: package_system) unless packages.elements.empty?
+    end
   end
 end

data/plugins/packages/packages_renderer.rb

@@ -15,57 +15,65 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class PackagesRenderer < Renderer
-  def display_name
-    "Packages"
-  end
+module Machinery
+  class Ui
+    class PackagesRenderer < Machinery::Ui::Renderer
+      def display_name
+        "Packages"
+      end
 
-  def content(description)
-    return unless description.packages
+      def content(description)
+        return unless description.packages
 
-    if description.packages.elements.empty?
-      puts "There are no packages."
-    end
+        if description.packages.elements.empty?
+          puts "There are no packages."
+        end
 
-    na_note("package vendor") if description.packages.any? { |a| a[:vendor] == "" }
+        na_note("package vendor") if description.packages.any? { |a| a[:vendor] == "" }
 
-    list do
-      description.packages.each do |p|
-        vendor = !p.vendor.empty? ? p.vendor : "N/A"
-        item [p.name, p.version, p.release].reject(&:empty?).join("-") + ".#{p.arch} (#{vendor})"
+        list do
+          description.packages.each do |p|
+            vendor = !p.vendor.empty? ? p.vendor : "N/A"
+            item [
+              p.name,
+              p.version,
+              p.release
+            ].reject(&:empty?).join("-") + ".#{p.arch} (#{vendor})"
+          end
+        end
       end
-    end
-  end
 
-  # In the comparison case we only want to show the package name, not all details like version,
-  # architecture etc.
-  def compare_content_only_in(description)
-    return if description.packages.empty?
+      # In the comparison case we only want to show the package name, not all details like version,
+      # architecture etc.
+      def compare_content_only_in(description)
+        return if description.packages.empty?
 
-    list do
-      description.packages.each do |p|
-        item "#{p.name}"
+        list do
+          description.packages.each do |p|
+            item p.name.to_s
+          end
+        end
       end
-    end
-  end
 
-  def compare_content_changed(changed_elements)
-    list do
-      changed_elements.each do |one, two|
-        changes = []
-        relevant_attributes = ["version", "vendor", "arch"]
-        if one.version == two.version
-          relevant_attributes << "release"
-          relevant_attributes << "checksum" if one.release == two.release
-        end
+      def compare_content_changed(changed_elements)
+        list do
+          changed_elements.each do |one, two|
+            changes = []
+            relevant_attributes = ["version", "vendor", "arch"]
+            if one.version == two.version
+              relevant_attributes << "release"
+              relevant_attributes << "checksum" if one.release == two.release
+            end
+
+            relevant_attributes.each do |attribute|
+              if one[attribute] != two[attribute]
+                changes << "#{attribute}: #{one[attribute]} <> #{two[attribute]}"
+              end
+            end
 
-        relevant_attributes.each do |attribute|
-          if one[attribute] != two[attribute]
-            changes << "#{attribute}: #{one[attribute]} <> #{two[attribute]}"
+            item "#{one.name} (#{changes.join(", ")})"
           end
         end
-
-        item "#{one.name} (#{changes.join(", ")})"
       end
     end
   end

data/plugins/patterns/patterns_inspector.rb

@@ -15,90 +15,92 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class PatternsInspector < Inspector
-  has_priority 30
-  def initialize(system, description)
-    @system = system
-    @description = description
-  end
+module Machinery
+  class PatternsInspector < Machinery::Inspector
+    has_priority 30
+    def initialize(system, description)
+      @system = system
+      @description = description
+    end
 
-  def inspect(_filter, _options = {})
-    if @system.has_command?("zypper")
-      @patterns_supported = true
-      inspect_with_zypper
-    elsif @system.has_command?("dpkg")
-      if @system.has_command?("tasksel")
-        Machinery::Ui.puts "Note: Tasks on Debian-like systems are treated as patterns."
+    def inspect(_filter, _options = {})
+      if @system.has_command?("zypper")
         @patterns_supported = true
-        inspect_with_tasksel
+        inspect_with_zypper
+      elsif @system.has_command?("dpkg")
+        if @system.has_command?("tasksel")
+          Machinery::Ui.puts "Note: Tasks on Debian-like systems are treated as patterns."
+          @patterns_supported = true
+          inspect_with_tasksel
+        else
+          @patterns_supported = false
+          @status = "For a patterns (tasks) inspection please install the package tasksel " \
+            "on the inspected system."
+          @description.patterns = PatternsScope.new
+        end
       else
         @patterns_supported = false
-        @status = "For a patterns (tasks) inspection please install the package tasksel " \
-          "on the inspected system."
+        @status = "Patterns or tasks are not supported on this system."
         @description.patterns = PatternsScope.new
       end
-    else
-      @patterns_supported = false
-      @status = "Patterns or tasks are not supported on this system."
-      @description.patterns = PatternsScope.new
     end
-  end
 
-  def summary
-    if @patterns_supported
-      "Found #{Machinery.pluralize(@description.patterns.count, "%d pattern")}."
-    else
-      @status
+    def summary
+      if @patterns_supported
+        "Found #{Machinery.pluralize(@description.patterns.count, "%d pattern")}."
+      else
+        @status
+      end
     end
-  end
 
-  private
+    private
 
-  def inspect_with_zypper
-    begin
-      xml = @system.run_command("zypper", "--non-interactive", "-xq", "--no-refresh", "patterns",
-        "-i", stdout: :capture)
-    rescue Cheetah::ExecutionFailed => e
-      if e.stdout.include?("locked")
-        Machinery.logger.error(e.stdout)
-        raise Machinery::Errors::ZypperFailed.new(
-          "Zypper is locked."
-        )
-      else
-        raise
+    def inspect_with_zypper
+      begin
+        xml = @system.run_command("zypper", "--non-interactive", "-xq", "--no-refresh", "patterns",
+          "-i", stdout: :capture)
+      rescue Cheetah::ExecutionFailed => e
+        if e.stdout.include?("locked")
+          Machinery.logger.error(e.stdout)
+          raise Machinery::Errors::ZypperFailed.new(
+            "Zypper is locked."
+          )
+        else
+          raise
+        end
       end
-    end
-    pattern_list = REXML::Document.new(xml).get_elements("/stream/pattern-list/pattern")
+      pattern_list = REXML::Document.new(xml).get_elements("/stream/pattern-list/pattern")
 
-    if pattern_list.count == 0
-      @description.patterns = PatternsScope.new
-      return
-    end
+      if pattern_list.empty?
+        @description.patterns = PatternsScope.new
+        return
+      end
 
-    patterns = pattern_list.map do |pattern|
-      Pattern.new(
-        name: pattern.attributes["name"],
-        version: pattern.attributes["version"],
-        release: pattern.attributes["release"]
-      )
-    end.uniq.sort_by(&:name)
+      patterns = pattern_list.map do |pattern|
+        Pattern.new(
+          name: pattern.attributes["name"],
+          version: pattern.attributes["version"],
+          release: pattern.attributes["release"]
+        )
+      end.uniq.sort_by(&:name)
 
-    @description.patterns = PatternsScope.new(patterns)
-    @description.patterns.attributes["patterns_system"] = "zypper"
-  end
+      @description.patterns = PatternsScope.new(patterns)
+      @description.patterns.attributes["patterns_system"] = "zypper"
+    end
 
-  def inspect_with_tasksel
-    tasksel_out = @system.run_command("tasksel", "--list-tasks", stdout: :capture)
-    tasklist = tasksel_out.lines.map(&:chomp)
-    installed = tasklist.select { |line| line.start_with?("i") }
-    installed.map! { |l| l.split[1] }
-    patterns = installed.map do |pattern|
-      Pattern.new(
-        name: pattern
-      )
-    end.uniq.sort_by(&:name)
+    def inspect_with_tasksel
+      tasksel_out = @system.run_command("tasksel", "--list-tasks", stdout: :capture)
+      tasklist = tasksel_out.lines.map(&:chomp)
+      installed = tasklist.select { |line| line.start_with?("i") }
+      installed.map! { |l| l.split[1] }
+      patterns = installed.map do |pattern|
+        Pattern.new(
+          name: pattern
+        )
+      end.uniq.sort_by(&:name)
 
-    @description.patterns = PatternsScope.new(patterns)
-    @description.patterns.attributes["patterns_system"] = "tasksel"
+      @description.patterns = PatternsScope.new(patterns)
+      @description.patterns.attributes["patterns_system"] = "tasksel"
+    end
   end
 end

data/plugins/patterns/patterns_model.rb

@@ -15,27 +15,28 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
+module Machinery
+  class Pattern < Machinery::Object
+  end
 
-class Pattern < Machinery::Object
-end
-
-class PatternsScope < Machinery::Array
-  include Machinery::Scope
+  class PatternsScope < Machinery::Array
+    include Machinery::Scope
 
-  has_attributes :patterns_system
-  has_elements class: Pattern
+    has_attributes :patterns_system
+    has_elements class: Pattern
 
-  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

data/plugins/patterns/patterns_renderer.rb

@@ -15,49 +15,53 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class PatternsRenderer < Renderer
-  def content(description)
-    return unless description.patterns
+module Machinery
+  class Ui
+    class PatternsRenderer < Machinery::Ui::Renderer
+      def content(description)
+        return unless description.patterns
 
-    if description.patterns.empty?
-      puts "There are no patterns or tasks."
-    end
+        if description.patterns.empty?
+          puts "There are no patterns or tasks."
+        end
 
-    if description.patterns.patterns_system == "tasksel"
-      puts "Note: Tasks on Debian-like systems are treated as patterns."
-    end
+        if description.patterns.patterns_system == "tasksel"
+          puts "Note: Tasks on Debian-like systems are treated as patterns."
+        end
 
-    puts "Pattern Manager: #{description.patterns.patterns_system}" unless
-      description.patterns.empty?
+        puts "Pattern Manager: #{description.patterns.patterns_system}" unless
+          description.patterns.empty?
 
-    list do
-      description.patterns.each do |p|
-        item "#{p.name}"
+        list do
+          description.patterns.each do |p|
+            item p.name.to_s
+          end
+        end
       end
-    end
-  end
 
-  def display_name
-    "Patterns"
-  end
+      def display_name
+        "Patterns"
+      end
 
-  def compare_content_changed(changed_elements)
-    list do
-      changed_elements.each do |one, two|
-        changes = []
-        relevant_attributes = ["version"]
+      def compare_content_changed(changed_elements)
+        list do
+          changed_elements.each do |one, two|
+            changes = []
+            relevant_attributes = ["version"]
 
-        if one.version == two.version
-          relevant_attributes << "release"
-        end
+            if one.version == two.version
+              relevant_attributes << "release"
+            end
+
+            relevant_attributes.each do |attribute|
+              if one[attribute] != two[attribute]
+                changes << "#{attribute}: #{one[attribute]} <> #{two[attribute]}"
+              end
+            end
 
-        relevant_attributes.each do |attribute|
-          if one[attribute] != two[attribute]
-            changes << "#{attribute}: #{one[attribute]} <> #{two[attribute]}"
+            item "#{one.name} (#{changes.join(", ")})"
           end
         end
-
-        item "#{one.name} (#{changes.join(", ")})"
       end
     end
   end