vagrant-puppetfile 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362c96b5711e8e8cd60b0f651938daeeb7128ace
-  data.tar.gz: e2dc0ec31dc197649d8e0ffb61b8cc80b47d8e6d
+  metadata.gz: bbff97cdeedbea9bc71c7460ee98e8d921d671a7
+  data.tar.gz: ec287ee9e5ffb598b8e60f0b3c42b0ddd7a2aac2
 SHA512:
-  metadata.gz: 94763c4eac04534b5013f08d36a1f38eb75c0a93bd799f5efed5ae257cae9f7aa063b48a9b2e3b86d51642d5e6adde83f935099572fa36acfb135e39082adb75
-  data.tar.gz: 6a83f7e8f390f93b40eb83bb5e1cdfc6e2a5a553b556b20a8469be8c3b3966752851bfa434c71afdfea5486e07a79f4583eb7492728aba0e7e714bd3f62514fe
+  metadata.gz: 9137331c54d4c2266c215fb906cfbe599c1c09e59fa3c3089fcfaf656b4968e6fa31044de38353fbf3957e28b2df19f032a6821c40a8b22556a6d32106695efb
+  data.tar.gz: 017386ab77bb35275814eee91a9e4b51f784afadcc628f93a325fff3ece3c1bff7971694e9b8b6f395c46bd0dc4a3645e166ebe0fcefc527b33e5918b61166f4

data/lib/vagrant/puppetfile/version.rb

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

data/lib/vagrant/puppetfile.rb

@@ -35,7 +35,7 @@ module Vagrant
       end
 
       def provision
-        Puppetfile.new(@config.path).evaluator(@config.evaluator, @logger).install!
+        Evaluator.create(@config.evaluator, @logger).install(@config.path)
       rescue Exception => e
         @logger.error("Failed to evaluate Puppetfile: #{e.message}")
       end
@@ -63,7 +63,7 @@ module Vagrant
 
         case parse_options(options)
         when ['install']
-          Puppetfile.new(puppetfile).evaluator(evaluator, @env.ui).install!
+          Evaluator.create(evaluator, @env.ui).install(puppetfile)
         else
           @env.ui.warn(options.help)
           exit 1
@@ -104,32 +104,9 @@ module Vagrant
       provisioner(:puppetfile) { Provisioner }
     end
 
-    class Puppetfile
-      attr_reader :path
+    module Evaluator
+      EVALUATORS = %w(librarian-puppet r10k puppet)
 
-      def initialize(path)
-        @path = path
-      end
-
-      def evaluator(type, logger)
-        case File.basename(type)
-        when 'librarian-puppet'
-          Evaluators::Librarian.new(type, path, logger)
-        when 'r10k'
-          Evaluators::R10k.new(type, path, logger)
-        when 'puppet'
-          Evaluators::Puppet.new(type, path, logger)
-        when 'autodetect'
-          evaluator('librarian-puppet', logger) rescue
-          evaluator('r10k', logger) rescue
-          evaluator('puppet', logger)
-        else
-          fail Evaluators::ConfigurationError, type
-        end
-      end
-    end
-
-    module Evaluators
       class InstallationError < Vagrant::Errors::VagrantError
         def error_message
           'Puppetfile module installation failed'
@@ -142,33 +119,58 @@ module Vagrant
         end
       end
 
-      class NoEvaluatorError < Vagrant::Errors::VagrantError
+      class EvaluatorError < Vagrant::Errors::VagrantError
         def error_message
           'No Puppetfile evaluator was found'
         end
       end
 
+      def Evaluator.create(type, logger)
+        case File.basename(type)
+        when 'librarian-puppet'
+          Librarian.new(type, logger)
+        when 'r10k'
+          R10k.new(type, logger)
+        when 'puppet'
+          Puppet.new(type, logger)
+        when 'autodetect'
+          autodetect(logger) or fail ConfigurationError
+        else
+          logger.warn("Invalid evaluator: #{type}")
+          fail ConfigurationError, type
+        end
+      end
+
+      def Evaluator.autodetect(logger)
+        EVALUATORS.detect do |type|
+          begin
+            return create(type, logger)
+          rescue EvaluatorError => e
+            nil
+          end
+        end
+      end
+
       class Base
         attr_reader :logger
         attr_reader :path
-        attr_reader :puppetfile
 
         ENV_CLEAN_KEYS = %w(GEM_HOME GEM_PATH)
 
-        def initialize(path, puppetfile, logger)
+        def initialize(path, logger)
           @logger = logger
           @path = path
-          @puppetfile = puppetfile
-
           # Make sure the evaluator actually exists and can be called.
           unless available?
-            logger.error("Unable to find command: #{path}")
-            fail NoEvaluatorError, path
+            logger.warn("Unable to find command: #{path}")
+            fail EvaluatorError, path
           end
+        end
 
+        def validate(puppetfile)
           # Check for the puppetfile and bomb if it doesn't exist.
           unless File.readable?(puppetfile)
-            logger.error("Unable to read puppetfile: #{puppetfile}")
+            logger.warn("Unable to read puppetfile: #{puppetfile}")
             fail ConfigurationError, puppetfile
           end
         end
@@ -208,7 +210,8 @@ module Vagrant
           false
         end
 
-        def install!
+        def install(puppetfile)
+          validate(puppetfile)
           run('puppetfile', 'install', '--verbose')
         end
       end
@@ -216,7 +219,7 @@ module Vagrant
       class Librarian < Base
         SUPPORTED_PUPPETFILE_NAMES = %w{Puppetfile Modulefile metadata.json}
 
-        def initialize(path, puppetfile, logger)
+        def validate(puppetfile)
           super
           unless SUPPORTED_PUPPETFILE_NAMES.include? File.basename(puppetfile)
             logger.error("The 'librarian-puppet' evaluator cannot install from a file named #{puppetfile.inspect}")
@@ -231,7 +234,8 @@ module Vagrant
           false
         end
 
-        def install!
+        def install(puppetfile)
+          validate(puppetfile)
           dir = File.dirname(puppetfile)
           Dir.chdir(dir) do
             run('install', '--verbose')
@@ -240,7 +244,7 @@ module Vagrant
       end
 
       class Puppet < Base
-        def initialize(path, puppetfile, logger)
+        def initialize(path, logger)
           super
           @moduledir = 'modules'
         end
@@ -251,7 +255,8 @@ module Vagrant
           false
         end
 
-        def install!
+        def install(puppetfile)
+          validate(puppetfile)
           logger.detail("Notice: Evaluating #{puppetfile} ...")
           instance_eval(File.read(puppetfile))
         end

metadata

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