vagrant-r10k 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4666dcc1faa126330ef66752ae6271931d6d856
-  data.tar.gz: 335eee055654f32f1ac8605dc5368ca1ec6857dd
+  metadata.gz: 8d10d813ebfeaaab6624535df85adf644ef33920
+  data.tar.gz: 18b0c7240ad342c182695b215b2eedd83a399437
 SHA512:
-  metadata.gz: 4e378b000c0d0772d99c1bd5a34b415f0c821a1249cc1893846702d84aa10cd606fb596ab54ad1fdb04e7f03d6426d5ddc9622bec119e4c2573fadebe9c9b740
-  data.tar.gz: e66844a6f7c8e937c3bd6b92a465b34b14a1eac75033fb2f6c10888faa2535ccd9bf31d0db9a1dc85b59f18660f4b3bf4af90f8b19baf8316cd9de4f85868ed5
+  metadata.gz: 8a590b625431419a985732cb0950339d3ac217dc6294a30696396685f61963bd62291b2ef81905414763f7f6fe1b39d15ab694d57d03e93936c15584d628867e
+  data.tar.gz: d57a257ed713e38dd6dcb6e722746197b7829e578a5a9c1f70757353dda7d2e262252077d6e86a769ef309c67ec5c77f2391dda80b9265c85c638cbfe840465c

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -21,6 +20,8 @@ tmp
 *.a
 mkmf.log
 vendor
-Vagrantfile
 .vagrant
 coverage
+results.xml
+spec/boxes
+acceptance.out

data/.pullreview.yml

@@ -0,0 +1,4 @@
+---
+notifications:
+  pullrequest:
+    comment: verbose

data/.rspec

@@ -0,0 +1,5 @@
+--format documentation
+--color
+--order random
+--format RspecJunitFormatter
+--out results.xml

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.1
+ruby-2.0.0

data/.travis.yml

@@ -1,8 +1,9 @@
 ---
+sudo: false
 language: ruby
 before_install:
   - gem install bundler --version $BUNDLER_VERSION
-install: bundle _${BUNDLER_VERSION}_ install
+install: bundle _${BUNDLER_VERSION}_ install --retry 5
 script: bundle _${BUNDLER_VERSION}_ exec rspec --color --format documentation
 notifications:
   email: true
@@ -12,6 +13,7 @@ env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
+    - VAGRANT_VERSION=1.5.0 BUNDLER_VERSION=1.5.2
     - VAGRANT_VERSION=1.6.5 BUNDLER_VERSION=1.6.9
     - VAGRANT_VERSION=1.7.0 BUNDLER_VERSION=1.7.9
     - BUNDLER_VERSION=1.7.9

data/CHANGES.md

@@ -1,5 +1,31 @@
 # vagrant-r10k changelog
 
+## master (unreleased)
+
+## 0.3.0 2015-09-04 Jason Antman <jason@jasonantman.com>
+
+* [#9](https://github.com/jantman/vagrant-r10k/issues/9) major refactor to separate config validation and provisioning, and prevent multiple provisioning runs
+* [#15](https://github.com/jantman/vagrant-r10k/issues/17) document how to install Forge modules
+* [#16](https://github.com/jantman/vagrant-r10k/issues/16) more helpful error message if r10k deploy fails with 'Could not resolve host'
+* Change gemspec from ``bundler ~> 1.6`` to ``bundler ~> 1.5`` for testing Vagrant 1.5.0
+* Updates to ``README.md``
+* Testing changes
+  * [#12](https://github.com/jantman/vagrant-r10k/issues/12) [vagrant-spec](https://github.com/mitchellh/vagrant-spec/)-based acceptance tests for VirtualBox
+  * [#20](https://github.com/jantman/vagrant-r10k/issues/20) vmware-workstation spec tests are broken and disabled
+  * Major overhaul to spec and acceptance tests
+  * Ignore ``spec/`` in coverage
+  * Add increased coverage of ``plugin.rb``
+  * Change to documentation output for rspec
+  * Don't gitignore ``Gemfile.lock``
+  * Randomize test execution order
+  * Add JUnit XML results output
+  * Ignore some un-testable code from coverage analysis
+  * Add Travis testing for Vagrant 1.5.0
+  * Add ``--retry`` to ``bundle install`` to fix Travis timeout errors
+  * Downgrade bundler from 1.6 to 1.5 to work with older testing versions
+  * Bump bundled Vagrant version from 1.7.2 to 1.7.4
+  * [#22](https://github.com/jantman/vagrant-r10k/issues/22) enable pullreview.com code analysis and comments, and make some recommended changes
+
 ## 0.2.0 2015-01-10 Jason Antman <jason@jasonantman.com>
 
 * Add unit tests for modulegetter and config.

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
+# this next line is needed for vagrant-vmware-workstation for acceptance testing
+#source "http://gems.hashicorp.com"
 
 group :development do
   if ENV.has_key?('VAGRANT_VERSION')
@@ -6,12 +8,15 @@ group :development do
   else
     gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", branch: 'master'
   end
-  # Pinned on 12/10/2014. Compatible with Vagrant 1.5.x, 1.6.x and 1.7.x.
-  gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec', :ref => '1df5a3a'
+  # pinned to branch for https://github.com/mitchellh/vagrant-spec/pull/16
+  gem 'vagrant-spec', :github => 'jantman/vagrant-spec', :ref => 'junit_and_env'
   gem 'simplecov', :require => false
   gem 'codecov', :require => false
+  gem "rspec_junit_formatter", :require => false
+  gem 'rspec-matcher-num-times', git: "https://github.com/jantman/rspec-matcher-num-times.git", branch: 'rspec2'
 end
 
 group :plugins do
   gemspec
+  #gem 'vagrant-vmware-workstation', '3.2.8'
 end

data/Gemfile.lock

@@ -0,0 +1,181 @@
+GIT
+  remote: git://github.com/jantman/vagrant-spec.git
+  revision: d85c6fd2887358b7adc145cf89a4bfb420f7f714
+  ref: junit_and_env
+  specs:
+    vagrant-spec (0.0.1)
+      childprocess (~> 0.5.0)
+      log4r (~> 1.1.9)
+      rspec (~> 2.14)
+      thor (~> 0.18.1)
+
+GIT
+  remote: https://github.com/jantman/rspec-matcher-num-times.git
+  revision: a34cf9b95ff94512d4c515056ef25a73dbf8d544
+  branch: rspec2
+  specs:
+    rspec-matcher-num-times (0.0.1)
+      rspec (>= 2.0)
+
+GIT
+  remote: https://github.com/mitchellh/vagrant.git
+  revision: cd25b820c4425c77b833550e1f1d90f9a7c8be14
+  branch: master
+  specs:
+    vagrant (1.7.4)
+      bundler (>= 1.5.2, <= 1.10.5)
+      childprocess (~> 0.5.0)
+      erubis (~> 2.7.0)
+      hashicorp-checkpoint (~> 0.1.1)
+      i18n (>= 0.6.0, <= 0.8.0)
+      listen (~> 3.0.2)
+      log4r (~> 1.1.9, < 1.1.11)
+      net-scp (~> 1.1.0)
+      net-sftp (~> 2.1)
+      net-ssh (>= 2.6.6, < 2.10.0)
+      nokogiri (= 1.6.3.1)
+      rb-kqueue (~> 0.2.0)
+      rest-client (>= 1.6.0, < 2.0)
+      wdm (~> 0.1.0)
+      winrm (~> 1.3)
+      winrm-fs (~> 0.2.0)
+
+PATH
+  remote: .
+  specs:
+    vagrant-r10k (0.3.0)
+      r10k (~> 1.2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    childprocess (0.5.6)
+      ffi (~> 1.0, >= 1.0.11)
+    codecov (0.0.4)
+      json
+      simplecov
+      url
+    colored (1.2)
+    cri (2.5.0)
+      colored (~> 1.2)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    erubis (2.7.0)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
+    faraday_middleware-multi_json (0.0.6)
+      faraday_middleware
+      multi_json
+    ffi (1.9.10)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    hashicorp-checkpoint (0.1.4)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    httpclient (2.6.0.1)
+    i18n (0.7.0)
+    json (1.8.2)
+    json_pure (1.8.1)
+    listen (3.0.3)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    little-plugger (1.1.3)
+    log4r (1.1.10)
+    logging (1.8.2)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.8.4)
+    mime-types (2.6.1)
+    mini_portile (0.6.0)
+    multi_json (1.8.4)
+    multipart-post (1.2.0)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    netrc (0.10.3)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    nori (2.6.0)
+    r10k (1.2.1)
+      colored (>= 1.2)
+      cri (~> 2.5.0)
+      faraday (~> 0.8.8)
+      faraday_middleware (~> 0.9.0)
+      faraday_middleware-multi_json (~> 0.0.5)
+      json_pure (~> 1.8.1)
+      log4r (>= 1.1.10)
+      multi_json (~> 1.8.2)
+      systemu (~> 2.5.2)
+    rake (10.4.2)
+    rb-fsevent (0.9.5)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.4)
+      ffi (>= 0.5.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.2)
+    rspec_junit_formatter (0.2.0)
+      builder (< 4)
+      rspec (>= 2, < 4)
+      rspec-core (!= 2.12.0)
+    rubyntlm (0.4.0)
+    rubyzip (1.1.7)
+    simplecov (0.9.2)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    systemu (2.5.2)
+    thor (0.18.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
+    url (0.3.2)
+    uuidtools (2.1.5)
+    wdm (0.1.1)
+    winrm (1.3.3)
+      builder (>= 2.1.2)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (~> 1.6, >= 1.6.1)
+      nori (~> 2.0)
+      rubyntlm (~> 0.4.0)
+      uuidtools (~> 2.1.2)
+    winrm-fs (0.2.2)
+      erubis (~> 2.7)
+      logging (~> 1.6, >= 1.6.1)
+      rubyzip (~> 1.1)
+      winrm (~> 1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.5)
+  codecov
+  rake
+  rspec-matcher-num-times!
+  rspec_junit_formatter
+  simplecov
+  vagrant!
+  vagrant-r10k!
+  vagrant-spec!

data/README.md

@@ -1,5 +1,11 @@
 # Vagrant::R10k
 
+[![Build Status](https://travis-ci.org/jantman/vagrant-r10k.svg?branch=master)](https://travis-ci.org/jantman/vagrant-r10k)
+[![Code Coverage](https://codecov.io/github/jantman/vagrant-r10k/coverage.svg?branch=master)](https://codecov.io/github/jantman/vagrant-r10k?branch=master)
+[![Code Climate](https://codeclimate.com/github/jantman/vagrant-r10k/badges/gpa.svg)](https://codeclimate.com/github/jantman/vagrant-r10k)
+[![Gem Version](https://img.shields.io/gem/v/vagrant-r10k.svg)](https://rubygems.org/gems/vagrant-r10k)
+[![Total Downloads](https://img.shields.io/gem/dt/vagrant-r10k.svg)](https://rubygems.org/gems/vagrant-r10k)
+[![Github Issues](https://img.shields.io/github/issues/jantman/vagrant-r10k.svg)](https://github.com/jantman/vagrant-r10k/issues)
 [![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/0.1.0/active.svg)](http://www.repostatus.org/#active)
 
 vagrant-r10k is a [Vagrant](http://www.vagrantup.com/) 1.2+ middleware plugin to allow you to have just a Puppetfile and
@@ -56,7 +62,39 @@ The configuration for r10k and puppet would look like:
 
 If you provide an array of directories in puppet.module_path, vagrant-r10k will use the first directory listed for auto configuration. If you want to let r10k use a different directory, see below.
 
-## Usage with explicit path to module installation directory
+### Puppet Forge Modules in Puppetfile
+
+In order to prevent conflicts with other plugins and allow you to use whatever Puppet version you need, ``puppet`` itself is not included
+in this plugin. This means that, _as-is, this plugin can't install Forge modules in your Puppetfile_, only modules from Git or SVN. This
+is because installing Forge modules requires ``puppet`` itself to download the module.
+
+The two possible ways to deal with this are:
+
+1. Only use git or svn repo references in your Puppetfile.
+2. Install ``puppet`` into Vagrant's gems
+
+For #2, installing puppet into Vagrant's gems, simply ``vagrant plugin install puppet``; for further information,
+see the [vagrant plugin documentation](https://docs.vagrantup.com/v2/plugins/usage.html). If you do this, you should
+probably ensure that puppet is present by putting something like this at the top of your Vagrantfile:
+
+```
+# test that puppet is installed as a Vagrant plugin
+# you can't use ``Vagrant.has_plugin?("puppet")`` because Vagrant's built-in
+# Puppet Provisioner provides a plugin named "puppet", so this always evaluates to true.
+begin
+  gem "puppet"
+rescue Gem::LoadError
+  raise "puppet is not installed in vagrant gems! please run 'vagrant plugin install puppet'"
+end
+```
+
+If you want to check for a specific version of Puppet, you can replace the content of the ``begin`` block with something like:
+
+```
+  gem "puppet", ">=3.8"
+```
+
+### Usage with explicit path to module installation directory
 
 Add the following to your Vagrantfile, before the puppet section:
 
@@ -94,6 +132,29 @@ The configuration for r10k and puppet would look like:
       puppet.module_path = ["puppet/modules", "puppet/vendor"]
     end
 
+## Getting Help
+
+Bug reports, feature requests, and pull requests are always welcome. At this time, the
+[GitHub Issues Tracker](https://github.com/jantman/vagrant-r10k/issues)
+is the only place for support, so questions and comments are welcome there as well,
+but please be sure they haven't already been asked and answered.
+
+Bug reports should include the following information in order to be investigated:
+
+1. A detailed description of the problem, including the behavior you expected and
+   the actual behavior that you're observing.
+2. The output of ``vagrant plugin list`` showing all of the plugins you're running
+   and their versions.
+3. The versions of Ruby (``ruby --version``) and Vagrant (``vagrant --version``)
+   itself that you're running.
+4. A copy of the Vagrantfile that was being used. Please include all lines in it;
+   if you have any confidential or proprietary information, feel free to replace
+   usernames, passwords, URLs, IPs, etc. with "X"s, but please don't remove
+   large portions of it.
+5. A debug-level log of the command you're having problems with. i.e. if your
+   problem is experienced when running ``vagrant up``, please include the full
+   output of ``VAGRANT_LOG=debug vagrant up``.
+
 ## Contributing
 
 1. Fork it ( https://github.com/jantman/vagrant-r10k/fork )
@@ -107,14 +168,66 @@ The configuration for r10k and puppet would look like:
 
 * Oliver Bertuch - [https://github.com/poikilotherm](https://github.com/poikilotherm)
 
-## Testing
-
-Still need to write tests... but they'll be using bundler and rspec.
+## Development
 
-__Note__ that developming vagrant plugins _requires_ ruby 2.0.0 or newer.
+__Note__ that developing vagrant plugins _requires_ ruby 2.0.0 or newer.
 A `.ruby-version` is provided to get [rvm](https://rvm.io/workflow/projects)
 to use 2.1.1.
 
+### Unit Tests
+
+These will be automatically run by TravisCI for any pull requests or commits
+to the repository. To run manually:
+
+    bundle install --path vendor
+    bundle exec rake spec
+
+### Acceptance Tests
+
+Unfortunately, "acceptance" testing Vagrant requires the various providers
+be functional; i.e. to test the [VMWare Providers](https://www.vagrantup.com/vmware)
+requires both a license for them from Hashicorp, and the VMWare products
+themselves. Similarly, testing the AWS providers requires an AWS account and
+actually running EC2 instances. As such, acceptance tests are provided separately
+for each provider.
+
+Note that the acceptance tests are tested with bundler 1.7.14. Also note that
+the first time the VMWare provider is run in a given installation, it will
+present an interactive sudo prompt in order to be able to interact with
+VMWare.
+
+Running Virtualbox acceptance tests:
+
+    bundle exec rake acceptance:virtualbox
+
+When tests fail, they leave Virtualbox ``hostonlyif``s around; this can quickly clutter up the
+system and cause other problems. As a result, after the virtualbox tests, we invoke the Vagrant
+VirtualBox Provider's [delete_unused_host_only_networks](https://github.com/mitchellh/vagrant/blob/b118ab10c8e0f8e62a547249805f05240e6e4ee9/plugins/providers/virtualbox/driver/version_5_0.rb#L69)
+method. This can also be manually run via ``bundle exec rake clean_vbox``.
+
+These tests may generate a _lot_ of output; since there's no nice standalone junit XML viewer,
+it may be helpful to run the tests as:
+
+    bundle exec rake acceptance:virtualbox 2>&1 | tee acceptance.out
+
+And then examine ``acceptance.out`` as needed.
+
+
+__Note__ that the vmware-workstation provider acceptance tests are not currently
+functional; I've only been able to get the VirtualBox acceptance tests working.
+If many users report vmware-specific problems, I'll give the tests another try.
+Helpful information for them is available at http://www.codingonstilts.com/2013/07/how-to-bundle-exec-vagrant-up-with.html
+and https://groups.google.com/d/topic/vagrant-up/J8J6LmhzBqM/discussion
+I had these working at some point, but have been unable to get them working since;
+it seems that (a bit painfully and ironically), mitchellh's [vagrant-spec](https://github.com/mitchellh/vagrant-spec/)
+doesn't seem to work cleanly with Hashicorp's paid/licensed Vagrant providers.
+
+Running (currently broken) VMWare Workstation acceptance tests:
+
+    bundle exec rake acceptance:vmware_workstation
+
+### Manually Testing Vagrant
+
 For manual testing:
 
     bundle install --path vendor
@@ -124,11 +237,13 @@ To use an existing project's Vagrantfile, you can just specify the directory tha
 is in using the ``VAGRANT_CWD`` environment variable (i.e. prepend ``VAGRANT_CWD=/path/to/project``
 to the above command).
 
-## Debugging
+Note that this will not work easily with the VMWare provider, or any other Hashicorp paid/licensed provider.
+
+### Debugging
 
 Exporting ``VAGRANT_LOG=debug`` will also turn on debug-level logging for r10k.
 
-## Releasing
+### Releasing
 
 1. Ensure all tests are passing, coverage is acceptable, etc.
 2. Increment the version number in ``lib/vagrant-r10k/version.rb``

data/Rakefile

@@ -11,7 +11,118 @@ begin
 rescue LoadError
 end
 
+def system_or_die(cmd, fail_msg=nil)
+  puts "running: '#{cmd}'"
+  res = system(cmd)
+  if ! res
+    if fail_msg.nil?
+      $stderr.puts "Command exited non-zero: #{cmd}"
+    else
+      $stderr.puts fail_msg
+    end
+    exit!(1)
+  end
+end
+
+def get_box_path(provider)
+  boxes_dir = File.join(File.dirname(__FILE__), 'spec', 'boxes')
+  Dir.mkdir(boxes_dir) if not File.directory?(boxes_dir)
+  if provider == 'virtualbox'
+    boxurl = 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/centos-7.0-x86_64-virtualbox-puppet-1.0.1.box'
+  elsif provider == 'aws'
+    boxurl = 'https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box'
+  elsif provider == 'vmware_workstation'
+    boxurl = 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/centos-7.0-x86_64-vmware-puppet-1.0.1.box'
+  else
+    STDERR.puts "ERROR: no box URL known for provider '#{provider}'"
+    exit!(1)
+  end
+  box_path = File.join(boxes_dir, "dummy_#{provider}.box")
+  if File.exist?(box_path)
+    puts "#{provider} box exists at #{box_path}"
+  else
+    puts "Downloading #{provider} box from #{boxurl} to #{box_path}"
+    system_or_die("curl -o #{box_path} '#{boxurl}'")
+  end
+  return box_path
+end
+
+def fix_results_xml()
+  # mainly a workaround for https://github.com/sj26/rspec_junit_formatter/issues/31
+  return if ! File.exist?('results.xml')
+  puts "Munging invalid control chracters in results.xml"
+  content = File.read('results.xml')
+  content.gsub!(/\033/, "\uFFFD")
+  File.open('results.xml', 'w') { |file| file.write(content) }
+end
+
+def vmware_workstation_prep()
+  # make vmware_workstation provider work in bundler install
+  # see: http://www.codingonstilts.com/2013/07/how-to-bundle-exec-vagrant-up-with.html
+  plugin_dir = Gem::Specification.find_by_name("vagrant-vmware-workstation").gem_dir
+  puts "Found vmware_workstation plugin dir as: #{plugin_dir}"
+  loader_link_path = File.join(plugin_dir, "rgloader")
+  if not File.exist?(loader_link_path)
+    rgloader_path = '/opt/vagrant/embedded/rgloader'
+    if not File.exist?(rgloader_path)
+      puts "ERROR: could not find rgloader in ~/.vagrant.d"
+      exit!(1)
+    end
+    puts "Found rgloader path as: #{rgloader_path}"
+    File.symlink(rgloader_path, loader_link_path)
+    puts "Symlinked #{loader_link_path} to #{rgloader_path}"
+  end
+  ENV['VAGRANT_INSTALLER_EMBEDDED_DIR'] = '/opt/vagrant/embedded'
+  lic_link_path = File.join(plugin_dir, "license-vagrant-vmware-workstation.lic")
+  if not File.exist?(lic_link_path)
+    lic_path = File.join(File.expand_path("~"), ".vagrant.d", "license-vagrant-vmware-workstation.lic")
+    if not File.exist?(lic_path)
+      puts "ERROR: could not find license file at #{lic_path}"
+      exit!(1)
+    end
+    File.symlink(lic_path, lic_link_path)
+    puts "Symlinked #{lic_link_path} to #{lic_path}"
+  end
+end
+
 desc "Display the list of available rake tasks"
 task :help do
   system("rake -T")
 end
+
+desc "Cleanup VirtualBox hostonlyifs"
+task :clean_vbox do
+  puts "Initializing Vagrant ProviderVirtualBox plugin"
+  require 'vagrant'
+  dm = VagrantPlugins::ProviderVirtualBox::Driver::Meta.new
+  puts "Deleting unused VirtualBox host-only networks"
+  dm.delete_unused_host_only_networks
+end
+
+namespace :acceptance do
+  providers = ['virtualbox', 'vmware_workstation']
+
+  # isolate our temp directories so we can easily remove them
+  tmp_dir_path = '/tmp/vagrant-r10k-spec'
+  Dir.mkdir(tmp_dir_path) unless Dir.exists?(tmp_dir_path)
+
+  providers.each do |prov|
+    desc "Run acceptance tests for #{prov}"
+    task prov do |task|
+      provider = task.name.split(':')[1]
+      puts "Running acceptance tests for #{provider}"
+      if provider == 'vmware_workstation'
+        puts "ERROR: vmware_workstation acceptance tests are broken. Please see https://github.com/jantman/vagrant-r10k/issues/20"
+        exit!(1)
+        vmware_workstation_prep()
+      end
+      box_path = get_box_path(provider)
+      system_or_die("VS_PROVIDER=#{provider} VS_BOX_PATH=#{box_path} TMPDIR=#{tmp_dir_path} bundle exec vagrant-spec test")
+      system("rm -Rf #{tmp_dir_path}/*")
+      fix_results_xml()
+      if provider == 'virtualbox'
+        Rake::Task['clean_vbox'].invoke
+      end
+    end
+  end
+end

data/lib/vagrant-r10k/action/base.rb

@@ -0,0 +1,44 @@
+require 'vagrant/action'
+require_relative '../helpers'
+
+module VagrantPlugins
+  module R10k
+    module Action
+      # base class for vagrant-r10k hook actions
+      class Base
+
+        include R10K::Logging
+
+        # validate hook
+        def self.validate
+          Vagrant::Action::Builder.new.tap do |b|
+            b.use Action::Validate
+          end
+        end
+
+        # r10k deploy hook
+        def self.deploy
+          Vagrant::Action::Builder.new.tap do |b|
+            b.use Action::Validate
+            b.use Action::Deploy
+          end
+        end
+
+        include VagrantPlugins::R10k::Helpers
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+          klass = self.class.name.downcase.split('::').last
+          @logger = Log4r::Logger.new("vagrant::r10k::#{klass}")
+          if ENV["VAGRANT_LOG"] == "debug"
+            R10K::Logging.level = 0
+            @logger.level = 0
+          else
+            R10K::Logging.level = 3
+          end
+        end
+      end
+    end
+  end
+end