hammer_cli_foreman_virt_who_configure 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ecdea9651c9394fb0c25d8e8a5ef3c4f1b0f76d8
-  data.tar.gz: b77f189652ccb32625a5253d7bf2c7a586ffcb73
+SHA256:
+  metadata.gz: 845377dff0db8f196099f05ed594c4bbdd4b33aa9f44dcd9fb42745e12e778d5
+  data.tar.gz: d3170a6efee5bed8b717986a0fc36d23a178f391357dcd01dbcb07ec56634a85
 SHA512:
-  metadata.gz: c6aedf1fd3aa8ac0699677d0828277a4159eca2633646b918a746675d848fb5376ceb27f20352f4bf45ea04a3287278a1f5e5d04ee4489ae23a347df63b9dfe2
-  data.tar.gz: 21fc3fa9187326288be6480f4fc44a0ccf62922ba1ebb7c4ec85928cdbd2137a2328f9ddac8b21188e3548aac66d914bb6ee4d88b16a9b1dcd2716df16a5890f
+  metadata.gz: f0c9a9013c306d41ecde2c2be58608b98a95d725d0d42e7aeff0d4656b951fa01916fc0183f74ea15f1fc70c6f3e4b1f6be916189eb7feaae5599d55e3317371
+  data.tar.gz: 51490292ea0e37bb750a2385b3780d69b124e68e269e1d21926f1243fd06a85cdba1ca89c94856809fe2e67680822f5080f5dd3a05f5a22601be85be956f0f86

data/lib/hammer_cli_foreman_virt_who_configure/config.rb

@@ -69,7 +69,6 @@ module HammerCLIForemanVirtWhoConfigure
           field :hypervisor_type, _('Hypervisor type')
           field :hypervisor_server, _('Hypervisor server')
           field :hypervisor_username, _('Hypervisor username')
-          field :hypervisor_password, _('Hypervisor password')
           field :_status, _('Status')
         end
         label _('Schedule') do
@@ -82,9 +81,17 @@ module HammerCLIForemanVirtWhoConfigure
           field :_filtering_mode, _('Filtering')
           field :blacklist, _('Excluded hosts'), Fields::Field, :hide_blank => true
           field :whitelist, _('Filtered hosts'), Fields::Field, :hide_blank => true
+          field :filter_host_parents, _('Filter host parents'), Fields::Field, :hide_blank => true
+          field :exclude_host_parents, _('Exclude host parents'), Fields::Field, :hide_blank => true
           field :debug, _('Debug mode'), Fields::Boolean
-          field :proxy, _('HTTP proxy')
-          field :no_proxy, _('Ignore proxy')
+          field :no_proxy, _('Ignore proxy'), Fields::Field, :hide_blank => true
+        end
+        label _('HTTP Proxy') do
+          from :http_proxy do
+            field :id, _('HTTP proxy ID'), Fields::Field, :hide_blank => true
+            field :name, _('HTTP proxy name'), Fields::Field, :hide_blank => true
+            field :url, _('HTTP proxy URL'), Fields::Field, :hide_blank => true
+          end
         end
         HammerCLIForeman::References.taxonomies(self)
       end
@@ -116,7 +123,7 @@ module HammerCLIForemanVirtWhoConfigure
 
       failure_message _('Could not fetch the Virt Who configuration')
 
-      option ['--output', '-o'], 'FILE', _('File where the script will be written.')
+      option ['-o', '--output'], 'FILE', _('File where the script will be written')
 
       def execute
         data = send_request

data/lib/hammer_cli_foreman_virt_who_configure/system_caller.rb

@@ -1,15 +1,27 @@
 module HammerCLIForemanVirtWhoConfigure
   class SystemCaller
+    WHITELISTED_VARS = %w[HOME USER LANG].freeze
+
     def initialize(tempfile = nil)
       @tempfile = tempfile || Tempfile.new('virt_who')
     end
 
-    def system(commad)
+    def clean_env_vars
+      # Cleaning ENV vars and keeping required vars only because,
+      # When using SCL it adds GEM_HOME and GEM_PATH ENV vars.
+      # These vars break foreman-maintain tool.
+      # This way we use system ruby to execute the bash script.
+      cleaned_env = ENV.select { |var| WHITELISTED_VARS.include?(var) || var.start_with?('LC_') }
+      cleaned_env['PATH'] = '/sbin:/bin:/usr/sbin:/usr/bin'
+      cleaned_env
+    end
+
+    def system(command)
       result = nil
       begin
-        @tempfile.write(commad)
+        @tempfile.write(command)
         @tempfile.flush # to make sure the command is complete
-        result = Kernel.system("/usr/bin/bash #{@tempfile.path}")
+        result = Kernel.system(clean_env_vars, "/usr/bin/bash #{@tempfile.path}", unsetenv_others: true)
       ensure
         @tempfile.close
         @tempfile.unlink

data/lib/hammer_cli_foreman_virt_who_configure/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForemanVirtWhoConfigure
   def self.version
-    @version ||= Gem::Version.new '0.0.2'
+    @version ||= Gem::Version.new '0.0.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Tomáš Strachota
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -76,9 +76,9 @@ files:
 - test/functional/test_helper.rb
 - test/test_helper.rb
 - test/unit/system_caller_test.rb
-homepage: http://github.com/theforeman/hammer-cli-foreman-virt-who-configure
+homepage: https://github.com/theforeman/hammer-cli-foreman-virt-who-configure
 licenses:
-- GPL v3+
+- GPL-3.0+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -95,19 +95,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Plugin for configuring Virt Who
 test_files:
-- test/data/1.15/foreman_api.json
-- test/functional/config/config_create_test.rb
-- test/functional/config/config_deploy_test.rb
-- test/functional/config/config_list_test.rb
+- test/functional/config/config_info_test.rb
 - test/functional/config/config_update_test.rb
+- test/functional/config/config_list_test.rb
+- test/functional/config/config_deploy_test.rb
 - test/functional/config/config_fetch_test.rb
-- test/functional/config/config_info_test.rb
+- test/functional/config/config_create_test.rb
 - test/functional/test_helper.rb
-- test/test_helper.rb
 - test/unit/system_caller_test.rb
+- test/test_helper.rb
+- test/data/1.15/foreman_api.json