falkorlib 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48621a1943781dfdea2558deaf7835d99ac2ecaf
-  data.tar.gz: 59f699b1e866574ae3f30de108467be662405287
+  metadata.gz: e6d8cec0c3c632500898407975a5973f60f0e7fb
+  data.tar.gz: 7f4f4f44b51d0a166417f47b4de3b8fd560a5551
 SHA512:
-  metadata.gz: 04f31de4f018201535bacb98160b630bc953212814de6349c429e8c479e87725999ea4aaa3477b28de1bf38ba0eeaabfc936dfa6671c5bbcd51076ca0e43c7d6
-  data.tar.gz: ca21f90e2c03fdac3d9df7b2ea95fab2508e0d909a29c6113331a27f47f73dd3ab19ae3d7791776f0e379fa895b20715f9a9b88670676281a50096bf22771c46
+  metadata.gz: b55f144b558fb083f70135c8e4234eae31e7205b4a32f629a2f7a93195f42288acafe1a02d052a5335269a48bde62ec3c6c309a85d077f0b9e00aa23922c5238
+  data.tar.gz: 4b059fa396dff399cdef5d1606fdfc12a5a19f5a636c824f456b6d6c7174c0497283213b319ace08aecefe7333c9c474bd0aeebd230d234f1345d2d02ce14604

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.3.12)
+    falkorlib (0.3.13)
       awesome_print (~> 1.2)
       configatron (~> 3.2)
       diffy (>= 3.0)

data/lib/falkorlib/common.rb

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Ven 2014-09-05 10:44 svarrette>
+# Time-stamp: <Ven 2014-12-05 15:41 svarrette>
 ################################################################################
 
 require "falkorlib"
 require 'open3'
 require 'erb'      # required for module generation
 require 'diffy'
+require 'json'
 
 module FalkorLib #:nodoc:
 
@@ -305,7 +306,8 @@ module FalkorLib #:nodoc:
             end
         end
 
-        ## ERB generation of the file `outfile` using the source template file `erbfile`
+        ### 
+        # ERB generation of the file `outfile` using the source template file `erbfile`
         # Supported options:
         #   :no_interaction [boolean]: do not interact
         def write_from_erb_template(erbfile, outfile, config = {}, 
@@ -316,28 +318,70 @@ module FalkorLib #:nodoc:
             template = File.read("#{erbfile}")
             output   = ERB.new(template, nil, '<>')
             content  = output.result(binding)
-            if File.exists?( outfile )
-                ref = File.read( outfile )
-                return if ref == content
-                warn "the file '#{outfile}' already exists and will be overwritten."
-                warn "Expected difference: \n------"
-                Diffy::Diff.default_format = :color
-                puts Diffy::Diff.new(ref, content, :context => 1)
-            else
-
-                watch =  options[:no_interaction] ? 'no' : ask( cyan("  ==> Do you want to see the generated file before commiting the writing (y|N)"), 'No')
-                puts content if watch =~ /y.*/i
+	        show_diff_and_write(content, outfile, options)
+        end
 
-            end
-            proceed = options[:no_interaction] ? 'yes' : ask( cyan("  ==> proceed with the writing (Y|n)"), 'Yes')
-            return if proceed =~ /n.*/i
+        ## Show the difference between a `content` string and an destination file (using Diff algorithm).
+        # Obviosuly, if the outfile does not exists, no difference is proposed. 
+        # Supported options:
+        #   :no_interaction [boolean]: do not interact
+        #   :json_pretty_format [boolean]: write a json content, in pretty format
+        #
+        # return 0 if nothing happened, 1 if a write has been done
+        def show_diff_and_write(content, outfile, options = {
+	                                :no_interaction     => false,
+	                                :json_pretty_format => false,
+                                })
+	        if File.exists?( outfile )
+		        ref = File.read( outfile )
+		        if options[:json_pretty_format]
+			        ref = JSON.pretty_generate (JSON.parse( IO.read( outfile ) ))
+		        end 
+		        if ref == content
+			        warn "Nothing to update"
+			        return 0
+		        end 
+		        warn "the file '#{outfile}' already exists and will be overwritten."
+		        warn "Expected difference: \n------"
+		        Diffy::Diff.default_format = :color
+		        puts Diffy::Diff.new(ref, content, :context => 1)
+	        else
+		        watch =  options[:no_interaction] ? 'no' : ask( cyan("  ==> Do you want to see the generated file before commiting the writing (y|N)"), 'No')
+		        puts content if watch =~ /y.*/i
+	        end
+	        proceed = options[:no_interaction] ? 'yes' : ask( cyan("  ==> proceed with the writing (Y|n)"), 'Yes')
+            return 0 if proceed =~ /n.*/i
             info("=> writing #{outfile}")
             File.open("#{outfile}", "w+") do |f|
-                f.puts content
+		        f.write content
             end
-        end
+	        if FalkorLib::Git.init?(File.dirname(outfile))
+		        do_commit = options[:no_interaction] ? 'yes' : ask( cyan("  ==> commit the changes (Y|n)"), 'Yes')
+		        FalkorLib::Git.add(outfile, "update content of '#{File.basename(outfile)}'") if do_commit =~ /y.*/i
+	        end
+	        return 1
+        end 
 
 
+        ## Blind copy of a source file `src` into its destination directory `dstdir`
+        # Supported options:
+        #   :no_interaction [boolean]: do not interact
+        #   :srcdir [string]: source directory, make the `src` file relative to that directory
+        #   :outfile [string]: alter the outfile name (File.basename(src) by default)
+        def write_from_template(src,dstdir,options = {
+	                               :no_interaction => false,
+	                               :srcdir         => '', 
+	                               :outfile        => ''
+                               })
+	        srcfile = options[:srcdir].nil? ? src : File.join(options[:srcdir], src)
+	        error "Unable to find the source file #{srcfile}" unless File.exists? ( srcfile )
+	        error "The destination directory '#{dstdir}' do not exist" unless File.directory?( dstdir )
+	        dstfile = options[:outfile].nil? ? File.basename(srcfile) : options[:outfile]
+	        outfile = File.join(dstdir, dstfile)
+	        content = File.read( srcfile )
+	        show_diff_and_write(content, outfile, options)
+        end # copy_from_template
+
 
         ### RVM init
         def init_rvm(rootdir = Dir.pwd, gemset = '')

data/lib/falkorlib/git/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2014-08-26 11:54 svarrette>
+# Time-stamp: <Ven 2014-12-05 22:43 svarrette>
 ################################################################################
 # Interface for the main Git operations
 #
@@ -315,12 +315,12 @@ module FalkorLib  #:nodoc:
                 FalkorLib.config.git[:subtrees].each do |dir,conf|
                     next if conf[:url].nil?
                     url    = conf[:url]
-                    remote = dir
+                    remote = dir.gsub(/\//, '-')
                     branch = conf[:branch].nil? ? 'master' : conf[:branch]
                     remotes = FalkorLib::Git.remotes
                     unless remotes.include?( remote )
                         info "Initialize Git remote '#{remote}' from URL '#{url}'"
-                        exit_status = execute "git remote add -f #{dir} #{url}"
+                        exit_status = execute "git remote add -f #{remote} #{url}"
                     end
                     unless File.directory?( File.join(git_root_dir, dir) )
                         info "initialize Git subtree '#{dir}'"
@@ -356,7 +356,7 @@ module FalkorLib  #:nodoc:
                 FalkorLib.config.git[:subtrees].each do |dir,conf|
                     next if conf[:url].nil?
                     url    = conf[:url]
-                    remote = dir
+                    remote = dir.gsub(/\//, '-')
                     branch = conf[:branch].nil? ? 'master' : conf[:branch]
                     remotes = FalkorLib::Git.remotes
                     raise IOError, "The git remote '#{remote}' is not configured" unless remotes.include?( remote )
@@ -377,7 +377,7 @@ module FalkorLib  #:nodoc:
                 FalkorLib.config.git[:subtrees].each do |dir,conf|
                     next if conf[:url].nil?
                     url    = conf[:url]
-                    remote = dir
+                    remote = dir.gsub(/\//, '-')
                     branch = conf[:branch].nil? ? 'master' : conf[:branch]
                     remotes = FalkorLib::Git.remotes
                     info "Pulling changes into subtree '#{dir}' using remote '#{remote}/#{branch}'"
@@ -387,6 +387,7 @@ module FalkorLib  #:nodoc:
                     raise IOError, "The git subtree directory '#{dir}' does not exists" unless File.directory? ( File.join(git_root_dir, dir) )
                     info "\t\\__ pulling changes"
                     exit_status = execute "git subtree pull --prefix #{dir} --squash #{remote} #{branch}"
+                    #exit_status = puts "git subtree pull --prefix #{dir} --squash #{remote} #{branch}"
                 end
             end
             exit_status

data/lib/falkorlib/puppet/modules.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sam 2014-09-06 16:21 svarrette>
+# Time-stamp: <Lun 2014-09-08 16:41 svarrette>
 ################################################################################
 # Interface for the main Puppet Module operations
 #
@@ -30,7 +30,7 @@ module FalkorLib  #:nodoc:
                         :source       => '',
                         :project_page => '',
                         :issues_url   => '',
-			            :forge_url    => 'https://forge.puppetlabs.com',       
+                        :forge_url    => 'https://forge.puppetlabs.com',
                         :dependencies => [],
                         :operatingsystem_support => [],
                         :tags         => []
@@ -76,7 +76,7 @@ module FalkorLib  #:nodoc:
                     end
                 end
                 result.uniq!
-                result
+                result.sort
             end
 
 
@@ -102,7 +102,7 @@ module FalkorLib  #:nodoc:
                                      when :issues_url
                                          config[:project_page].nil? ? v : "#{config[:project_page]}/issues"
                                      when :forge_url
-	                                     v + '/' + config[:name].gsub(/-/,'/')
+                                         v + '/' + config[:name].gsub(/-/,'/')
                                      when :description
                                          config[:summary].nil? ? v : "#{config[:summary]}"
                                      when :source
@@ -123,19 +123,20 @@ module FalkorLib  #:nodoc:
                                       idx.nil? ? 1 : idx + 1)
                 config[:license] = license.downcase unless license.empty?
                 puts "\t" + sprintf("%-20s", "Module License:") + config[:license]
-	            
-	            # Supported platforms
-	            config[:platforms] = [ 'debian' ]
-	            config[:dependencies] = [{
-		                                     "name"          => "puppetlabs-stdlib",
-		                                     "version_range" => ">= 1.0.0"
-	                                     }]
+
+                # Supported platforms
+                config[:platforms] = [ 'debian' ]
+                config[:dependencies] = [{
+                                             "name"          => "puppetlabs-stdlib",
+                                             "version_range" => ">= 1.0.0"
+                                         }]
+                config[:params] = ["ensure", "protocol", "port", "packagename" ]
                 #ap config
                 # Bootstrap the directory
                 templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
                 init_from_template(templatedir, moduledir, config, {
                                        :erb_exclude    => [ 'templates\/[^\/]*variables\.erb$' ],
-	                                   :no_interaction => true
+                                       :no_interaction => true
                                    })
                 # Rename the files / element templatename
                 Dir["#{moduledir}/**/*"].each do |e|
@@ -152,22 +153,22 @@ module FalkorLib  #:nodoc:
                 end
                 info "Initialize RVM"
                 init_rvm(moduledir)
-	            unless FalkorLib::Git.init?(moduledir)
-		            init_gitflow = command?('git-flow')
-		            warn "Git #{init_gitflow ? '[Flow]' : ''} is not initialized in #{moduledir}."
-		            a = ask("Proceed to git-flow initialization (Y|n)", 'Yes')
-		            return if a =~ /n.*/i
-		            init_gitflow ? FalkorLib::GitFlow.init(moduledir) : FalkorLib::Git.init(moduledir)
-	            end 
-               
+                unless FalkorLib::Git.init?(moduledir)
+                    init_gitflow = command?('git-flow')
+                    warn "Git #{init_gitflow ? '[Flow]' : ''} is not initialized in #{moduledir}."
+                    a = ask("Proceed to git-flow initialization (Y|n)", 'Yes')
+                    return if a =~ /n.*/i
+                    init_gitflow ? FalkorLib::GitFlow.init(moduledir) : FalkorLib::Git.init(moduledir)
+                end
+
                 # Propose to commit the key files
                 if FalkorLib::Git.init?(moduledir)
                     if FalkorLib::GitFlow.init?(moduledir)
                         info "=> preparing git-flow feature for the newly created module '#{config[:name]}'"
                         FalkorLib::GitFlow.start('feature', "bootstraping", moduledir)
                     end
-                    [ 'metadata.json', 
-                      'doc/', 'LICENSE', '.gitignore', 
+                    [ 'metadata.json',
+                      'doc/', 'LICENSE', '.gitignore',
                       'Gemfile', '.vagrant_init.rb', 'Rakefile', 'Vagrantfile' ].each do |f|
                         FalkorLib::Git.add(File.join(moduledir, f))
                     end
@@ -176,15 +177,25 @@ module FalkorLib  #:nodoc:
 
             ####
             # Parse a given modules to collect information
-            ##
-            def parse(moduledir = Dir.pwd)
-                name     = File.basename( moduledir )
-                error "The module #{name} does not exist" unless File.directory?( moduledir )
+            # Supported options:
+            #   :no_interaction [boolean]: do not interact
+            #
+            def parse(moduledir = Dir.pwd, options = {
+                          :no_interaction => false
+                      })
+                name = File.basename(moduledir)
+                metadata = metadata(moduledir, {
+                                        :use_symbols => false,
+                                        :extras      => false
+                                    })
+                puts "**********************"
+                puts metadata.to_yaml
+                # error "The module #{name} does not exist" unless File.directory?( moduledir )
                 jsonfile = File.join( moduledir, 'metadata.json')
-                error "Unable to find #{jsonfile}" unless File.exist?( jsonfile )
-                metadata = JSON.parse( IO.read( jsonfile ) )
+                # error "Unable to find #{jsonfile}" unless File.exist?( jsonfile )
+                # metadata = JSON.parse( IO.read( jsonfile ) )
                 ref = JSON.pretty_generate( metadata )
-	            metadata["classes"]     = classes(moduledir)
+                metadata["classes"]     = classes(moduledir)
                 metadata["definitions"] = definitions(moduledir)
                 deps        = deps(moduledir)
                 listed_deps = metadata["dependencies"]
@@ -195,18 +206,16 @@ module FalkorLib  #:nodoc:
                         deps.delete( lib )
                     else
                         unless lib =~ /stdlib/
-                            warn "The library '#{dep["name"]}' is not analyzed as part of the #{name} module"
+                            warn "The library '#{dep["name"]}' is not analyzed as part of the #{metadata['shortname']} module"
                             missed_deps << dep
                         end
                     end
                 end
                 if ! deps.empty?
                     deps.each do |l|
-                        shortname = name.gsub(/.*-/, '')
-                        shortmetaname = metadata["name"].gsub(/.*-/, '')
                         next if [name, metadata["name"], name.gsub(/.*-/, ''), metadata["name"].gsub(/.*-/, '') ].include? ( l )
                         warn "The module '#{l}' is missing in the dependencies thus added"
-                        login = ask("[Github] login for the module '#{l}'")
+                        login   = ask("[Github] login for the module '#{l}'")
                         version = ask("Version requirement (ex: '>=1.0.0 <2.0.0' or '1.2.3' or '1.x')")
                         metadata["dependencies"] << {
                             "name"                => "#{login}/#{l}",
@@ -214,58 +223,126 @@ module FalkorLib  #:nodoc:
                         }
                     end
                 end
-	            content = JSON.pretty_generate( metadata ) 
+                content = JSON.pretty_generate( metadata )
                 info "Metadata configuration for the module '#{name}'"
                 puts content
-	            if ref == content
-		            warn "No difference to commit"
-		            return []
-	            end 
-	            info "Differences with the previous file"
-	            Diffy::Diff.default_format = :color
-	            puts Diffy::Diff.new(ref, content, :context => 1)
-                warn "About to commit these changes in the '#{name}/metadata.json' file"
-                really_continue?
-                File.open(jsonfile,"w") do |f|
-                    f.write JSON.pretty_generate( metadata )
-                end
-	            run %{ git commit -s -m "Update metadata.json" #{jsonfile} }
+                show_diff_and_write(content, jsonfile, {
+                                        :no_interaction     => options[:no_interaction],
+                                        :json_pretty_format => true
+                                    })
                 metadata
             end # parse
 
-            ##Upgrade the repository README etc. with the
-            def upgrade(moduledir = Dir.pwd, 
-                        options = {
-	                        :no_interaction => false
-                        })
+            ###
+            # Retrieves the metadata from the metadata.json file in `moduledir`.
+            # Supported options:
+            #   :use_symbols [boolean]: convert all keys to symbols
+            #   :extras  [boolean]: add extra keys
+            #
+            def metadata(moduledir = Dir.pwd, options = {
+                             :use_symbols => true,
+                             :extras      => true
+                         })
+                add_extras = options[:extras].nil? ? true : options[:extras]
                 name     = File.basename( moduledir )
                 error "The module #{name} does not exist" unless File.directory?( moduledir )
                 jsonfile = File.join( moduledir, 'metadata.json')
                 error "Unable to find #{jsonfile}" unless File.exist?( jsonfile )
                 metadata = JSON.parse( IO.read( jsonfile ) )
-                templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
-                # convert string keys to symbols
-                metadata.keys.each do |k|
-                    metadata[(k.to_sym rescue k) || k] = metadata.delete(k)
+                if add_extras
+                    metadata[:shortname] = name.gsub(/.*-/, '')
+                    metadata[:platforms] = []
+                    metadata["operatingsystem_support"].each do |e|
+                        metadata[:platforms] << e["operatingsystem"].downcase unless e["operatingsystem"].nil?
+                    end
+                    # Analyse params
+                    params_manifest = File.join(moduledir, 'manifests', 'params.pp')
+                    if File.exist?(params_manifest)
+                        params = []
+                        File.read(params_manifest).scan(/^\s*\$(.*)\s*=/) do |m|
+                            params << $1 unless $1.nil?
+                        end
+                        metadata[:params] = params.uniq
+                    end
                 end
-	            metadata[:platforms] = []
-	            metadata[:operatingsystem_support].each do |e| 
-		            metadata[:platforms] << e["operatingsystem"].downcase
-	            end
-	            metadata[:shortname] = name.gsub(/.*-/, '')
-                [ 'README.md', 'doc/contributing.md'].each do |f|
-		            info "Upgrade the content of #{f}"
-		            ans = options[:no_interaction] ? 'Yes' : ask("procceed?", 'Yes')
-		            next unless ans =~ /n*/i 
-                    write_from_erb_template(File.join(templatedir, "#{f}.erb"),
-                                            File.join(moduledir,  f),
-                                            metadata,
-                                            options)
+                if options[:use_symbols]
+                    # convert string keys to symbols
+                    metadata.keys.each do |k|
+                        metadata[(k.to_sym rescue k) || k] = metadata.delete(k)
+                    end
                 end
-            end
+                metadata
+            end # metadata
 
 
 
+            ##
+            # Upgrade the key files (README etc.) of the puppet module hosted
+            # in `moduledir` with the latest version of the FalkorLib template
+            # Supported options:
+            #   :no_interaction [boolean]: do not interact
+            #   :only [Array of string]: update only the listed files
+            #   :exclude [Array of string]: exclude from the upgrade the listed
+            #                               files
+            # return the number of considered files
+            def upgrade(moduledir = Dir.pwd,
+                        options = {
+                            :no_interaction => false,
+                            :only    => nil,
+                            :exclude => []
+                        })
+                metadata = metadata(moduledir)
+                templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
+                i = 0
+                update_from_erb = [ 'README.md', 'doc/contributing.md']
+                (update_from_erb + [ 'Gemfile', 'Rakefile', 'Vagrantfile', '.vagrant_init.rb' ]).each do |f|
+                    next unless options[:exclude].nil? or ! options[:exclude].include?( f )
+                    next unless options[:only].nil?    or options[:only].include?(f)
+                    info "Upgrade the content of #{f}"
+                    ans = options[:no_interaction] ? 'Yes' : ask(cyan("==> procceed? (Y|n)"), 'Yes')
+                    next if ans =~ /n.*/i
+                    if update_from_erb.include?(f)
+                        i += write_from_erb_template(File.join(templatedir, "#{f}.erb"),
+                                                     File.join(moduledir,  f),
+                                                     metadata,
+                                                     options)
+                    else
+                        i+= write_from_template(f, moduledir, {
+                                                    :no_interaction => options[:no_interaction],
+                                                    :srcdir => templatedir
+                                                })
+                    end
+                end
+                i
+            end
+
+            ##
+            # initializes or update the (tests/specs/etc.) sub-directory of the
+            # `moduledir` using the correcponding ERB files.
+            # Supported options:
+            #   :no_interaction [boolean]: do not interactww
+            #
+            # returns the number of considered files
+            def upgrade_from_template(moduledir = Dir.pwd,
+                                      subdir = 'tests',
+                                      options = {
+                                          :no_interaction => false
+                                      })
+                metadata = metadata(moduledir)
+                #ap metadata
+                i = 0
+                templatedir = File.join( FalkorLib.templates, 'puppet', 'modules', subdir)
+                error "Unable to find the template directory '#{templatedir}" unless File.directory?( templatedir )
+                Dir["#{templatedir}/**/*.erb"].each do |erbfile|
+                    f = File.join(subdir, File.basename(erbfile, '.erb'))
+                    info "Upgrade the content of #{f}"
+                    ans = options[:no_interaction] ? 'Yes' : ask(cyan("==> procceed? (Y|n)"), 'Yes')
+                    next if ans =~ /n.*/i
+                    i+= write_from_erb_template(erbfile, File.join(moduledir, f), metadata, options)
+                end
+                i
+            end
+
 
             #######
             # Find the classes of a given module
@@ -298,12 +375,12 @@ module FalkorLib  #:nodoc:
                     resulttmp = result.dup
                     (result - result2).each do |x|
                         Dir["#{moduledir}/**/*.pp"].each do |ppfile|
-				            File.read(ppfile).scan(/^\s*(include|require|class\s*{)\s*["']?(::)?([0-9a-zA-Z:{$}\-]*)["']?/) do |m|
-					            next if $3.nil?
-					            entry = $3.split('::').first 
-					            result << entry unless entry.nil? or entry.empty?
-				            end 
-			            end 
+                            File.read(ppfile).scan(/^\s*(include|require|class\s*{)\s*["']?(::)?([0-9a-zA-Z:{$}\-]*)["']?/) do |m|
+                                next if $3.nil?
+                                entry = $3.split('::').first
+                                result << entry unless entry.nil? or entry.empty?
+                            end
+                        end
                     end
                     result.uniq!
                     result2 = resulttmp.dup

data/lib/falkorlib/tasks/puppet_modules.rake

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
 # puppet_modules.rake - Special tasks for the management of Puppet modules
-# Time-stamp: <Sam 2014-09-06 16:32 svarrette>
+# Time-stamp: <Lun 2014-09-08 17:19 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
 ################################################################################
 
+require 'rake'
 require 'falkorlib'
 require 'falkorlib/tasks'
 require 'falkorlib/puppet'
@@ -119,12 +120,40 @@ end # namespace puppet
 
 #.....................
 namespace :templates do
+
 	namespace :upgrade do
-		###########   module:upgrade:readme   ###########
-		task :readme do |t|
-			#info "#{t.comment}"
+		###########   templates:upgrade:all   ###########
+		task :all do 
+			info "Upgrade all key module files from FalkorLib templates"
 			FalkorLib::Puppet::Modules.upgrade()
 		end 
+
+		[ 'readme', 'rake', 'vagrant' ].each do |t|
+			###########   templates:upgrade:{readme,rake,vagrant}   ###########
+			task t.to_sym do
+				list = case t
+				       when 'readme'
+					       [ 'README.md', 'doc/contributing.md' ]
+				       when 'rake' 
+					       [ 'Gemfile', 'Rakefile' ]
+				       when 'vagrant'
+					       [ 'Vagrantfile', '.vagrant_init.rb']
+				       else []
+				       end
+				#info "Upgrade the module files '#{list.join(',')}' from FalkorLib templates"
+				FalkorLib::Puppet::Modules.upgrade(Dir.pwd,{
+					                                   :only => list
+				                                   })
+			end
+		end
+
+		###########   templates:upgrade:tests   ###########
+		task :tests do 
+			info "Upgrade the basic tests manifests in tests/"
+			FalkorLib::Puppet::Modules.upgrade_from_template(Dir.pwd, 'tests')
+		end 
+
+
 	end # namespace upgrade
 end # namespace module
 
@@ -162,6 +191,32 @@ PuppetSyntax.exclude_paths = exclude_tests_paths
 # end 
 # task :syntax => :syntax_info
 
+#.........................................................................
+# rspec-puppet tasks -- see http://rspec-puppet.com/tutorial/
+#
+require 'rspec/core/rake_task'
+
+########## rspec #################
+desc "Run all RSpec code examples"
+RSpec::Core::RakeTask.new(:rspec) do |t|
+	t.rspec_opts = File.read("spec/spec.opts").chomp || ""
+end
+
+SPEC_SUITES = (Dir.entries('spec') - ['.', '..','fixtures']).select {|e| File.directory? "spec/#{e}" }
+namespace :rspec do
+	SPEC_SUITES.each do |suite|
+		############ rspec:{classes,defines...} ##########
+		desc "Run #{suite} RSpec code examples"
+		RSpec::Core::RakeTask.new(suite) do |t|
+			t.pattern = "spec/#{suite}/**/*_spec.rb"
+			t.rspec_opts = File.read("spec/spec.opts").chomp || ""
+		end
+	end
+end
+task :default => :rspec
+
+
+
 
 ################################################
 

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, 3, 12  
+	    MAJOR, MINOR, PATCH = 0, 3, 13  
 	    
 	    module_function
 	    

data/spec/falkorlib/puppet_modules_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # puppet_modules_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Sam 2014-09-06 16:25 svarrette>
+# Time-stamp: <Ven 2014-12-05 22:56 svarrette>
 #
 # @description Check the Puppet Modules operations
 #
@@ -88,17 +88,23 @@ describe FalkorLib::Puppet::Modules do
             d.should == []
         end
 
-        it "#upgrade" do
-			d = FalkorLib::Puppet::Modules.upgrade(moduledir, {
-				                                       :no_interaction => true
-			                                       })
-        end
+		it "#metadata" do
+			ref = JSON.parse( IO.read( jsonfile ) )
+			metadata = FalkorLib::Puppet::Modules.metadata(moduledir, { 
+				                                               :use_symbols => false,
+				                                               :extras      => false
+			                                               })
+			ref.keys.each do |k|
+				metadata[k].should == ref[k] 
+			end
+		end
+
 
         it "#parse" do
-            STDIN.should_receive(:gets).and_return('')
+            #STDIN.should_receive(:gets).and_return('')
             ref = JSON.parse( IO.read( jsonfile ) )
-            metadata = FalkorLib::Puppet::Modules.parse(moduledir)
-            diff = (metadata.to_a - ref.to_a).flatten.sort
+			metadata = FalkorLib::Puppet::Modules.parse(moduledir, { :no_interaction => true })
+			diff = (metadata.to_a - ref.to_a).flatten.sort
             diff.should == [
                             'classes',
                             'definitions',
@@ -111,9 +117,11 @@ describe FalkorLib::Puppet::Modules do
                            ]
         end
 
-		it "#parse again" do
-			metadata = FalkorLib::Puppet::Modules.parse(moduledir)
-			metadata.should == []
+		it "#parse again -- should not exhibit any difference" do
+			ref = JSON.parse( IO.read( jsonfile ) )
+			metadata = FalkorLib::Puppet::Modules.parse(moduledir, { :no_interaction => true })
+			diff = (metadata.to_a - ref.to_a).flatten.sort
+			diff.should == []
 		end
 
 		it "#deps -- should find a new dependency" do
@@ -124,11 +132,12 @@ describe FalkorLib::Puppet::Modules do
 			a.should include newdep 
 		end
 
-		it "#parse -- should ask new dependency elements" do
+		it "#parse again -- should ask new dependency elements" do
 			ref      = JSON.parse( IO.read( jsonfile ) )
 			STDIN.should_receive(:gets).and_return('svarrette')
 			STDIN.should_receive(:gets).and_return('1.2')
 			STDIN.should_receive(:gets).and_return('Yes')
+			STDIN.should_receive(:gets).and_return('')
 			metadata = FalkorLib::Puppet::Modules.parse(moduledir)
 			diff = (metadata.to_a - ref.to_a).flatten
 			diff.should == [
@@ -137,6 +146,41 @@ describe FalkorLib::Puppet::Modules do
 			                {"name"=>"svarrette/tata", "version_requirement"=>"1.2"}
 			               ]
 		end
+
+		upgraded_files_default = 1
+		it "#upgrade" do
+			d = FalkorLib::Puppet::Modules.upgrade(moduledir, {
+				                                       :no_interaction => true
+			                                       })
+			d.should == upgraded_files_default
+		end
+
+		it "#upgrade -- with only a subset of files" do
+			d = FalkorLib::Puppet::Modules.upgrade(moduledir, {
+				                                       :no_interaction => true,
+				                                       :only => [ 'README.md', 'Gemfile']
+			                                       })
+			d.should == 0
+		end
+
+		it "#upgrade -- exclude some files" do
+			d = FalkorLib::Puppet::Modules.upgrade(moduledir, {
+				                                       :no_interaction => true, 
+				                                       :exclude => [ 'README.md']
+			                                       })
+			d.should == (upgraded_files_default - 1)
+		end
+
+		it "#upgrade -- both include and exclude files" do
+			d = FalkorLib::Puppet::Modules.upgrade(moduledir, {
+				                                       :no_interaction => true, 
+				                                       :only    => [ 'README.md'],
+				                                       :exclude => [ 'README.md']
+			                                       })
+			d.should == 0
+		end
+
+
     end # context
 
 end

data/templates/puppet/modules/Gemfile

@@ -6,7 +6,8 @@ gem 'falkorlib' #, :path => '~/git/github.com/Falkor/falkorlib'
 # Puppet stuff
 puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
 gem "puppet", puppetversion
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
+#gem 'puppetlabs_spec_helper', '>= 0.1.0'
 gem 'puppet-lint',            '>= 0.3.2'
 gem 'puppet-syntax'
 gem 'facter',                 '>= 1.7.0'
+gem 'rspec-puppet'

data/templates/puppet/modules/doc/contributing.md.erb

@@ -1,6 +1,6 @@
 -*- mode: markdown; mode: auto-fill; fill-column: 80 -*-
 
-# <%= config[:name].gsub(/.*-/, '').capitalize %> Puppet Module Developments
+# <%= config[:shortname].capitalize %> Puppet Module Developments
 
 If you want to contribute to the code, you shall be aware of the way this module
 is organized.   
@@ -13,18 +13,18 @@ is organized.
            `-- files/            # Contains static files, which managed nodes can download
            `-- lib/              # custom facts/type/provider definitions
            `-- manifests/
-                `-- init.pp      # Main manifests file
-                `-- classes/     # Hold manifest for <%= config[:name] %> classes/
-                     `-- <%= config[:name] %>.pp         # defines the <%= config[:name] %> class
-                     `-- <%= config[:name] %>-params.pp  # <%= config[:name] %> module variables 
-                `-- definitions/ # Hold manifest for <%= config[:name] %> definitions
-                     `-- <%= config[:name] %>-mydef.pp   # defines the <%= config[:name] %>::mydef definition   `-- templates/        # Module ERB template files
+                `-- init.pp      # Main manifests file which defines the <%= config[:shortname] %> class 
+                `-- params.pp    # <%= config[:name] %> module variables 
+                `-- mydef.pp     # defines the <%= config[:shortname] %>::mydef  definition   
+           `-- templates/        # Module ERB template files
            `-- tests/            # Contains examples showing how to declare the module’s classes and defined type
-           `-- spec/             # Contains spec tests for any plugins in the lib directory
+           `-- spec/             # Contains rspec tests 
            `-- Rakefile          # Definition of the [rake](https://github.com/jimweirich/rake) tasks
            `-- .ruby-{version,gemset}   # [RVM](https://rvm.io/) configuration
            `-- Gemfile[.lock]    # [Bundler](http://bundler.io/) configuration
            `-- .git/             # Hold git configuration
+           `-- .vagrant_init.rb  # Vagrant provisionner to test this module
+           `-- Vagrantfile       # Vagrant file
 
 ### Git Branching Model
 

data/templates/puppet/modules/tests/params.pp.erb

@@ -15,27 +15,13 @@
 
 include '<%= config[:shortname] %>::params'
 
-$names = [
-          "ensure",
-          "protocol",
-          "port",
-          "packagename",
-          "logdir",
-          "logdir_mode",
-          "logdir_owner",
-          "logdir_group",
-          "servicename",
-          "processname",
-          "hasstatus",
-          "hasrestart",
-          "configfile",
-          "configfile_init",
-          "configfile_mode",
-          "configfile_owner",
-          "configfile_group",
-          ]
+$names = <%= config[:params] %>
 
-each($names) |$v| {
-    $var = "<%= config[:shortname] %>::params::${v}"
-    notice("${var} = ", inline_template('<%%= scope.lookupvar(@var) %>'))
-}
+<% config[:params].each do |v| %>
+notice("<%= config[:shortname] %>::params::<%= v %> = ${<%= config[:shortname] %>::params::<%= v %>}")
+<% end %>
+
+#each($names) |$v| {
+#    $var = "<%= config[:shortname] %>::params::${v}"
+#    notice("${var} = ", inline_template('<%%= scope.lookupvar(@var) %>'))
+#}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake