falkorlib 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b251b68ef9aa5c75e11514017abd5b5802a822a
-  data.tar.gz: 1ad2b3edcee9a6291f84a9f188b95fca8a6702b3
+  metadata.gz: 2e28d97f7a88cce31cc5f23032ccdd23b887d8ce
+  data.tar.gz: aec4b454bf7177169e6195026d19c3c21390fe62
 SHA512:
-  metadata.gz: ce5d15c59e12f42237e867baf00dbf80b91a0a2c390ac070f1bfea17febc19e28c85d4dad457a2ccaac820d41a1c6878ea0caa337fc37080dd7f5226c6f59e4f
-  data.tar.gz: 7beca3455d326fc02c40610a524ad0a72cd6753e44fb2eace920f8574c15c42fb47b4541d52092469fc45c57c0508a0c9bfa7fbb5c78c46d6690b9f29d518a4e
+  metadata.gz: 15a8dd62ad3968beed584d5122cbf82899fc5192f4b60cb8d314839a2e707867c94c09760cdb74fdbf0d0e6929bdc2516b34c133e1a7af582919a0e55bb0e1ed
+  data.tar.gz: 67bc8769082c8a4e08ae1bfafeb7a5066c3a9597752ccf0902d155e18b4238e7742170d022df0017143bca0c8e7c54b2352e8cf3cf2911b412569dce4d26f70f

data/Gemfile.lock

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

data/lib/falkorlib/puppet/modules.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Fri 2015-05-15 23:58 svarrette>
+# Time-stamp: <Wed 2015-05-20 16:18 svarrette>
 ################################################################################
 # Interface for the main Puppet Module operations
 #
@@ -106,7 +106,7 @@ module FalkorLib  #:nodoc:
                                      when :description
                                          config[:summary].nil? ? v : "#{config[:summary]}"
                                      when :source
-                                         v.empty? ? "https://github.com/#{`whoami`.chomp}/#{config[:name]}" : v
+                                         v.empty? ? "https://github.com/#{config[:name].gsub(/\//,'/puppet-')}" : v
                                      else
                                          v
                                      end
@@ -170,7 +170,7 @@ module FalkorLib  #:nodoc:
                         FalkorLib::GitFlow.start('feature', "bootstrapping", moduledir)
                     end
                     [ 'metadata.json',
-                     'docs/', 'LICENSE', '.gitignore', '.ruby-version', '.ruby-gemset',
+                     'docs/', 'mkdocs.yml', 'LICENSE', '.gitignore', '.ruby-version', '.ruby-gemset', 
                      'Gemfile', '.vagrant_init.rb', 'Rakefile', 'Vagrantfile' ].each do |f|
                         FalkorLib::Git.add(File.join(moduledir, f))
                     end

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, 3  
+	    MAJOR, MINOR, PATCH = 0, 5, 4  
 	    
 	    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: <Lun 2015-03-30 22:42 svarrette>
+# Time-stamp: <Mon 2015-05-25 20:12 svarrette>
 #
 # @description 
 #
@@ -23,13 +23,15 @@ error "Unable to find the metadata.json" unless File.exists?(jsonfile)
 
 metadata   = JSON.parse( IO.read( jsonfile ) )
 name = metadata["name"].gsub(/^[^\/-]+[\/-]/,'') 
+modulepath=`puppet config print modulepath`.chomp
+moduledir=modulepath.split(':').first
+
 metadata["dependencies"].each do |dep|
 	lib = dep["name"]
-	run %{ puppet module install #{lib} } 
+    action = File.directory?("#{moduledir}") ? 'upgrade' : 'install'
+	run %{ puppet module #{action} #{lib} } 
 end
 
-modulepath=`puppet config print modulepath`.chomp
-moduledir=modulepath.split(':').first
 
 puts "Module path: #{modulepath}"
 puts "Moduledir:   #{moduledir}" 

data/templates/puppet/modules/Vagrantfile

@@ -21,7 +21,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         }
     }.each do |name,cfg|
         boxname = name.to_s.downcase.gsub(/_/, '-')
-        config.vm.define boxname, :primary => cfg[:primary] do |local|
+        config.vm.define boxname, :autostart => (! cfg[:primary].nil?), :primary => cfg[:primary] do |local|
             #local.vm.primary = true if cfg[:primary]
             local.vm.box = cfg[:box]
             local.vm.host_name = ENV['VAGRANT_HOSTNAME'] || name.to_s.downcase.gsub(/_/, '-').concat(".vagrant.com")

data/templates/puppet/modules/files/README.md.erb

@@ -8,14 +8,14 @@ file objects. Learn more [here](http://projects.puppetlabs.com/projects/puppet/w
 
 You can use managed files like this:
 
-    class <%= config[:name] %> {
-      package { <%= config[:name].gsub(/^puppet-/, '') %>: ensure => latest }
-      file { "/etc/<%= config[:name] %>.conf":
-        source => "puppet://$servername/modules/<%= config[:name] %>/myfile"
+    class <%= config[:shortname] %> {
+      package { <%= config[:shortname] %>: ensure => latest }
+      file { "/etc/<%= config[:shortname] %>.conf":
+        source => "puppet://$servername/modules/<%= config[:shortname] %>/myfile"
       }
     }
 
 The files are searched for in:
 	
-	$modulepath/<%= config[:name] %>/files/myfile
+	$modulepath/<%= config[:shortname] %>/files/myfile
 

data/templates/puppet/modules/manifests/init.pp.erb

@@ -10,11 +10,11 @@
 #
 # == Parameters:
 #
-# $ensure:: *Default*: 'present'. Ensure the presence (or absence) of <%= config[:name] %>
+# $ensure:: *Default*: 'present'. Ensure the presence (or absence) of <%= config[:shortname] %>
 #
 # == Actions:
 #
-# Install and configure <%= config[:name] %>
+# Install and configure <%= config[:shortname] %>
 #
 # == Requires:
 #

data/templates/puppet/modules/templates/README.md.erb

@@ -10,15 +10,15 @@ Learn more [here](http://projects.puppetlabs.com/projects/puppet/wiki/Puppet_Tem
 
 You can use templates like this: 
 
-    class <%= config[:name] %> {
-        package { <%= config[:name].gsub(/^puppet-/, '') %>: ensure => latest }
-        file { "/etc/<%= config[:name] %>.conf":
-             content => template("<%= config[:name] %>/myfile.erb")
+    class <%= config[:shortname] %> {
+        package { <%= config[:shortname] %>: ensure => latest }
+        file { "/etc/<%= config[:shortname] %>.conf":
+             content => template("<%= config[:shortname] %>/myfile.erb")
         }
     }
 
 The templates are searched for in:
 
-    $templatedir/<%= config[:name] %>/myfile.erb
-    $modulepath/<%= config[:name] %>/templates/myfile.erb
+    $templatedir/<%= config[:shortname] %>/myfile.erb
+    $modulepath/<%= config[:shortname] %>/templates/myfile.erb
 

data/templates/puppet/modules/templates/templatename-variables.erb

@@ -13,4 +13,4 @@
 # These are the variables used by the module <%= config[:name] %>
 #
 # General internal variables:
-$packagename = < %= scope.lookupvar('<%= config[:name] %>::params::packagename') % >
+$packagename = < %= scope.lookupvar('<%= config[:shortname] %>::params::packagename') % >

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake