boxes 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5106c67561b5dbf9b132e8cab7c97b4905ed6478
-  data.tar.gz: 3ff73aa92235cf4111c4a1241347b4c9bd65d812
+SHA256:
+  metadata.gz: b749a9a33b2dda40aad6917ca20448e445bebea00260a9b00dcc4f5f4548ff0d
+  data.tar.gz: aec4f6c96166beffb081e7780a60a9d26290c1b4bd85a61f6770c42b8a89c1ba
 SHA512:
-  metadata.gz: dfadc3fb89a0f904454b27b66da0ce5aa212bcf0e0c355fdd1ac6aff01b1f9df4d61cb8566b4b9568e38133b6fabf1d703ee1eb22cdcc489e8fc0d7a7fc221cd
-  data.tar.gz: 472ad770e3022e46af83b5613900eca701263640049daf333547a2fa0fb6398d54ed1dd0eec623c00197f77c506d7bf422007775c7278198ee3c37a094710bd4
+  metadata.gz: a98de9c699d352be12dbda5094fa675c5c089ffb41b6abd8b6d1c3dfe1e62771738bd9eb2c4a869eecfe3cf78de81cca3247a3b451c6a2735e0b3f9019c87c57
+  data.tar.gz: 27e2ee3e684309739e70945b84799e9c128c492b5a4a0cbceed3ce1fd371875715808a4777ffadaca221cba705504122a14b1934759ac69b1a7a884c24e51d82

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.rubocop.yml

@@ -352,8 +352,18 @@ Style/TrailingCommaInArguments:
     - no_comma
   Enabled: true
 
-Style/TrailingCommaInLiteral:
-  Description: 'Checks for trailing comma in array and hash literals.'
+Style/TrailingCommaInArrayLiteral:
+  Description: 'Checks for trailing comma in array literals.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
+  EnforcedStyleForMultiline: comma
+  SupportedStylesForMultiline:
+    - comma
+    - consistent_comma
+    - no_comma
+  Enabled: true
+
+Style/TrailingCommaInHashLiteral:
+  Description: 'Checks for trailing comma in hash literals.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
   EnforcedStyleForMultiline: comma
   SupportedStylesForMultiline:
@@ -398,6 +408,13 @@ Layout/AlignParameters:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-double-indent'
   Enabled: false
 
+Layout/ConditionPosition:
+  Description: >-
+                 Checks for condition placed in a confusing position relative to
+                 the keyword.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#same-line-condition'
+  Enabled: false
+
 Layout/DotPosition:
   Description: 'Checks the position of the dot in multi-line method calls.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains'
@@ -450,13 +467,6 @@ Lint/CircularArgumentReference:
   Description: "Don't refer to the keyword argument in the default value."
   Enabled: false
 
-Lint/ConditionPosition:
-  Description: >-
-                 Checks for condition placed in a confusing position relative to
-                 the keyword.
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#same-line-condition'
-  Enabled: false
-
 Lint/DeprecatedClassMethods:
   Description: 'Check for deprecated class method calls.'
   Enabled: false
@@ -482,7 +492,7 @@ Lint/HandleExceptions:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions'
   Enabled: false
 
-Lint/LiteralInCondition:
+Lint/LiteralAsCondition:
   Description: 'Checks of literals used in conditions.'
   Enabled: false
 
@@ -523,7 +533,7 @@ Lint/UnderscorePrefixedVariableName:
   Description: 'Do not use prefix `_` for a variable that is used.'
   Enabled: false
 
-Lint/UnneededDisable:
+Lint/UnneededCopDisableDirective:
   Description: >-
                  Checks for rubocop:disable comments that can be removed.
                  Note: this cop is not disabled when disabling all cops.

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.2
+ruby-2.5.3

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 3.4.0 (02/12/2018)
+
+* Update Debian Stretch ISO to 9.6.0.
+* Update Ubuntu Xenial ISO image to 16.04.4.
+* Update Ubuntu Bionic ISO to 18.04.1.
+* Remove unnecessary thread block.
+* Avoid printing variables which are nil.
+
 ## 3.3.1 (27/04/2018)
 
 * Refresh Ubuntu Xenial ISO image. ([55])

data/lib/boxes/subprocess.rb

@@ -18,14 +18,11 @@ module Boxes
       Open3.popen3(command) do |_stdin, stdout, stderr, thread|
         # read each stream from a new thread
         { out: stdout, err: stderr }.each do |key, stream|
-          Thread.new do
-            stream.each_line do |line|
-              # yield the block depending on the stream
-              if key == :out
-                yield line, nil, thread if block_given?
-              else
-                yield nil, line, thread if block_given?
-              end
+          stream.each_line do |line|
+            if key == :out
+              yield line, nil, thread if block_given?
+            elsif key == :err
+              yield nil, line, thread if block_given?
             end
           end
         end

data/lib/boxes/version.rb

@@ -1,3 +1,3 @@
 module Boxes
-  VERSION = "3.3.1".freeze
+  VERSION = "3.4.0".freeze
 end

data/scripts/postinstall.sh

@@ -1,4 +1,10 @@
-# postinstall.sh based upon Mitchell's old basebox example
+#!/bin/sh
+
+##
+# Post install configuration, preparing the box for usage
+#
+# Originally based upon Mitchell's old basebox example
+##
 
 # mark the build time
 date > /etc/vagrant_box_build_time
@@ -34,17 +40,55 @@ curl -Lo /home/vagrant/.ssh/authorized_keys \
 chmod 0600 /home/vagrant/.ssh/authorized_keys
 chown -R vagrant:vagrant /home/vagrant/.ssh
 
-# under systemd distributions, networking breaks on first reboot
-# this is because it's renamed to follow the PCI slot
-case $(lsb_release -cs) in
-    "wily" | "xenial" | "stretch")
-        sed -i "s/ens33/ens32/g" /etc/network/interfaces
-    ;;
-    *)
-    ;;
-esac
+disable_automatic_udev_rules() {
+	echo "Disabling automatic udev rules for network interfaces..."
+
+	# source: http://6.ptmc.org/164/
+	rm -f /etc/udev/rules.d/70-persistent-net.rules
+	ln -s /dev/null /etc/udev/rules.d/70-persistent-net.rules
+	rm -f /lib/udev/rules.d/75-persistent-net-generator.rules
+	rm -rf /dev/.udev/ /var/lib/dhcp/*
+}
+
+disable_predictable_interface_names() {
+	echo "Disabling predictable interface names..."
+
+	sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces
+	sed -ie 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub
+	update-grub
+}
+
+configure_netplan() {
+	echo "Creating DHCP netplan config for eth0..."
+
+	cat <<-EOF >/etc/netplan/01-netcfg.yaml;
+	network:
+    version: 2
+    ethernets:
+      eth0:
+        dhcp4: true
+	EOF
+}
+
+distribution=$(lsb_release -si)
+version=$(lsb_release -sr)
+major_version=$(echo "$version" | awk -F . '{print $1}')
+
+if [ "$distribution" = 'Ubuntu' ]; then
+	if [ "$major_version" -ge "16" ]; then
+		disable_predictable_interface_names
+	fi
+
+	if [ "$major_version" -ge "18" ]; then
+		configure_netplan
+	fi
+elif [ "$distribution" = 'Debian' ]; then
+	if [ "$major_version" -ge "8" ]; then
+		disable_predictable_interface_names
+	fi
+fi
+
+disable_automatic_udev_rules
 
 # clean up any artifacts
 rm -f /home/vagrant/shutdown.sh
-
-exit

data/scripts/purge.sh

@@ -6,25 +6,6 @@
 # Based on: https://gist.github.com/adrienbrault/3775253
 ##
 
-# tidy up DCHP leases
-echo "Cleaning up dhcp..."
-rm /var/lib/dhcp/*
-
-# make sure Udev doesn't block our network
-# except on systemd systems where this isn't used
-# http://6.ptmc.org/?p=164
-case $(lsb_release -cs) in
-    "wily" | "xenial")
-    ;;
-    *)
-    echo "Cleaning up udev..."
-    rm /etc/udev/rules.d/70-persistent-net.rules
-    mkdir /etc/udev/rules.d/70-persistent-net.rules
-    rm -rf /dev/.udev/
-    rm /lib/udev/rules.d/75-persistent-net-generator.rules
-    ;;
-esac
-
 # clean up apt
 echo "Cleaning up apt..."
 apt-get -qy autoremove

data/spec/boxes/subprocess_spec.rb

@@ -1,36 +1,37 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Boxes::Subprocess do
-  let(:command) do
-    File.expand_path("../../support/subprocess_command.sh", __FILE__).
-      shellescape
-  end
-
-  it 'runs a command and yields a block' do
+  it "runs a command and yields a block" do
     expect { |b| Boxes::Subprocess.run(command, &b) }.to yield_control
   end
 
-  it 'runs a command and returns stdout' do
-    total_stdout = ''
+  it "runs a command and returns stdout" do
+    total_stdout = ""
     Boxes::Subprocess.run(command) do |stdout, _stderr, _thread|
-      total_stdout << stdout
+      total_stdout << stdout if stdout
     end
 
     expect(total_stdout).to eq "A happy output.\n"
   end
 
-  it 'runs a command and returns stderr' do
-    total_stderr = ''
+  it "runs a command and returns stderr" do
+    total_stderr = ""
     Boxes::Subprocess.run(command) do |_stdout, stderr, _thread|
-      total_stderr << stderr
+      total_stderr << stderr if stderr
     end
 
     expect(total_stderr).to eq "An unhappy output.\n"
   end
 
-  it 'returns a status code' do
+  it "returns a status code" do
     status = Boxes::Subprocess.run(command) { |_stdout, _stderr, _thread| }
 
     expect(status.exitstatus).to eq 5
   end
+
+  private
+
+  def command
+    File.expand_path("../support/subprocess_command.sh", __dir__).shellescape
+  end
 end

data/templates/debian/stretch64.erb

@@ -25,8 +25,8 @@
             <%- end -%>
             "headless": true,
 
-            "iso_url": "https://cdimage.debian.org/debian-cd/9.4.0/amd64/iso-cd/debian-9.4.0-amd64-netinst.iso",
-            "iso_checksum": "124d270006703f2111224dec3bf7a9d01450168be41d4834f88fdd035552b044",
+            "iso_url": "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-9.6.0-amd64-netinst.iso",
+            "iso_checksum": "c51d84019c3637ae9d12aa6658ea8c613860c776bd84c6a71eaaf765a0dd60fe",
             "iso_checksum_type": "sha256",
 
             "ssh_username": "vagrant",

data/templates/ubuntu/bionic64.erb

@@ -0,0 +1,64 @@
+{
+    "provisioners": [
+        {
+            "type": "shell",
+            "scripts": [
+                "scripts/postinstall.sh",
+                "scripts/vmtools.sh",
+                <%- @scripts.each do |script| -%>
+                "scripts/<%= script %>",
+                <%- end -%>
+                "scripts/purge.sh"
+            ],
+            "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -E -S bash '{{ .Path }}'"
+        }
+    ],
+
+    "builders": [
+        {
+            "name": "<%= @name %>",
+            "type": "<%= @provider %>-iso",
+            <%- if @provider == "vmware" -%>
+            "guest_os_type": "ubuntu-64",
+            "tools_upload_flavor": "linux",
+            <%- else -%>
+            "guest_os_type": "Ubuntu_64",
+            <%- end -%>
+            "headless": true,
+
+            "iso_url": "http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-amd64.iso",
+            "iso_checksum": "a5b0ea5918f850124f3d72ef4b85bda82f0fcd02ec721be19c1a6952791c8ee8",
+            "iso_checksum_type": "sha256",
+
+            "ssh_username": "vagrant",
+            "ssh_password": "vagrant",
+            "ssh_timeout": "15m",
+
+            "http_directory": "templates/ubuntu",
+
+            "boot_command": [
+                "<enter><wait><f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+                "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+                "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+                "<bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
+                "/install/vmlinuz noapic ",
+                "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg ",
+                "debian-installer=en_US auto locale=en_US kbd-chooser/method=us ",
+                "hostname={{ .Name }} ",
+                "fb=false debconf/frontend=noninteractive ",
+                "keyboard-configuration/modelcode=SKIP keyboard-configuration/layout=USA ",
+                "keyboard-configuration/variant=USA console-setup/ask_detect=false ",
+                "grub-installer/bootdev=/dev/sda ",
+                "initrd=/install/initrd.gz -- <enter>"
+            ],
+
+            "shutdown_command": "echo 'shutdown -P now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'"
+        }
+    ],
+
+    "post-processors": [
+        {
+            "type": "vagrant"
+        }
+    ]
+}

data/templates/ubuntu/preseed.cfg

@@ -49,7 +49,7 @@ d-i user-setup/encrypt-home boolean false
 # packages
 tasksel tasksel/first multiselect standard, ubuntu-server
 d-i pkgsel/install-language-support boolean false
-d-i pkgsel/include string openssh-server nfs-common curl git-core
+d-i pkgsel/include string openssh-server nfs-common curl git-core python
 d-i pkgsel/upgrade select full-upgrade
 d-i pkgsel/update-policy select none
 postfix postfix/main_mailer_type select No configuration

data/templates/ubuntu/xenial64.erb

@@ -26,8 +26,8 @@
             <%- end -%>
             "headless": true,
 
-            "iso_url": "http://releases.ubuntu.com/16.04/ubuntu-16.04.4-server-amd64.iso",
-            "iso_checksum": "0a03608988cfd2e50567990dc8be96fb3c501e198e2e6efcb846d89efc7b89f2",
+            "iso_url": "http://releases.ubuntu.com/xenial/ubuntu-16.04.5-server-amd64.iso",
+            "iso_checksum": "c94de1cc2e10160f325eb54638a5b5aa38f181d60ee33dae9578d96d932ee5f8",
             "iso_checksum_type": "sha256",
 
             "ssh_username": "vagrant",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxes
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Nick Charlton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -137,6 +137,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".hound.yml"
+- ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
@@ -197,6 +198,7 @@ files:
 - templates/debian/preseed.cfg
 - templates/debian/stretch64.erb
 - templates/debian/wheezy64.erb
+- templates/ubuntu/bionic64.erb
 - templates/ubuntu/precise64.erb
 - templates/ubuntu/preseed.cfg
 - templates/ubuntu/trusty64.erb
@@ -221,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A command line tool to take the complexity out of building Vagrant boxes.