boxes 2.5.0 → 3.0.0

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.1
+ruby-2.4.2

data/.travis.yml

@@ -1,3 +1 @@
 language: ruby
-rvm:
-    - 2.2.2

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # CHANGELOG
 
+## 3.0.0 (05/02/2018)
+
+* Update scripts/ruby.sh to follow ruby-lang.org current Rubies ([48]).
+* Fix a bug with Shell Path Expansion ([44]).
+* Add acceptance testing using RSpec ([43], [48], [49]).
+* Remove Cucumber ([42]).
+* Update Ubuntu Xenial to 16.04.3 ([40]).
+* Update Ubuntu Trusty to 14.04.5 ([39]).
+* Update Debian Stretch to 9.3.0 ([38]).
+* Add support for Debian Stretch (9.1).
+* Drop support for Ubuntu Wily 15.10.
+* Switch to a working mirror for Debian Jessie.
+
+[38]: https://github.com/nickcharlton/boxes/pull/38
+[40]: https://github.com/nickcharlton/boxes/pull/40
+[42]: https://github.com/nickcharlton/boxes/pull/42
+[43]: https://github.com/nickcharlton/boxes/pull/43
+[44]: https://github.com/nickcharlton/boxes/pull/44
+[48]: https://github.com/nickcharlton/boxes/pull/48
+[49]: https://github.com/nickcharlton/boxes/pull/49
+
 ## 2.5.0 (20/01/2017)
 
 * Add Ruby 2.3.3.

data/Rakefile

@@ -1,34 +1,29 @@
-#!/usr/bin/env rake
-
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
 ##
 # Configure the test suite.
 ##
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new
+require "rspec/core"
+require "rspec/core/rake_task"
 
-##
-# Cucumber for feature testing.
-##
-require 'rake/clean'
-require 'cucumber'
-require 'cucumber/rake/task'
+task(:spec).clear
+desc "Run specs other than spec/acceptance"
+RSpec::Core::RakeTask.new("spec") do |task|
+  task.exclude_pattern = "spec/acceptance/**/*_spec.rb"
+  task.verbose = false
+end
 
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = 'features --format pretty -x'
-  t.fork = false
+desc "Run acceptance specs in spec/acceptance"
+RSpec::Core::RakeTask.new("spec:acceptance") do |task|
+  task.pattern = "spec/acceptance/**/*_spec.rb"
+  task.verbose = false
 end
 
-##
-# By default, just run the tests.
-##
-task default: :spec
+desc "Run the specs and acceptance tests"
+task default: %w(spec spec:acceptance)

data/boxes.gemspec

@@ -30,10 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "colored"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "cucumber"
-  spec.add_development_dependency "aruba"
+  spec.add_development_dependency "climate_control"
   spec.add_development_dependency "fakefs"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/lib/boxes/command.rb

@@ -1,12 +1,12 @@
 module Boxes
-  # Class which encapsulates the command line handling.
   class Command < CLAide::Command
-    require 'boxes/command/build'
-    require 'boxes/command/env'
+    require "boxes/command/build"
+    require "boxes/command/env"
 
     self.abstract_command = true
-    self.command = 'boxes'
+    self.command = "boxes"
     self.version = VERSION
-    self.description = 'Toolkit for building Vagrantboxes, VM and cloud images.'
+    self.description = "A command line tool that takes the complexity out " \
+                       "of building Vagrant boxes."
   end
 end

data/lib/boxes/testing.rb

@@ -0,0 +1,6 @@
+module Boxes
+  module Testing
+    require "boxes/testing/command"
+    require "boxes/testing/matchers"
+  end
+end

data/lib/boxes/testing/command.rb

@@ -0,0 +1,23 @@
+module Boxes
+  module Testing
+    module Command
+      attr_reader :response
+
+      def run_command(cmd)
+        stdout = `#{cmd}`
+
+        @response = Response.new(cmd, stdout, $?.exitstatus)
+      end
+
+      class Response
+        attr_accessor :cmd, :stdout, :exit_status
+
+        def initialize(cmd, stdout, exit_status)
+          @cmd = cmd
+          @stdout = stdout
+          @exit_status = exit_status
+        end
+      end
+    end
+  end
+end

data/lib/boxes/testing/matchers.rb

@@ -0,0 +1,16 @@
+module Boxes
+  module Testing
+    module Matchers
+      require "boxes/testing/matchers/have_exit_status_matcher"
+      require "boxes/testing/matchers/write_to_stdout_matcher"
+
+      def have_exit_status(status)
+        HaveExitStatusMatcher.new(status)
+      end
+
+      def write_to_stdout(data)
+        WriteToStdoutMatcher.new(data)
+      end
+    end
+  end
+end

data/lib/boxes/testing/matchers/base_matcher.rb

@@ -0,0 +1,21 @@
+module Boxes
+  module Testing
+    module Matchers
+      class BaseMatcher
+        attr_reader :actual, :expected
+
+        # we can't compare to nil, because we might want nil
+        UNDEFINED = Object.new.freeze
+
+        def initialize(expected = UNDEFINED)
+          @expected = expected unless UNDEFINED.equal?(expected)
+        end
+
+        def matches?(actual)
+          @actual = actual
+          match(actual, expected)
+        end
+      end
+    end
+  end
+end

data/lib/boxes/testing/matchers/have_exit_status_matcher.rb

@@ -0,0 +1,19 @@
+require "boxes/testing/matchers/base_matcher"
+
+module Boxes
+  module Testing
+    module Matchers
+      class HaveExitStatusMatcher < BaseMatcher
+        def failure_message
+          "expected that `#{actual.cmd}` would exit with #{expected}"
+        end
+
+        private
+
+        def match(actual, expected)
+          expected == actual.exit_status
+        end
+      end
+    end
+  end
+end

data/lib/boxes/testing/matchers/write_to_stdout_matcher.rb

@@ -0,0 +1,23 @@
+require "boxes/testing/matchers/base_matcher"
+
+module Boxes
+  module Testing
+    module Matchers
+      class WriteToStdoutMatcher < BaseMatcher
+        def failure_message
+          "expected that '#{clean(actual.stdout)}' would be #{clean(expected)}"
+        end
+
+        private
+
+        def match(actual, expected)
+          expected == actual.stdout
+        end
+
+        def clean(output)
+          output.gsub(/\n/, '\n')
+        end
+      end
+    end
+  end
+end

data/lib/boxes/version.rb

@@ -1,4 +1,3 @@
-# Versions and other declarations.
 module Boxes
-  VERSION = "2.5.0".freeze
+  VERSION = "3.0.0".freeze
 end

data/scripts/postinstall.sh

@@ -34,10 +34,10 @@ curl -Lo /home/vagrant/.ssh/authorized_keys \
 chmod 0600 /home/vagrant/.ssh/authorized_keys
 chown -R vagrant:vagrant /home/vagrant/.ssh
 
-# under systemd based Ubuntu systems, networking breaks on first reboot
+# 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")
+    "wily" | "xenial" | "stretch")
         sed -i "s/ens33/ens32/g" /etc/network/interfaces
     ;;
     *)

data/scripts/ruby.sh

@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 # this installs chruby, ruby-install and a selection of rubies and is used in
 # the 'ruby' special box type.
 
 chruby_version=0.3.9
-rubyinstall_version=0.6.0
+rubyinstall_version=0.6.1
 
 # install chruby
 wget -O chruby-$chruby_version.tar.gz https://github.com/postmodern/chruby/archive/v$chruby_version.tar.gz
@@ -27,11 +27,11 @@ cd ruby-install-$rubyinstall_version/
 make install
 
 # install a set of recent MRI Rubies.
-ruby-install ruby 2.2.3
-ruby-install ruby 2.2.4
-ruby-install ruby 2.3.1
-ruby-install ruby 2.3.3
-ruby-install ruby 2.4.0
+ruby-install ruby 2.1.10
+ruby-install ruby 2.2.9
+ruby-install ruby 2.3.6
+ruby-install ruby 2.4.3
+ruby-install ruby 2.5.0
 
 # update gems and install bundler
 source /usr/local/share/chruby/chruby.sh

data/scripts/vmtools.sh

@@ -16,6 +16,7 @@ case $PACKER_BUILDER_TYPE in
     ;;
     'vmware-iso')
         echo "Installing VMware Tools..."
+        apt-get -qy install fuse
         mkdir -p /mnt/cdrom
         mount -o loop /home/vagrant/linux.iso /mnt/cdrom
 

data/spec/acceptance/user_builds_box_spec.rb

@@ -0,0 +1,51 @@
+require "acceptance_helper"
+
+RSpec.describe "User builds box" do
+  describe "boxes build" do
+    it "shows help when the name option is missing" do
+      run_command("boxes build --provider=vmware --template=debian/jessie64")
+
+      expect(response).to have_exit_status(1)
+      expect(response.stdout).to include("[!] A name is required!")
+      expect_response_to_show_build_help
+    end
+
+    it "shows help when the provider option is missing" do
+      run_command("boxes build --name=example --template=debian/jessie64")
+
+      expect(response).to have_exit_status(1)
+      expect(response.stdout).to include("[!] A provider is required!")
+      expect_response_to_show_build_help
+    end
+
+    it "shows help when the template option is missing" do
+      run_command("boxes build --name=example --provider=vmware")
+
+      expect(response).to have_exit_status(1)
+      expect(response.stdout).to include("[!] A template is required!")
+      expect_response_to_show_build_help
+    end
+  end
+
+  def expect_response_to_show_build_help
+    expect(response.stdout).to include(
+      "Builds boxes using templates and scripts.",
+    )
+
+    expect(response.stdout).to include(
+      "--name                           The name for the build",
+    )
+
+    expect(response.stdout).to include(
+      "--provider=[virtualbox|vmware]   The provider to build the box for",
+    )
+
+    expect(response.stdout).to include(
+      "--template                       Template to build the box with",
+    )
+
+    expect(response.stdout).to include(
+      "--scripts                        Scripts to apply to the box",
+    )
+  end
+end

data/spec/acceptance/user_cleans_the_env_spec.rb

@@ -0,0 +1,15 @@
+require "acceptance_helper"
+
+RSpec.describe "User cleans the env" do
+  describe "boxes env" do
+    it "shows the environment details" do
+      mktmpdir
+
+      with_modified_env(BOXES_WORKING_DIR: tmpdir.to_s) do
+        run_command("boxes env clean")
+      end
+
+      expect(tmpdir).not_to exist
+    end
+  end
+end

data/spec/acceptance/user_shows_the_env_spec.rb

@@ -0,0 +1,49 @@
+require "acceptance_helper"
+
+RSpec.describe "User shows the env" do
+  describe "boxes env" do
+    it "shows the environment details" do
+      run_command("boxes env")
+
+      expect(response).to have_exit_status(0)
+      expect_response_to_show_environment_details
+    end
+  end
+
+  describe "boxes env show" do
+    it "shows the environment details" do
+      run_command("boxes env show")
+
+      expect(response).to have_exit_status(0)
+      expect_response_to_show_environment_details
+    end
+  end
+
+  def expect_response_to_show_environment_details
+    expect(response.stdout).to include(
+      "WORKING_DIR=\"#{home_path('.boxes/tmp')}",
+    )
+    expect(response.stdout).to include("HOME_DIR=\"#{home_path('.boxes')}\"")
+
+    expect(response.stdout).to include(
+      "TEMPLATE_PATHS=\"#{project_path('templates')}\"",
+    )
+
+    expect(response.stdout).to include(
+      "SCRIPT_PATHS=\"#{project_path('scripts')}\"",
+    )
+
+    expect(response.stdout).to include(
+      "PACKER_CACHE_DIR=\"#{home_path('.boxes/packer_cache')}",
+    )
+  end
+
+  def project_path(subpath)
+    project_root = Pathname.new("../../").expand_path
+    project_root.join(subpath)
+  end
+
+  def home_path(subpath)
+    Pathname.new(Dir.home).join(subpath)
+  end
+end

data/spec/acceptance/user_views_env_help_spec.rb

@@ -0,0 +1,18 @@
+require "acceptance_helper"
+
+RSpec.describe "User views env help" do
+  describe "boxes env" do
+    it "describes available subcommands" do
+      run_command("boxes env --help")
+
+      expect(response).to have_exit_status(0)
+      expect(response.stdout).to include(
+        "+ clean     Clean up the environment.",
+      )
+
+      expect(response.stdout).to include(
+        "> show      Show the environment and configuration",
+      )
+    end
+  end
+end