vagrant-puppetfile 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d5eeaa153d6998bc5003e12dd77d8c36de9e40f
-  data.tar.gz: 9aa4016927c8a1bae872f5f357e3779c1b52629c
+  metadata.gz: 362c96b5711e8e8cd60b0f651938daeeb7128ace
+  data.tar.gz: e2dc0ec31dc197649d8e0ffb61b8cc80b47d8e6d
 SHA512:
-  metadata.gz: 9080b1ee8a5c5adf04b3ed5b0045b115d864d3f439ba7aa7034ed868e64303063b20b9745d0d936c37519aa70e7d58a79b0157a2ae0f724af8f5b90e90a15908
-  data.tar.gz: 8b706134b0534f732121a2f7af6bb0a8efb17e935dd503dc4165a3c4cef8d4e7a0f1860e0ab528d1e3b698c04766d40b1023c980e350525ecbe8a29f6a0da211
+  metadata.gz: 94763c4eac04534b5013f08d36a1f38eb75c0a93bd799f5efed5ae257cae9f7aa063b48a9b2e3b86d51642d5e6adde83f935099572fa36acfb135e39082adb75
+  data.tar.gz: 6a83f7e8f390f93b40eb83bb5e1cdfc6e2a5a553b556b20a8469be8c3b3966752851bfa434c71afdfea5486e07a79f4583eb7492728aba0e7e714bd3f62514fe

data/lib/vagrant/puppetfile/version.rb

@@ -21,6 +21,6 @@
 module Vagrant
   module Puppetfile
     NAME = 'vagrant-puppetfile'
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/lib/vagrant/puppetfile.rb

@@ -161,7 +161,10 @@ module Vagrant
           @puppetfile = puppetfile
 
           # Make sure the evaluator actually exists and can be called.
-          fail NoEvaluatorError, path unless available?
+          unless available?
+            logger.error("Unable to find command: #{path}")
+            fail NoEvaluatorError, path
+          end
 
           # Check for the puppetfile and bomb if it doesn't exist.
           unless File.readable?(puppetfile)
@@ -170,9 +173,19 @@ module Vagrant
           end
         end
 
+        def with_clean_env
+          if not defined? ::Bundler
+            yield
+          else
+            ::Bundler.with_clean_env do
+              ENV_CLEAN_KEYS.each { |k| ENV.delete(k) }
+              yield
+            end
+          end
+        end
+
         def command(*args)
-          ::Bundler.with_clean_env do
-            ENV_CLEAN_KEYS.each { |k| ENV.delete(k) }
+          with_clean_env do
             Open3.capture2e(path, *args.map(&:shellescape))
           end
         end
@@ -191,7 +204,7 @@ module Vagrant
       class R10k < Base
         def available?
           command('version').last.success?
-        rescue
+        rescue SystemCallError
           false
         end
 
@@ -214,7 +227,7 @@ module Vagrant
 
         def available?
           command('version').last.success?
-        rescue
+        rescue SystemCallError
           false
         end
 
@@ -234,7 +247,7 @@ module Vagrant
 
         def available?
           command('--version').last.success?
-        rescue
+        rescue SystemCallError
           false
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-puppetfile
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies: []
 description: Automatically installs puppet modules from a Puppetfile during Vagrant
   provisioning