falkorlib 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 594670018ab8236776433f498a44b26de9cd3ffe
-  data.tar.gz: 3e53ef37e6dceb5f8dd2b52768476196467cbf35
+  metadata.gz: 18249c7e732e003058d30a79275689eea32a3167
+  data.tar.gz: 5f4897d5efd296f97b5bb56eb201765b2784a87f
 SHA512:
-  metadata.gz: 4aab889e8da480ddb8f24f3a4831d7f38b3ece97f55107dc6ea09f70231d1ee92621a78693b15aa0186ca65a09d3bf033e2185a881b0ef2a4cb24cf195b90a31
-  data.tar.gz: 2043cf466d756a1cddeffb81307fdad18f4e9b5c945326fb9f849dcc49b27b88747ec065d1e73f09269f839026c562e0d3da05b0e52f9e0b6a9120bbc3fb3eff
+  metadata.gz: 6091b09eb7645df8bbe35d43e1be1a8399fb1ad6f487cfb3f6c70fd81512df84a2d8ba1001222ab56c9cc8b2339665e01d20d8f4666f19a0e1c9a176a47644b4
+  data.tar.gz: dec1707b7dd64c4260dbf1b483a04f3ded41e58629975b89916b0e82a60af11fb9b6a70c21a46e7c897a0169b3446909fbf5de615c87b74ce8447ed6b48f779b

data/Gemfile.lock

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

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, 7  
+	    MAJOR, MINOR, PATCH = 0, 5, 8  
 	    
 	    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: <Tue 2015-06-02 10:36 svarrette>
+# Time-stamp: <Tue 2015-06-02 21:37 svarrette>
 #
 # @description 
 #
@@ -27,12 +27,18 @@ name = metadata["name"].gsub(/^[^\/-]+[\/-]/,'')
 modulepath=`puppet config print modulepath`.chomp
 moduledir=modulepath.split(':').first
 
-metadata["dependencies"].each do |dep|
-	lib = dep["name"]
-    shortname = lib.gsub(/^.*[\/-]/,'')
-    action = File.directory?("#{moduledir}/#{shortname}") ? 'upgrade --force' : 'install'
-	run %{ puppet module #{action} #{lib} } 
-end
+
+run %{ cd /etc/puppet && librarian-puppet clean && rm Puppetfile* }
+run %{ ln -s /vagrant/metadata.json /etc/puppet/ }
+run %{ cd /etc/puppet && librarian-puppet install --verbose }
+
+
+# metadata["dependencies"].each do |dep|
+# 	lib = dep["name"]
+#     shortname = lib.gsub(/^.*[\/-]/,'')
+#     action = File.directory?("#{moduledir}/#{shortname}") ? 'upgrade --force' : 'install'
+# 	run %{ puppet module #{action} #{lib} } 
+# end
 
 puts "Module path: #{modulepath}"
 puts "Moduledir:   #{moduledir}" 
@@ -44,9 +50,16 @@ run %{ ln -s #{basedir} #{moduledir}/#{name}  } unless File.exists?("#{moduledir
 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)
+# # hieracfg = YAML::load_file('/etc/hiera.yaml')
+# # [ '/vagrant/tests/hiera' ].each do |d|
+# #     hieracfg[:datadir] = [] if hieracfg[:datadir].nil?
+# #     hieracfg[:datadir] << d #if File.directory?('#{d}')
+# # end
+# # hieracfg[:hierarchy] = [] if hieracfg[:hierarchy].nil?
+# # hieracfg[:hierarchy] << 'common' unless hieracfg[:hierarchy].include?('common')
+hieracfg = {
+    :backend   => 'yaml',
+    :hierarchy => [ 'defaults', 'common' ],
+    :datadir   => '/vagrant/tests/hiera',
+}
+FalkorLib::Common.store_config('/etc/hiera.yaml', hieracfg, {:no_interaction => true})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Sebastien Varrette