kitchen-vagrant 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fb270095f5db9faaf4e119fcf908d038c4bbb72
-  data.tar.gz: 094f1e770ca8a18519c1dd979184661eec5f1019
+  metadata.gz: 8e2f332a407b17162a67ac95a7157b9ca6d3bd55
+  data.tar.gz: 0b6affbcd220e3e7ebf6592dc465c61fc5a986ee
 SHA512:
-  metadata.gz: 4f1ceb43bc7abd69ec49e55005d0e2bfdfcc66bfc2cc98f6aac746438a3b157ad19fb0c37c4d455c84685fcd624d905295dbbd92f1ae09cda1ef510c6bd65b0b
-  data.tar.gz: 16cfd491a7adfe2e4cd8f12d045774118d95dcb06a3cb4edb2d0bdffc871cd79b82362de35189f98503977eed5b53d1bd8941d04cf13c267003d0cc127599fbc
+  metadata.gz: 6c1c7580f8d1676855c911a195de79c1e75cffd4c175059b804b48fba5a347a19b8c2d2828f20dea97ea985c7f98710494239a76d60f659314bde5ee4f4ad244
+  data.tar.gz: f80efdf4c6820d243f77a11bc77d6ad37ef1e4457088c82cf98d5352b8bfef8a6c196a7ddbd91db578986d4eb28fa3ea852ab94007491fc09bda789c16154022

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.15.0 / 2014-04-28
+
+### New features
+
+* Support vagrant-softlayer plugin
+
+### Improvements
+
+* Improved/updated README documentation + typos
+* Remove default memory setting
+* Fix relative paths in synced folders
+
 ## 0.14.0 / 2013-12-09
 
 ### New features
@@ -187,4 +199,4 @@ The initial release.
 [@petejkim]: https://github.com/petejkim
 [@sandfish8]: https://github.com/sandfish8
 [@sethvargo]: https://github.com/sethvargo
-[@tmatilai]: https://github.com/tmatilai
+[@tmatilai]: https://github.com/tmatilai

data/README.md

@@ -72,20 +72,22 @@ This will effectively generate a configuration similar to:
 ---
 platforms:
 - name: ubuntu-10.04
-  driver_config:
+  driver:
     box: opscode-ubuntu-10.04
     box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box
 - name: ubuntu-12.04
-  driver_config:
+  driver:
     box: opscode-ubuntu-12.04
     box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
 - name: ubuntu-12.10
-  driver_config:
+  driver:
     box: opscode-ubuntu-12.10
     box_url: ...
 # ...
 ```
 
+Many host wide defaults for Vagrant can be set using `$HOME/.vagrant.d/Vagrantfile`. See the [Vagrantfile documentation][vagrantfile] for more information.
+
 ## <a name="config"></a> Configuration
 
 ### <a name="config-box"></a> box
@@ -108,13 +110,14 @@ The default will be computed from the platform name of the instance.
 
 ### <a name="config-provider"></a> provider
 
-This determines which Vagrant provider to use when testing and should match
+This determines which Vagrant provider to use. The value 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**
+Vagrant [default provider][vagrant_default_provider] which at this current time
+is `virtualbox` unless set by `VAGRANT_DEFAULT_PROVIDER` environment variable.
 
 ### <a name="config-customize"></a> customize
 
@@ -123,7 +126,7 @@ pair will be passed to your providers customization block. For example, with
 the default `virtualbox` provider:
 
 ```ruby
-driver_config:
+driver:
   customize:
     memory: 1024
     cpuexecutioncap: 50
@@ -142,11 +145,7 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-Please read the [Vagrantfile configuration][vagrantfile] page for
-more details.
-
-By default, each Vagrant virtual machine is configured with 256 MB of RAM. In
-other words the default value for `customize` is `{:memory => '256'}`.
+Please read the "Customizations" sections for [VirtualBox][vagrant_config_vbox] and [VMware][vagrant_config_vmware] for more details.
 
 ### <a name="config-dry-run"></a> dry\_run
 
@@ -167,11 +166,11 @@ The default is unset, or `nil`.
 ### <a name="config-network"></a> network
 
 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.netork`
+element is itself an Array of arguments to be passed to the `config.vm.network`
 method. For example:
 
 ```ruby
-driver_config:
+driver:
   network:
   - ["forwarded_port", {guest: 80, host: 8080}]
   - ["private_network", {ip: "192.168.33.33"}]
@@ -195,7 +194,7 @@ The default is an empty Array, `[]`.
 
 ### <a name="config-pre-create-command"></a> pre\_create\_command
 
-An optional hoook to run a command immediately prior to the
+An optional hook to run a command immediately prior to the
 `vagrant up --no-provisioner` command being executed.
 
 There is an optional token, `{{vagrant_root}}` that can be used in the
@@ -215,15 +214,16 @@ 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.
+Allow the user to specify a collection of synced folders on each Vagrant
+instance. Source paths can be relative to the kitchen root.
 
 The default is an empty Array, or `[]`. The example:
 
 ```ruby
-driver_config:
-  synced_folders: [["/Users/mray/ws/cookbooks/pxe_dust/.kitchen/kitchen-vagrant/opt/chef", "/opt/chef"],
-                   ["/host_path", "/vm_path", "create: true, disabled: false"]]
+driver:
+  synced_folders: 
+    - ["data/%{instance_name}", "/opt/instance_data"],
+    - ["/host_path", "/vm_path", "create: true, type: :nfs"]
 ```
 
 will generate a Vagrantfile configuration similar to:
@@ -232,8 +232,8 @@ will generate a Vagrantfile configuration similar to:
 Vagrant.configure("2") do |config|
   # ...
 
-  c.vm.synced_folder "/Users/mray/ws/cookbooks/pxe_dust/.kitchen/kitchen-vagrant/opt/chef", "/opt/chef"
-  c.vm.synced_folder "/host_path", "/vm_path", create: true, disabled: false
+  c.vm.synced_folder "/Users/mray/cookbooks/pxe_dust/data/default-ubuntu-1204", "/opt/instance_data"
+  c.vm.synced_folder "/host_path", "/vm_path", create: true, type: :nfs
 end
 ```
 
@@ -247,7 +247,7 @@ will be used (which is usually set to 'vagrant').
 
 ### <a name="config-vagrantfile-erb"></a> vagrantfile\_erb
 
-An alternamte Vagrantfile ERB template that will be rendered for use by this
+An alternate Vagrantfile ERB template that will be rendered for use by this
 driver. The binding context for the ERB processing is that of the Driver
 object, which means that methods like `config[:kitchen_root]`, `instance.name`,
 and `instance.provisioner[:run_list]` can be used to compose a custom
@@ -316,13 +316,16 @@ Apache 2.0 (see [LICENSE][license])
 [issues]:           https://github.com/opscode/kitchen-vagrant/issues
 [license]:          https://github.com/opscode/kitchen-vagrant/blob/master/LICENSE
 [repo]:             https://github.com/opscode/kitchen-vagrant
-[driver_usage]:     http://docs.kitchen-ci.org/drivers/usage
+[driver_usage]:     http://kitchen.ci/docs/getting-started/adding-platform
 
 [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
 [virtualbox_dl]:            https://www.virtualbox.org/wiki/Downloads
 [vagrantfile]:              http://docs.vagrantup.com/v2/vagrantfile/index.html
+[vagrant_default_provider]: http://docs.vagrantup.com/v2/providers/default.html
+[vagrant_config_vbox]:      http://docs.vagrantup.com/v2/virtualbox/configuration.html
+[vagrant_config_vmware]:    http://docs.vagrantup.com/v2/vmware/configuration.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

data/lib/kitchen/driver/vagrant.rb

@@ -33,7 +33,7 @@ module Kitchen
     #   dependency hook checks when feature is released
     class Vagrant < Kitchen::Driver::SSHBase
 
-      default_config :customize, { :memory => '256' }
+      default_config :customize, {}
       default_config :network, []
       default_config :synced_folders, []
       default_config :pre_create_command, nil
@@ -143,6 +143,8 @@ module Kitchen
       def create_vagrantfile
         return if @vagrantfile_created
 
+        finalize_synced_folder_config
+
         vagrantfile = File.join(vagrant_root, "Vagrantfile")
         debug("Creating Vagrantfile for #{instance.to_str} (#{vagrantfile})")
         FileUtils.mkdir_p(vagrant_root)
@@ -151,6 +153,19 @@ module Kitchen
         @vagrantfile_created = true
       end
 
+      def finalize_synced_folder_config
+        config[:synced_folders].map! do |source, destination, options|
+          [
+            File.expand_path(
+              source.gsub("%{instance_name}", instance.name),
+              config[:kitchen_root]
+            ),
+            destination.gsub("%{instance_name}", instance.name),
+            options || "nil"
+          ]
+        end
+      end
+
       def render_template
         if File.exists?(template)
           ERB.new(IO.read(template)).result(binding).gsub(%r{^\s*$\n}, '')

data/lib/kitchen/driver/vagrant_version.rb

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

data/templates/Vagrantfile.erb

@@ -20,12 +20,8 @@ Vagrant.configure("2") do |c|
 <% end %>
 
   c.vm.synced_folder ".", "/vagrant", disabled: true
-<% config[:synced_folders].each do |source, destination, options|
-     l_source = source.gsub("%{instance_name}", instance.name)
-     l_destination = destination.gsub("%{instance_name}", instance.name)
-     opt = (options.nil? ? '' : ", #{options}")
-%>
-  c.vm.synced_folder "<%= l_source %>", "<%= l_destination %>"<%= opt %>
+<% config[:synced_folders].each do |source, destination, options| %>
+  c.vm.synced_folder "<%= source %>", "<%= destination %>", <%= options %>
 <% end %>
 
   c.vm.provider :<%= config[:provider] %> do |p|
@@ -33,7 +29,7 @@ Vagrant.configure("2") do |c|
   <% case config[:provider]
      when "virtualbox" %>
     p.customize ["modifyvm", :id, "--<%= key %>", "<%= value %>"]
-  <% when "rackspace" %>
+  <% when "rackspace", "softlayer" %>
     p.<%= key %> = "<%= value%>"
   <% when /^vmware_/ %>
     <% if key == :memory %>

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: cane
   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: tailor
   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: countloc
   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.
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -94,18 +94,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
 test_files: []
+has_rdoc: