vagrant-r10k 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11ae37b7c28f43dcdd732d3b5515e4f2c0eadcc1
-  data.tar.gz: a7d31bd3f78eea85d5e1e0098471d26f6c08a477
+  metadata.gz: a4666dcc1faa126330ef66752ae6271931d6d856
+  data.tar.gz: 335eee055654f32f1ac8605dc5368ca1ec6857dd
 SHA512:
-  metadata.gz: 336d24166bda7d40cd6a8c3a6ffecc8e6247aae15892fadb9ce8b887e8b36ec3b271f6ad1bf417d93c53f7738ae3054bf57c60eea49883541e4dea818e5d8a1c
-  data.tar.gz: 7a11489ace64e0edb07410b28740e4df80f6c952fb94243a59fe673024db027418b3e5b37b8be44484b6a92df8db3e3786075f77249a9d3e95163851d576aa12
+  metadata.gz: 4e378b000c0d0772d99c1bd5a34b415f0c821a1249cc1893846702d84aa10cd606fb596ab54ad1fdb04e7f03d6426d5ddc9622bec119e4c2573fadebe9c9b740
+  data.tar.gz: e66844a6f7c8e937c3bd6b92a465b34b14a1eac75033fb2f6c10888faa2535ccd9bf31d0db9a1dc85b59f18660f4b3bf4af90f8b19baf8316cd9de4f85868ed5

data/.gitignore

@@ -23,3 +23,4 @@ mkmf.log
 vendor
 Vagrantfile
 .vagrant
+coverage

data/.travis.yml

@@ -0,0 +1,17 @@
+---
+language: ruby
+before_install:
+  - gem install bundler --version $BUNDLER_VERSION
+install: bundle _${BUNDLER_VERSION}_ install
+script: bundle _${BUNDLER_VERSION}_ exec rspec --color --format documentation
+notifications:
+  email: true
+rvm:
+  - 2.0.0
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+  matrix:
+    - 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

@@ -0,0 +1,21 @@
+# vagrant-r10k changelog
+
+## 0.2.0 2015-01-10 Jason Antman <jason@jasonantman.com>
+
+* Add unit tests for modulegetter and config.
+* Readme updates.
+* Add changelog.
+* Fix bug in newer Vagrant where provider does not have .name ([issue #3](https://github.com/jantman/vagrant-r10k/issues/3))
+* Update README.md
+
+## 0.1.1 2014-08-07 Jason Antman <jason@jasonantman.com>
+
+* Add support for optional config of r10k module_path and check if it is defined ([Oliver Bertuch](https://github.com/poikilotherm)).
+* Add documentation
+* Add default Rake task to list available tasks
+* Add development docs and `.ruby_version`.
+* Update contributing docs and contributors list.
+
+## 0.1.0 2014-07-01 Jason Antman <jason@jasonantman.com>
+
+* Initial Release

data/Gemfile

@@ -1,9 +1,17 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
+  if ENV.has_key?('VAGRANT_VERSION')
+    gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", tag: "v#{ENV['VAGRANT_VERSION']}"
+  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'
+  gem 'simplecov', :require => false
+  gem 'codecov', :require => false
 end
 
 group :plugins do
-  gem "vagrant-r10k", path: "."
+  gemspec
 end

data/README.md

@@ -1,5 +1,7 @@
 # Vagrant::R10k
 
+[![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
 manifests in your vagrant project, and pull in the required modules via [r10k](https://github.com/adrienthebo/r10k). This
 plugin only works with the 'puppet' provisioner, not a puppet server. It expects you to have a Puppetfile in the same repository
@@ -97,10 +99,9 @@ The configuration for r10k and puppet would look like:
 1. Fork it ( https://github.com/jantman/vagrant-r10k/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Increment the version number in `lib/vagrant-r10k/version.rb`
-5. Add yourself to the "Contributors" list below.
-6. Push to the branch (`git push origin my-new-feature`)
-7. Create a new Pull Request
+4. Add yourself to the "Contributors" list below.
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create a new Pull Request
 
 ### Contributors
 
@@ -127,10 +128,19 @@ to the above command).
 
 Exporting ``VAGRANT_LOG=debug`` will also turn on debug-level logging for r10k.
 
+## Releasing
+
+1. Ensure all tests are passing, coverage is acceptable, etc.
+2. Increment the version number in ``lib/vagrant-r10k/version.rb``
+3. Update CHANGES.md
+4. Push those changes to origin.
+5. ``bundle exec rake build``
+6. ``bundle exec rake release``
+
 ## Acknowlegements
 
 Thanks to the following people:
 
-* [@adrienthebo](https://github.com/adrienthebo) for [r10k](https://github.com/adrienthebo/r10k)
+* [@adrienthebo](https://github.com/adrienthebo) for [r10k](https://github.com/adrienthebo/r10k) and for [vagrant-pe_build](https://github.com/adrienthebo/vagrant-pe_build) as a wonderful example of unit testing Vagrant plugins.
 * [@garethr](https://github.com/garethr) for [librarian-puppet-vagrant](https://github.com/garethr/librarian-puppet-vagrant) which inspired this plugin
 * [Alex Kahn](http://akahn.net/) of Paperless Post for his [How to Write a Vagrant Middleware](http://akahn.net/2014/05/05/vagrant-middleware.html) blog post, documenting the new middleware API

data/Rakefile

@@ -5,6 +5,12 @@ Bundler::GemHelper.install_tasks
 
 task :default => [:help]
 
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+end
+
 desc "Display the list of available rake tasks"
 task :help do
   system("rake -T")

data/lib/vagrant-r10k/modulegetter.rb

@@ -60,27 +60,30 @@ module VagrantPlugins
         manifest_file = nil
         manifests_path = nil
         @env[:machine].config.vm.provisioners.each do |prov|
-          if prov.name == :puppet
-            # if module_path has been set before, check if it fits to one defined in the provisioner config
-            if module_path != nil
-              if prov.config.module_path.is_a?(Array) and ! prov.config.module_path.include?(module_path) 
-                @env[:ui].detail "vagrant-r10k: module_path \"#{module_path}\" is not within the ones defined in puppet provisioner; not running"
-                @app.call(env)
-                return
-              elsif ! prov.config.module_path.is_a?(Array) and prov.config.module_path != module_path
-                @env[:ui].detail "vagrant-r10k: module_path \"#{module_path}\" is not the same as in puppet provisioner; not running"
-                @app.call(env)
-                return
-              end
-            # no modulepath explict set in config, build one from the provisioner config
-            else
-              module_path = prov.config.module_path.is_a?(Array) ? prov.config.module_path[0] : prov.config.module_path
-              @env[:ui].info "vagrant-r10k: Building the r10k module path with puppet provisioner module_path \"#{module_path}\". (if module_path is an array, first element is used)"
+          if prov.respond_to?(:type)
+            next if prov.type != :puppet
+          else
+            next if prov.name != :puppet
+          end
+          # if module_path has been set before, check if it fits to one defined in the provisioner config
+          if module_path != nil
+            if prov.config.module_path.is_a?(Array) and ! prov.config.module_path.include?(module_path) 
+              @env[:ui].detail "vagrant-r10k: module_path \"#{module_path}\" is not within the ones defined in puppet provisioner; not running"
+              @app.call(env)
+              return
+            elsif ! prov.config.module_path.is_a?(Array) and prov.config.module_path != module_path
+              @env[:ui].detail "vagrant-r10k: module_path \"#{module_path}\" is not the same as in puppet provisioner; not running"
+              @app.call(env)
+              return
             end
-
-            manifest_file = File.join(env_dir, prov.config.manifest_file)
-            manifests_path = File.join(env_dir, prov.config.manifests_path[1])
+          # no modulepath explict set in config, build one from the provisioner config
+          else
+            module_path = prov.config.module_path.is_a?(Array) ? prov.config.module_path[0] : prov.config.module_path
+            @env[:ui].info "vagrant-r10k: Building the r10k module path with puppet provisioner module_path \"#{module_path}\". (if module_path is an array, first element is used)"
           end
+
+          manifest_file = File.join(env_dir, prov.config.manifest_file)
+          manifests_path = File.join(env_dir, prov.config.manifests_path[1])
         end
 
         # now join the module_path with the env_dir to have an absolute path

data/lib/vagrant-r10k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module R10k
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,18 @@
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+
+# Disable Vagrant autoloading so that other plugins defined in the Gemfile for
+# Acceptance tests are not loaded.
+ENV['VAGRANT_NO_PLUGINS'] = '1'
+
+require 'vagrant-spec/unit'
+
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/vendor/"
+  if ENV['CI']=='true'
+    require 'codecov'
+    formatter = SimpleCov::Formatter::Codecov
+  end
+end
+
+require 'vagrant-r10k'

data/spec/unit/config_spec.rb

@@ -0,0 +1,139 @@
+require 'spec_helper'
+
+require 'vagrant-r10k/config'
+
+describe VagrantPlugins::R10k::Config do
+  include_context 'vagrant-unit'
+  let(:test_env) do
+    test_env = isolated_environment
+    test_env.vagrantfile <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+end
+EOF
+    test_env
+  end
+  let(:env)              { test_env.create_vagrant_env }
+  let(:machine)          { env.machine(:test, :dummy) }
+
+  context 'when validated' do
+    before(:each) { subject.finalize! }
+    describe 'with puppet_dir and puppetfile_path unset' do
+      it 'passes validation' do
+        errors = subject.validate(machine)
+        errors.should eq({})
+      end
+    end
+
+    describe 'with puppet_dir unset' do
+      it 'fails validation' do
+        subject.puppetfile_path = '/foo/bar'
+        errors = subject.validate(machine)
+        errors.should eq({"vagrant-r10k"=>["config.r10k.puppet_dir must be set"]})
+      end
+    end
+
+    describe 'when puppet_dir does not exist' do
+      it 'fails validation' do
+        puppetfile = '/foo/bar'
+        puppet_dir = '/baz/blam'
+        puppetfile_path = File.join(env.root_path, puppetfile)
+        puppet_dir_path = File.join(env.root_path, puppet_dir)
+
+        subject.puppetfile_path = puppetfile
+        subject.puppet_dir = puppet_dir
+
+        # stub only for the checks we care about
+        File.stub(:file?).and_call_original
+        File.stub(:file?).with(puppetfile_path).and_return(true)
+        File.stub(:directory?).and_call_original
+        File.stub(:directory?).with(puppet_dir_path).and_return(false)
+        errors = subject.validate(machine)
+        errors.should eq({"vagrant-r10k"=>["puppet_dir directory '#{puppet_dir_path}' does not exist"]})
+      end
+    end
+
+    describe 'with puppetfile_path unset' do
+      it 'fails validation' do
+        puppet_dir = '/baz/blam'
+        puppet_dir_path = File.join(env.root_path, puppet_dir)
+
+        subject.puppet_dir = puppet_dir
+
+        # stub File.directory? only for /baz/blam
+        File.stub(:directory?).and_call_original
+        File.stub(:directory?).with(puppet_dir_path).and_return(true)
+        errors = subject.validate(machine)
+        errors.should eq({"vagrant-r10k"=>["config.r10k.puppetfile_path must be set"]})
+      end
+    end
+
+    describe 'when puppetfile_path does not exist' do
+      it 'fails validation' do
+        puppetfile = '/foo/bar'
+        puppet_dir = '/baz/blam'
+        puppetfile_path = File.join(env.root_path, puppetfile)
+        puppet_dir_path = File.join(env.root_path, puppet_dir)
+
+        subject.puppetfile_path = puppetfile
+        subject.puppet_dir = puppet_dir
+
+        # stub only for the checks we care about
+        File.stub(:file?).and_call_original
+        File.stub(:file?).with(puppetfile_path).and_return(false)
+        File.stub(:directory?).and_call_original
+        File.stub(:directory?).with(puppet_dir_path).and_return(true)
+        errors = subject.validate(machine)
+        errors.should eq({"vagrant-r10k"=>["puppetfile '#{puppetfile_path}' does not exist"]})
+      end
+    end
+
+    describe 'if module_path specified but does not exist' do
+      it 'fails validation' do
+        puppetfile = '/foo/bar'
+        puppet_dir = '/baz/blam'
+        module_path = '/blarg/modules'
+        puppetfile_path = File.join(env.root_path, puppetfile)
+        puppet_dir_path = File.join(env.root_path, puppet_dir)
+        module_path_path = File.join(env.root_path, module_path)
+
+        subject.puppetfile_path = puppetfile
+        subject.puppet_dir = puppet_dir
+        subject.module_path = module_path
+
+        # stub only for the checks we care about
+        File.stub(:file?).and_call_original
+        File.stub(:file?).with(puppetfile_path).and_return(true)
+        File.stub(:directory?).and_call_original
+        File.stub(:directory?).with(puppet_dir_path).and_return(true)
+        File.stub(:directory?).with(module_path_path).and_return(false)
+        errors = subject.validate(machine)
+        errors.should eq({"vagrant-r10k"=>["module_path directory '#{module_path_path}' does not exist"]})
+      end
+    end
+
+    describe 'if module_path specified and exists' do
+      it 'passes validation' do
+        puppetfile = '/foo/bar'
+        puppet_dir = '/baz/blam'
+        module_path = '/blarg/modules'
+        puppetfile_path = File.join(env.root_path, puppetfile)
+        puppet_dir_path = File.join(env.root_path, puppet_dir)
+        module_path_path = File.join(env.root_path, module_path)
+
+        subject.puppetfile_path = puppetfile
+        subject.puppet_dir = puppet_dir
+        subject.module_path = module_path
+
+        # stub only for the checks we care about
+        File.stub(:file?).and_call_original
+        File.stub(:file?).with(puppetfile_path).and_return(true)
+        File.stub(:directory?).and_call_original
+        File.stub(:directory?).with(puppet_dir_path).and_return(true)
+        File.stub(:directory?).with(module_path_path).and_return(true)
+        errors = subject.validate(machine)
+        errors.should eq({"vagrant-r10k"=>[]})
+      end
+    end
+  end
+end

data/spec/unit/modulegetter_spec.rb

@@ -0,0 +1,369 @@
+require 'spec_helper'
+require_relative 'sharedcontext'
+require_relative 'shared_expectations'
+
+require 'r10k/puppetfile'
+require 'r10k/task_runner'
+require 'r10k/task/puppetfile'
+require 'vagrant-r10k/modulegetter'
+
+include SharedExpectations
+
+describe Log4r::Logger do
+  subject { described_class.new('testlogger') }
+  describe '#debug1' do
+    it 'should pass through to debug' do
+      expect(subject).to receive(:debug).with('a message').once
+      subject.debug1('a message')
+    end
+  end
+  describe '#debug2' do
+    it 'should pass through to debug' do
+      expect(subject).to receive(:debug).with('different message').once
+      subject.debug2('different message')
+    end
+  end 
+end
+
+describe R10K::TaskRunner do
+  subject { described_class.new({}) }
+  describe '#get_errors' do
+    it 'returns @errors' do
+      subject.instance_variable_set(:@errors, ['foo'])
+      expect(subject).to receive(:get_errors).once.and_call_original
+      foo = subject.get_errors
+      expect(foo).to eq(['foo'])
+    end
+  end
+end
+
+describe VagrantPlugins::R10k::Modulegetter do 
+  subject { described_class.new(app, env) }
+
+  describe '#call' do
+    describe 'puppet_dir unset' do
+      include_context 'unit' do
+        let(:vagrantfile) { <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+  # r10k plugin to deploy puppet modules
+  # config.r10k.puppet_dir = 'puppet'
+  config.r10k.puppetfile_path = 'puppet/Puppetfile'
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end
+EOF
+        }
+      end
+      it 'should raise an error' do
+        expect(ui).to receive(:detail).with("vagrant-r10k: puppet_dir and/or puppetfile_path not set in config; not running").once
+        File.stub(:join).and_call_original
+        File.stub(:join).with('/rootpath', 'puppet/Puppetfile').and_return('foobarbaz')
+        expect(File).to receive(:join).with('/rootpath', 'puppet/Puppetfile').exactly(0).times
+        expect_did_not_run(ui, app, env)
+        
+        retval = subject.call(env)
+        expect(retval).to be_nil
+      end
+    end
+    describe 'puppetfile_path unset' do
+      include_context 'unit' do
+        let(:vagrantfile) { <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = 'puppet'
+  # config.r10k.puppetfile_path = 'puppet/Puppetfile'
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end
+EOF
+        }
+      end
+      it 'should raise an error' do
+        expect(ui).to receive(:detail).with("vagrant-r10k: puppet_dir and/or puppetfile_path not set in config; not running").once
+        File.stub(:join).and_call_original
+        File.stub(:join).with('/rootpath', 'puppet/Puppetfile').and_return('foobarbaz')
+        expect(File).to receive(:join).with('/rootpath', 'puppet/Puppetfile').exactly(0).times
+        expect_did_not_run(ui, app, env)
+        
+        retval = subject.call(env)
+        expect(retval).to be_nil
+      end
+    end
+    describe 'r10k module_path set differently from puppet' do
+      include_context 'unit' do
+        let(:vagrantfile) { <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = 'puppet'
+  config.r10k.puppetfile_path = 'puppet/Puppetfile'
+  config.r10k.module_path = "mymodulepath/foo"
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end
+EOF
+        }
+      end
+      it 'should raise an error' do
+        expect(ui).to receive(:detail).with("vagrant-r10k: module_path \"mymodulepath/foo\" is not the same as in puppet provisioner; not running").once
+        File.stub(:file?).with('/rootpath/puppet/Puppetfile').and_return(true)
+        expect(File).to receive(:join).with('/rootpath', 'default.pp').exactly(0).times
+        expect_did_not_run(ui, app, env)
+        
+        retval = subject.call(env)
+        expect(retval).to be_nil
+      end
+    end
+    describe 'r10k module_path set differently from puppet array' do
+      include_context 'unit' do
+        let(:vagrantfile) { <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = 'puppet'
+  config.r10k.puppetfile_path = 'puppet/Puppetfile'
+  config.r10k.module_path = "mymodulepath/foo"
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = ["puppet/modules", "foo/modules"]
+  end
+end
+EOF
+        }
+      end
+      it 'should raise an error' do
+        expect(ui).to receive(:detail).with("vagrant-r10k: module_path \"mymodulepath/foo\" is not within the ones defined in puppet provisioner; not running").once
+        File.stub(:file?).with('/rootpath/puppet/Puppetfile').and_return(true)
+        expect(File).to receive(:join).with('/rootpath', 'default.pp').exactly(0).times
+        expect_did_not_run(ui, app, env)
+        
+        retval = subject.call(env)
+        expect(retval).to be_nil
+      end
+    end
+    describe 'r10k module_path not set' do
+      include_context 'unit' do
+        let(:vagrantfile) { <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = 'puppet'
+  config.r10k.puppetfile_path = 'puppet/Puppetfile'
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end
+EOF
+        }
+      end
+      it 'should use the module_path from provisioner' do
+        expect_ran_successfully({:ui => ui,
+                                 :subject => subject,
+                                 :module_path => 'puppet/modules',
+                                 :puppetfile_path => 'puppet/Puppetfile',
+                                 :rootpath => '/rootpath',
+                                 :puppet_dir => 'puppet',
+                                })
+        retval = subject.call(env)
+        expect(retval).to be_nil
+      end
+    end
+    describe 'vagrant normal logging' do
+      include_context 'unit' do
+        let(:vagrantfile) { <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = 'puppet'
+  config.r10k.puppetfile_path = 'puppet/Puppetfile'
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end
+EOF
+        }
+      end
+      it 'should set r10k normal logging' do
+        expect_ran_successfully({:ui => ui,
+                                 :subject => subject,
+                                 :module_path => 'puppet/modules',
+                                 :puppetfile_path => 'puppet/Puppetfile',
+                                 :rootpath => '/rootpath',
+                                 :puppet_dir => 'puppet',
+                                })
+        retval = subject.call(env)
+        expect(R10K::Logging.level).to eq(3)
+        expect(retval).to be_nil
+      end
+    end
+    describe 'vagrant debug logging' do
+      include_context 'unit' do
+        let(:vagrantfile) { <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = 'puppet'
+  config.r10k.puppetfile_path = 'puppet/Puppetfile'
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end
+EOF
+        }
+      end
+      it 'should set r10k debug logging' do
+        expect_ran_successfully({:ui => ui,
+                                 :subject => subject,
+                                 :module_path => 'puppet/modules',
+                                 :puppetfile_path => 'puppet/Puppetfile',
+                                 :rootpath => '/rootpath',
+                                 :puppet_dir => 'puppet',
+                                })
+        with_temp_env("VAGRANT_LOG" => "debug") do
+          retval = subject.call(env)
+          expect(R10K::Logging.level).to eq(0)
+          expect(retval).to be_nil
+        end
+      end
+    end
+    describe 'puppetfile does not exist' do
+      include_context 'unit' do
+        let(:vagrantfile) { <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = 'puppet'
+  config.r10k.puppetfile_path = 'puppet/Puppetfile'
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end
+EOF
+        }
+      end
+      it 'raise an error' do
+        File.stub(:file?).with('/rootpath/puppet/Puppetfile').and_return(false)
+        expect(ui).to receive(:info).with(/Building the r10k module path with puppet provisioner module_path/).once
+        expect(ui).to receive(:info).with(/Beginning r10k deploy/).once
+        expect_did_not_run(ui, app, env, nobegin=false, appcall=false)
+        expect{subject.call(env)}.to raise_error(VagrantPlugins::R10k::ErrorWrapper, "RuntimeError: Puppetfile at /rootpath/puppet/Puppetfile does not exist.")
+      end
+    end
+    describe 'puppetfile syntax error' do
+      include_context 'unit' do
+        let(:vagrantfile) { <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = 'puppet'
+  config.r10k.puppetfile_path = 'puppet/Puppetfile'
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end
+EOF
+        }
+      end
+      it 'raise an error' do
+        File.stub(:file?).with('/rootpath/puppet/Puppetfile').and_return(true)
+        expect(ui).to receive(:info).with(/Building the r10k module path with puppet provisioner module_path/).once
+        expect(ui).to receive(:info).with("vagrant-r10k: Building the r10k module path with puppet provisioner module_path \"puppet/modules\". (if module_path is an array, first element is used)").exactly(0).times
+        full_puppetfile_path = File.join('/rootpath', 'puppet/Puppetfile')
+        full_puppet_dir = File.join('/rootpath', 'puppet')
+        full_module_path = File.join('/rootpath', 'puppet/modules')
+        File.stub(:file?).with(full_puppetfile_path).and_return(true)
+        File.stub(:readable?).with(full_puppetfile_path).and_return(true)
+        File.stub(:read).with(full_puppetfile_path).and_return("mod 'branan/eight_hundred' :git => 'https://github.com/branan/eight_hundred'")
+        errmsg = /SyntaxError: \/rootpath\/puppet\/Puppetfile:1: syntax error, unexpected ':', expecting end-of-input/
+        expect(ui).to receive(:info).with(/Beginning r10k deploy/).once
+        expect(ui).to receive(:info).with('vagrant-r10k: Deploy finished').exactly(0).times
+        expect(ui).to receive(:error).with('Invalid syntax in Puppetfile at /rootpath/puppet/Puppetfile').exactly(1).times
+        expect{subject.call(env)}.to raise_error(VagrantPlugins::R10k::ErrorWrapper, errmsg)
+      end
+    end
+    describe 'runner failed' do
+      include_context 'unit' do
+        let(:vagrantfile) { <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = 'puppet'
+  config.r10k.puppetfile_path = 'puppet/Puppetfile'
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end
+EOF
+        }
+      end
+      it 'raise an error' do
+        File.stub(:file?).with('/rootpath/puppet/Puppetfile').and_return(true)
+        expect(ui).to receive(:info).with(/Building the r10k module path with puppet provisioner module_path/).once
+        expect(ui).to receive(:info).with("vagrant-r10k: Building the r10k module path with puppet provisioner module_path \"puppet/modules\". (if module_path is an array, first element is used)").exactly(0).times
+        full_puppetfile_path = File.join('/rootpath', 'puppet/Puppetfile')
+        full_puppet_dir = File.join('/rootpath', 'puppet')
+        full_module_path = File.join('/rootpath', 'puppet/modules')
+        File.stub(:file?).with(full_puppetfile_path).and_return(true)
+        File.stub(:readable?).with(full_puppetfile_path).and_return(true)
+        File.stub(:read).with(full_puppetfile_path).and_return("mod 'puppetlabs/apache'")
+        expect(ui).to receive(:info).with(/Beginning r10k deploy/).once
+        runner = R10K::TaskRunner.new([])
+        R10K::TaskRunner.stub(:new).and_return(runner)
+        R10K::TaskRunner.stub(:append_task).and_call_original
+        runner.stub(:run)
+        runner.stub(:succeeded?).and_return(false)
+        runner.stub(:get_errors).and_return([['foo', 'this is an error']])
+        expect(runner).to receive(:append_task).once
+        expect(runner).to receive(:run).once
+        expect(ui).to receive(:info).with('vagrant-r10k: Deploy finished').exactly(0).times
+        expect{subject.call(env)}.to raise_error(VagrantPlugins::R10k::ErrorWrapper, /this is an error/)
+      end
+    end
+
+    
+  end
+end

data/spec/unit/shared_expectations.rb

@@ -0,0 +1,48 @@
+module SharedExpectations
+  def expect_ran_successfully(vars)
+    # expect it to run with the right arguments, etc.
+    mp = vars[:module_path]
+    full_puppetfile_path = File.join(vars[:rootpath], vars[:puppetfile_path])
+    full_puppet_dir = File.join(vars[:rootpath], vars[:puppet_dir])
+    full_module_path = File.join(vars[:rootpath], vars[:module_path])
+    expect(vars[:ui]).to receive(:info).with("vagrant-r10k: Building the r10k module path with puppet provisioner module_path \"#{mp}\". (if module_path is an array, first element is used)").once
+    File.stub(:file?).with(full_puppetfile_path).and_return(true)
+    expect(vars[:ui]).to receive(:info).with(/Beginning r10k deploy/).once
+    R10K::Puppetfile.stub(:new)
+    expect(R10K::Puppetfile).to receive(:new).with(full_puppet_dir, full_module_path, full_puppetfile_path).once
+    R10K::Task::Puppetfile::Sync.stub(:new).and_call_original
+    expect(R10K::Task::Puppetfile::Sync).to receive(:new).once
+    runner = R10K::TaskRunner.new([])
+    R10K::TaskRunner.stub(:new).and_return(runner)
+    R10K::TaskRunner.stub(:append_task).and_call_original
+    runner.stub(:run)
+    runner.stub(:succeeded?).and_return(true)
+    runner.stub(:get_errors).and_return([])
+    expect(runner).to receive(:append_task).once
+    expect(runner).to receive(:run).once
+    expect(vars[:ui]).to receive(:info).with('vagrant-r10k: Deploy finished').once
+    expect(ui).to receive(:error).exactly(0).times
+  end
+
+  def expect_did_not_run(ui, app, env, nobegin=true, appcall=true)
+    # expect it to not really run
+    if appcall
+      expect(app).to receive(:call).with(env).once
+    end
+    if nobegin
+      expect(ui).to receive(:info).with(/Beginning r10k deploy/).exactly(0).times
+    end
+    R10K::Puppetfile.stub(:new)
+    expect(R10K::Puppetfile).to receive(:new).exactly(0).times
+    runner = R10K::TaskRunner.new([])
+    R10K::TaskRunner.stub(:new).and_return(runner)
+    R10K::TaskRunner.stub(:append_task).and_call_original
+    runner.stub(:run)
+    runner.stub(:succeeded?).and_return(false)
+    runner.stub(:get_errors).and_return(['foo'])
+    expect(runner).to receive(:append_task).exactly(0).times
+    expect(runner).to receive(:run).exactly(0).times
+  end
+end
+
+

data/spec/unit/sharedcontext.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+shared_context "unit" do
+  include_context 'vagrant-unit'
+
+  let(:test_env) do
+    test_env = isolated_environment
+    test_env.vagrantfile vagrantfile
+    test_env
+  end
+  let(:env)              { { env: iso_env, machine: machine, ui: ui, root_path: '/rootpath' } }
+  let(:conf)             { Vagrant::Config::V2::DummyConfig.new() }
+  let(:ui)               { Vagrant::UI::Basic.new() }
+  let(:iso_env)          { test_env.create_vagrant_env ui_class: Vagrant::UI::Basic }
+  let(:machine)          { iso_env.machine(:test, :dummy)  }
+  # Mock the communicator to prevent SSH commands for being executed.
+  let(:communicator)     { double('communicator') }
+  # Mock the guest operating system.
+  let(:guest)            { double('guest') }
+  let(:app)              { lambda { |env| } }
+  let(:plugin)           { register_plugin() }
+
+  before (:each) do
+    machine.stub(:guest => guest)
+    machine.stub(:communicator => communicator)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-r10k
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Antman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r10k
@@ -62,6 +62,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".ruby-version"
+- ".travis.yml"
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -71,6 +73,11 @@ files:
 - lib/vagrant-r10k/modulegetter.rb
 - lib/vagrant-r10k/plugin.rb
 - lib/vagrant-r10k/version.rb
+- spec/spec_helper.rb
+- spec/unit/config_spec.rb
+- spec/unit/modulegetter_spec.rb
+- spec/unit/shared_expectations.rb
+- spec/unit/sharedcontext.rb
 - vagrant-r10k.gemspec
 homepage: https://github.com/jantman/vagrant-r10k
 licenses:
@@ -96,4 +103,9 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Vagrant middleware plugin to retrieve puppet modules using r10k.
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/unit/config_spec.rb
+- spec/unit/modulegetter_spec.rb
+- spec/unit/shared_expectations.rb
+- spec/unit/sharedcontext.rb