kitchen-vagrant 0.9.0 → 0.10.0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.10.0 / 2013-05-08
+
+### New features
+
+* Pull request #12: Use SSHBase functionality (using ChefDataUploader) to manage Chef provisioning in the converge action and make Vagrant's built in provisioning an optional mode by setting `use_vagrant_provision: true` in the `driver_config` section of the .kitchen.yml. As a consequence, the vagrant-berkshelf middleware is now also optional and off by default (can be re-enabled by setting `use_vagrant_berkshelf_plugin: true`). (@fujin)
+* Pull request #18: Add VMware Fusion/Workstation support. (@TheDude05)
+
+### Improvements
+
+* Issue #19: Recommend the vagrant-wrapper gem in README. (@fnichol)
+
+
 ## 0.9.0 / 2013-04-19
 
 ### Upstream changes
@@ -54,11 +66,11 @@
 The initial release.
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
-[#7]: https://github.com/opscode/kitchen/issues/7
-[#8]: https://github.com/opscode/kitchen/issues/8
-[#15]: https://github.com/opscode/kitchen/issues/15
-[#16]: https://github.com/opscode/kitchen/issues/16
+[#7]: https://github.com/opscode/kitchen-vagrant/issues/7
+[#8]: https://github.com/opscode/kitchen-vagrant/issues/8
+[#15]: https://github.com/opscode/kitchen-vagrant/issues/15
+[#16]: https://github.com/opscode/kitchen-vagrant/issues/16
 [@fnichol]: https://github.com/fnichol
 [@martinisoft]: https://github.com/martinisoft
 [@petejkim]: https://github.com/petejkim
-[@sandfish8]: https://github.com/sandfish8
+[@sandfish8]: https://github.com/sandfish8

data/README.md

@@ -22,12 +22,27 @@ Test Kitchen.
 to 1.1.0), this version may be resolved first in your `PATH`. If you receive an
 error message that Vagrant is too old despite having installed Vagrant as a
 package, you may be required to uninstall the gem version or modify your `PATH`
-environment.
+environment. If you require the vagrant gem for older projects you should
+consider the [vagrant-wrapper][vagrant_wrapper] gem which helps manage both
+styles of Vagrant installations
+([background details][vagrant_wrapper_background]).
 
-### <a name="dependencies-virtualbox"></a> Virtualbox
+### <a name="dependencies-virtualization"></a> Virtualbox and/or VMware Fusion/Workstation
+
+Currently this driver supports VirtualBox and VMware Fusion/Workstation.
+Virtualbox is free and is the default provider for Vagrant.
+
+[VirtualBox package][virtualbox_dl]
+
+If you would like to use VMware Fusion/Workstation you must purchase the
+software from VMware and then must also purchase the Vagrant VMware plugin.
+
+[Vagrant VMware Plugin][vmware_plugin]
+
+[VMware Fusion][fusion_dl]
+
+[VMware Workstation][workstation_dl]
 
-Currently this driver only supports the VirtualBox provisioner which requires
-the [VirtualBox package][virtualbox_dl] to be installed.
 
 ### <a name="dependencies-berkshelf"></a> Vagrant Berkshelf Plugin
 
@@ -49,7 +64,7 @@ Please read the [Driver usage][driver_usage] page for more details.
 
 ### <a name="config-box"></a> box
 
-(**Required**) This determines which Vagrant box will be used. For more
+**Required** This determines which Vagrant box will be used. For more
 details, please read the Vagrant [machine settings][vagrant_machine_settings]
 page.
 
@@ -63,11 +78,21 @@ started.
 
 There is **no** default value set.
 
+### <a name="config-provider"></a> provider
+
+This determines which Vagrant provider to use when testing and should match
+the provider name in Vagrant. For example, to use VMware Fusion the provider
+should be `vmware_fusion`. Please see the docs on [providers][vagrant_providers]
+for further details.
+
+By default the value is unset, or `nil`. In this case the driver will use the
+Vagrant default provider which at this current time is **virtualbox**
+
 ### <a name="config-customize"></a> customize
 
-A **Hash** of customizations to a Vagrant virtual machine backed by VirtualBox.
-Each key/value pair will be passed to the `virtualbox.customize` method. For
-example:
+A **Hash** of customizations to a Vagrant virtual machine.  Each key/value
+pair will be passed to your providers customization block. For example, with
+the default `virtualbox` provider:
 
 ```ruby
 driver_config:
@@ -89,7 +114,7 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-Please read the Vagrant [VirtualBox configuration][vagrant_virtualbox] page for
+Please read the [Vagrantfile configuration][vagrantfile] page for
 more details.
 
 By default, each Vagrant virtual machine is configured with 256 MB of RAM. In
@@ -97,8 +122,8 @@ other words the default value for `customize` is `{:memory => '256'}`.
 
 ### <a name="config-dry-run"></a> dry\_run
 
-Useful when debugging Vagrant CLI commands. If set to `true`, all Vagrant CLI commands
-will be displayed rather than executed.
+Useful when debugging Vagrant CLI commands. If set to `true`, all Vagrant CLI
+commands will be displayed rather than executed.
 
 The default is unset, or `nil`.
 
@@ -131,6 +156,33 @@ more details.
 
 There is **no** default value set.
 
+### <a name="config-use-vagrant-provision"></a> use_vagrant_provision
+
+Determines whether or not this driver will use a `vagrant provision` shell out
+in the **converge** action. If this value is falsey (`nil`, `false`) the
+behavior from `Kitchen::Driver::SSHBase` will be used, bypassing the Vagrant
+Chef solo provisioner. If this value is truthy, a `vagrant provision` will
+be used.
+
+The default is unset, or `nil`.
+
+### <a name="config-use-vagrant-berkshelf-plugin"></a> use_vagrant_berkshelf_plugin
+
+Determines whether or not this driver will use the vagrant-berkself Vagrant
+plugin to assemble cookbook dependencies. If this value if falsey (`nil`,
+`false`) then the driver will skip the vagrant-berkshelf dependency check
+and not activate the plugin in the rendered Vagrantfile. If this value is
+truthy the opposite behvior will be used.
+
+The default is unset, or `nil`.
+
+### <a name="config-synced-folders"></a> synced_folders
+
+Allow the user to specify a collection of synced folders for on each Vagrant
+instance.
+
+The default is an empty Hash, or `{}`.
+
 ### <a name="config-require-chef-omnibus"></a> require\_chef\_omnibus
 
 Determines whether or not a Chef [Omnibus package][chef_omnibus_dl] will be
@@ -182,5 +234,11 @@ Apache 2.0 (see [LICENSE][license])
 [vagrant_dl]:               http://downloads.vagrantup.com/
 [vagrant_machine_settings]: http://docs.vagrantup.com/v2/vagrantfile/machine_settings.html
 [vagrant_networking]:       http://docs.vagrantup.com/v2/networking/basic_usage.html
-[vagrant_virtualbox]:       http://docs.vagrantup.com/v2/virtualbox/configuration.html
 [virtualbox_dl]:            https://www.virtualbox.org/wiki/Downloads
+[vagrantfile]:              http://docs.vagrantup.com/v2/vagrantfile/index.html
+[vagrant_providers]:        http://docs.vagrantup.com/v2/providers/index.html
+[vagrant_wrapper]:          https://github.com/org-binbab/gem-vagrant-wrapper
+[vagrant_wrapper_background]: https://github.com/org-binbab/gem-vagrant-wrapper#background---aka-the-vagrant-gem-enigma
+[vmware_plugin]:            http://www.vagrantup.com/vmware
+[fusion_dl]:                http://www.vmware.com/products/fusion/overview.html
+[workstation_dl]:           http://www.vmware.com/products/workstation/

data/kitchen-vagrant.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'test-kitchen', '~> 1.0.0.alpha.2'
+  gem.add_dependency 'test-kitchen', '~> 1.0.0.alpha.6'
 
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'tailor'

data/lib/kitchen/driver/vagrant.rb

@@ -35,6 +35,7 @@ module Kitchen
     class Vagrant < Kitchen::Driver::SSHBase
 
       default_config :customize, {:memory => '256'}
+      default_config :synced_folders, {}
 
       required_config :box
 
@@ -42,7 +43,9 @@ module Kitchen
 
       def create(state)
         create_vagrantfile
-        run "vagrant up --no-provision"
+        cmd = "vagrant up --no-provision"
+        cmd += " --provider=#{@config[:provider]}" if @config[:provider]
+        run cmd
         set_ssh_state(state)
         info("Vagrant instance #{instance.to_str} created.")
       end
@@ -51,7 +54,13 @@ module Kitchen
         create_vagrantfile
         ssh_args = build_ssh_args(state)
         install_omnibus(ssh_args) if config[:require_chef_omnibus]
-        run "vagrant provision"
+        if config[:use_vagrant_provision]
+          run "vagrant provision"
+        else
+          prepare_chef_home(ssh_args)
+          upload_chef_data(ssh_args)
+          run_chef_solo(ssh_args)
+        end
       end
 
       def setup(state)
@@ -77,7 +86,7 @@ module Kitchen
 
       def verify_dependencies
         check_vagrant_version
-        check_berkshelf_plugin
+        check_berkshelf_plugin if config[:use_vagrant_berkshelf_plugin]
       end
 
       protected

data/lib/kitchen/driver/vagrant_version.rb

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

data/lib/kitchen/vagrant/vagrantfile_creator.rb

@@ -36,8 +36,9 @@ module Kitchen
         common_block(arr)
         network_block(arr)
         provider_block(arr)
-        chef_block(arr)
-        berkshelf_block(arr)
+        chef_block(arr) if config[:use_vagrant_provision]
+        berkshelf_block(arr) if config[:use_vagrant_berkshelf_plugin]
+        synced_folders_block(arr)
         arr << %{end}
         arr.join("\n")
       end
@@ -61,10 +62,15 @@ module Kitchen
       end
 
       def provider_block(arr)
-        arr << %{  c.vm.provider :virtualbox do |p|}
-          config[:customize].each do |key, value|
-            arr << %{    p.customize ["modifyvm", :id, "--#{key}", #{value}]}
-          end
+        provider = config[:provider] || 'virtualbox'
+
+        arr << %{  c.vm.provider :#{provider} do |p|}
+        case provider
+        when 'virtualbox'
+          virtualbox_customize(arr)
+        when 'vmware_fusion', 'vmware_workstation'
+          vmware_customize(arr)
+        end
         arr << %{  end}
       end
 
@@ -76,6 +82,9 @@ module Kitchen
         if instance.suite.data_bags_path
           arr << %{    chef.data_bags_path = "#{instance.suite.data_bags_path}"}
         end
+        if key_path
+          arr << %{    chef.encrypted_data_bag_secret_key_path = "#{key_path}"}
+        end
         if instance.suite.roles_path
           arr << %{    chef.roles_path = "#{instance.suite.roles_path}"}
         end
@@ -91,6 +100,12 @@ module Kitchen
         end
       end
 
+      def synced_folders_block(arr)
+        config[:synced_folders].each do |source, destination|
+          arr << %{  c.vm.synced_folder "#{source}", "#{destination}" }
+        end
+      end
+
       def vagrant_logger_level
         if instance.logger.debug?
           ":debug"
@@ -108,6 +123,39 @@ module Kitchen
       def berksfile
         File.join(config[:kitchen_root], "Berksfile")
       end
+
+      def virtualbox_customize(arr)
+        config[:customize].each do |key, value|
+          arr << %{    p.customize ["modifyvm", :id, "--#{key}", #{value}]}
+        end
+      end
+
+      def vmware_customize(arr)
+        config[:customize].each do |key, value|
+          if key == :memory
+            # XXX: This is kind of a hack to address the fact that
+            # "memory" is a default attribute in our Vagrant driver.
+            #
+            # The VMware VMX format expects to see "memsize" instead of
+            # just "memory" like Virtualbox would. So if "memsize" has
+            # been specified we simply ignore the "memory" option.
+            unless config[:customize].include?(:memsize)
+              arr << %{    p.vmx["memsize"] = "#{value}"}
+            end
+          else
+            arr << %{    p.vmx["#{key}"] = "#{value}"}
+          end
+        end
+      end
+
+      def key_path
+        return nil if instance.suite.encrypted_data_bag_secret_key_path.nil?
+
+        File.join(
+          config[:kitchen_root],
+          instance.suite.encrypted_data_bag_secret_key_path
+        )
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.2
+        version: 1.0.0.alpha.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.2
+        version: 1.0.0.alpha.6
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 777835139873983513
+      hash: 4281053971058593237
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 777835139873983513
+      hash: 4281053971058593237
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24