falkorlib 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eba86657efa15410ce5eac1bd49205f78e958d7
-  data.tar.gz: 24c229e174aa8abe5c5675731b49b32fc3d4147a
+  metadata.gz: 594670018ab8236776433f498a44b26de9cd3ffe
+  data.tar.gz: 3e53ef37e6dceb5f8dd2b52768476196467cbf35
 SHA512:
-  metadata.gz: 17f1c879e7c84f17b98db8f61040a780a438a82838d9fa1e9b24ed84b7066f0f312d94178523021bab6612208e94ce4409d717ddb54e0cb9ad6c20c3002f1a4e
-  data.tar.gz: 1e74c3009789243a384893f7d9410594b81e46ada84340640600474b9fad7fe7ddc9e7a34732ea95a11bdb66b28d782b8f9f95eb8c30f0546641055069717127
+  metadata.gz: 4aab889e8da480ddb8f24f3a4831d7f38b3ece97f55107dc6ea09f70231d1ee92621a78693b15aa0186ca65a09d3bf033e2185a881b0ef2a4cb24cf195b90a31
+  data.tar.gz: 2043cf466d756a1cddeffb81307fdad18f4e9b5c945326fb9f849dcc49b27b88747ec065d1e73f09269f839026c562e0d3da05b0e52f9e0b6a9120bbc3fb3eff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.5.6)
+    falkorlib (0.5.7)
       artii (>= 2.1)
       awesome_print (~> 1.2)
       configatron (~> 3.2)

data/lib/falkorlib/puppet/modules.rb

@@ -170,7 +170,7 @@ module FalkorLib  #:nodoc:
                         FalkorLib::GitFlow.start('feature', "bootstrapping", moduledir)
                     end
                     [ 'metadata.json',
-                     'docs/', 'mkdocs.yml', 'LICENSE', '.gitignore', '.pmignore',
+                     'docs/', 'mkdocs.yml', 'LICENSE', '.gitignore', '.pmtignore',
                      '.ruby-version', '.ruby-gemset', 'Gemfile',
                      '.vagrant_init.rb', 'Rakefile', 'Vagrantfile' ].each do |f|
                         FalkorLib::Git.add(File.join(moduledir, f))

data/lib/falkorlib/tasks/puppet_modules.rake

@@ -165,7 +165,7 @@ end # namespace module
 require 'rake/clean'
 CLEAN.add   'pkg'
 
-exclude_tests_paths = ['pkg/**/*','spec/**/*']
+exclude_tests_paths = ['pkg/**/*','spec/**/*','manifests.old/**/*']
 
 #.........................................................................
 # puppet-lint tasks -- see http://puppet-lint.com/checks/

data/lib/falkorlib/version.rb

@@ -19,7 +19,7 @@ module FalkorLib #:nodoc:
         # MAJOR: Defines the major version
         # MINOR: Defines the minor version
         # PATCH: Defines the patch version
-	    MAJOR, MINOR, PATCH = 0, 5, 6  
+	    MAJOR, MINOR, PATCH = 0, 5, 7  
 	    
 	    module_function
 	    

data/templates/puppet/modules/.vagrant_init.rb

@@ -2,7 +2,7 @@
 ##########################################################################
 # vagrant_init.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Thu 2015-05-28 14:06 svarrette>
+# Time-stamp: <Tue 2015-06-02 10:36 svarrette>
 #
 # @description 
 #
@@ -11,6 +11,7 @@
 ##############################################################################
 
 require 'json'
+require 'yaml'
 require 'falkorlib'
 
 include FalkorLib::Common
@@ -29,13 +30,23 @@ moduledir=modulepath.split(':').first
 metadata["dependencies"].each do |dep|
 	lib = dep["name"]
     shortname = lib.gsub(/^.*[\/-]/,'')
-    action = File.directory?("#{moduledir}/#{shortname}") ? 'upgrade' : 'install'
+    action = File.directory?("#{moduledir}/#{shortname}") ? 'upgrade --force' : 'install'
 	run %{ puppet module #{action} #{lib} } 
 end
 
-
 puts "Module path: #{modulepath}"
 puts "Moduledir:   #{moduledir}" 
 
 info "set symlink to the '#{basedir}' module for local developments"
 run %{ ln -s #{basedir} #{moduledir}/#{name}  } unless File.exists?("#{moduledir}/#{name}")
+
+# Prepare hiera
+unless File.exists?('/etc/puppet/hiera.yaml')
+    run %{ ln -s /etc/hiera.yaml /etc/puppet/hiera.yaml } if File.exists?("/etc/hiera.yaml")
+end
+hieracfg = YAML::load_file('/etc/hiera.yaml')
+[ '/vagrant/hiera', '/vagrant/tests/hiera' ].each do |d|
+    hieracfg[:datadir] << d if File.directory?('#{d}')
+end
+hieracfg[:hierarchy] << common unless hieracfg[:hierarchy].include?('common')
+FalkorLib::Common.store_config('/etc/hiera.yaml', hieracfg)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -416,7 +416,7 @@ files:
 - templates/Rakefile/rakefile_gitflow.erb
 - templates/motd/motd.erb
 - templates/puppet/modules/.gitignore
-- templates/puppet/modules/.pmignore
+- templates/puppet/modules/.pmtignore
 - templates/puppet/modules/.vagrant_init.rb
 - templates/puppet/modules/Gemfile
 - templates/puppet/modules/README.md.erb