kafo_parsers 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8d072d78df31b4b5a3951eb1f9a543b672d3f83d427e5c5d06608a76ac32f78
-  data.tar.gz: 83c95ee4652b98f292c8d214e5ff6ea9c4f2dd5cc823e80abcb955173f2857a0
+  metadata.gz: 9de270f92023f0577232bb8165246fd6afc2da7bcc18992b8b979d178f19526b
+  data.tar.gz: 7718b9cad1349e1a4800de3c360deaa13c87cbe7bc2c24fd11dbf50949cb6f7b
 SHA512:
-  metadata.gz: 80cbea32e05363b8620776800943e93c931094b74d2eced273f129c1a058e381199ec2708e997da3eb970ff201a92ed4b5837675baf4d3020f6679fcf72a074e
-  data.tar.gz: 7073e6ecc7cc140c3298a447d552929686fb58047118b8e118cfbf8fa8581e7d9592e6403775620497d6a1d629ec99a672e3f23660dec86c21ac57b32f764027
+  metadata.gz: dba6b56a64cbdfe15b137e08cf6d79d4ab488c8fc6a3c980070a43fe75995cd61404f8119401073522aa589ba6dee5922fcc4705d0186c9c57f8c8fe6007f602
+  data.tar.gz: 8b5a282f6aa2c30a6a7ade395b27c0142c134ea9f703a87dc83b9abd42ef8805aed9b6bed70d1779a1880de837af700fd222976ad83efe48c09a318eef5184a1

data/lib/kafo_parsers/puppet_strings_module_parser.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 require 'json'
+require 'open3'
+
 require 'kafo_parsers/doc_parser'
 require 'kafo_parsers/param_doc_parser'
 
@@ -25,11 +27,11 @@ module KafoParsers
     end
 
     def self.available?
-      `#{puppet_bin} help strings 2>&1`
-      if $?.success?
+      _stdout, _stderr, status = run_puppet(['help', 'strings'])
+      if status.success?
         return true
       else
-        raise KafoParsers::ParserNotAvailable.new("#{puppet_bin} does not have strings module installed")
+        raise KafoParsers::ParserNotAvailable.new("#{puppet_bin} does not have strings module installed.")
       end
     end
 
@@ -37,10 +39,11 @@ module KafoParsers
       @file = file = File.expand_path(file)
       raise KafoParsers::ModuleName, "File not found #{file}, check your answer file" unless File.exist?(file)
 
-      command = "#{self.class.puppet_bin} strings generate --format json #{file}"
-      @raw_json = `#{command}`
-      unless $?.success?
-        raise KafoParsers::ParseError, "'#{command}' returned error\n#{@raw_json}"
+      command = ['strings', 'generate', '--format', 'json', file]
+      @raw_json, stderr, status = self.class.run_puppet(command)
+
+      unless status.success?
+        raise KafoParsers::ParseError, "'#{command}' returned error:\n  #{@raw_json}\n  #{stderr}"
       end
 
       begin
@@ -130,6 +133,22 @@ module KafoParsers
 
     private
 
+    def self.run_puppet(command)
+      env_vars = self.puppet_bin.start_with?('/opt/puppetlabs') ? clean_env_vars : ::ENV
+      command = command.unshift(self.puppet_bin)
+      Open3.capture3(env_vars, *command, :unsetenv_others => true)
+    end
+
+    def self.clean_env_vars
+      # Cleaning ENV vars and keeping required vars only because,
+      # When using SCL it adds GEM_HOME and GEM_PATH ENV vars.
+      whitelisted_vars = %w[HOME USER LANG]
+
+      cleaned_env = ::ENV.select { |var| whitelisted_vars.include?(var) || var.start_with?('LC_') }
+      cleaned_env['PATH'] = '/sbin:/bin:/usr/sbin:/usr/bin:/opt/puppetlabs/bin'
+      cleaned_env
+    end
+
     # default values using puppet strings includes $ symbol, e.g. "$::foreman::params::ssl"
     #
     # values are reported as strings which is issue especially for :under

data/lib/kafo_parsers/version.rb

@@ -1,3 +1,3 @@
 module KafoParsers
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo_parsers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Puppet module parsers