boxes 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eef35d51a88c6a6f90d351125b40067ae67520bf
-  data.tar.gz: d583221915286eefd13de1b3ae90103d28dd0ea8
+  metadata.gz: 52086e8025e436389b24a3277ade1e64078120c0
+  data.tar.gz: 0bca9ac72bc3a4d5a27837d55384233533395d83
 SHA512:
-  metadata.gz: b9b66d0a3bce4a64ed8b85c314f56cf74d88eba95617017875de482b3a8cc71942e874c8aa5c3ea83d31e315abaf22a6e7bbd97bceb2b952368bb801884a3a2f
-  data.tar.gz: 96f92de5281e31ce9fed58de4e5f865ef9c65938591a69f70df9a96fecd6558d3ad4c4c8272cc1925859edd5791c895715a4ba502dd1ae1bd41fc134a3c3c575
+  metadata.gz: bc189c6e439afc17c59348315a88854c74e1ec22a009a16194a9c0916e230d635e2bd5f5e4a7b7bf77f7705a8c8650b6fb95898653677b8a9a1e461712027980
+  data.tar.gz: edaf1b9d08f12f9fc063fc9c2379b115fcd4b6b2f9edabeef45ed449986a094f5e79c00882ddcdc4e89e213ecabd6caf171bcb1358639f91ae7e54b82a315497

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 3.1.0 (08/04/2018)
+
+* Switch to use the Boxes Metadata API for Chef ([52]).
+* Fix Puppet deb installation ([51])
+
+[51]: https://github.com/nickcharlton/boxes/pull/51
+[52]: https://github.com/nickcharlton/boxes/pull/52
+
 ## 3.0.0 (05/02/2018)
 
 * Update scripts/ruby.sh to follow ruby-lang.org current Rubies ([48]).

data/lib/boxes/version.rb

@@ -1,3 +1,3 @@
 module Boxes
-  VERSION = "3.0.0".freeze
+  VERSION = "3.1.0".freeze
 end

data/scripts/chef.sh

@@ -1,28 +1,43 @@
 #!/bin/bash
 
-# Get the Chef package version through their metadata service.
+# Fetches the Chef package version and sha from the Boxes API, then installs
+# the package.
+
+set -e
+
+boxes_api="https://boxes.io/api/v1"
 platform=$(lsb_release -si | tr '[:upper:]' '[:lower:]')
 release=$(lsb_release -sr)
-version_url="https://www.opscode.com/chef/metadata?v=&prerelease=false&nightlies=false&p=$platform&pv=$release&m=x86_64"
-current_version=$(curl -s "$version_url")
 
-version_url=$(echo "$current_version" | awk '/url/{print $2}')
-version_sha=$(echo "$current_version" | awk '/sha256/{print $2}')
+if [ "$platform" == "debian" ]; then
+	release=$(echo "$release" | cut -d. -f1)
+fi
+
+version_url="$boxes_api/metadata/chef?platform=$platform&platform_version=$release"
+
+echo "Determining current Chef package version..."
+if ! current_version=$(curl --silent --fail "${version_url}"); then
+	>&2 echo "Unable to fetch version information for $platform, $release"
+	exit 1
+fi
+
+version_url=$(echo "$current_version" | python -c  \
+	"import json,sys;obj=json.load(sys.stdin);print obj['url'];")
+version_sha=$(echo "$current_version" | python -c \
+	"import json,sys;obj=json.load(sys.stdin);print obj['sha256'];")
 
-# fetch chef
-curl --insecure --location $version_url -o chef.deb
+echo "Fetching Chef package..."
+curl --silent --fail "$version_url" -o chef.deb
 
-# check the file
-echo "$version_sha  chef.deb" > '/tmp/chef-checksum'
-shasum -a 256 -c '/tmp/chef-checksum'
-if [ $? -ne 0 ]; then
-    echo "Downloaded Chef package failed to checksum."
-    exit 1
+echo "Verifying downloaded Chef package..."
+downloaded_sha=$(openssl sha256 -r chef.deb)
+if [ "$version_sha *chef.deb" != "$downloaded_sha" ]; then
+	>&2 echo "Unable to verify downloaded chef.deb"
+	echo 2
 fi
 
-# install
-dpkg -i chef.deb
+echo "Installing Chef package..."
+dpkg --install chef.deb
 
-# cleanup
+echo "Tidying up artifacts..."
 rm chef.deb
-rm /tmp/chef-checksum

data/scripts/puppet.sh

@@ -1,14 +1,11 @@
 #!/bin/bash
 
-# see: http://docs.puppetlabs.com/guides/puppetlabs_package_repositories.html
+# see: https://docs.puppet.com/puppet/latest/puppet_platform.html
 
 # determine the os release
 os_release=$(lsb_release -cs)
 
 # configure the puppet package sources
-wget http://apt.puppetlabs.com/puppetlabs-release-$os_release.deb
-dpkg -i puppetlabs-release-$os_release.deb
+wget "https://apt.puppet.com/puppet5-release-$os_release.deb"
+dpkg -i "puppet5-release-$os_release.deb"
 apt-get -q update
-
-# install puppet
-apt-get install -qy puppet

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxes
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Nick Charlton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide