boxes 2.5.0 → 3.0.0

data/spec/acceptance/user_views_help_spec.rb

@@ -0,0 +1,39 @@
+require "acceptance_helper"
+
+RSpec.describe "User views help" do
+  describe "boxes" do
+    it "describes the tool" do
+      run_command("boxes")
+
+      expect(response).to have_exit_status(0)
+      expect(response.stdout).to include(
+        "A command line tool that takes the complexity out of " \
+        "building Vagrant boxes.",
+      )
+    end
+
+    it "shows available subcommands" do
+      run_command("boxes")
+
+      expect(response).to have_exit_status(0)
+      expect(response.stdout).to include(
+        "+ build     Build boxes",
+      )
+      expect(response.stdout).to include(
+        "+ env       Manage the build environment",
+      )
+    end
+
+    it "shows available options" do
+      run_command("boxes")
+
+      expect(response).to have_exit_status(0)
+      expect(response.stdout).to include(
+        "--version   Show the version of the tool",
+      )
+      expect(response.stdout).to include(
+        "--help      Show help banner of specified command",
+      )
+    end
+  end
+end

data/spec/acceptance/user_views_version_spec.rb

@@ -0,0 +1,10 @@
+require "acceptance_helper"
+
+RSpec.describe "User views version" do
+  it "successfully lists it's version" do
+    run_command("boxes --version")
+
+    expect(response).to have_exit_status(0)
+    expect(response).to write_to_stdout("#{Boxes::VERSION}\n")
+  end
+end

data/spec/acceptance_helper.rb

@@ -0,0 +1,15 @@
+require "boxes/testing"
+
+require "support/env"
+require "support/tmp"
+
+RSpec.configure do |config|
+  include Boxes::Testing::Matchers
+  include Boxes::Testing::Command
+
+  config.around(:each) do |example|
+    Dir.chdir("spec/tmp") do
+      example.run
+    end
+  end
+end

data/spec/boxes/subprocess_spec.rb

@@ -1,7 +1,10 @@
 require 'spec_helper'
 
 describe Boxes::Subprocess do
-  let(:command) { "spec/support/subprocess_command.rb" }
+  let(:command) do
+    File.expand_path("../../support/subprocess_command.sh", __FILE__).
+      shellescape
+  end
 
   it 'runs a command and yields a block' do
     expect { |b| Boxes::Subprocess.run(command, &b) }.to yield_control

data/spec/boxes/testing/command_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+require "boxes/testing/command"
+
+RSpec.describe Boxes::Testing::Command do
+  include described_class
+
+  describe "#run_command" do
+    context "with output" do
+      it "returns the result of stdout" do
+        run_command("echo 'Hello World!'")
+
+        expect(response).to have_attributes(cmd: "echo 'Hello World!'",
+                                            stdout: "Hello World!\n",
+                                            exit_status: 0)
+      end
+    end
+
+    context "with an exit status" do
+      it "returns the custom exit code" do
+        run_command("exit 1")
+
+        expect(response).to have_attributes(cmd: "exit 1",
+                                            stdout: "",
+                                            exit_status: 1)
+      end
+    end
+  end
+end

data/spec/boxes/testing/matchers/have_exit_status_matcher_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+require "boxes/testing"
+
+RSpec.describe Boxes::Testing::Matchers::HaveExitStatusMatcher do
+  context "when an exit status matches" do
+    it "passes" do
+      expected = mock_command(status: 10)
+
+      instance = described_class.new(10)
+      outcome = instance.matches?(expected)
+
+      expect(outcome).to be(true)
+    end
+  end
+
+  context "when an exit status is different" do
+    it "fails with a message" do
+      expected = mock_command(cmd: "cmd", status: 10)
+
+      instance = described_class.new(0)
+      outcome = instance.matches?(expected)
+
+      expect(outcome).to be(false)
+      expect(instance.failure_message).to eq(
+        "expected that `cmd` would exit with 0",
+      )
+    end
+  end
+
+  def mock_command(cmd: nil, status: nil)
+    double("Command::Response", cmd: cmd, exit_status: status)
+  end
+end

data/spec/boxes/testing/matchers/write_to_stdout_matcher_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+require "boxes/testing"
+
+RSpec.describe Boxes::Testing::Matchers::WriteToStdoutMatcher do
+  context "when the output matches" do
+    it "passes" do
+      expected = mock_command(stdout: "Hello World!\n")
+
+      instance = described_class.new("Hello World!\n")
+      outcome = instance.matches?(expected)
+
+      expect(outcome).to be(true)
+    end
+  end
+
+  context "when the output is different" do
+    it "fails with a message" do
+      expected = mock_command(stdout: "Hello!\n")
+
+      instance = described_class.new("Hello World!\n")
+      outcome = instance.matches?(expected)
+
+      expect(outcome).to be(false)
+      expect(instance.failure_message).to eq(
+        "expected that 'Hello!\\n' would be Hello World!\\n",
+      )
+    end
+  end
+
+  def mock_command(cmd: nil, stdout: nil)
+    double("Command::Response", cmd: cmd, stdout: stdout)
+  end
+end

data/spec/support/env.rb

@@ -0,0 +1,5 @@
+require "climate_control"
+
+def with_modified_env(options, &block)
+  ClimateControl.modify(options, &block)
+end

data/spec/support/subprocess_command.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo "A happy output."
+
+>&2 echo "An unhappy output."
+
+exit 5

data/spec/support/tmp.rb

@@ -0,0 +1,17 @@
+require "pathname"
+require "securerandom"
+require "tmpdir"
+require "fileutils"
+
+def tmpdir
+  @tmp_dir ||= begin
+    system_tmp = Dir.tmpdir
+    random_hash = SecureRandom.hex(10)
+
+    Pathname.new(system_tmp).join("boxes-#{random_hash}")
+  end
+end
+
+def mktmpdir
+  FileUtils.mkdir_p(tmpdir)
+end

data/templates/debian/jessie64.erb

@@ -25,8 +25,8 @@
             <%- end -%>
             "headless": true,
 
-            "iso_url": "http://cdimage.debian.org/debian-cd/8.6.0/amd64/iso-cd/debian-8.6.0-amd64-netinst.iso",
-            "iso_checksum": "9479c5c2df72ae3878116c43fb42eefae53d1fe363ce514a6afc8289064b9f5f",
+            "iso_url": "http://debian.ethz.ch/debian-cd/8.8.0/amd64/iso-cd/debian-8.8.0-amd64-netinst.iso",
+            "iso_checksum": "2c07ff8cc766767610566297b8729740f923735e790c8e78b718fb93923b448e",
             "iso_checksum_type": "sha256",
 
             "ssh_username": "vagrant",

data/templates/debian/preseed.cfg

@@ -49,10 +49,14 @@ d-i user-setup/encrypt-home boolean false
 # packages
 tasksel tasksel/first multiselect standard
 #d-i pkgsel/install-language-support boolean false
-d-i pkgsel/include string openssh-server nfs-common curl ntp acpid sudo bzip2 rsync git ca-certificates
+d-i pkgsel/include string openssh-server nfs-common curl ntp acpid sudo \
+  bzip2 rsync git ca-certificates net-tools
 d-i pkgsel/upgrade select full-upgrade
 d-i pkgsel/update-policy select none
 d-i popularity-contest/participate boolean false
+d-i preseed/late_command string sed -i '/^deb cdrom:/s/^/#/' /target/etc/apt/sources.list
+apt-cdrom-setup apt-setup/cdrom/set-first boolean false
+apt-mirror-setup apt-setup/use_mirror boolean true
 postfix postfix/main_mailer_type select No configuration
 
 # boot loader

data/templates/debian/stretch64.erb

@@ -0,0 +1,60 @@
+{
+    "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": "debian8-64",
+            "tools_upload_flavor": "linux",
+            <%- else -%>
+            "guest_os_type": "Debian_64",
+            <%- end -%>
+            "headless": true,
+
+            "iso_url": "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-9.3.0-amd64-netinst.iso",
+            "iso_checksum": "83480be837710a76fd4e75a6573ca110e06f5a7589d2d3852bdb0f45749800b3",
+            "iso_checksum_type": "sha256",
+
+            "ssh_username": "vagrant",
+            "ssh_password": "vagrant",
+            "ssh_timeout": "15m",
+
+            "http_directory": "templates/debian",
+
+            "boot_command": [
+                "<esc><wait>",
+                "install ",
+                "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/preseed.cfg ",
+                "debian-installer=en_US auto=true locale=en_US kbd-chooser/method=us ",
+                "netcfg/get_hostname={{ .Name }} ",
+                "netcfg/get_domain=vagrantup.com ",
+                "fb=false debconf/frontend=noninteractive ",
+                "console-setup/ask_detect=false console-keymaps-at/keymap=us ",
+                "keyboard-configuration/xkb-keymap=us ",
+                "<enter>"
+            ],
+
+            "shutdown_command": "echo 'shutdown -h now' > shutdown.sh; echo 'vagrant'|sudo -S sh 'shutdown.sh'"
+        }
+    ],
+
+    "post-processors": [
+        {
+            "type": "vagrant"
+        }
+    ]
+}

data/templates/ubuntu/trusty64.erb

@@ -26,8 +26,8 @@
             <%- end -%>
             "headless": true,
 
-            "iso_url": "http://releases.ubuntu.com/trusty/ubuntu-14.04.4-server-amd64.iso",
-            "iso_checksum": "07e4bb5569814eab41fafac882ba127893e3ff0bdb7ec931c9b2d040e3e94e7a",
+            "iso_url": "http://releases.ubuntu.com/trusty/ubuntu-14.04.5-server-amd64.iso",
+            "iso_checksum": "dde07d37647a1d2d9247e33f14e91acb10445a97578384896b4e1d985f754cc1",
             "iso_checksum_type": "sha256",
 
             "ssh_username": "vagrant",

data/templates/ubuntu/xenial64.erb

@@ -26,8 +26,8 @@
             <%- end -%>
             "headless": true,
 
-            "iso_url": "http://releases.ubuntu.com/xenial/ubuntu-16.04-server-amd64.iso",
-            "iso_checksum": "b8b172cbdf04f5ff8adc8c2c1b4007ccf66f00fc6a324a6da6eba67de71746f6",
+            "iso_url": "http://releases.ubuntu.com/xenial/ubuntu-16.04.3-server-amd64.iso",
+            "iso_checksum": "a06cd926f5855d4f21fb4bc9978a35312f815fbda0d0ef7fdc846861f4fc4600",
             "iso_checksum_type": "sha256",
 
             "ssh_username": "vagrant",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxes
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Nick Charlton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: climate_control
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,6 +136,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
@@ -159,10 +147,6 @@ files:
 - Rakefile
 - bin/boxes
 - boxes.gemspec
-- features/boxes.feature
-- features/build.feature
-- features/env.feature
-- features/support/env.rb
 - lib/boxes.rb
 - lib/boxes/builder.rb
 - lib/boxes/command.rb
@@ -173,6 +157,12 @@ files:
 - lib/boxes/errors.rb
 - lib/boxes/subprocess.rb
 - lib/boxes/template.rb
+- lib/boxes/testing.rb
+- lib/boxes/testing/command.rb
+- lib/boxes/testing/matchers.rb
+- lib/boxes/testing/matchers/base_matcher.rb
+- lib/boxes/testing/matchers/have_exit_status_matcher.rb
+- lib/boxes/testing/matchers/write_to_stdout_matcher.rb
 - lib/boxes/version.rb
 - scripts/ansible.sh
 - scripts/chef.sh
@@ -183,20 +173,33 @@ files:
 - scripts/purge.sh
 - scripts/ruby.sh
 - scripts/vmtools.sh
+- spec/acceptance/user_builds_box_spec.rb
+- spec/acceptance/user_cleans_the_env_spec.rb
+- spec/acceptance/user_shows_the_env_spec.rb
+- spec/acceptance/user_views_env_help_spec.rb
+- spec/acceptance/user_views_help_spec.rb
+- spec/acceptance/user_views_version_spec.rb
+- spec/acceptance_helper.rb
 - spec/boxes/builder_spec.rb
 - spec/boxes/config_spec.rb
 - spec/boxes/environment_spec.rb
 - spec/boxes/subprocess_spec.rb
 - spec/boxes/template_spec.rb
+- spec/boxes/testing/command_spec.rb
+- spec/boxes/testing/matchers/have_exit_status_matcher_spec.rb
+- spec/boxes/testing/matchers/write_to_stdout_matcher_spec.rb
 - spec/spec_helper.rb
-- spec/support/subprocess_command.rb
+- spec/support/env.rb
+- spec/support/subprocess_command.sh
+- spec/support/tmp.rb
+- spec/tmp/.gitkeep
 - templates/debian/jessie64.erb
 - templates/debian/preseed.cfg
+- templates/debian/stretch64.erb
 - templates/debian/wheezy64.erb
 - templates/ubuntu/precise64.erb
 - templates/ubuntu/preseed.cfg
 - templates/ubuntu/trusty64.erb
-- templates/ubuntu/wily64.erb
 - templates/ubuntu/xenial64.erb
 homepage: https://github.com/nickcharlton/boxes
 licenses:
@@ -218,19 +221,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A command line tool to take the complexity out of building Vagrant boxes.
 test_files:
-- features/boxes.feature
-- features/build.feature
-- features/env.feature
-- features/support/env.rb
+- spec/acceptance/user_builds_box_spec.rb
+- spec/acceptance/user_cleans_the_env_spec.rb
+- spec/acceptance/user_shows_the_env_spec.rb
+- spec/acceptance/user_views_env_help_spec.rb
+- spec/acceptance/user_views_help_spec.rb
+- spec/acceptance/user_views_version_spec.rb
+- spec/acceptance_helper.rb
 - spec/boxes/builder_spec.rb
 - spec/boxes/config_spec.rb
 - spec/boxes/environment_spec.rb
 - spec/boxes/subprocess_spec.rb
 - spec/boxes/template_spec.rb
+- spec/boxes/testing/command_spec.rb
+- spec/boxes/testing/matchers/have_exit_status_matcher_spec.rb
+- spec/boxes/testing/matchers/write_to_stdout_matcher_spec.rb
 - spec/spec_helper.rb
-- spec/support/subprocess_command.rb
+- spec/support/env.rb
+- spec/support/subprocess_command.sh
+- spec/support/tmp.rb
+- spec/tmp/.gitkeep