pupistry 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c94c39eb6f50371e99762aee5b7546f60f9897d
-  data.tar.gz: 3d23604c96dd8e1a1991e71347ef2481428bf00e
+  metadata.gz: b194966f9998c32e6272e2d31c7cecded4d58c95
+  data.tar.gz: 824e9e3d6e695ede6524c805e12d3b8376521815
 SHA512:
-  metadata.gz: 0095ac651397af41960be834d5ed202265920dc1315f3b974b057f5aa5a32a7b132dbb5fd323299f3cfcba6b9b128bc4131bb463e4028d3b4653e1ff19b0746e
-  data.tar.gz: 2552da2af903929b92f115ee24e017be6e2c39af8b27eab850c1f92159ef5165704ff88421fc52f46ef5e34fc88dbbe053864261ddf0f18205220d729bc167cc
+  metadata.gz: e17bd516928ec6db3ddca4e65dc515a3273ddce0dd021622efa574244dd7721d27d3040961d885499b3760112729ed05f088e4c43c4ad700b3958c07514b639e
+  data.tar.gz: 0a0f8384d7260a0b1123c094a32cf49f35658361acc7eeb92e57905e7001bf9c033ebcd5553a7af7926eb7738c6b7eeafef171ff170a5117a70eacb8324fb966

data/lib/pupistry/agent.rb

@@ -142,7 +142,7 @@ module Pupistry
       puppet_cmd += " --environment #{environment}"
       puppet_cmd += " --confdir #{$config['agent']['puppetcode']}"
       puppet_cmd += " --environmentpath #{$config['agent']['puppetcode']}"
-      puppet_cmd += " --modulepath #{$config['agent']['puppetcode']}/#{environment}/modules/"
+      puppet_cmd += " --modulepath #{build_modulepath(environment)}"
       puppet_cmd += " --hiera_config #{$config['agent']['puppetcode']}/#{environment}/hiera.yaml"
       puppet_cmd += " #{$config['agent']['puppetcode']}/#{environment}/manifests/site.pp"
 
@@ -151,6 +151,33 @@ module Pupistry
 
       $logger.error 'An unexpected issue occured when running puppet' unless system puppet_cmd
     end
+ 
+    def self.build_modulepath(environment)
+
+      environment_path = "#{$config['agent']['puppetcode']}/#{environment}"
+      environment_conf = "#{environment_path}/environment.conf"
+
+      configured_paths = []
+
+      if File.exist?(environment_conf)
+        $logger.debug "Adding modulepath config from '#{environment_path}'"
+
+        File.open(environment_conf, 'r').readlines.each do |line|
+          if line !~ /^\s*#/ && /^(.*)=(.*)/ =~ line
+            key, val = $1.strip, $2.strip
+            configured_paths = val.split(':') if key == 'modulepath'
+          end
+        end
+      end
+
+      modulepaths = configured_paths.map { |path| File.expand_path(path, environment_path) }
+
+      # Ensure '<environment_path>/modules' in modulepath.
+      ensure_path = File.expand_path('modules', environment_path)
+      modulepaths.insert(0, ensure_path) unless modulepaths.include? ensure_path
+
+      modulepaths.join(File::PATH_SEPARATOR)
+    end 
   end
 end
 

data/lib/pupistry/version.rb

@@ -1,3 +1,3 @@
 module Pupistry
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupistry
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jethro Carr
@@ -237,3 +237,4 @@ signing_key:
 specification_version: 4
 summary: A workflow tool for Puppet Masterless Deployments
 test_files: []
+has_rdoc: