mixlib-install 3.11.28 → 3.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3abbd31ee089f8f24407d866aef6e40546f12a30ba715720b155b13abcf3cc5a
-  data.tar.gz: bb1efeac551415d6bf1962b19b9df9335a4ad8bd673a003610400f56e8c53735
+  metadata.gz: 601807500297868555334b6b675f76e7f47e82b06508c25034b7104c8d2d6310
+  data.tar.gz: 505719449732303c18b2b6c1ca892f61bcc9c2bfb249e3b10f7073f0db675e68
 SHA512:
-  metadata.gz: 5c470a63c6325b3c81743b54453bea4a8a52124b5624786f316989599c82d53337fc5f32d9aaeeb0c1d6bd66994346bd60b20862c91bb8895c247cb24331cee3
-  data.tar.gz: e360d48b512a3c1cc2213fb4c28f6a5a001b1f93bb10a4399a30491eca665b09067d79fddb71a7975e3f423520353b890dcf5c403ddb6cb7298e0c44567c80e9
+  metadata.gz: 28787830d0a413c5698fd7889562f9210d8ab3f6ae9d94274f02c015280ce6e1914413e18a89036306d7f5e3ac12fd24a9401b891fde2c7de8f33a98183e4bc3
+  data.tar.gz: 0d3ec51ff6c6dbaa499eba0cf95ffd9e66881381543b6cabe257539901ad2e1cf3ca895768729d2cadc7bd8a250f9925ecfe15e88bc59f7355469ee105a6f194

data/Gemfile

@@ -2,6 +2,8 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "chef-utils", "= 16.6.14" if RUBY_VERSION < "2.6.0"
+
 group :docs do
   gem "github-markup"
   gem "redcarpet"
@@ -27,6 +29,6 @@ end
 group :debug do
   gem "pry"
   gem "pry-byebug"
-  gem "pry-stack_explorer"
+  gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6
   gem "rb-readline"
 end

data/lib/mixlib/install.rb

@@ -18,13 +18,14 @@
 #
 
 require "mixlib/versioning"
-require "mixlib/shellout"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 require_relative "install/backend"
 require_relative "install/options"
 require_relative "install/generator"
 require_relative "install/generator/bourne"
 require_relative "install/generator/powershell"
+require_relative "install/dist"
 
 module Mixlib
   class Install
@@ -119,7 +120,7 @@ module Mixlib
       # This only works for chef and chefdk but they are the only projects
       # we are supporting as of now.
       if options.for_ps1?
-        "$env:systemdrive\\opscode\\#{options.product_name}"
+        "$env:systemdrive\\#{Mixlib::Install::Dist::WINDOWS_INSTALL_DIR}\\#{options.product_name}"
       else
         "/opt/#{options.product_name}"
       end
@@ -136,7 +137,7 @@ module Mixlib
       # chef-server -> /opt/opscode). But this is OK for now since
       # chef & chefdk are the only supported products.
       version_manifest_file = if options.for_ps1?
-                                "$env:systemdrive\\opscode\\#{options.product_name}\\version-manifest.json"
+                                "$env:systemdrive\\#{Mixlib::Install::Dist::WINDOWS_INSTALL_DIR}\\#{options.product_name}\\version-manifest.json"
                               else
                                 "/opt/#{options.product_name}/version-manifest.json"
                               end
@@ -183,7 +184,7 @@ module Mixlib
                    # to disallow unsigned powershell scripts. This changes it for just this
                    # powershell session, which allows this to run even if the execution policy
                    # is set higher.
-                   Mixlib::ShellOut.new("powershell.exe -file #{File.join(d, "detect_platform.ps1")}", :env => { "PSExecutionPolicyPreference" => "Bypass" }).run_command
+                   Mixlib::ShellOut.new("powershell.exe -NoProfile -file #{File.join(d, "detect_platform.ps1")}", :env => { "PSExecutionPolicyPreference" => "Bypass" }).run_command
                  end
                else
                  Mixlib::ShellOut.new(detect_platform_sh).run_command

data/lib/mixlib/install/backend/package_router.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "json"
+require "json" unless defined?(JSON)
 require_relative "../artifact_info"
 require_relative "base"
 require_relative "../product"
@@ -24,7 +24,7 @@ require_relative "../product_matrix"
 require_relative "../util"
 require_relative "../dist"
 require "mixlib/versioning"
-require "net/http"
+require "net/http" unless defined?(Net::HTTP)
 
 module Mixlib
   class Install
@@ -78,7 +78,7 @@ EOF
 
           # Filter out the partial builds if we are in :unstable channel
           # In other channels we do not need to do this since all builds are
-          # always complete. Infact we should not do this since for some arcane
+          # always complete. In fact we should not do this since for some arcane
           # builds like Chef Client 10.X we do not have build record created in
           # artifactory.
           if options.channel == :unstable
@@ -245,7 +245,7 @@ EOF
         private
 
         # Converts Array<Hash> where the Hash is a key pair and
-        # value pair to a simplifed key/pair Hash
+        # value pair to a simplified key/pair Hash
         #
         def map_properties(properties)
           return {} if properties.nil?

data/lib/mixlib/install/cli.rb

@@ -13,7 +13,7 @@
 #
 
 require_relative "../install"
-require "thor"
+require "thor" unless defined?(Thor)
 
 module Mixlib
   class Install
@@ -67,7 +67,7 @@ If no earlier version is found the earliest version available will be set.",
         desc: "Print artifact attributes",
         type: :boolean
       def download(product_name)
-        # Set mininum options
+        # Set minimum options
         mixlib_install_options = {
           channel: options[:channel].to_sym,
           product_name: product_name,

data/lib/mixlib/install/dist.rb

@@ -24,6 +24,8 @@ module Mixlib
       MACOS_VOLUME = "chef_software".freeze
       # Windows install directory name
       WINDOWS_INSTALL_DIR = "opscode".freeze
+      # Linux install directory name
+      LINUX_INSTALL_DIR = "/opt"
     end
   end
 end

data/lib/mixlib/install/generator/base.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require "erb"
-require "ostruct"
+require "erb" unless defined?(Erb)
+require "ostruct" unless defined?(OpenStruct)
 require_relative "../util"
 require_relative "../dist"
 
@@ -45,7 +45,7 @@ module Mixlib
           script_path = File.join(script_base_path, name)
 
           # If there is an erb template we render it, otherwise we just read
-          # and returnt the contents of the script
+          # and return the contents of the script
           if File.exist? "#{script_path}.erb"
             # Default values to use incase they are not set in the context
             context[:project_name] ||= Mixlib::Install::Dist::PROJECT_NAME.freeze

data/lib/mixlib/install/generator/bourne/scripts/helpers.sh.erb

@@ -87,7 +87,7 @@ http_404_error() {
   echo "In order to test the version parameter, adventurous users may take the Metadata URL"
   echo "below and modify the '&v=<number>' parameter until you successfully get a URL that"
   echo "does not 404 (e.g. via curl or wget).  You should be able to use '&v=11' or '&v=12'"
-  echo "succesfully."
+  echo "successfully."
   echo ""
   echo "If you cannot fix this problem by setting the bootstrap_version, it probably means"
   echo "that $platform is not supported."
@@ -215,7 +215,7 @@ do_checksum() {
     checksum=`shasum -a 256 $1 | awk '{ print $1 }'`
     return `test "x$checksum" = "x$2"`
   else
-    echo "WARNING: could not find a valid checksum program, pre-install shasum or sha256sum in your O/S image to get valdation..."
+    echo "WARNING: could not find a valid checksum program, pre-install shasum or sha256sum in your O/S image to get validation..."
     return 0
   fi
 }

data/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh

@@ -48,7 +48,7 @@ elif test -f "/etc/redhat-release"; then
   platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release`
 
   if test "$platform" = "xenserver"; then
-    # Current XenServer 6.2 is based on CentOS 5, platform is not reset to "el" server should hanlde response
+    # Current XenServer 6.2 is based on CentOS 5, platform is not reset to "el" server should handle response
     platform="xenserver"
   else
     # FIXME: use "redhat"
@@ -71,17 +71,11 @@ elif test -f "/etc/system-release"; then
     fi
   esac
 
-# Apple OS X
+# Apple macOS
 elif test -f "/usr/bin/sw_vers"; then
   platform="mac_os_x"
   # Matching the tab-space with sed is error-prone
   platform_version=`sw_vers | awk '/^ProductVersion:/ { print $2 }' | cut -d. -f1,2`
-
-  # x86_64 Apple hardware often runs 32-bit kernels (see OHAI-63)
-  x86_64=`sysctl -n hw.optional.x86_64`
-  if test $x86_64 -eq 1; then
-    machine="x86_64"
-  fi
 elif test -f "/etc/release"; then
   machine=`/usr/bin/uname -p`
   if grep SmartOS /etc/release >/dev/null; then
@@ -96,7 +90,7 @@ elif test -f "/etc/SuSE-release"; then
   then
       platform="sles"
       platform_version=`awk '/^VERSION/ {V = $3}; /^PATCHLEVEL/ {P = $3}; END {print V "." P}' /etc/SuSE-release`
-  else
+  else # opensuse 43 only. 15 ships with /etc/os-release only
       platform="opensuseleap"
       platform_version=`awk '/^VERSION =/ { print $3 }' /etc/SuSE-release`
   fi
@@ -114,7 +108,14 @@ elif test -f "/etc/os-release"; then
   fi
 
   platform=$ID
-  platform_version=$VERSION
+
+  # VERSION_ID is always the preferred variable to use, but not
+  # every distro has it so fallback to VERSION
+  if test "x$VERSION_ID" != "x"; then
+    platform_version=$VERSION_ID
+  else
+    platform_version=$VERSION
+  fi
 fi
 
 if test "x$platform" = "x"; then
@@ -163,6 +164,9 @@ esac
 
 # normalize the architecture we detected
 case $machine in
+  "arm64"|"aarch64")
+    machine="aarch64"
+    ;;
   "x86_64"|"amd64"|"x64")
     machine="x86_64"
     ;;

data/lib/mixlib/install/generator/powershell/scripts/helpers.ps1.erb

@@ -79,14 +79,14 @@ function Get-WebContentOnFullNet {
   $wc.Headers.Add("user-agent", "<%= user_agent_string %>")
   $proxy.Address = $env:http_proxy
   $bypassList = $env:no_proxy
-  
+
 
   if($bypassList -ne $null){
-     
+
 	 $bypassList = $bypassList.split(",")
 	 $proxy.BypassList = $byPassList
   }
-  
+
   $wc.Proxy = $proxy
 
   if ([string]::IsNullOrEmpty($filepath)) {
@@ -180,9 +180,16 @@ function Get-WMIQuery {
   param ($class)
 
   if(Get-Command -Name Get-CimInstance -ErrorAction SilentlyContinue) {
-    Get-CimInstance $class
+    try{
+      $classObject = Get-CimInstance $class
+      # If the Get-CimInstance command exists but fails due to security settings, try Get-WmiObject.
+    }
+    catch {
+      $classObject = Get-WmiObject $class
+    }
   }
   else {
-    Get-WmiObject $class
+    $classObject = Get-WmiObject $class
   }
+  return $classObject
 }

data/lib/mixlib/install/options.rb

@@ -30,7 +30,6 @@ module Mixlib
 
       SUPPORTED_ARCHITECTURES = %w{
         aarch64
-        arm64
         armv7l
         i386
         powerpc

data/lib/mixlib/install/script_generator.rb

@@ -19,6 +19,7 @@
 
 require_relative "util"
 require_relative "generator/powershell"
+require_relative "dist"
 require "cgi"
 
 module Mixlib
@@ -83,9 +84,9 @@ module Mixlib
         @sudo_command = "sudo -E"
 
         @root = if powershell
-                  "$env:systemdrive\\opscode\\chef"
+                  "$env:systemdrive\\#{Mixlib::Install::Dist::WINDOWS_INSTALL_DIR}\\#{Mixlib::Install::Dist::DEFAULT_PRODUCT}"
                 else
-                  "/opt/chef"
+                  "#{Mixlib::Install::Dist::LINUX_INSTALL_DIR}/#{Mixlib::Install::Dist::DEFAULT_PRODUCT}"
                 end
 
         parse_opts(opts)
@@ -226,7 +227,7 @@ module Mixlib
       # Conditionally prefixes a command with a sudo command.
       #
       # @param command [String] command to be prefixed
-      # @return [String] the command, conditionaly prefixed with sudo
+      # @return [String] the command, conditionally prefixed with sudo
       # @api private
       def sudo(script)
         use_sudo ? "#{sudo_command} #{script}" : script

data/lib/mixlib/install/util.rb

@@ -109,7 +109,7 @@ module Mixlib
         # invoked on a remote instance or locally.
         #
         # This method uses the Bourne shell (/bin/sh) to maximize the chance of
-        # cross platform portability on Unixlike systems.
+        # cross platform portability on Unix-like systems.
         #
         # @param [String] the command
         # @return [String] a wrapped command string
@@ -129,7 +129,7 @@ module Mixlib
           require_relative "version"
           user_agents = %W{mixlib-install/#{Mixlib::Install::VERSION}}
           user_agents << headers
-          # Ensure that if the default user agent is aleady set it doesn't get duplicated
+          # Ensure that if the default user agent is already set it doesn't get duplicated
           user_agents.flatten.compact.uniq.join(" ")
         end
 
@@ -162,6 +162,8 @@ module Mixlib
           case architecture
           when "amd64"
             "x86_64"
+          when "arm64"
+            "aarch64"
           when "i86pc", "i686"
             "i386"
           when "sun4u", "sun4v"

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.11.28"
+    VERSION = "3.12.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.11.28
+  version: 3.12.7
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A library for interacting with Chef Software Inc's software distribution