kitchen-vagrant 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddba86d79279d14df33f8c73fc277107be1339420766c69bb79df7204b16abc5
-  data.tar.gz: 4c0173401f598321a4373814a2fa3aae368c3a583ab7d6edd7a344b87c07de03
+  metadata.gz: 44fe5fa016d68b8df77048de90a67efd6778798318137a1a933c026f27a36b5e
+  data.tar.gz: a73a65ef8e107af5724f9394136079392a7774b32d28833b4107f49ecb1ee27a
 SHA512:
-  metadata.gz: e8f1168da31ab90b5f06d76ea897658ed115093e5e321c357a18c58c0554caffe18d66b187d434c4db2ab393114869eae694498f3d47c842d304414a5ce83ee5
-  data.tar.gz: 90cacf14ed9d38b306f71a0b95e171eb9a483338a579fac31b1ede1f3ea09559ad5ce47cfbf8db2a793644e83443d1e66b833c8ef65033ffe3cc7ac96804cab6
+  metadata.gz: 601abaf5f74023827196550f972782e577bd62bd8fca37aea3dc7617495dea6ab7d49bbff37946cf8ff3be6d7948a59fc07f8aeaaa7be05994de8f377df57ff9
+  data.tar.gz: 9c475c54e23adee6824bcea2995b5a372c457b698693e0b48b3a7cecab468c41806e01af325ba0675d03ad82390d640b6f6ab55d7584a8840313264b1eb6bb18

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - 2.5.1
   - ruby-head
 
-bundler_args: --without guard
+bundler_args: --without guard, changelog
 
 sudo: false
 

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## [v1.3.3](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.3.3) (2018-08-13)
+[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.3.2...v1.3.3)
+
+**Closed issues:**
+
+- Hard to identify running VM instance from Hyper-V Manager or PowerShell [\#367](https://github.com/test-kitchen/kitchen-vagrant/issues/367)
+- \[Feature\] Add support for vm.name for virtualbox [\#365](https://github.com/test-kitchen/kitchen-vagrant/issues/365)
+
+**Merged pull requests:**
+
+- Adding a per-instance generated vmname for Hyper-V [\#368](https://github.com/test-kitchen/kitchen-vagrant/pull/368) ([stuartpreston](https://github.com/stuartpreston))
+- Fix \#365 - add name for virtualbox instances [\#366](https://github.com/test-kitchen/kitchen-vagrant/pull/366) ([cheeseplus](https://github.com/cheeseplus))
+- Adding the lifecycle hooks stub to fix tests [\#364](https://github.com/test-kitchen/kitchen-vagrant/pull/364) ([cheeseplus](https://github.com/cheeseplus))
+- Add an example for vagrantfile\_erb [\#363](https://github.com/test-kitchen/kitchen-vagrant/pull/363) ([jkugler](https://github.com/jkugler))
+- Move github changelog generator to the gemfile and skip install in testing [\#362](https://github.com/test-kitchen/kitchen-vagrant/pull/362) ([tas50](https://github.com/tas50))
+- Fix disk examples [\#360](https://github.com/test-kitchen/kitchen-vagrant/pull/360) ([espoelstra](https://github.com/espoelstra))
+
 ## [v1.3.2](https://github.com/test-kitchen/kitchen-vagrant/tree/v1.3.2) (2018-04-23)
 [Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v1.3.1...v1.3.2)
 

data/Gemfile

@@ -9,3 +9,7 @@ end
 group :test do
   gem "codeclimate-test-reporter", :require => nil
 end
+
+group :changelog do
+  gem "github_changelog_generator", "1.11.3", :require => nil
+end

data/README.md

@@ -276,7 +276,7 @@ driver:
         port: 1
         device: 0
         type: hdd
-        medium: /tmp/disk2.vmdk
+        medium: /tmp/disk1.vmdk
       - storagectl: IDE Controller
         port: 1
         device: 1
@@ -529,6 +529,12 @@ object, which means that methods like `config[:kitchen_root]`, `instance.name`,
 and `instance.provisioner[:run_list]` can be used to compose a custom
 Vagrantfile if necessary.
 
+```yaml
+---
+driver:
+  vagrantfile_erb: CustomVagrantfile.erb
+```
+
 **Warning:** Be cautious when going down this road as your setup may cease to
 be portable or applicable to other Test Kitchen Drivers such as Ec2 or Docker.
 Using the alternative Vagrantfile template strategy may be a dangerous

data/Rakefile

@@ -30,11 +30,17 @@ task :quality => [:style, :stats]
 
 task :default => [:test, :quality]
 
-require "github_changelog_generator/task"
-
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.future_release = Kitchen::Driver::VAGRANT_VERSION
-  config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature,Improvement".split(",")
-  config.bug_labels = "bug,Bug".split(",")
-  config.exclude_labels = %w{Duplicate Question Discussion No_Changelog}
+begin
+  require "github_changelog_generator/task"
+
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.future_release = Kitchen::Driver::VAGRANT_VERSION
+    config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature,Improvement".split(",")
+    config.bug_labels = "bug,Bug".split(",")
+    config.exclude_labels = %w{Duplicate Question Discussion No_Changelog}
+  end
+rescue LoadError
+  task :changelog do
+    raise "github_changelog_generator not installed! gem install github_changelog_generator."
+  end
 end

data/example/kitchen.vagrant.yml

@@ -0,0 +1,122 @@
+---
+# All the options for kitchen-vagrant enumerated and annotated
+# options are illustrated where they most commonly would be set
+driver:
+  name: vagrant # test-kitchen default
+
+  # If not set, check for the environment variable `VAGRANT_DEFAULT_PROVIDER` 
+  # If that is unset, default to `virtualbox`
+  # provider: virtualbox
+
+  # If `true` check if the box is up-to-date
+  # box_check_update: nil
+
+  # If `true`, then SSL certificates from the server will not be verified.
+  # box_download_insecure: nil
+
+  # A relative path to a CA certificate bundle
+  # for verifying endpoints with custom certificates
+  # box_download_ca_cert: nil
+
+  # Integer for setting custom boot timeout
+  # boot_timeout: nil
+  # Hash for passing k/v options to specific
+  # providers for customization
+  # emtpy by default
+  # customize:
+  #   memory: 1024
+  #   cpuexecutioncap: 50
+  # If `true`, allows GUI mode for Vagrant providers
+  # that support this feature
+  # gui: nil
+
+  # If `true`, use "Linked Clones" or "Differencing Disk" 
+  # options for providers that support this feature
+  # This can reduce disk usage and offer performance benefits.
+  # linked_clone: nil
+
+  # An Array of network customizations for the virtual machine. 
+  # Each Array element is itself an Array of arguments to be passed to the 
+  # config.vm.network method
+  # network: []
+
+  # An optional hook to run a command immediately prior to 
+  # the `vagrant up --no-provisioner` command being executed.
+  # **CAUTION**
+  # pre_create_command: nil
+
+  # Enables Vagrant built-in provisioning
+  # Useful in conjunction with `vagrantfiles`
+  # provision: false
+
+  # Hash for passing k/v options to Vagrant's SSH
+  # configuration. Only needed for advanaced/custom
+  # configuration. **CAUTION**
+  # ssh: {}
+
+  # An array of arrays that configure a synced folder
+  # This value is automatically configured if using
+  # the `cache_directory` option. Otherwise, empty.
+  # synced_folders:    
+  #   - ["data/%{instance_name}", "/opt/instance_data"]
+  #   - ["/host_path", "/vm_path", "create: true, type: :nfs"]
+
+  # This should only need to get set if the Vagrant binary
+  # isn't in the PATH or there is a specific location desired
+  # vagrant_binary: "vagrant"
+
+  # By default, use the Vagrantfile.erb that is part of the gem
+  # otherwise use whatever the user provides here. **CAUTION**
+  # vagrantfile_erb: Alt_Vagrantfile.erb
+
+  # An array of paths to Vagrantfiles
+  # Empty by default
+  # vagrantfiles: []
+
+  # We only set this to a path for a subset of known bento boxes
+  # driver.windows_os? ? "/omnibus/cache" : "/tmp/omnibus/cache"
+  # if set to `false` this will disable caching entirely
+  # cache_directory: /tmp/omnibus/cache
+
+  # Path to kitchen's global cache directory, primarily for caching
+  # chef-client downlaods
+  # Default is File.expand_path("~/.kitchen/cache")
+  # kitchen_cache_directory: /Users/cheeseplus/.kitchen/cache
+
+  # If `box` or `machine`, sets the respective value for 
+  # config.cache.scope. Any other truthy value yields `box`
+  # cachier: nil
+
+provisioner:
+  name: chef_zero
+
+verifier:
+  name: inspec
+
+platforms:
+  # We will grab boxes from bento on Vagrant Cloud
+  # for a set of common platforms
+  - name: ubuntu-16.04
+  - name: centos-7
+  # Otherwise for platforms we don't know, the box needs to exist locally
+  # and be known to Vagrant, otherwise provide `box` or `box_url`
+  - name: openbsd-5.6
+    driver:
+      # Versioned boxes from Vagrant Cloud can be utilized
+      # `box_version` only works when `box` uses the Vagrant Cloud syntax
+      # box: organization/openbsd-56
+      # box_version: 1.2.3
+      # If not using Vagrant Cloud, the box can be fetched
+      # remotely via `http(s)://` or locally via `file://`
+      # `box` requires a value
+      box: openbsd-5.6 
+      box_url: http://url.tld/openbsd-5.6.box
+
+suites:
+  - name: default
+    driver:
+      # If Windows, this is nil otherwise it's set to
+      # "#{driver.instance.name}.vagrantup.com"
+      # vm_hostname: "custom.tld"
+    run_list:
+      - recipe[cookbook::default]

data/kitchen-vagrant.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec",     "~> 3.2"
   gem.add_development_dependency "simplecov", "~> 0.9"
-  gem.add_development_dependency "github_changelog_generator", "1.11.3"
 
   gem.add_development_dependency "chefstyle"
 end

data/lib/kitchen/driver/vagrant_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Vagrant Kitchen driver
-    VAGRANT_VERSION = "1.3.2"
+    VAGRANT_VERSION = "1.3.3"
   end
 end

data/spec/kitchen/driver/vagrant_spec.rb

@@ -35,6 +35,7 @@ describe Kitchen::Driver::Vagrant do
   let(:suite)         { Kitchen::Suite.new(:name => "suitey") }
   let(:verifier)      { Kitchen::Verifier::Dummy.new }
   let(:provisioner)   { Kitchen::Provisioner::Dummy.new }
+  let(:lifecycle_hooks) { Kitchen::LifecycleHooks.new({}) }
   let(:transport)     { Kitchen::Transport::Dummy.new }
   let(:state_file)    { double("state_file") }
   let(:state)         { Hash.new }
@@ -60,6 +61,7 @@ describe Kitchen::Driver::Vagrant do
       :suite => suite,
       :platform => platform,
       :provisioner => provisioner,
+      :lifecycle_hooks => lifecycle_hooks,
       :transport => transport,
       :state_file => state_file
     )
@@ -1264,6 +1266,16 @@ describe Kitchen::Driver::Vagrant do
 
       before { config[:provider] = "virtualbox" }
 
+      it "sets :name for virtualbox GUI" do
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
+          end
+        RUBY
+      end
+
       it "adds a line for each element in :customize" do
         config[:customize] = {
           :a_key => "some value",
@@ -1273,6 +1285,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.customize ["modifyvm", :id, "--a_key", "some value"]
             p.customize ["modifyvm", :id, "--something", "else"]
           end
@@ -1292,6 +1305,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.gui = false
           end
         RUBY
@@ -1303,6 +1317,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.gui = true
           end
         RUBY
@@ -1322,6 +1337,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.linked_clone = false
           end
         RUBY
@@ -1333,6 +1349,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.linked_clone = true
           end
         RUBY
@@ -1349,6 +1366,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.customize ["createhd", "--filename", "./d1.vmdk", "--size", 10240]
           end
         RUBY
@@ -1371,6 +1389,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.customize ["createhd", "--filename", "./d1.vmdk", "--size", 10240]
             p.customize ["createhd", "--filename", "./d2.vmdk", "--size", 20480]
           end
@@ -1390,6 +1409,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.customize ["storagectl", :id, "--name", "Custom SATA Controller", "--add", "sata", "--controller", "IntelAHCI", "--portcount", 4]
           end
         RUBY
@@ -1413,6 +1433,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.customize ["storagectl", :id, "--name", "Custom SATA Controller", "--add", "sata", "--controller", "IntelAHCI"]
             p.customize ["storagectl", :id, "--name", "Custom SATA Controller", "--portcount", 4]
           end
@@ -1430,6 +1451,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.customize ["storageattach", :id, "--type", "hdd", "--port", 1]
           end
         RUBY
@@ -1458,6 +1480,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.customize ["storageattach", :id, "--storagectl", "SATA Controller", "--port", 1, "--device", 0, "--type", "hdd", "--medium", "./d1.vmdk"]
             p.customize ["storageattach", :id, "--storagectl", "SATA Controller", "--port", 1, "--device", 1, "--type", "hdd", "--medium", "./d2.vmdk"]
           end
@@ -1472,6 +1495,7 @@ describe Kitchen::Driver::Vagrant do
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :virtualbox do |p|
+            p.name = "kitchen-#{File.basename(config[:kitchen_root])}-suitey-fooos-99"
             p.customize ["modifyvm", :id, "--cpuidset", "00000001", "00000002"]
           end
         RUBY

data/templates/Vagrantfile.erb

@@ -90,6 +90,11 @@ Vagrant.configure("2") do |c|
 <% end %>
 
   c.vm.provider :<%= config[:provider] %> do |p|
+<% case config[:provider]
+   when "virtualbox" %>
+    p.name = "kitchen-<%= File.basename(config[:kitchen_root]) %>-<%= instance.name %>"
+<% end %>
+   
 <% case config[:provider]
    when "virtualbox", /^vmware_/
      if config[:gui] == true || config[:gui] == false %>
@@ -102,8 +107,9 @@ Vagrant.configure("2") do |c|
      if config[:linked_clone] == true || config[:linked_clone] == false %>
     p.linked_clone = <%= config[:linked_clone] %>
 <%   end
-   when "hyperv"
-     if config[:linked_clone] == true || config[:linked_clone] == false %>
+   when "hyperv" %>
+    p.vmname = "kitchen-<%= File.basename(config[:kitchen_root]) %>-<%= instance.name %>"
+<%   if config[:linked_clone] == true || config[:linked_clone] == false %>
     p.differencing_disk = <%= config[:linked_clone] %>
 <%   end
    end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: chefstyle
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +110,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- example/kitchen.vagrant.yml
 - kitchen-vagrant.gemspec
 - lib/kitchen/driver/helpers.rb
 - lib/kitchen/driver/vagrant.rb