mixlib-install 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d396bf37f1b50052a6d6550a76dd2e830466f42b
-  data.tar.gz: c5ebe8fe43866d0dc9cdf737b3786b355eed9da3
+  metadata.gz: 6521f3678f0d1b61776fd15ed97211bb9a218ba4
+  data.tar.gz: ff8d551119e27d84087e4b69c129a0aab47bfff5
 SHA512:
-  metadata.gz: ea784db481d70828c8d176717453c28837631c265c9bb4227c922bc53ede996c0a8391b9badf2bc508d52da20fa3f91dcf2136af97f1ee5cc4239b0c9e932a2b
-  data.tar.gz: 421e125545c088dec5c7b63f572180046422c87a60c6cabe0ac82dd9c81e19be0a888292c6857f1a25864dbc2f1ee115eff5696e716e39ef707ee157e82ec8d7
+  metadata.gz: 0e897cdb1dd20f149d2c6949a8df21b974baea1baf837cc76ed540530c11d199dbaf22998b05a3b7ed5da58799a32fa584ecb3dd08db5e4ac7a8454f79a6d84e
+  data.tar.gz: 9c8c72d0d7fa09dea9e64ff6524758af09fd41238080b8afcf7f190ee0c4eaf1af973754b5ba72c4232bdf5354872a1eac54e58ca3c58974836fbfa583459f22

data/.travis.yml

@@ -21,15 +21,7 @@ before_script:
   - export PATH="$PWD/bin:$PATH"
 
 script:
-  # run unit tests
-  - /opt/chefdk/embedded/bin/bundle install && /opt/chefdk/bin/chef exec rake
-  # setup acceptance tests
-  - cd acceptance && export BUNDLE_GEMFILE=$PWD/Gemfile && /opt/chefdk/embedded/bin/bundle install && export APPBUNDLER_ALLOW_RVM=true
-  # run acceptances tests and force cleanup
-  # only testing bourne until issues with powershell suite resovled:
-  # 1) inspec not finding chef package once connected (not reproducible locally)
-  # 2) currently no way to mask password (sensitive true) AND know what the error is if inspec fails
-  - /opt/chefdk/embedded/bin/bundle exec chef-acceptance test bourne --force-destroy
+  - ci/script.sh
 
 env:
   global:

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [2.0.1]
+- Fix install.sh and install.ps1 scripts to install unstable packages
+
 ## [2.0.0]
 - Replaced all backends with PackageRouter
 - All channels are now available using the single backend

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/chef/mixlib-install.svg?branch=master)](https://travis-ci.org/chef/mixlib-install)
+
 # Mixlib::Install
 
 ## Usage

data/ci/before-script.sh

@@ -19,13 +19,17 @@ do
   unset $ruby_env_var
 done
 
-# download terraform
-wget "https://releases.hashicorp.com/terraform/0.7.4/terraform_0.7.4_linux_amd64.zip"
+# Don't run acceptance tests on forks. The decryption keys are not available.
+if [ "${TRAVIS_REPO_SLUG}" = "chef/mixlib-install" ]; then
 
-# inflate archive
-unzip terraform_0.7.4_linux_amd64.zip -d bin
+  # download terraform
+  wget "https://releases.hashicorp.com/terraform/0.7.4/terraform_0.7.4_linux_amd64.zip"
 
-# 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
-mkdir -p ~/.ssh
-mv es-infrastructure.pem ~/.ssh
+   # inflate archive
+   unzip terraform_0.7.4_linux_amd64.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
+   mkdir -p ~/.ssh
+   mv es-infrastructure.pem ~/.ssh
+fi

data/ci/script.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -evx
+
+# run unit tests
+/opt/chefdk/embedded/bin/bundle install && /opt/chefdk/bin/chef exec rake
+
+# Don't run acceptance tests on forks. The decryption keys are not available.
+if [ "${TRAVIS_REPO_SLUG}" = "chef/mixlib-install" ]; then
+  # setup acceptance tests
+  cd acceptance && export BUNDLE_GEMFILE=$PWD/Gemfile && /opt/chefdk/embedded/bin/bundle install && export APPBUNDLER_ALLOW_RVM=true
+  # run acceptances tests and force cleanup
+  # only testing bourne until issues with powershell suite resovled:
+  # 1) inspec not finding chef package once connected (not reproducible locally)
+  # 2) currently no way to mask password (sensitive true) AND know what the error is if inspec fails
+  /opt/chefdk/embedded/bin/bundle exec chef-acceptance test bourne --force-destroy
+fi

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

@@ -45,8 +45,14 @@ module Mixlib
           install_command << get_script("helpers.sh")
           install_command << render_variables
           install_command << get_script("platform_detection.sh")
-          install_command << get_script("fetch_metadata.sh")
-          install_command << get_script("fetch_package.sh")
+          # TODO: Remove this condition check once the PackageRouter changes for
+          #   omnitruck are delivered to production! For now, we will allow
+          #   unstable channel requests to omnitruck to use the acceptance environment.
+          if options.channel == :unstable
+            install_command << get_script("fetch_metadata.sh", base_url: "https://omnitruck-acceptance.chef.io/")
+          else
+            install_command << get_script("fetch_metadata.sh")
+          end
           install_command << get_script("install_package.sh")
 
           install_command.join("\n\n")

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

@@ -46,9 +46,15 @@ module Mixlib
         def install_command
           install_project_module = []
           install_project_module << get_script("helpers.ps1")
-          install_project_module << get_script("get_project_metadata.ps1")
+          # TODO: Remove this condition check once the PackageRouter changes for
+          #   omnitruck are delivered to production! For now, we will allow
+          #   unstable channel requests to omnitruck to use the acceptance environment.
+          if options.channel == :unstable
+            install_project_module << get_script("get_project_metadata.ps1", base_url: "https://omnitruck-acceptance.chef.io/")
+          else
+            install_project_module << get_script("get_project_metadata.ps1")
+          end
           install_project_module << get_script("install_project.ps1")
-
           install_command = []
           install_command << ps1_modularize(install_project_module.join("\n"), "Omnitruck")
           install_command << render_command

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

data/support/install_command.ps1

@@ -102,7 +102,7 @@ Function Install-ChefAppx($appx, $chef_omnibus_root) {
   return $true
 }
 
-Function Log($m) { Write-Host "       $m`n" }
+Function Log($m) { Write-Host "       $m" }
 
 function Get-WebContent {
   param ($uri, $filepath)
@@ -178,7 +178,7 @@ Function Unresolve-Path($p) {
 $chef_omnibus_root = Unresolve-Path $chef_omnibus_root
 
 if (Check-UpdateChef $chef_omnibus_root $version) {
-  Write-Host "-----> Installing Chef Omnibus ($pretty_version)`n"
+  Write-Host "-----> Installing Chef Omnibus ($pretty_version)"
   if ($chef_metadata_url -ne $null) {
     $url, $sha256 = Get-ChefMetadata "$chef_metadata_url"
   } else {
@@ -190,5 +190,5 @@ if (Check-UpdateChef $chef_omnibus_root $version) {
   Download-Chef "$url" $sha256 $msi
   Install-Chef $msi $chef_omnibus_root
 } else {
-  Write-Host "-----> Chef Omnibus installation detected ($pretty_version)`n"
+  Write-Host "-----> Chef Omnibus installation detected ($pretty_version)"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifactory
@@ -221,6 +221,7 @@ files:
 - acceptance/powershell/terraform/variables.tf
 - ci/before-script.sh
 - ci/es-infrastructure.pem.enc
+- ci/script.sh
 - lib/mixlib/install.rb
 - lib/mixlib/install/artifact_info.rb
 - lib/mixlib/install/backend.rb