kitchen-vagrant_winrm 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 16ecf0da894a2cc18d5686f0202880622a7e6b2c
-  data.tar.gz: e6ed107fd4d07554d62852dc9015afe17bbbfd1e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2YxNmVjN2YzYWJmNjM0NzRkM2IyZWZhYjc1OGJhZmQ2ZGVjMmFmOQ==
+  data.tar.gz: !binary |-
+    NTZkZWVlYjg1ZGY3YzRhOTUxMjU5YTAyMjZhOGE2MWJhZjU5NjJlOQ==
 SHA512:
-  metadata.gz: a52555efa90e670fe9a0a291a50d345b42ae2985719cd139f325785a7d2420546e6cbfa479eb6a249d79ac7b185c6b3cb1492d516efbfddcade5ccbddfa820e1
-  data.tar.gz: 4e3aeae19e62c66e20eb6c2e8a4848ef8936a45c53c95ea6f9839677038def8dc968aa83cfaf3e50b47ce226e6c97e001ffa619f5fc76d1d4b9db1ef1230f2ec
+  metadata.gz: !binary |-
+    YmQyNTQ2MDNkYWZkODAwZmM1Yzc1ZjUwMTEzNGU1NjU1NmQyOWEwYTZiOWU1
+    YjNmODNlYTQxNTA0NTYyYzUxNDFlZmMzM2QyZjAyZmY3ZDA0OTQwY2UyYTI4
+    YTE1OWNiZmI3ZjkyZDdhZDEzNzg1NmQ1M2UwODE1NzY3NDMxZDk=
+  data.tar.gz: !binary |-
+    NTdjMzFjOTk3ODA5NWI2NWYyZDYyMWFiZjdiNzc4NTg2NjdkNGU5YWJhOTcy
+    MGRkNWJlOTFlYTg3YmE3ZjljMDIzNjNmNmJhNDIwZjM5ZjNmMmIyNmQ0Yzhl
+    ZDU5NGEzNWE3ZDU1MzVlMmM0ZjlhN2Q5MTI5M2VhYjEyNzE0MTE=

data/.travis.yml

@@ -3,8 +3,8 @@ deploy:
   provider: rubygems
   api_key:
     secure: UM1xgIt9jc8oy0ZL6R7VTPApn/JTrjvIM1J1QcPNtKkp4b9Ykr62uozsadyk4giTlMU3/Fhswx6wdInwzKwLy63OVn1P4iSJn66SlOAcnn1EuK5oqyJ7UsDL8ZUphIHx0OQD+FYn/ax3ClqieWfC4W/jU277skziS9lOkEQ8FLw=
-  gem: kitchen-vagant_winrm
+  gem: kitchen-vagrant_winrm
   on:
     tags: true
     all_branches: true
-    repo: criteo/kitchen-vagant_winrm
+    repo: criteo/kitchen-vagrant_winrm

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.2.2
+* Allow to configure custom/arbitrary vagrant settings
+* Allow to use vagrant provisioning system
+* Add example to integrate with new test-kitchen 1.3.1 chez-zero provisioner
+
+## 0.2.1
+* Fix wrong sandbox path
+
 ## 0.2.0
 * Use vagrant-winrm (>=0.4) compression feature
 * Use shell script instead of winrm commands

data/README.md

@@ -74,6 +74,9 @@ platforms:
       name: chef_zero
       sudo: false
       root_path: /var/chef/
+      chef_client_path: /opscode/chef/bin/chef-client
+      chef_omnibus_root: /opscode/chef/
+      ruby_bindir: /opscode/chef/embedded/bin
     driver_config:
       guest: windows
       communicator: 'winrm'
@@ -104,6 +107,14 @@ started.
 
 The default will be computed from the platform name of the instance.
 
+### <a name="config-provision"></a> provision
+
+A boolean value that determines whether Vagrant provisioning system is used
+when creating the VM.
+
+By default the value is unset, or `nil`. In this case the driver will not use
+the Vagrant provisioning system
+
 ### <a name="config-provider"></a> provider
 
 This determines which Vagrant provider to use. The value should match
@@ -115,6 +126,29 @@ By default the value is unset, or `nil`. In this case the driver will use the
 Vagrant [default provider][vagrant_default_provider] which at this current time
 is `virtualbox` unless set by `VAGRANT_DEFAULT_PROVIDER` environment variable.
 
+### <a name="config-custom_settings"></a> custom_settings
+
+A **Hash** of Vagrant settings. Each key/value pair should be vagrant settings.
+It could be used to configure custom plugins. For example:
+
+```ruby
+driver:
+  custom_settings:
+    omnibus.chef_version: :latest
+    berkshelf.enabled: 'false'
+```
+
+will generate a Vagrantfile configuration similar to:
+```ruby
+Vagrant.configure("2") do |config|
+  # ...
+
+  config.omnibus.chef_version = :latest
+  config.berkshelf.enabled = false
+end
+
+You should take care of adding single/double quotes around your string values.
+
 ### <a name="config-customize"></a> customize
 
 A **Hash** of customizations to a Vagrant virtual machine.  Each key/value

data/lib/kitchen/driver/vagrant_winrm.rb

@@ -13,6 +13,7 @@ module Kitchen
     class VagrantWinrm < Base
 
       default_config :communicator, :winrm
+      default_config :custom_settings, {}
       default_config :customize, {
         vrde: 'on',
         vrdeport: '5000-5100',
@@ -23,6 +24,7 @@ module Kitchen
       default_config :pre_create_command, nil
       default_config :require_chef_omnibus, false
       default_config :synced_folders, []
+      default_config :provision, false
 
       default_config :vagrantfile_erb,
         File.join(File.dirname(__FILE__), '../../../templates/Vagrantfile.erb')
@@ -45,7 +47,8 @@ module Kitchen
       def create(state)
         create_vagrantfile
         run_pre_create_command
-        cmd = 'vagrant up --no-provision'
+        cmd = 'vagrant up'
+        cmd += ' --no-provision' unless config[:provision]
         cmd += " --provider=#{config[:provider]}" if config[:provider]
         run cmd
         info("Vagrant instance #{instance.to_str} created.")

data/lib/kitchen/driver/vagrant_winrm_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for VagrantWinrm Kitchen driver
-    VAGRANT_WINRM_VERSION = '0.2.1'
+    VAGRANT_WINRM_VERSION = '0.2.2'
   end
 end

data/templates/Vagrantfile.erb

@@ -20,6 +20,12 @@ Vagrant.configure("2") do |c|
   c.winrm.port = <%= config[:winrm_port] %>
 <% end %>
 
+<% config[:custom_settings].each do |key, value|
+  value = "\"#{value}\"" if [TrueClass,FalseClass,Fixnum].include? value.class
+%>
+  c.<%= key %> = "<%= value %>"
+<% end %>
+
 <% Array(config[:network]).each do |opts| %>
   c.vm.network(:<%= opts[0] %>, <%= opts[1..-1].join(", ") %>)
 <% end %>

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant_winrm
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Baptiste Courtois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-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.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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: 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: rspec
   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::VagrantWinRM - A Test Kitchen Driver using Vagrant-WinRM
@@ -115,11 +115,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".cane"
-- ".gitignore"
-- ".rspec"
-- ".tailor"
-- ".travis.yml"
+- .cane
+- .gitignore
+- .rspec
+- .tailor
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -140,17 +140,17 @@ 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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver using vagrant winrm