mixlib-install 3.11.26 → 3.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6b99d4690d5fe92eb7b63c8a6ee0866f01ba3631a9a11bfc545d71d980bb9a
-  data.tar.gz: 9b91687c0bfc7ad8940958726e6e07a31c693b227f340324488c93c93ef6f3dd
+  metadata.gz: fb233e51e18e929105c7c97d7f1ca060e4dc02bb31c96fe593bdcda077e7f57a
+  data.tar.gz: 874ef20231f17e3bf00a0b5f9a8f6ad6c428793be44a897edb1b878449cdf86e
 SHA512:
-  metadata.gz: 19f09f8899303faea32625580ca022ac759f9bb7bea83807d16d2d13ec6217d22f52bc8d6f0748ed7afd4505911819cc1c4c083f5156892377138de340af6034
-  data.tar.gz: 3bd3541be3bc0ec57aca9b0cae11ba30c354ab8f1aeb1ebd601d015f066c205166f520c3d95d9727e025fc8db8770ec469464d586686299c4e21f04f3bcacb53
+  metadata.gz: 267808104df5f1e62d9a11b067ed53f75bf540465b5a1a5065d76dacb7618ba20acc381616a19d287d8dcbc996b2ee94fe53ca5e8f7856512abad827ad69a3c5
+  data.tar.gz: 123e1017d5c41f2a02be2723e8cacda065363ef5bd6f3af858e46c38a0099ead3bf7b8d2a687dbd4206e4986d0798d19f76014f5fc53c096b66a956b956ac793

data/Gemfile

@@ -27,6 +27,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

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,13 +13,17 @@
 #
 
 require_relative "../install"
-require "thor"
+require "thor" unless defined?(Thor)
 
 module Mixlib
   class Install
     class Cli < Thor
       include Thor::Actions
 
+      def self.exit_on_failure?
+        true
+      end
+
       desc "version", "print mixlib-install version"
       def version
         require_relative "version"
@@ -63,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

@@ -78,6 +78,15 @@ function Get-WebContentOnFullNet {
   $wc = new-object System.Net.WebClient
   $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)) {

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.26"
+    VERSION = "3.12.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.11.26
+  version: 3.12.5
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout