kitchen-vagrant 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea05c234c21fba360397e3555d800f354cd9a6997ab16c2ffaceaaaa46c0b52a
-  data.tar.gz: d1cb7e7e751b379c04274bb5df10d699d62b42fa39b5d58e97baa37546d9f7a1
+  metadata.gz: c8ffff4597560fe5c80e680f81e3b0f7cf64389c7cb9d3142fb88e5fe1e23996
+  data.tar.gz: 39a1151b4a7a2009ee22e7071f534244e140b6065535cd861daa5ed243081a5d
 SHA512:
-  metadata.gz: 54f09922713934463de54ec0dfffbc38068730b021b20f1103d2a024c7969c61349d1b422abadd34b347c7193c55df2842d5b5ebf111119fa9ffe162de92769d
-  data.tar.gz: 11f919e37cacab6ab7c7d880f6d1834d21b21ecf8a317ed0c1c1adbd16791e6bdd5cab2c65461f32ad59468df92937066ff5bf967e26b8733ada11d4161bce72
+  metadata.gz: 8ff409ccb93f5e33ef1077636c640efd72d45af0ce18227902b82012608b2af5a724e7ccec0010f3d8c2b0b0b6fd67364b613a56e8ff761f72c0e4ce660dd901
+  data.tar.gz: 519c45a62165f08d5caf1bb57cbd5d7a653cf0329c78309bca700cacc9a3fd654122fa24979c85dc87f5f9fae0e2794785739438c85f6d1289ac780ce3bd6166

data/lib/kitchen/driver/helpers.rb

@@ -15,9 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "mixlib/shellout"
-require "fileutils"
-require "json"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require "fileutils" unless defined?(FileUtils)
+require "json" unless defined?(JSON)
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/vagrant.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
@@ -16,13 +15,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "erb"
-require "fileutils"
+require "erb" unless defined?(Erb)
+require "fileutils" unless defined?(FileUtils)
 require "rubygems/version"
 
 require "kitchen"
-require "kitchen/driver/vagrant_version"
-require "kitchen/driver/helpers"
+require_relative "vagrant_version"
+require_relative "helpers"
 
 module Kitchen
 
@@ -45,6 +44,10 @@ module Kitchen
 
       default_config :box_check_update, nil
 
+      default_config :box_auto_update, nil
+
+      default_config :box_auto_prune, nil
+
       default_config :box_download_insecure, nil
 
       default_config :box_download_ca_cert, nil
@@ -109,6 +112,8 @@ module Kitchen
       def create(state)
         create_vagrantfile
         run_pre_create_command
+        run_box_auto_update
+        run_box_auto_prune
         run_vagrant_up
         update_state(state)
         instance.transport.connection(state).wait_until_ready
@@ -172,6 +177,8 @@ module Kitchen
       def finalize_config!(instance)
         super
         finalize_vm_hostname!
+        finalize_box_auto_update!
+        finalize_box_auto_prune!
         finalize_pre_create_command!
         finalize_synced_folders!
         finalize_ca_cert!
@@ -238,7 +245,7 @@ module Kitchen
       #   box
       # @api private
       def bento_box?(name)
-        name =~ /^(centos|debian|fedora|freebsd|opensuse|ubuntu|oracle|hardenedbsd|amazonlinux)-/
+        name =~ /^(centos|debian|fedora|freebsd|opensuse|ubuntu|oracle|hardenedbsd|amazonlinux|almalinux)-/
       end
 
       # Returns whether or not the we expect the box to work with shared folders
@@ -247,9 +254,9 @@ module Kitchen
       #   shared folders
       # @api private
       def safe_share?(box)
-        return false if config[:provider] =~ /(hyperv|libvirt)/
+        return false if /(hyperv|libvirt)/.match?(config[:provider])
 
-        box =~ %r{^bento/(centos|debian|fedora|opensuse|ubuntu|oracle|amazonlinux)-}
+        box =~ %r{^bento/(centos|debian|fedora|opensuse|ubuntu|oracle|amazonlinux|almalinux)-}
       end
 
       # Return true if we found the criteria to enable the cache_directory
@@ -299,6 +306,20 @@ module Kitchen
         end
       end
 
+      # Create vagrant command to update box to the latest version
+      def finalize_box_auto_update!
+        return if config[:box_auto_update].nil?
+
+        config[:box_auto_update] = "vagrant box update #{"--insecure " if config[:box_download_insecure]}--box #{config[:box]}"
+      end
+
+      # Create vagrant command to remove older versions of the box
+      def finalize_box_auto_prune!
+        return if config[:box_auto_prune].nil?
+
+        config[:box_auto_prune] = "vagrant box prune --keep-active-boxes --name #{config[:box]}"
+      end
+
       # Replaces any `{{vagrant_root}}` tokens in the pre create command.
       #
       # @api private
@@ -461,6 +482,26 @@ module Kitchen
       end
       # rubocop:enable Metrics/CyclomaticComplexity
 
+      # Tell vagrant to update vagrant box to latest version
+      def run_box_auto_update
+        if config[:box_auto_update]
+          begin
+            run(config[:box_auto_update])
+          rescue Kitchen::ShellOut::ShellCommandFailed => e
+            # If the box has never been downloaded, the update command will fail with this message.
+            # Just ignore it and move on. Re-raise all other errors.
+            raise e unless e.message.match?(/The box '.*' does not exist/m)
+          end
+        end
+      end
+
+      # Tell vagrant to remove older vagrant boxes
+      def run_box_auto_prune
+        if config[:box_auto_prune]
+          run(config[:box_auto_prune])
+        end
+      end
+
       # Runs a local command before `vagrant up` has been called.
       #
       # @api private

data/lib/kitchen/driver/vagrant_version.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
@@ -21,6 +20,6 @@ module Kitchen
   module Driver
 
     # Version string for Vagrant Kitchen driver
-    VAGRANT_VERSION = "1.6.0".freeze
+    VAGRANT_VERSION = "1.8.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Fletcher Nichol
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -30,76 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: countloc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: chefstyle
-  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'
 description: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
 email:
 - fnichol@nichol.ca
@@ -117,7 +47,7 @@ homepage: https://github.com/test-kitchen/kitchen-vagrant/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,15 +55,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
 test_files: []