foreman_bootdisk 12.0.1 → 16.0.0

data/lib/foreman_bootdisk/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'foreman_bootdisk'
 require 'fast_gettext'
 require 'gettext_i18n_rails'
@@ -9,67 +11,54 @@ module ForemanBootdisk
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
+    config.autoload_paths += Dir["#{config.root}/app/lib"]
 
-    initializer 'foreman_bootdisk.mount_engine', :after=> :build_middleware_stack do |app|
+    initializer 'foreman_bootdisk.mount_engine' do |app|
       app.routes_reloader.paths << "#{ForemanBootdisk::Engine.root}/config/routes/mount_engine.rb"
     end
 
-    initializer 'foreman_bootdisk.load_default_settings', :before => :load_config_initializers do |app|
-      require_dependency File.expand_path("../../../app/models/setting/bootdisk.rb", __FILE__) if (Setting.table_exists? rescue(false))
+    initializer 'foreman_bootdisk.load_default_settings', before: :load_config_initializers do |_app|
+      table_exists = begin
+                       Setting.table_exists?
+                     rescue StandardError
+                       false
+                     end
+      require_dependency File.expand_path('../../app/models/setting/bootdisk.rb', __dir__) if table_exists
     end
 
-    initializer "foreman_bootdisk.load_app_instance_data" do |app|
+    initializer 'foreman_bootdisk.load_app_instance_data' do |app|
       ForemanBootdisk::Engine.paths['db/migrate'].existent.each do |path|
         app.config.paths['db/migrate'] << path
       end
     end
 
-    initializer "foreman_bootdisk.apipie" do
+    initializer 'foreman_bootdisk.apipie' do
       Apipie.configuration.checksum_path += ['/bootdisk/api/']
     end
 
-    # Precompile any JS or CSS files under app/assets/
-    # If requiring files from each other, list them explicitly here to avoid precompiling the same
-    # content twice.
-    assets_to_precompile =
-      Dir.chdir(root) do
-        Dir['app/assets/javascripts/**/*', 'app/assets/stylesheets/**/*'].map do |f|
-          f.split(File::SEPARATOR, 4).last
-        end
-      end
-
-    initializer 'foreman_bootdisk.assets.precompile' do |app|
-      app.config.assets.precompile += assets_to_precompile
-    end
-
-    initializer 'foreman_bootdisk.configure_assets', group: :assets do
-      SETTINGS[:foreman_bootdisk] = { assets: { precompile: assets_to_precompile } }
-    end
-
-    initializer 'foreman_bootdisk.register_plugin', :before => :finisher_hook do |app|
+    initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 1.18'
+        requires_foreman '>= 1.24'
 
-        security_block :bootdisk do |map|
-          permission :download_bootdisk, {:'foreman_bootdisk/disks' => [:generic, :host, :full_host, :subnet, :help],
-                                          :'foreman_bootdisk/api/v2/disks' => [:generic, :host],
-                                          :'foreman_bootdisk/api/v2/subnet_disks' => [:subnet]}
+        security_block :bootdisk do |_map|
+          permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host subnet help],
+                                         'foreman_bootdisk/api/v2/disks': %i[generic host],
+                                         'foreman_bootdisk/api/v2/subnet_disks': [:subnet]
         end
 
-        role "Boot disk access", [:download_bootdisk]
+        role 'Boot disk access', [:download_bootdisk]
 
         add_all_permissions_to_default_roles
 
-        allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise
         apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
         provision_method 'bootdisk', N_('Boot disk based')
         template_labels 'Bootdisk' => N_('Boot disk embedded template')
-        extend_template_helpers ForemanBootdisk::RendererMethods
+        allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise, :bootdisk_build?
       end
     end
 
-    initializer 'foreman_bootdisk.register_gettext', :after => :load_config_initializers do |app|
-      locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
+    initializer 'foreman_bootdisk.register_gettext', after: :load_config_initializers do |_app|
+      locale_dir = File.join(File.expand_path('../..', __dir__), 'locale')
       locale_domain = 'foreman_bootdisk'
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
@@ -77,12 +66,11 @@ module ForemanBootdisk
     config.to_prepare do
       begin
         Host::Managed.send(:prepend, ForemanBootdisk::HostExt)
-        Host::Managed.send(:include, ForemanBootdisk::RendererMethods)
         Host::Managed.send(:include, ForemanBootdisk::Orchestration::Compute) if SETTINGS[:unattended]
         HostsHelper.send(:prepend, ForemanBootdisk::HostsHelperExt)
         Foreman::Model::Vmware.send(:prepend, ForemanBootdisk::ComputeResources::Vmware) if Foreman::Model::Vmware.available?
-      rescue => e
-        puts "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e.to_s})"
+      rescue StandardError => e
+        Rails.logger.warn "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e})"
       end
     end
   end

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanBootdisk
-  VERSION = '12.0.1'
+  VERSION = '16.0.0'
 end

data/lib/tasks/bootdisk.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require 'rake/testtask'
 require 'tmpdir'
@@ -15,12 +17,12 @@ namespace :bootdisk do
 
   namespace :generate do
     desc 'Generate a static boot disk for a specific host.  NAME=fqdn, OUTPUT path'
-    task :host => :environment do
+    task host: :environment do
       User.as_anonymous_admin do
-        host = Host::Base.unscoped.find_by_name(ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
+        host = Host::Base.unscoped.find_by(name: ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
         tmpl = host.bootdisk_template_render
 
-        ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl, :dir => outputdir) do |image|
+        ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl, dir: outputdir) do |image|
           output = ENV['OUTPUT'] || File.join(outputdir, "#{host.name}.iso")
           FileUtils.mv image, output
           puts "Wrote #{output}"
@@ -29,10 +31,10 @@ namespace :bootdisk do
     end
 
     desc 'Generate a full boot disk for a specific host with the OS bootloader included.  NAME=fqdn, OUTPUT path'
-    task :full_host => :environment do
+    task full_host: :environment do
       User.as_anonymous_admin do
-        host = Host::Base.unscoped.find_by_name(ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
-        ForemanBootdisk::ISOGenerator.generate_full_host(host, :dir => outputdir) do |image|
+        host = Host::Base.unscoped.find_by(name: ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
+        ForemanBootdisk::ISOGenerator.generate_full_host(host, dir: outputdir) do |image|
           output = ENV['OUTPUT'] || File.join(outputdir, "#{host.name}_#{Date.today.strftime('%Y%m%d')}.iso")
           FileUtils.cp image, output
           puts "Wrote #{output}"
@@ -41,11 +43,11 @@ namespace :bootdisk do
     end
 
     desc 'Generate a generic boot disk.  OUTPUT=path'
-    task :generic => :environment do
+    task generic: :environment do
       User.as_anonymous_admin do
         tmpl = ForemanBootdisk::Renderer.new.generic_template_render
 
-        ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl, :dir => outputdir) do |image|
+        ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl, dir: outputdir) do |image|
           output = ENV['OUTPUT'] || File.join(outputdir, "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso")
           FileUtils.cp image, output
           puts "Wrote #{output}"
@@ -54,12 +56,12 @@ namespace :bootdisk do
     end
 
     desc 'Generate a subnet disk for a specific subnet. NAME=subnet, OUTPUT=path'
-    task :subnet => :environment do
+    task subnet: :environment do
       User.as_anonymous_admin do
-        subnet = Subnet.unscoped.find_by_name(ENV['NAME']) || raise("cannot find subnet '#{ENV['NAME']}', specify NAME=subnet")
-        subnet.tftp || raise(::Foreman::Exception.new(N_("TFTP feature not enabled for subnet %s"), subnet.name))
+        subnet = Subnet.unscoped.find_by(name: ENV['NAME']) || raise("cannot find subnet '#{ENV['NAME']}', specify NAME=subnet")
+        subnet.tftp || raise(::Foreman::Exception.new(N_('TFTP feature not enabled for subnet %s'), subnet.name))
         tmpl = ForemanBootdisk::Renderer.new.generic_template_render(subnet)
-        ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl, :dir => outputdir) do |image|
+        ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl, dir: outputdir) do |image|
           output = ENV['OUTPUT'] || File.join(outputdir, "bootdisk_subnet_#{subnet.name}.iso")
           FileUtils.cp image, output
           puts "Wrote #{output}"
@@ -71,10 +73,10 @@ end
 
 # Tests
 namespace :test do
-  desc "Test foreman_bootdisk"
+  desc 'Test foreman_bootdisk'
   Rake::TestTask.new(:foreman_bootdisk) do |t|
     test_dir = File.join(File.dirname(__FILE__), '../..', 'test')
-    t.libs << ["test",test_dir]
+    t.libs << ['test', test_dir]
     t.pattern = "#{test_dir}/**/*_test.rb"
     t.verbose = true
     t.warning = false
@@ -83,7 +85,22 @@ end
 
 Rake::Task[:test].enhance ['test:foreman_bootdisk']
 
-load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task["jenkins:unit"].enhance ['test:foreman_bootdisk']
+namespace :foreman_bootdisk do
+  task :rubocop do
+    begin
+      require 'rubocop/rake_task'
+      RuboCop::RakeTask.new(:rubocop_foreman_bootdisk) do |task|
+        task.patterns = ["#{ForemanBootdisk::Engine.root}/app/**/*.rb",
+                         "#{ForemanBootdisk::Engine.root}/lib/**/*.rb",
+                         "#{ForemanBootdisk::Engine.root}/test/**/*.rb"]
+      end
+    rescue StandardError
+      puts 'Rubocop not loaded.'
+    end
+
+    Rake::Task['rubocop_foreman_bootdisk'].invoke
+  end
 end
+
+load 'tasks/jenkins.rake'
+Rake::Task['jenkins:unit'].enhance ['test:foreman_bootdisk', 'foreman_bootdisk:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')

data/locale/ca/foreman_bootdisk.po

@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the foreman_bootdisk package.
 #
 # Translators:
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Foreman\n"
+"Project-Id-Version: foreman_bootdisk 15.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-09-20 00:09+0000\n"
+"PO-Revision-Date: 2019-08-12 08:51+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
@@ -21,6 +22,9 @@ msgstr ""
 msgid "A variant of the per-host image which contains the OS bootloader embedded inside the disk.  This may be useful if chainloading fails on certain hardware, but has the downside that the image must be regenerated for any change in the OS, bootloader or PXELinux templates."
 msgstr ""
 
+msgid "Action with sub plans"
+msgstr ""
+
 msgid "All images are usable as either ISOs or as disk images, including being written to a USB disk with `dd`."
 msgstr ""
 
@@ -45,6 +49,9 @@ msgstr ""
 msgid "Boot disks"
 msgstr "Discs d'arrencada"
 
+msgid "Both IP and Subnet must be set"
+msgstr ""
+
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "L'ordre per generar la imatge ISO, utilitzeu genisoimage o mkisofs"
 
@@ -93,8 +100,11 @@ msgstr "Ajuda"
 msgid "Host '%s' image"
 msgstr ""
 
-msgid "Host has no IP address defined"
-msgstr "L'amfitrió no té definida cap adreça IP"
+msgid "Host bootdisk does not work with static IPv6"
+msgstr ""
+
+msgid "Host has no IPv4 or IPv6 address defined"
+msgstr ""
 
 msgid "Host has no domain defined"
 msgstr "L'amfitrió no té definit cap domini"
@@ -115,7 +125,7 @@ msgid "Host is not in build mode, so the template cannot be rendered"
 msgstr ""
 
 msgid "ISO build failed"
-msgstr "No s'ha pogut construir la ISO"
+msgstr "No s'ha pogut construir l'ISO"
 
 msgid "ISO generation command"
 msgstr ""
@@ -126,6 +136,12 @@ msgstr ""
 msgid "ISOLINUX directory"
 msgstr ""
 
+msgid "Import Puppet classes"
+msgstr ""
+
+msgid "Import facts"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -139,7 +155,7 @@ msgid "Path to directory containing iPXE images"
 msgstr "El camí al directori que conté les imatges iPXE"
 
 msgid "Path to directory containing isolinux images"
-msgstr ""
+msgstr "El camí al directori que conté les imatges isolinux"
 
 msgid "Path to directory containing syslinux images"
 msgstr "El camí al directori que conté les imatges syslinux"
@@ -156,18 +172,15 @@ msgstr ""
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr ""
 
+msgid "Remote action:"
+msgstr ""
+
 msgid "SYSLINUX directory"
 msgstr ""
 
 msgid "Subnet '%s' generic image"
 msgstr ""
 
-msgid "Subnet (%s) has no gateway defined"
-msgstr "La subxarxa (%s) no té definida cap passarel·la"
-
-msgid "Subnet (%s) has no primary DNS server defined"
-msgstr "La subxarxa (%s) no té definit cap servidor DNS primari"
-
 msgid "Subnet boot disks"
 msgstr "Discs d'arrencada de subxarxa"
 
@@ -195,8 +208,11 @@ msgstr ""
 msgid "Unable to find template specified by %s setting"
 msgstr "No es pot trobar la plantilla especificada per l'ajust %s"
 
-msgid "Unable to generate disk template: %s"
-msgstr "No es pot generar la plantilla de disc: %s"
+msgid "Unable to generate disk PXELinux template: %s"
+msgstr ""
+
+msgid "Unable to generate disk template, PXELinux template not found."
+msgstr ""
 
 msgid "Upload ISO image to datastore for %s"
 msgstr ""
@@ -205,7 +221,7 @@ msgid "Various types of boot disks can be created to provision hosts without the
 msgstr ""
 
 msgid "iPXE directory"
-msgstr ""
+msgstr "Directori iPXE"
 
 msgid "iPXE template to use for generic host boot disks"
 msgstr ""

data/locale/de/foreman_bootdisk.po

@@ -5,14 +5,17 @@
 # Translators:
 # Christina Gurski <Gurski_christina@yahoo.de>, 2015
 # Ettore Atalan <atalanttore@googlemail.com>, 2014,2016
+# Martin Zimmermann <martin.zimmermann@gmx.com>, 2018
 # Paul Puschmann, 2014
+# abf90805572190d649c59f7a021d76cb, 2014
+# simon11 <simon.stieger.98@live.de>, 2014
 # simon11 <simon.stieger.98@live.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Foreman\n"
+"Project-Id-Version: foreman_bootdisk 15.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-09-20 00:09+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
+"PO-Revision-Date: 2019-08-12 08:51+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,6 +26,9 @@ msgstr ""
 msgid "A variant of the per-host image which contains the OS bootloader embedded inside the disk.  This may be useful if chainloading fails on certain hardware, but has the downside that the image must be regenerated for any change in the OS, bootloader or PXELinux templates."
 msgstr "Eine Variante des Abbildes pro Host mit im im Medium eingebetteten Betriebssystem-Bootloader. Dies ist hilfreich, falls Chainloading auf einer bestimmten Hardware fehlschlägt, hat jedoch den Nachteil, dass das Abbild bei jeglicher Änderung von Betriebssystem, Bootloader oder PXELinux-Vorlagen neu generiert werden muss."
 
+msgid "Action with sub plans"
+msgstr ""
+
 msgid "All images are usable as either ISOs or as disk images, including being written to a USB disk with `dd`."
 msgstr "Alle Abbilder können entweder als ISOs oder als Festplattenabbilder verwendet werden und auch mit `dd` auf eine USB-Festplatte geschrieben."
 
@@ -39,14 +45,17 @@ msgid "Boot disk based"
 msgstr "Startmedium-basiert"
 
 msgid "Boot disk download not available for %s architecture"
-msgstr ""
+msgstr "Startmedium Download nicht verfügbar für Architektur %s"
 
 msgid "Boot disk embedded template"
-msgstr ""
+msgstr "Im Startmedium eingebettete Vorlage"
 
 msgid "Boot disks"
 msgstr "Startmedien"
 
+msgid "Both IP and Subnet must be set"
+msgstr ""
+
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "Kommando zur Erstellung von ISO-Abbildern, verwende genisoimage oder mkisofs"
 
@@ -60,16 +69,16 @@ msgid "Download subnet generic image"
 msgstr "Generisches Abbild von Subnetz herunterladen"
 
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
-msgstr ""
+msgstr "Fehler beim Einhängen des ISO-Abbild am CDROM-Laufwerk für Instanz %{name}: %{message}"
 
 msgid "Failed to generate ISO image for instance %{name}: %{message}"
-msgstr ""
+msgstr "Fehler beim Erzeugen des ISO-Abbild für Instanz %{name}: %{message}"
 
 msgid "Failed to render boot disk template"
 msgstr "Fehler beim Rendern der Vorlage für Startmedium"
 
 msgid "Failed to upload ISO image for instance %{name}: %{message}"
-msgstr ""
+msgstr "Fehler beim Upload des ISO-Abbild für Instanz %{name}: %{message}"
 
 msgid "Full host '%s' image"
 msgstr "Vollständiges Host \"%s\"-Abbild"
@@ -95,8 +104,11 @@ msgstr "Hilfe"
 msgid "Host '%s' image"
 msgstr "Host '%s'-Abbild"
 
-msgid "Host has no IP address defined"
-msgstr "Host hat keine IP-Adresse definiert"
+msgid "Host bootdisk does not work with static IPv6"
+msgstr ""
+
+msgid "Host has no IPv4 or IPv6 address defined"
+msgstr ""
 
 msgid "Host has no domain defined"
 msgstr "Host hat keine Domäne definiert"
@@ -128,9 +140,15 @@ msgstr "ISO hybrid Konvertierung fehlgeschlagen"
 msgid "ISOLINUX directory"
 msgstr "ISOLINUX-Verzeichnis"
 
-msgid "Installation media caching"
+msgid "Import Puppet classes"
 msgstr ""
 
+msgid "Import facts"
+msgstr ""
+
+msgid "Installation media caching"
+msgstr "Installationsmedien-Dateien Caching"
+
 msgid "Installation media files will be cached for full host images"
 msgstr "Installationsmedien-Dateien werden für vollständige Host-Images zwischengespeichert."
 
@@ -141,7 +159,7 @@ msgid "Path to directory containing iPXE images"
 msgstr "Pfad zum Verzeichnis mit iPXE-Abbildern"
 
 msgid "Path to directory containing isolinux images"
-msgstr ""
+msgstr "Pfad zum Verzeichnis welches die ISOLINUX Abbilder enthält"
 
 msgid "Path to directory containing syslinux images"
 msgstr "Pfad zum Verzeichnis mit syslinux-Abbildern"
@@ -150,26 +168,23 @@ msgid "Per-host images contain data about a particular host registered in Forema
 msgstr "\"Pro-Host\"-Abbilder enthalten Daten über einen bestimmten Host, der in Foreman registriert ist, und richten eine vollständig statische Verbindung ein, wobei die Notwendigkeit von DHCP vermieden wird. Nach der Konfiguration der Verbindung werden sie nacheinander von Foreman geladen (Chainloading) und nehmen die gegenwärtige OS-Konfiguration und den Buildstatus vom Server auf."
 
 msgid "Please ensure the ipxe-bootimgs package is installed."
-msgstr ""
+msgstr "Bitte die Installation des IPXE-bootimgs Paket sicherstellen."
 
 msgid "Please ensure the isolinux/syslinux package(s) are installed."
-msgstr ""
+msgstr "Bitte die Installation des/der ISOLINUX/SYSLINUX Paket(e) sicherstellen."
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "Plugin für Foreman, welches iPXE-basierte Startmedien erstellt, um Hosts ohne die Notwendigkeit einer PXE-Infrastruktur bereitzustellen."
 
+msgid "Remote action:"
+msgstr ""
+
 msgid "SYSLINUX directory"
 msgstr "SYSLINUX-Verzeichnis"
 
 msgid "Subnet '%s' generic image"
 msgstr "Subnetz '%s' generisches Abbild"
 
-msgid "Subnet (%s) has no gateway defined"
-msgstr "Subnetz (%s) hat keinen Gateway definiert"
-
-msgid "Subnet (%s) has no primary DNS server defined"
-msgstr "Subnetz (%s) hat keinen primären DNS-Server definiert"
-
 msgid "Subnet boot disks"
 msgstr "Subnetz-Startmedien"
 
@@ -197,8 +212,11 @@ msgstr "\"True\" für vollständiges, \"false\" für einfaches wiederverwendbare
 msgid "Unable to find template specified by %s setting"
 msgstr "Konnte Vorlage mit der %s-Einstellung nicht finden"
 
-msgid "Unable to generate disk template: %s"
-msgstr "Startmedium-Vorlage konnte nicht erzeugt werden: %s"
+msgid "Unable to generate disk PXELinux template: %s"
+msgstr ""
+
+msgid "Unable to generate disk template, PXELinux template not found."
+msgstr ""
 
 msgid "Upload ISO image to datastore for %s"
 msgstr "ISO-Abbild zum Datenspeicher für %s hochladen"