mixlib-install 3.12.3 → 3.12.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9292398c41cc34a46a603c508a55b865da85bf161780dc19892fe9ae3607319
-  data.tar.gz: 767131ab311ea5ef51c3aef89f40beca0634aabacb6d0c4cdd60a9ba233cec49
+  metadata.gz: 7a21f92ea82f18b67b83b117f0acd51b14651a57d0a9f5ae1651fc1e38364122
+  data.tar.gz: 74e44ce180f1e6ec62caa06901b9ef8fe479ef2e540b3d7dda69ccc15fc8ad31
 SHA512:
-  metadata.gz: f1c4f472513b0f4a61463f6314781f59c088b934a5ac8a9f812152dc4ae70f25647ce164e9856f4f7dc62ec4c3eccb3c34ddda2a990c56f1368476d25cc8e8dc
-  data.tar.gz: b6d9ff5a37a56484aa7028aa61421ffde2a6acd2f32d97cde6abfed658c74cb63402999b98d28f5e2d3999102ac8b9ff3aa868da7bef1afd5b33568e24c28cba
+  metadata.gz: e1aae0835dfd3a6fc198b7be66280414f90c755fdf4dbc5f3c9455b671c6ddba99b81a644911c109c845624cbea1ca959b8a264235e3545a5b6f9a81b14422bb
+  data.tar.gz: 92210d23a37f1b09d908aeb2b3af418b806f9a75515718b86c94a357c83fb8d30ef20db6f28b41e8583f8b944bc3b4e8b658e6147a7321774d56849f9ca8ba39

data/Gemfile

@@ -2,31 +2,31 @@ source "https://rubygems.org"
 
 gemspec
 
-group :docs do
-  gem "github-markup"
-  gem "redcarpet"
-  gem "yard"
-end
+gem "chef-utils", "= 16.6.14" if RUBY_VERSION < "2.6.0"
 
 group :test do
   gem "rake"
   gem "rspec"
   gem "vcr"
+  gem "webrick"
   gem "webmock", "~> 3.4"
   gem "aruba", "~> 0.14"
   gem "cucumber", "~> 1.3.20"
-  gem "climate_control"
+  gem "contracts", "~> 0.16.0" # this entry can go away when ruby < 3 support is gone
+  if RUBY_VERSION < "2.5.0"
+    gem "climate_control", "= 0.1.0"
+  else
+    gem "climate_control", "~> 1.0"
+  end
 end
 
-if RUBY_VERSION =~ /^2/
-  group :chefstyle do
-    gem "chefstyle", "~> 0.4.0"
-  end
+# use old chefstyle to support TargetRubyVersion of 1.9
+group :chefstyle do
+  gem "chefstyle", "~> 0.4.0"
 end
 
 group :debug do
   gem "pry"
   gem "pry-byebug"
-  gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6
   gem "rb-readline"
 end

data/Rakefile

@@ -40,13 +40,6 @@ task "matrix" do
   end
 end
 
-begin
-  require "yard"
-  YARD::Rake::YardocTask.new(:docs)
-rescue LoadError
-  puts "yard is not available. bundle install first to make sure all dependencies are installed."
-end
-
 task :console do
   require "irb"
   require "irb/completion"

data/lib/mixlib/install.rb

@@ -25,6 +25,7 @@ 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/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/bourne/scripts/fetch_package.sh

@@ -14,7 +14,7 @@
 # $filetype: Type of the file downloaded.
 ############
 
-filename=`echo $download_url | sed -e 's/^.*\///'`
+filename=`echo $download_url | sed -e 's/?.*//'` | sed -e 's/^.*\///'
 filetype=`echo $filename | sed -e 's/^.*\.//'`
 
 # use either $tmp_dir, the provided directory (-d) or the provided filename (-f)

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

@@ -15,7 +15,7 @@ if test "x$version" = "x" -a "x$CI" != "xtrue"; then
   echo "You are installing a package without a version pin.  If you are installing"
   echo "on production servers via an automated process this is DANGEROUS and you will"
   echo "be upgraded without warning on new releases, even to new major releases."
-  echo "Letting the version float is only appropriate in desktop, test, development or"
+  echo "Letting the version float is only appropriate in test, development or"
   echo "CI/CD environments."
   echo
   echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING"

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

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

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/generator/powershell/scripts/install_project.ps1.erb

@@ -73,7 +73,7 @@ function Install-Project {
 
   $cached_installer_available = $false
   $verify_checksum = $true
-  
+
   if (-not [string]::IsNullOrEmpty($download_url_override)) {
     $download_url = $download_url_override
     $sha256 = $checksum
@@ -91,7 +91,7 @@ function Install-Project {
     }
   }
   else {
-    $filename = ($download_url -split '/')[-1]
+    $filename = (([System.Uri]$download_url).AbsolutePath -split '/')[-1]
   }
   Write-Verbose "Download directory: $download_directory"
   Write-Verbose "Filename: $filename"

data/lib/mixlib/install/options.rb

@@ -233,7 +233,7 @@ Must be one of: #{SUPPORTED_SHELL_TYPES.join(", ")}
       def validate_platform_options
         unless all_or_none?(platform_info.values)
           errors << <<-EOS
-Must provide platform, platform version and architecture when specifying any platform details
+Must provide platform (-p), platform version (-l) and architecture (-a) when specifying any platform details
           EOS
         end
       end

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)

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.12.3"
+    VERSION = "3.12.15"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.12.3
+  version: 3.12.15
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2021-08-13 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