mixlib-install 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 224dcc037895554bd5679293fef66f390ce7cb76
-  data.tar.gz: bdc66954227ce1851bb604cd0eff7ec23a8a0ad7
+  metadata.gz: bec3e91b588c14d590bd962b0a5af3b3b2f504f8
+  data.tar.gz: fd7b334717d2a2d550f61687d75483fddb588341
 SHA512:
-  metadata.gz: 12ef14553be2d62a37f6b117c8057f40a6eaf88801b4e4b7f819403db452d2c33c4b55c6f55e3b7987c3544e525176c8e12ef249feb1a7d4b0bd3cc0a31146d5
-  data.tar.gz: 8857e431fb8d93eddabae414f16de27d9be945abe185b339de17ad8bd4eecacc5b0616722e75615e4effdd472866d0668efbb84aa35879cb74e7aa7a26fdeb3f
+  metadata.gz: 4b98bc560c946f95c59a6710c5a677de36628857d2f97a82a7b8cda6233cc28291d114586d3f0e25817749e7c595c3e7cd2ade17e0cdcc6dce1272e370e09e48
+  data.tar.gz: f201ddee0975cb209d0f4f7b7a4e39f57e842cdab5ed629afb35a8325a36195f11efb5cd7e89acd4745914636ff29e8e19e3d809ee1e75be765ae35ae34daade

data/.expeditor/config.yml

@@ -4,6 +4,8 @@ slack:
 github:
   maintainer_group: chef/engineering-services
   version_tag_format: v{{version}}
+  minor_bump_labels:
+    - "Version: Bump Minor"
 
 merge_actions:
   - built_in:bump_version:

data/CHANGELOG.md

@@ -1,13 +1,18 @@
 # Mixlib::Install Changes
 
-<!-- latest_release 3.5.1 -->
+<!-- latest_release 3.6.0 -->
+## [v3.6.0](https://github.com/chef/mixlib-install/tree/v3.6.0) (2017-09-15)
+
+#### Merged Pull Requests
+- add install.sh proxy support [#242](https://github.com/chef/mixlib-install/pull/242) ([wrightp](https://github.com/wrightp))
+<!-- latest_release -->
+
 ## [v3.5.1](https://github.com/chef/mixlib-install/tree/v3.5.1) (2017-09-08)
 
 #### Merged Pull Requests
 - Return nil when looking up non-existing products [#241](https://github.com/chef/mixlib-install/pull/241) ([adamleff](https://github.com/adamleff))
 - v3.5.0 [#239](https://github.com/chef/mixlib-install/pull/239) ([wrightp](https://github.com/wrightp))
 - download url override and checksum updates [#237](https://github.com/chef/mixlib-install/pull/237) ([wrightp](https://github.com/wrightp))
-<!-- latest_release -->
 
 ## [v3.4.0](https://github.com/chef/mixlib-install/tree/v3.4.0) (2017-08-22)
 

data/Gemfile

@@ -10,6 +10,7 @@ group :test, :development do
   gem "addressable", "~> 2.4.0"  # ruby 1.9.3
   gem "aruba", "~> 0.14"
   gem "cucumber", "~> 1.3.20"
+  gem "climate_control"
 end
 
 if RUBY_VERSION =~ /^2/

data/README.md

@@ -222,6 +222,16 @@ options = {
 Mixlib::Install.new(options).install_command
 ```
 
+#### Proxies
+The API uses Ruby's OpenURI module to load proxy environment variables (`http_proxy`, `https_proxy`, `ftp_proxy`, `no_proxy`).
+
+When `install.sh` and `install.ps1` are executed as standalone scripts the will rely on environment variables to configure proxy settings. The install scripts will not configure proxy settings by default.
+
+In order to customize the proxy environment variables for generated install scripts they must be set by the `install_command_options` option. Setting these options will override session environment variables.
+
+Bourne install script (`install.sh`) supports `http_proxy`, `https_proxy`, `ftp_proxy`, and `no_proxy` passed as keys to `install_command_options`.
+
+Powershell install script (`install.ps1`) supports `http_proxy` passed as a key to `install_command_options`.
 
 ## Development
 VCR is a tool that helps cache and replay http responses. When these responses change or when you add more tests you might need to update cached responses. Check out [spec_helper.rb](https://github.com/chef/mixlib-install/blob/master/spec/spec_helper.rb) for instructions on how to do this.

data/VERSION

@@ -1 +1 @@
-3.5.1
+3.6.0

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

@@ -27,6 +27,7 @@ module Mixlib
           install_command << get_script("script_cli_parameters.sh")
           install_command << get_script("check_product.sh")
           install_command << get_script("platform_detection.sh")
+          install_command << get_script("proxy_env.sh")
           install_command << get_script("fetch_metadata.sh", context)
           install_command << get_script("fetch_package.sh")
           install_command << get_script("install_package.sh")
@@ -47,6 +48,7 @@ module Mixlib
           install_command << render_variables
           install_command << get_script("check_product.sh")
           install_command << get_script("platform_detection.sh")
+          install_command << get_script("proxy_env.sh")
           install_command << get_script("fetch_metadata.sh")
           install_command << get_script("fetch_package.sh")
           install_command << get_script("install_package.sh")

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

@@ -0,0 +1,28 @@
+# All of the download utilities in this script load common proxy env vars.
+# If variables are set they will override any existing env vars.
+# Otherwise, default proxy env vars will be loaded by the respective
+# download utility.
+
+if test "x$https_proxy" != "x"; then
+  echo "setting https_proxy: $https_proxy"
+  export HTTPS_PROXY=$https_proxy
+  export https_proxy=$https_proxy
+fi
+
+if test "x$http_proxy" != "x"; then
+  echo "setting http_proxy: $http_proxy"
+  export HTTP_PROXY=$http_proxy
+  export http_proxy=$http_proxy
+fi
+
+if test "x$ftp_proxy" != "x"; then
+  echo "setting ftp_proxy: $ftp_proxy"
+  export FTP_PROXY=$ftp_proxy
+  export ftp_proxy=$ftp_proxy
+fi
+
+if test "x$no_proxy" != "x"; then
+  echo "setting no_proxy: $no_proxy"
+  export NO_PROXY=$no_proxy
+  export no_proxy=$no_proxy
+fi

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.5.1"
+    VERSION = "3.6.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -192,6 +192,7 @@ files:
 - lib/mixlib/install/generator/bourne/scripts/helpers.sh.erb
 - lib/mixlib/install/generator/bourne/scripts/install_package.sh
 - lib/mixlib/install/generator/bourne/scripts/platform_detection.sh
+- lib/mixlib/install/generator/bourne/scripts/proxy_env.sh
 - lib/mixlib/install/generator/bourne/scripts/script_cli_parameters.sh
 - lib/mixlib/install/generator/powershell.rb
 - lib/mixlib/install/generator/powershell/scripts/get_project_metadata.ps1.erb