mixlib-install 2.1.9 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85494cb7677e35f2fd1a84ec8c23ecfc0d24efef
-  data.tar.gz: 38048f01eafc6bd86d79cab807957e0e62a98ab9
+  metadata.gz: 33aae15f046862d9ff419e37d41aaa29b81d6c6d
+  data.tar.gz: fdc1c8caca3ae66346623fd46021ddb6f42b3180
 SHA512:
-  metadata.gz: 489c05e749dd5b421d34b0366872dc9006d1cea865ab8e01b35126808b112341723e9cbb87588ce8b7d85c963d179e148a4049db59b905872e9ed2eeb4934f73
-  data.tar.gz: 89c412f80a84c223af0f329674affd1325ea9e2f846bf58df0f944c7429613d591d08923648e48b653b018c04f091d2c42d8fff1ef40eab39b17abae31cfa706
+  metadata.gz: 83ce80b409838a649904703c165dc194e4749789df457172141fc39c089590f830fcf6b30c2e97d1d6c703a117209b0e7875ab1441950874b7c56b786baf29b6
+  data.tar.gz: 3c866560cf575ec0314a9495689194d913b775a341ec31ba4250358fd704894df0afd2d872f4e9917136156c7bd9af84615ecea1505a8c5c0d62ef4c1255e10a

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 sudo: false
+dist: trusty # https://github.com/travis-ci/travis-ci/issues/7131
 
 addons:
   apt:

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [2.1.10]
+- Backward and forward compatibility support for `automate` and `delivery` product versions.
+
 ## [2.1.9]
 - Add `download_directory` option to powershell install script
 

data/ci/before-script.sh

@@ -6,10 +6,10 @@ set -evx
 if [ "${CHEF_ACCEPTANCE}" = "true" ] && [[ $encrypted_e2edbb28e76c_key ]]; then
 
   # download terraform
-  wget "https://releases.hashicorp.com/terraform/0.7.4/terraform_0.7.4_linux_amd64.zip"
+  wget "https://releases.hashicorp.com/terraform/0.7.4/terraform_0.7.4_linux_amd64.zip" -O tf.zip
 
    # inflate archive
-   unzip terraform_0.7.4_linux_amd64.zip -d bin
+   unzip tf.zip -d bin
 
    # decrypt pem
    openssl aes-256-cbc -K $encrypted_e2edbb28e76c_key -iv $encrypted_e2edbb28e76c_iv -in ci/es-infrastructure.pem.enc -out es-infrastructure.pem -d

data/lib/mixlib/install/cli.rb

@@ -49,6 +49,7 @@ If no earlier version is found the earliest version available will be set.",
         desc: "Print artifact attributes",
         type: :boolean
       def download(product_name)
+        say_status("Warn", "Product key `delivery` will be deprecated in a future release. Please use `automate`") if product_name == "delivery"
         # Set mininum options
         mixlib_install_options = {
           channel: options[:channel].to_sym,

data/lib/mixlib/install/product.rb

@@ -193,8 +193,13 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
 
   product "automate" do
     product_name "Chef Automate"
-    package_name "delivery"
-    ctl_command "delivery-ctl"
+    # Delivery backward compatibility
+    package_name do |v|
+      v < version_for("0.7.0") ? "delivery" : "automate"
+    end
+    ctl_command do |v|
+      v < version_for("0.7.0") ? "delivery-ctl" : "automate-ctl"
+    end
     config_file "/etc/delivery/delivery.rb"
   end
 
@@ -256,8 +261,13 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
 
   product "delivery" do
     product_name "Delivery"
-    package_name "delivery"
-    ctl_command "delivery-ctl"
+    # Chef Automate forward compatibility
+    package_name do |v|
+      v < version_for("0.7.0") ? "delivery" : "automate"
+    end
+    ctl_command do |v|
+      v < version_for("0.7.0") ? "delivery-ctl" : "automate-ctl"
+    end
     config_file "/etc/delivery/delivery.rb"
   end
 

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "2.1.9"
+    VERSION = "2.1.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -290,6 +290,7 @@ files:
 - mixlib-install.gemspec
 - support/install_command.ps1
 - support/install_command.sh
+- terraform_0.7.4_linux_amd64.zip
 homepage: https://chef.io
 licenses:
 - Apache-2.0
@@ -310,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A mixin to help with omnitruck installs