vagrant-puppetfile 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d630dfea4265619b7d7011cc3ca686893bd92159
-  data.tar.gz: ce55251db0c8d90e18aefb0cb01d43c465ba7e95
+  metadata.gz: 8d5eeaa153d6998bc5003e12dd77d8c36de9e40f
+  data.tar.gz: 9aa4016927c8a1bae872f5f357e3779c1b52629c
 SHA512:
-  metadata.gz: bb7211571ab50f91db3b13ced038517a6b90c8e7844edaa0d327e13867b5d16fe07635bb8eedde310c3d59c1a562d3005a8d3479c79bf3643f470542906e05eb
-  data.tar.gz: 2979bf2e51e9ac37773a55c13d9b17b32553957939290f87b8ef8f1daf7048eeef40849b3192596028d2b65f7106f1cbc783d5852271256369d7af861e0709d3
+  metadata.gz: 9080b1ee8a5c5adf04b3ed5b0045b115d864d3f439ba7aa7034ed868e64303063b20b9745d0d936c37519aa70e7d58a79b0157a2ae0f724af8f5b90e90a15908
+  data.tar.gz: 8b706134b0534f732121a2f7af6bb0a8efb17e935dd503dc4165a3c4cef8d4e7a0f1860e0ab528d1e3b698c04766d40b1023c980e350525ecbe8a29f6a0da211

data/lib/vagrant/puppetfile/version.rb

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

data/lib/vagrant/puppetfile.rb

@@ -104,7 +104,13 @@ module Vagrant
       provisioner(:puppetfile) { Provisioner }
     end
 
-    class Puppetfile < File
+    class Puppetfile
+      attr_reader :path
+
+      def initialize(path)
+        @path = path
+      end
+
       def evaluator(type, logger)
         case File.basename(type)
         when 'librarian-puppet'
@@ -153,7 +159,15 @@ module Vagrant
           @logger = logger
           @path = path
           @puppetfile = puppetfile
+
+          # Make sure the evaluator actually exists and can be called.
           fail NoEvaluatorError, path unless available?
+
+          # Check for the puppetfile and bomb if it doesn't exist.
+          unless File.readable?(puppetfile)
+            logger.error("Unable to read puppetfile: #{puppetfile}")
+            fail ConfigurationError, puppetfile
+          end
         end
 
         def command(*args)
@@ -187,6 +201,17 @@ module Vagrant
       end
 
       class Librarian < Base
+        SUPPORTED_PUPPETFILE_NAMES = %w{Puppetfile Modulefile metadata.json}
+
+        def initialize(path, puppetfile, logger)
+          super
+          unless SUPPORTED_PUPPETFILE_NAMES.include? File.basename(puppetfile)
+            logger.error("The 'librarian-puppet' evaluator cannot install from a file named #{puppetfile.inspect}")
+            logger.error("Please use one of these names instead: #{SUPPORTED_PUPPETFILE_NAMES.map(&:inspect).join(', ')}")
+            fail ConfigurationError, puppetfile
+          end
+        end
+
         def available?
           command('version').last.success?
         rescue
@@ -194,12 +219,15 @@ module Vagrant
         end
 
         def install!
-          run('install', '--verbose')
+          dir = File.dirname(puppetfile)
+          Dir.chdir(dir) do
+            run('install', '--verbose')
+          end
         end
       end
 
       class Puppet < Base
-        def initialize(path, puppetlabs, logger)
+        def initialize(path, puppetfile, logger)
           super
           @moduledir = 'modules'
         end

metadata

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