machinery-tool 1.22.1 → 1.22.2

data/lib/html.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class Html
+class Machinery::Html
   # Creates a new thread running a sinatra webserver which serves the local system descriptions
   # The Thread object is returned so that the caller can `.join` it until it's finished.
   def self.run_server(system_description_store, opts, &block)

data/lib/inspect_task.rb

@@ -14,7 +14,7 @@
 #
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
-class InspectTask
+class Machinery::InspectTask
   def inspect_system(store, system, name, current_user, scopes, filter, options = {})
     check_root(system, current_user)
 
@@ -48,7 +48,7 @@ class InspectTask
     return unless scopes
 
     scopes.each do |scope|
-      renderer = Renderer.for(scope)
+      renderer = Machinery::Ui::Renderer.for(scope)
       next unless renderer
 
       output = renderer.render(description)
@@ -58,26 +58,26 @@ class InspectTask
 
   def build_description(store, name, system, scopes, filter, options)
     begin
-      description = SystemDescription.load(name, store)
+      description = Machinery::SystemDescription.load(name, store)
     rescue Machinery::Errors::SystemDescriptionNotFound
-      description = SystemDescription.new(name, store)
+      description = Machinery::SystemDescription.new(name, store)
     end
     timestring = Time.now.utc.iso8601
-    if system.class == LocalSystem
-      host = "localhost"
-    elsif system.class == DockerSystem
-      host = system.image
+    host = if system.class == Machinery::LocalSystem
+      "localhost"
+    elsif system.class == Machinery::DockerSystem
+      system.image
     else
-      host = system.host
+      system.host
     end
     set_system_locale(system, description)
 
     failed_inspections = {}
 
-    effective_filter = Filter.new(description.filter_definitions("inspect"))
+    effective_filter = Machinery::Filter.new(description.filter_definitions("inspect"))
 
     scopes.each do |scope|
-      inspector = Inspector.for(scope).new(system, description)
+      inspector = Machinery::Inspector.for(scope).new(system, description)
       Machinery::Ui.puts "Inspecting #{Machinery::Ui.internal_scope_list_to_string(inspector.scope)}..."
 
       element_filters = filter.element_filters_for_scope(scope)
@@ -105,7 +105,7 @@ class InspectTask
   end
 
   def set_system_locale(system, description)
-    Inspector.for("environment").new(system, description).inspect
+    Machinery::Inspector.for("environment").new(system, description).inspect
     system.locale = description.environment.locale
   end
 end

data/lib/inspector.rb

@@ -31,7 +31,7 @@
 # the description. It returns a brief summary string of the inspection.
 #
 # The description object can also be used to store files in the description.
-class Inspector
+class Machinery::Inspector
   abstract_method :inspect
   abstract_method :summary
 
@@ -53,7 +53,7 @@ class Inspector
     def for(scope)
       class_name = "#{scope.split("_").map(&:capitalize).join}Inspector"
 
-      Object.const_get(class_name) if Object.const_defined?(class_name)
+      Machinery.const_get(class_name) if Machinery.const_defined?(class_name)
     end
 
     def all
@@ -83,7 +83,7 @@ class Inspector
     def scope
       # Return the un-camelcased name of the inspector,
       # e.g. "foo_bar" for "FooBarInspector"
-      scope = self.name.match(/^(.*)Inspector$/)[1]
+      scope = name.match(/^Machinery::(.*)Inspector$/)[1]
       scope.gsub(/([^A-Z])([A-Z])/, "\\1_\\2").downcase
     end
   end

data/lib/json_validation_error_cleaner.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class JsonValidationErrorCleaner
+class Machinery::JsonValidationErrorCleaner
   class <<self
     def cleanup_error(message, scope)
       message = cleanup_json_path(message, scope)

data/lib/json_validator.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class JsonValidator
+class Machinery::JsonValidator
   def initialize(json_hash)
     @json_hash = json_hash
 
@@ -53,11 +53,11 @@ class JsonValidator
       "In scope #{scope}: #{error}"
     end
     errors.map do |error|
-      JsonValidationErrorCleaner.cleanup_error(error, scope)
+      Machinery::JsonValidationErrorCleaner.cleanup_error(error, scope)
     end
   end
 
-  def global_schema(format_version = SystemDescription::CURRENT_FORMAT_VERSION)
+  def global_schema(format_version = Machinery::SystemDescription::CURRENT_FORMAT_VERSION)
     JSON.parse(File.read(File.join(
       Machinery::ROOT,
       "schema",
@@ -65,7 +65,7 @@ class JsonValidator
     )))
   end
 
-  def scope_schemas(format_version = SystemDescription::CURRENT_FORMAT_VERSION)
+  def scope_schemas(format_version = Machinery::SystemDescription::CURRENT_FORMAT_VERSION)
     schema_path = File.join(
       Machinery::ROOT,
       "plugins",

data/lib/kiwi_config.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class KiwiConfig < Exporter
+class Machinery::KiwiConfig < Machinery::Exporter
   attr_accessor :xml_text, :sh
   attr_accessor :name
 
@@ -57,6 +57,10 @@ class KiwiConfig < Exporter
 
   private
 
+  def repos_with_credentials?(repo)
+    repo.username && repo.password
+  end
+
   def optional_bootstrap_packages
     [
       "glibc-locale",
@@ -196,7 +200,7 @@ EOF
   end
 
   def check_exported_os
-    unless @system_description.os.is_a?(OsSuse)
+    unless @system_description.os.is_a?(Machinery::OsSuse)
       raise Machinery::Errors::ExportFailed.new(
         "Export is not possible because the operating system " \
         "'#{@system_description.os.display_name}' is not supported."
@@ -293,7 +297,7 @@ EOF
           end
         end
 
-        next if repo.url =~ /^https:\/\/nu.novell.com|^https:\/\/update.suse.com/
+        next if repos_with_credentials?(repo)
 
         @sh << "zypper -n ar --name='#{repo.name}' "
         @sh << "--type='#{repo.type}' " if repo.type
@@ -373,7 +377,7 @@ EOF
   end
 
   def enable_dhcp(output_location)
-    if @system_description.os.is_a?(OsSles11)
+    if @system_description.os.is_a?(Machinery::OsSles11)
       write_dhcp_network_config(output_location, "eth0")
     else
       write_dhcp_network_config(output_location, "lan0")

data/lib/list_task.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class ListTask
+class Machinery::ListTask
   def list(store, system_descriptions, options = {})
     if options[:html]
       list_html(store, options)
@@ -29,7 +29,7 @@ class ListTask
 
       descriptions.each do |name|
         begin
-          system_description = SystemDescription.load(name, store, skip_validation: true)
+          system_description = Machinery::SystemDescription.load(name, store, skip_validation: true)
         rescue Machinery::Errors::SystemDescriptionIncompatible => e
           show_error("#{e}\n", options)
           next
@@ -39,8 +39,9 @@ class ListTask
           )
           next
         rescue Machinery::Errors::SystemDescriptionValidationFailed
-          show_error("#{name}: This description is broken. Use " \
-            "`#{Hint.program_name} validate #{name}` to see the error message.", options)
+          show_error("#{name}: This description is broken. Use "\
+            "`#{Machinery::Ui::Hint.program_name} validate "\
+            "#{name}` to see the error message.", options)
           next
         rescue Machinery::Errors::SystemDescriptionError
           show_error("#{name}: This description is broken.", options)
@@ -54,7 +55,7 @@ class ListTask
 
           system_description.scopes.each do |scope|
             entry = Machinery::Ui.internal_scope_list_to_string(scope)
-            if SystemDescription::EXTRACTABLE_SCOPES.include?(scope)
+            if Machinery::SystemDescription::EXTRACTABLE_SCOPES.include?(scope)
               if system_description.scope_extracted?(scope)
                 entry += " (extracted)"
               else
@@ -83,13 +84,13 @@ class ListTask
         end
       end
 
-      Hint.print(:upgrade_system_description) if has_incompatible_version
+      Machinery::Ui::Hint.print(:upgrade_system_description) if has_incompatible_version
     end
   end
 
   def list_html(store, options)
     begin
-      LocalSystem.validate_existence_of_command("xdg-open", "xdg-utils")
+      Machinery::LocalSystem.validate_existence_of_command("xdg-open", "xdg-utils")
 
       url = "http://#{options[:ip]}:#{options[:port]}/"
 
@@ -100,8 +101,8 @@ Trying to start a web server for serving the descriptions on #{url}.
 The server can be closed with Ctrl+C.
 EOF
 
-      server = Html.run_server(store, port: options[:port], ip: options[:ip]) do
-        LoggedCheetah.run("xdg-open", url)
+      server = Machinery::Html.run_server(store, port: options[:port], ip: options[:ip]) do
+        Machinery::LoggedCheetah.run("xdg-open", url)
       end
 
       server.join # Wait until the user cancelled the blocking webserver

data/lib/local_system.rb

@@ -15,14 +15,20 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class LocalSystem < System
+class Machinery::LocalSystem < Machinery::System
   @@os = nil
 
   class << self
     def os
       unless @@os
-        description = SystemDescription.new("localhost", SystemDescriptionMemoryStore.new)
-        inspector = OsInspector.new(System.for("localhost"), description)
+        description = Machinery::SystemDescription.new(
+          "localhost",
+          Machinery::SystemDescriptionMemoryStore.new
+        )
+        inspector = Machinery::OsInspector.new(
+          Machinery::System.for("localhost"),
+          description
+        )
         inspector.inspect(nil)
         @@os = description.os
       end
@@ -102,7 +108,7 @@ You can install it by running `zypper install #{package}`.
     if args.last.is_a?(Hash) && args.last[:disable_logging]
       cheetah_class = Cheetah
     else
-      cheetah_class = LoggedCheetah
+      cheetah_class = Machinery::LoggedCheetah
     end
 
     with_env(
@@ -118,7 +124,7 @@ You can install it by running `zypper install #{package}`.
   # the directory where to put the files.
   def retrieve_files(filelist, destination)
     begin
-      LoggedCheetah.run(
+      Machinery::LoggedCheetah.run(
         "rsync",
         "--chmod=go-rwx",
         "--files-from=-",

data/lib/logged_cheetah.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class LoggedCheetah
+class Machinery::LoggedCheetah
   class << self
     def run(*args)
       command = args.select { |e| e.is_a?(String) }.join(" ")

data/lib/man_task.rb

@@ -15,10 +15,10 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class ManTask
+class Machinery::ManTask
   def self.compile_documentation
     docs = "# Scopes\n\n"
-    docs += Inspector.all_scopes.map do |scope|
+    docs += Machinery::Inspector.all_scopes.map do |scope|
       scope_doc = "* #{scope.tr("_", "-")}\n\n"
       scope_doc += YAML.load_file(
         File.join(Machinery::ROOT, "plugins/#{scope}/#{scope}.yml")
@@ -40,7 +40,7 @@ class ManTask
   end
 
   def man_system
-    LocalSystem.validate_existence_of_package("man")
+    Machinery::LocalSystem.validate_existence_of_package("man")
     system("man", File.join(Machinery::ROOT, "man/generated/machinery.1.gz"))
   end
 
@@ -53,7 +53,7 @@ class ManTask
       return
     end
 
-    LocalSystem.validate_existence_of_command("xdg-open", "xdg-utils")
+    Machinery::LocalSystem.validate_existence_of_command("xdg-open", "xdg-utils")
 
     url = "http://#{options[:ip]}:#{options[:port]}/site/docs/index.html"
 
@@ -64,8 +64,12 @@ Trying to start a web server for serving the documentation on #{url}.
 The server can be closed with Ctrl+C.
 EOF
 
-    server = Html.run_server(SystemDescriptionStore.new, port: options[:port], ip: options[:ip]) do
-      LoggedCheetah.run("xdg-open", url)
+    server = Machinery::Html.run_server(
+      Machinery::SystemDescriptionStore.new,
+      port: options[:port],
+      ip:   options[:ip]
+    ) do
+      Machinery::LoggedCheetah.run("xdg-open", url)
     end
 
     server.join # Wait until the user cancelled the blocking webserver

data/lib/managed_files_database.rb

@@ -15,7 +15,7 @@
 # To contact SUSE about this file by physical or electronic mail,
 # you may find current contact information at www.suse.com
 
-class ManagedFilesDatabase
+class Machinery::ManagedFilesDatabase
   class ChangedFile < Machinery::Object
     attr_accessor :type
 

data/lib/manifest.rb

@@ -18,7 +18,7 @@
 # The Manifest class takes care of handling the JSON representation of system
 # descriptions. It loads and parses the JSON into a hash and validates it against
 # the current schema.
-class Manifest
+class Machinery::Manifest
   attr_accessor :name, :path, :json, :hash
 
   def self.load(name, path)
@@ -29,7 +29,7 @@ class Manifest
     end
 
     json = File.read(path)
-    Manifest.new(name, json, path)
+    Machinery::Manifest.new(name, json, path)
   end
 
   def initialize(name, json, path = nil)
@@ -43,7 +43,7 @@ class Manifest
   def validate
     return unless compatible_json?
 
-    errors = JsonValidator.new(@hash).validate
+    errors = Machinery::JsonValidator.new(@hash).validate
     unless errors.empty?
       Machinery::Ui.warn("Warning: System Description validation errors:")
       Machinery::Ui.warn(errors.join("\n"))
@@ -53,7 +53,7 @@ class Manifest
   def validate!
     return unless compatible_json?
 
-    errors = JsonValidator.new(@hash).validate
+    errors = Machinery::JsonValidator.new(@hash).validate
     unless errors.empty?
       raise Machinery::Errors::SystemDescriptionValidationFailed.new(errors)
     end
@@ -96,6 +96,6 @@ class Manifest
 
   def compatible_json?
     @hash && @hash["meta"] && @hash["meta"]["format_version"] &&
-      @hash["meta"]["format_version"] <= SystemDescription::CURRENT_FORMAT_VERSION
+      @hash["meta"]["format_version"] <= Machinery::SystemDescription::CURRENT_FORMAT_VERSION
   end
 end

data/lib/migration.rb

@@ -43,7 +43,7 @@
 #
 # Simple example migration which adds a new attribute to the JSON:
 #
-#   class Migrate1To2 < Migration
+#   class Machinery::Migrate1To2 < Machinery::Migration
 #     desc <<-EOT
 #       Add 'foo' element to the system description root.
 #     EOT
@@ -53,7 +53,7 @@
 #       @hash["changed_config_files"]["extracted"] = is_extracted
 #     end
 #   end
-class Migration
+class Machinery::Migration
   MIGRATIONS_DIR= File.join(Machinery::ROOT, "schema/migrations")
 
   class << self
@@ -66,10 +66,16 @@ class Migration
     def migrate_description(store, description_name, options = {})
       load_migrations
 
-      hash = Manifest.load(description_name, store.manifest_path(description_name)).to_hash
+      hash = Machinery::Manifest.load(
+        description_name,
+        store.manifest_path(description_name)
+      ).to_hash
 
-      errors = JsonValidator.new(hash).validate
-      errors += FileValidator.new(hash, store.description_path(description_name)).validate
+      errors = Machinery::JsonValidator.new(hash).validate
+      errors += Machinery::FileValidator.new(
+        hash,
+        store.description_path(description_name)
+      ).validate
       unless errors.empty?
         if options[:force]
           Machinery::Ui.warn("Warning: System Description validation errors:")
@@ -87,21 +93,21 @@ class Migration
         )
       end
 
-      if current_version == SystemDescription::CURRENT_FORMAT_VERSION
+      if current_version == Machinery::SystemDescription::CURRENT_FORMAT_VERSION
         Machinery::Ui.puts "No upgrade necessary."
         return false
       end
 
       backup_description = store.backup(description_name)
       backup_path = store.description_path(backup_description)
-      backup_hash = Manifest.load(
+      backup_hash = Machinery::Manifest.load(
         backup_description, store.manifest_path(backup_description)
       ).to_hash
 
-      (current_version..SystemDescription::CURRENT_FORMAT_VERSION-1).each do |version|
+      (current_version..Machinery::SystemDescription::CURRENT_FORMAT_VERSION - 1).each do |version|
         next_version = version + 1
         begin
-          klass = Object.const_get("Migrate#{version}To#{next_version}")
+          klass = Object.const_get("Machinery::Migrate#{version}To#{next_version}")
         rescue NameError
           return
         end
@@ -125,7 +131,7 @@ class Migration
         Machinery::Ui.puts "Saved backup to #{backup_path}"
       else
         begin
-          SystemDescription.load!(backup_description, store)
+          Machinery::SystemDescription.load!(backup_description, store)
           store.remove(description_name)
           store.rename(backup_description, description_name)
         rescue Machinery::Errors::SystemDescriptionError