vagrant-librarian-puppet 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bde3fa7da035c0b4c481472d343cd5f757037232
-  data.tar.gz: a34404374c91ece831bc7815a5356ca117db15a7
+  metadata.gz: 06853b9fc2b9d7ab1f735f5c17904fd521398dce
+  data.tar.gz: ad66f090afa226825661c0d86233c7057f771bb9
 SHA512:
-  metadata.gz: 6d61594228916ed66a848d24b7f13c96a980a5a67a0764a4e27c0c8239c5da92c684786dacb2a126e39e92bcd95245667c71ed84f82df087135e853c1504842d
-  data.tar.gz: 08659f9addc7f061bb9b53687be5ef2ec38790fe55f0422bd98787a4f912e16ffd9262c29353b52ef4c69f67a0bfdb4900c96062870803aaf78cf7588a972e50
+  metadata.gz: 8833e4e3a209fc9b0508b2456fa676dd58a46793649b7270cb9031bc6499d5d8095f4264d6ea037ca179dd82b46888037a5beae97dc677f5b3022c44ac047e1d
+  data.tar.gz: 7aec620720511a6dc17522be4c6a351d3fad1bc834935dd380e49fd70fd59a83917e08942d5a0d0ba9bbe3bf44a5cc9580785aa91aedee0adeb97e43145996ca

data/README.md

@@ -24,6 +24,11 @@ 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.
 
+Like the `puppet.module_path`, `librarian_puppet.puppetfile_dir` supports both,
+a simple String or an Array of Strings. Librarian Puppet will look for Puppetfiles
+in each Directory and manage each modules directory.
+
+
 **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

data/Vagrantfile

@@ -6,13 +6,27 @@ Vagrant.configure('2') do |config|
   config.vm.box = 'precise64'
   config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
 
-  config.librarian_puppet.puppetfile_dir = 'puppet'
-  config.librarian_puppet.resolve_options = { :force => true }
+  config.vm.define "default" do |default|
+    default.librarian_puppet.puppetfile_dir = 'puppet'
+    default.librarian_puppet.placeholder_filename = ".gitkeep"
+    default.librarian_puppet.resolve_options = { :force => true }
 
-  config.vm.provision :puppet do |puppet|
-    puppet.manifests_path = 'manifests'
-    puppet.manifest_file = 'init.pp'
-    puppet.module_path = 'puppet/modules'
+    default.vm.provision :puppet do |puppet|
+      puppet.manifests_path = 'manifests'
+      puppet.manifest_file = 'init.pp'
+      puppet.module_path = 'puppet/modules'
+    end
   end
 
+  config.vm.define "multidir" do |multidir|
+    multidir.librarian_puppet.puppetfile_dir = ['puppet', 'puppet_custom']
+    multidir.librarian_puppet.placeholder_filename = ".gitkeep"
+    multidir.librarian_puppet.resolve_options = { :force => true }
+
+    multidir.vm.provision :puppet do |puppet|
+      puppet.manifests_path = 'manifests'
+      puppet.manifest_file = 'multidir.pp'
+      puppet.module_path = ['puppet_custom/modules', 'puppet/modules']
+    end
+  end
 end

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

@@ -15,12 +15,7 @@ module VagrantPlugins
 
         def call(env)
           config = env[:machine].config.librarian_puppet
-          if
-            provisioned? and
-            File.exist? File.join(env[:root_path], config.puppetfile_path)
-
-            env[:ui].info "Installing Puppet modules with Librarian-Puppet..."
-
+          if provisioned?
             # NB: Librarian::Puppet::Environment calls `which puppet` so we
             # need to make sure VAGRANT_HOME/gems/bin has been added to the
             # path.
@@ -28,10 +23,27 @@ module VagrantPlugins
             bin_path = env[:gems_path].join('bin')
             ENV['PATH'] = "#{bin_path}#{::File::PATH_SEPARATOR}#{ENV['PATH']}"
 
+            puppetfile_dirs = config.puppetfile_dir.kind_of?(Array) ? config.puppetfile_dir : [config.puppetfile_dir]
+
+            puppetfile_dirs.each do |puppetfile_dir|
+              provision(puppetfile_dir, env, config)
+            end
+
+            # Restore the original path
+            ENV['PATH'] = original_path
+          end
+          @app.call(env)
+        end
+
+        def provision(puppetfile_dir, env, config)
+          if File.exist? File.join(env[:root_path], config.puppetfile_path(puppetfile_dir))
+
+            env[:ui].info "Installing Puppet modules in \"#{puppetfile_dir}\" with Librarian-Puppet..."
+
             # Determine if we need to persist placeholder file
             placeholder_file = File.join(
               env[:root_path],
-              config.puppetfile_dir,
+              puppetfile_dir,
               'modules',
               config.placeholder_filename
             )
@@ -42,7 +54,7 @@ module VagrantPlugins
             end
 
             environment = Librarian::Puppet::Environment.new({
-              :project_path => File.join(env[:root_path], config.puppetfile_dir)
+              :project_path => File.join(env[:root_path], puppetfile_dir)
             })
             environment.config_db.local['destructive']  = config.destructive.to_s
             environment.config_db.local['use-v1-api']   = config.use_v1_api
@@ -51,18 +63,13 @@ module VagrantPlugins
             Librarian::Action::Resolve.new(environment, config.resolve_options).run
             Librarian::Puppet::Action::Install.new(environment).run
 
-            # 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
 
         def provisioned?

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

@@ -31,8 +31,8 @@ module VagrantPlugins
         return { 'vagrant-librarian-puppet' => errors }
       end
 
-      def puppetfile_path
-        @puppetfile_path ||= @puppetfile_dir ? File.join(@puppetfile_dir, 'Puppetfile') : 'Puppetfile'
+      def puppetfile_path(puppetfile_dir)
+        @puppetfile_path ||= puppetfile_dir ? File.join(puppetfile_dir, 'Puppetfile') : 'Puppetfile'
       end
 
       def use_v1_api

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module LibrarianPuppet
-    VERSION = "0.7.2"
+    VERSION = "0.8.0"
   end
 end

data/manifests/multidir.pp

@@ -0,0 +1,9 @@
+class dev {
+
+  include git
+  include supervisor
+  include ntp
+
+}
+
+include dev

data/puppet_custom/Puppetfile

@@ -0,0 +1,5 @@
+# Manage Puppet module dependencies with librarian-puppet
+
+forge 'http://forge.puppetlabs.com'
+
+mod 'puppetlabs/ntp'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Michael Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian-puppet
@@ -113,7 +113,11 @@ files:
 - lib/vagrant-librarian-puppet/plugin.rb
 - lib/vagrant-librarian-puppet/version.rb
 - manifests/init.pp
+- manifests/multidir.pp
 - puppet/Puppetfile
+- puppet/modules/.gitkeep
+- puppet_custom/Puppetfile
+- puppet_custom/modules/.gitkeep
 - vagrant-librarian-puppet.gemspec
 homepage: https://github.com/mhahn/vagrant-librarian-puppet
 licenses: