kitchen-vagrant 1.6.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ea7c93ef421aaa716cae48e585432beecd3c09b655ee477c5a9bac35e058e5
-  data.tar.gz: 26d491a7a3cb7213ab7c8bdee51eef727359f0ffe5d9ad9895ae0b7bea61c547
+  metadata.gz: fbef5fa6546d02a6640139df510994167fc3aec4b38b483e20cf4ae9145d72ba
+  data.tar.gz: facb440cf915760ddb4e85635b8a566cde4f6ac3a1fdb51fb59dad09a8acbdee
 SHA512:
-  metadata.gz: 7c35f0a8d81f3519a0a580163db11e744bb666e76664ff5646040c7c410bb4a988430c4a9aa639772946640dffe0f1f5f995a9488c5c218ee7835b485a0635d5
-  data.tar.gz: 9f67a9cfccfa4796eba8a7cc088d2425ade9d80f7b817ccf9b7e46f9b2a9d2c692cb8537ce453baa453d019a7bb3fb31931c7f93f8e36296a35c97ec7a281c33
+  metadata.gz: ba40b559d0a0fcdd9b8c3559b2a69cb668ba3c7811efc6b7b002ca7fd97e8f94cea7f1b35c6cf89060621eb239ddfa9fbd04761f98f28e54d8c952a3dfda6e9c
+  data.tar.gz: 2f99a8edd8f3349b54c290fdd250ad06e0e876569729a2355c91bbb606baef3f848f1d2a051a9150077623b443155eec87fd466ef57781d7db857bbeebc819d1

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,8 +15,8 @@
 # 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"
@@ -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.1".freeze
+    VAGRANT_VERSION = "1.9.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Fletcher Nichol
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -19,7 +19,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,77 +29,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !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'
+        version: '4'
 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.2.15
+signing_key:
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
 test_files: []