vagrant-r10k 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d10d813ebfeaaab6624535df85adf644ef33920
-  data.tar.gz: 18b0c7240ad342c182695b215b2eedd83a399437
+  metadata.gz: e3d2d735115ce34477747ee81985151eeaad23f0
+  data.tar.gz: a673da8597c69b15d10e65cfbd2cbba4b20c1725
 SHA512:
-  metadata.gz: 8a590b625431419a985732cb0950339d3ac217dc6294a30696396685f61963bd62291b2ef81905414763f7f6fe1b39d15ab694d57d03e93936c15584d628867e
-  data.tar.gz: d57a257ed713e38dd6dcb6e722746197b7829e578a5a9c1f70757353dda7d2e262252077d6e86a769ef309c67ec5c77f2391dda80b9265c85c638cbfe840465c
+  metadata.gz: c7473d327c17ebc033f09f288b6c98dc4d5a6b188de8083b6b930ddc036c11c9bfbf3f235d6f5dd1b63b3623effdc885909821359e7dbba69871197792ef2894
+  data.tar.gz: 6075b961160b141b890b4f46ca7aabe2f35cfb03459b223338e3124c0b5aa886dfab0b9d7e7f9a5f27d783552f1d7493380d740026ccd6551138a31572603f18

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+2.1.0

data/CHANGES.md

@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+## 0.4.0 2015-10-29 Jason Antman <jason@jasonantman.com>
+
+* [#13]() / [PR #34/35](https://github.com/jantman/vagrant-r10k/pull/35) - Upgrade r10k dependency to 1.5.1 (thanks to [@cdenneen](https://github.com/cdenneen) for the work).
+
 ## 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

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 
 GIT
   remote: https://github.com/jantman/rspec-matcher-num-times.git
-  revision: a34cf9b95ff94512d4c515056ef25a73dbf8d544
+  revision: 03409dfc6a96bb8b3c7c60d8b28ccd20b02cc8c0
   branch: rspec2
   specs:
     rspec-matcher-num-times (0.0.1)
@@ -19,8 +19,8 @@ GIT
 
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: cd25b820c4425c77b833550e1f1d90f9a7c8be14
-  branch: master
+  revision: 78ea5e4a78ce644717ab16d8001ab77430168f0f
+  tag: v1.7.4
   specs:
     vagrant (1.7.4)
       bundler (>= 1.5.2, <= 1.10.5)
@@ -43,30 +43,30 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-r10k (0.3.0)
-      r10k (~> 1.2.1)
+    vagrant-r10k (0.4.0)
+      r10k (~> 1.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    childprocess (0.5.6)
+    childprocess (0.5.7)
       ffi (~> 1.0, >= 1.0.11)
-    codecov (0.0.4)
+    codecov (0.1.1)
       json
       simplecov
       url
     colored (1.2)
-    cri (2.5.0)
+    cri (2.6.1)
       colored (~> 1.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       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.9.2)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.9.2)
       faraday (>= 0.7.4, < 0.10)
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
@@ -81,20 +81,20 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.6.0.1)
     i18n (0.7.0)
-    json (1.8.2)
-    json_pure (1.8.1)
+    json (1.8.3)
+    json_pure (1.8.3)
     listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    little-plugger (1.1.3)
+    little-plugger (1.1.4)
     log4r (1.1.10)
     logging (1.8.2)
       little-plugger (>= 1.1.3)
       multi_json (>= 1.8.4)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mini_portile (0.6.0)
-    multi_json (1.8.4)
-    multipart-post (1.2.0)
+    multi_json (1.11.2)
+    multipart-post (2.0.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -104,18 +104,18 @@ GEM
     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)
+    r10k (1.5.1)
+      colored (= 1.2)
+      cri (~> 2.6.1)
+      faraday (~> 0.9.0)
       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)
+      faraday_middleware-multi_json (~> 0.0.6)
+      json_pure (~> 1.8)
+      log4r (= 1.1.10)
+      multi_json (~> 1.10)
+      semantic_puppet (~> 0.1.0)
     rake (10.4.2)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.4)
@@ -131,19 +131,18 @@ GEM
     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)
+    rspec-mocks (2.99.4)
+    rspec_junit_formatter (0.2.3)
       builder (< 4)
-      rspec (>= 2, < 4)
-      rspec-core (!= 2.12.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rubyntlm (0.4.0)
     rubyzip (1.1.7)
-    simplecov (0.9.2)
+    semantic_puppet (0.1.1)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
-    systemu (2.5.2)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     thor (0.18.1)
     unf (0.1.4)
       unf_ext
@@ -151,7 +150,7 @@ GEM
     url (0.3.2)
     uuidtools (2.1.5)
     wdm (0.1.1)
-    winrm (1.3.3)
+    winrm (1.3.4)
       builder (>= 2.1.2)
       gssapi (~> 1.2)
       gyoku (~> 1.0)

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

@@ -32,10 +32,10 @@ module VagrantPlugins
           klass = self.class.name.downcase.split('::').last
           @logger = Log4r::Logger.new("vagrant::r10k::#{klass}")
           if ENV["VAGRANT_LOG"] == "debug"
-            R10K::Logging.level = 0
+            R10K::Logging.level = "debug"
             @logger.level = 0
           else
-            R10K::Logging.level = 3
+            R10K::Logging.level = "info"
           end
         end
       end

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

@@ -47,9 +47,9 @@ module VagrantPlugins
           env[:ui].info "vagrant-r10k: Beginning r10k deploy of puppet modules into #{config[:module_path]} using #{config[:puppetfile_path]}"
 
           if ENV["VAGRANT_LOG"] == "debug"
-            R10K::Logging.level = 0
+            R10K::Logging.level = 'debug'
           else
-            R10K::Logging.level = 3
+            R10K::Logging.level = 'info'
           end
 
           unless File.file?(config[:puppetfile_path])
@@ -69,7 +69,7 @@ module VagrantPlugins
             @logger.debug("vagrant-r10k: sync task complete")
           rescue Exception => ex
             @env[:ui].error "Invalid syntax in Puppetfile at #{config[:puppetfile_path]}"
-            raise ErrorWrapper.new(ex)
+            raise ErrorWrapper.new(ex.original)
           end
           unless runner.succeeded?
             runner.get_errors().each do |error|

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

@@ -34,7 +34,7 @@ module VagrantPlugins
             puppetfile.load
           rescue Exception => ex
             @env[:ui].error "Invalid syntax in Puppetfile at #{config[:puppetfile_path]}"
-            raise ErrorWrapper.new(ex)
+            raise ErrorWrapper.new(ex.original)
           end
 
           @app.call(env)

data/lib/vagrant-r10k/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   # hold version number constant
   module R10k
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/spec/acceptance/vagrant-r10k/vagrant-r10k_spec.rb

@@ -177,7 +177,7 @@ shared_examples 'provider/vagrant-r10k' do |provider, options|
       status("Test: vagrant up")
       up_result = execute('vagrant', 'up', "--provider=#{provider}", '--debug')
       expect(up_result).to exit_with(1)
-      expect(up_result.stderr).to match(%r"RuntimeError: Couldn't update git cache for https://invalidhost\.jasonantman\.com/jantman/puppet-reviewboard\.git: \"fatal: unable to access 'https://invalidhost\.jasonantman\.com/jantman/puppet-reviewboard\.git/': Could not resolve host: invalidhost\.jasonantman\.com\"\n\nIf you don't have connectivity to the host, running 'vagrant up --no-provision' will skip r10k deploy and all provisioning")
+      expect(up_result.stderr).to match(%r"fatal: unable to access 'https://invalidhost\.jasonantman\.com/jantman/puppet-reviewboard\.git/': Could not resolve host: invalidhost\.jasonantman\.com\nExit code: 128\n\nIf you don't have connectivity to the host, running 'vagrant up --no-provision' will skip r10k deploy and all provisioning")
       ensure_puppet_didnt_run(up_result)
     end
   end
@@ -193,7 +193,7 @@ shared_examples 'provider/vagrant-r10k' do |provider, options|
   def ensure_successful_run(up_result, workdir)
     expect(up_result).to exit_with(0)
     # version checks
-    expect(up_result.stderr).to include('global:   - r10k = 1.2.1')
+    expect(up_result.stderr).to include('global:   - r10k = 1.5.1')
     expect(up_result.stderr).to include("global:   - vagrant-r10k = #{VagrantPlugins::R10k::VERSION}")
     expect(up_result.stderr).to include('Registered plugin: vagrant-r10k')
     expect(up_result.stderr).to include('vagrant::r10k::validate called')

data/spec/unit/action_base_spec.rb

@@ -21,16 +21,16 @@ describe VagrantPlugins::R10k::Action::Base do
       expect(x.instance_variable_get(:@logger).fullname).to eq('vagrant::r10k::base')
     end
 
-    it 'sets logging levels to 3 when not running in debug mode' do
+    it 'sets logging levels to 2 when not running in debug mode' do
       allow(ENV).to receive(:[]).with("VAGRANT_LOG").and_return('no')
       x = described_class.new(:app, :env)
-      expect(R10K::Logging.level).to eq(3)
+      expect(R10K::Logging.level).to eq(2)
     end
 
-    it 'sets logging levels to 0 when running in debug mode' do
+    it 'sets logging levels to 1 when running in debug mode' do
       allow(ENV).to receive(:[]).with("VAGRANT_LOG").and_return('debug')
       x = described_class.new(:app, :env)
-      expect(R10K::Logging.level).to eq(0)
+      expect(R10K::Logging.level).to eq(1)
       expect(x.instance_variable_get(:@logger).level).to eq(0)
     end
   end

data/spec/unit/action_deploy_spec.rb

@@ -5,6 +5,7 @@ require 'vagrant-r10k/action/base'
 require 'vagrant-r10k/action/deploy'
 require 'r10k/task/puppetfile'
 require 'r10k/git/errors'
+require 'r10k/errors'
 
 include SharedExpectations
 
@@ -239,7 +240,7 @@ EOF
           R10K::TaskRunner.stub(:new) { runner_dbl }
           R10K::Task::Puppetfile::Sync.stub(:new) { sync_dbl }
           # expectations
-          expect(R10K::Logging).to receive(:level=).with(3).twice
+          expect(R10K::Logging).to receive(:level=).with('info').twice
           expect(ui).to receive(:info).with("vagrant-r10k: Beginning r10k deploy of puppet modules into module/path using puppetfile/path")
           logger = subject.instance_variable_get(:@logger)
           expect(logger).to receive(:debug).once.ordered.with("vagrant::r10k::deploy.deploy called")
@@ -294,7 +295,7 @@ EOF
           R10K::TaskRunner.stub(:new) { runner_dbl }
           R10K::Task::Puppetfile::Sync.stub(:new) { sync_dbl }
           # expectations
-          expect(R10K::Logging).to receive(:level=).with(0).twice
+          expect(R10K::Logging).to receive(:level=).with('debug').twice
           expect(ui).to receive(:info).with("vagrant-r10k: Beginning r10k deploy of puppet modules into module/path using puppetfile/path")
           logger = subject.instance_variable_get(:@logger)
           expect(logger).to receive(:debug).once.ordered.with("vagrant::r10k::deploy.deploy called")
@@ -408,7 +409,7 @@ EOF
           R10K::TaskRunner.stub(:new) { runner_dbl }
           R10K::Task::Puppetfile::Sync.stub(:new) { sync_dbl }
           # expectations
-          expect(R10K::Logging).to receive(:level=).with(3).twice
+          expect(R10K::Logging).to receive(:level=).with('info').twice
           expect(ui).to receive(:info).with("vagrant-r10k: Beginning r10k deploy of puppet modules into module/path using puppetfile/path")
           logger = subject.instance_variable_get(:@logger)
           expect(logger).to receive(:debug).once.ordered.with("vagrant::r10k::deploy.deploy called")
@@ -469,7 +470,7 @@ EOF
           R10K::TaskRunner.stub(:new) { runner_dbl }
           R10K::Task::Puppetfile::Sync.stub(:new) { sync_dbl }
           # expectations
-          expect(R10K::Logging).to receive(:level=).with(3).twice
+          expect(R10K::Logging).to receive(:level=).with('info').twice
           expect(ui).to receive(:info).with("vagrant-r10k: Beginning r10k deploy of puppet modules into module/path using puppetfile/path")
           logger = subject.instance_variable_get(:@logger)
           expect(logger).to receive(:debug).once.ordered.with("vagrant::r10k::deploy.deploy called")
@@ -522,12 +523,14 @@ EOF
           sync_dbl = double
           allow(runner_dbl).to receive(:append_task).with(sync_dbl)
           allow(runner_dbl).to receive(:succeeded?).and_return(false)
-          allow(runner_dbl).to receive(:run).and_raise(SyntaxError.new("some syntax error"))
+          orig = SyntaxError.new("some syntax error")
+          ex = R10K::Error.wrap(orig, 'message')
+          allow(runner_dbl).to receive(:run).and_raise(ex)
           allow(sync_dbl).to receive(:new).with(puppetfile_dbl)
           R10K::TaskRunner.stub(:new) { runner_dbl }
           R10K::Task::Puppetfile::Sync.stub(:new) { sync_dbl }
           # expectations
-          expect(R10K::Logging).to receive(:level=).with(3).twice
+          expect(R10K::Logging).to receive(:level=).with('info').twice
           expect(ui).to receive(:info).with("vagrant-r10k: Beginning r10k deploy of puppet modules into module/path using puppetfile/path")
           logger = subject.instance_variable_get(:@logger)
           expect(logger).to receive(:debug).once.ordered.with("vagrant::r10k::deploy.deploy called")

data/spec/unit/action_validate_spec.rb

@@ -3,6 +3,7 @@ require_relative 'sharedcontext'
 require_relative 'shared_expectations'
 require 'vagrant-r10k/action/base'
 require 'vagrant-r10k/action/validate'
+require 'r10k/errors'
 
 include SharedExpectations
 
@@ -222,7 +223,9 @@ EOF
       end
       it 'should call app.call' do
         # positive assertions
-        allow(pf_dbl).to receive(:load).and_raise(RuntimeError)        
+        orig = RuntimeError.new("foo")
+        ex = R10K::Error.wrap(orig, 'message')
+        allow(pf_dbl).to receive(:load).and_raise(ex)
         expect_any_instance_of(VagrantPlugins::R10k::Helpers).to receive(:r10k_enabled?).with(env).once
         expect_any_instance_of(VagrantPlugins::R10k::Helpers).to receive(:provision_enabled?).with(env).once
         expect_any_instance_of(VagrantPlugins::R10k::Helpers).to receive(:r10k_config).with(env).once

data/vagrant-r10k.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "r10k", "~> 1.2.1"
+  spec.add_runtime_dependency "r10k", "~> 1.5.0"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-r10k
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jason Antman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r10k
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement