manageiq-appliance_console 5.3.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6ba8e9cdf053c6d1eee9360c074ed3584d54e848d7d60e4f63c77a9d673ad60
-  data.tar.gz: 1ade599ce3628695ecf5b6a0444195ab3593e5ab539f5c3585f1ceffc9ace600
+  metadata.gz: 7c04199e075927842681f7aad9d1cc81fd7be4320e9a30ece2e18bf2c8188567
+  data.tar.gz: 207f9b85fbb22c346a531423b36a1d10de707567f1679f829d73ee7f5c3d0068
 SHA512:
-  metadata.gz: fd63b37fb4fb850a6b94efe35ebbb4d643992e7a9855fed584fb267b8939c122b93d4488c1b3eb2caaba37e7871e74280c07a4c5944f783a01cf10cb55ffd521
-  data.tar.gz: 9aa0a97f69f677a8b395c1fbaa724ae136f297f77ec9874ad7ffbbe4239b7d8b4e93bb619f8c43a271e36d0cf89f14cce264ebcb36a5e54cdb1b31f8e9b16cdd
+  metadata.gz: b87201ac79bde869f66484e431a75f5f13adefc3bd0a92c76f7b9bef9b0f8bdd2156a78386fd37315754727c578d9583517f2240eabe994df51f54419f64a9a0
+  data.tar.gz: c72233eadfb6a07f50ac53df833246d048b1d319afc7a257a1d50c989a94bf92bb570697e5b5d9ba38378af405c7c25fe260c68f0e45d1e72ff00c847c907b28

data/Gemfile

@@ -1,3 +1,4 @@
+source 'http://rubygems.manageiq.org'
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in manageiq-smartstate.gemspec

data/bin/appliance_console

@@ -19,8 +19,6 @@ include HighLine::SystemExtensions
 
 require 'manageiq/appliance_console/i18n'
 
-SCAP_RULES_DIR = File.expand_path("productization/appliance_console/config", ManageIQ::ApplianceConsole::RAILS_ROOT)
-
 $terminal.wrap_at = 80
 $terminal.page_at = 35
 
@@ -280,7 +278,7 @@ Static Network Configuration
 
         when 'hostname'
           say("Hostname Configuration\n\n")
-          new_host = just_ask("new hostname", host)
+          new_host = just_ask("new hostname", host, HOSTNAME_REGEXP, "Please enter a valid hostname")
 
           if new_host != host
             say("Applying new hostname...")
@@ -538,7 +536,7 @@ Static Network Configuration
 
       when I18n.t("advanced_settings.scap")
         say("#{selection}\n\n")
-        ManageIQ::ApplianceConsole::Scap.new(SCAP_RULES_DIR).lockdown
+        ManageIQ::ApplianceConsole::Scap.new.lockdown
         press_any_key
 
       when I18n.t("advanced_settings.summary")

data/lib/manageiq/appliance_console/cli.rb

@@ -8,9 +8,6 @@ unless defined?(say)
   end
 end
 
-# define SCAP_RULES_DIR for scap fucntionality
-SCAP_RULES_DIR = File.expand_path("productization/appliance_console/config", ManageIQ::ApplianceConsole::RAILS_ROOT)
-
 module ManageIQ
 module ApplianceConsole
   class CliError < StandardError; end
@@ -355,7 +352,7 @@ module ApplianceConsole
 
     def openscap
       say("Configuring Openscap")
-      ManageIQ::ApplianceConsole::Scap.new(SCAP_RULES_DIR).lockdown
+      ManageIQ::ApplianceConsole::Scap.new.lockdown
     end
 
     def config_tmp_disk

data/lib/manageiq/appliance_console/prompts.rb

@@ -13,7 +13,7 @@ module ApplianceConsole
     DOMAIN_REGEXP = /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,13})?$/
     INT_REGEXP    = /^[0-9]+$/
     NONE_REGEXP   = /^('?NONE'?)?$/i.freeze
-    HOSTNAME_REGEXP = /^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$/
+    HOSTNAME_REGEXP = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/.freeze
 
     def ask_for_uri(prompt, expected_scheme, opts = {})
       require 'uri'

data/lib/manageiq/appliance_console/scap.rb

@@ -3,7 +3,9 @@ require 'linux_admin'
 module ManageIQ
 module ApplianceConsole
   class Scap
-    def initialize(rules_dir)
+    RULES_DIR = File.expand_path("productization/appliance_console/config", ManageIQ::ApplianceConsole::RAILS_ROOT).freeze
+
+    def initialize(rules_dir = RULES_DIR)
       @rules_dir = rules_dir
     end
 

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '5.3.0'.freeze
+    VERSION = '5.3.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.1
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -310,7 +310,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: ManageIQ Appliance Console