vagrant-librarian-puppet-plugin 0.1.3 → 0.2.0

data/README.md

@@ -22,12 +22,20 @@ simply set up your Puppetfile as you normally would.
 You may specify the subdirectory within which to run `librarian-puppet`
 using the `librarian_puppet.puppetfile_dir` config key.  Please keep in mind
 that you will need to explicitly set the `modules` path in the
-`:puppet` provisioner and this path must exist before running vagrant commands:
+`:puppet` provisioner and this path must exist before running vagrant commands.
+
+**NOTE:** Since the puppet provisioner will fail if the path provided to
+"puppet.modules" doesn't exist and librarian-puppet will destroy and recreate
+the modules directory on each run, this plugin supports a placeholder file
+within the modules directory that can be checked into version control and will
+persist between provisions.
 
 ```ruby
 Vagrant.configure("2") do |config|
 
   config.librarian_puppet.puppetfile_dir = "puppet"
+  # placeholder_filename defaults to .PLACEHOLDER
+  config.librarian_puppet.placeholder_filename = ".MYPLACEHOLDER"
 
   config.vm.provision :puppet do |puppet|
     puppet.modules = "puppet/modules"

data/lib/vagrant-librarian-puppet-plugin/action/librarian_puppet.rb

@@ -27,6 +27,19 @@ module VagrantPlugins
             bin_path = env[:gems_path].join('bin')
             ENV['PATH'] = "#{bin_path}#{::File::PATH_SEPARATOR}#{ENV['PATH']}"
 
+            # Determine if we need to persist placeholder file
+            placeholder_file = File.join(
+              env[:root_path],
+              config.puppetfile_dir,
+              'modules',
+              config.placeholder_filename
+            )
+            if File.exist? placeholder_file
+              placeholder_contents = File.read(placeholder_file)
+            else
+              placeholder_contents = nil
+            end
+
             environment = Librarian::Puppet::Environment.new({
               :project_path => File.join(env[:root_path], config.puppetfile_dir)
             })
@@ -36,6 +49,14 @@ module VagrantPlugins
 
             # Restore the original path
             ENV['PATH'] = original_path
+
+            # Persist placeholder if necessary
+            if placeholder_contents != nil
+              File.open(placeholder_file, 'w') { |file|
+                file.write(placeholder_contents)
+              }
+            end
+
           end
           @app.call(env)
         end

data/lib/vagrant-librarian-puppet-plugin/config.rb

@@ -2,13 +2,16 @@ module VagrantPlugins
   module LibrarianPuppet
     class Config < Vagrant.plugin(2, :config)
       attr_accessor :puppetfile_dir
+      attr_accessor :placeholder_filename
 
       def initialize
         @puppetfile_dir = UNSET_VALUE
+        @placeholder_filename = UNSET_VALUE
       end
 
       def finalize!
         @puppetfile_dir = '.' if @puppetfile_dir == UNSET_VALUE
+        @placeholder_filename = '.PLACEHOLDER' if @placeholder_filename == UNSET_VALUE
       end
 
       def puppetfile_path

data/lib/vagrant-librarian-puppet-plugin/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module LibrarianPuppet
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-librarian-puppet-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: