falkorlib 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 268cbfbe13bf123bf09deb6b4ecb48ea73bb7c47
-  data.tar.gz: fd2d6faf23d9a783012e40e85f61be0109939e79
+  metadata.gz: 04f2741d9368f17031d85aaf70162b520885251a
+  data.tar.gz: 9a2ff37f2459c2c9ec3014ea5c380cb4ccba4eb2
 SHA512:
-  metadata.gz: f8c3ef80d9c7704651ac8b20e11ed8ef3e62e0dd884ef57447947bf8ec577094c3668ad6b5492fd0736fdb83b4f123c64997ad14f0e3f3631ac815daecf84390
-  data.tar.gz: bddd9304358b05d2c26297bf1d067f440588c0f679c86d4c9d60695b769c663fb0f82d9eae8d0d00b919f6d538f1aa42b8b4d802f862563a3e4d81488f59255d
+  metadata.gz: 3a11240f50dec10daa3d9a5bf36ffc95e6c6b314e17a97731e2651db4ed227af5864118e8111599a9aa612032628191555e21796f47559fa4638af86539fdc60
+  data.tar.gz: be5cb38f44c4926a785f50f2b932f6077b83de6b61cade921e8a685226b8e553b8c5103a8c2e8823ae5a479dbe1d9a1340117625a0e691b331b778ed9c742c47

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.3.3)
+    falkorlib (0.3.4)
       awesome_print (~> 1.2)
       configatron (~> 3.2)
+      diffy (>= 3.0)
       git_remote_branch (~> 0)
       json (~> 1.8)
       license-generator (~> 0)
@@ -22,6 +23,7 @@ GEM
     coderay (1.1.0)
     configatron (3.2.0)
     diff-lcs (1.1.3)
+    diffy (3.0.6)
     docile (1.1.5)
     ethon (0.7.0)
       ffi (>= 1.3.0)

data/falkorlib.gemspec

@@ -132,6 +132,7 @@ Gem::Specification.new do |s|
 	s.add_runtime_dependency("awesome_print", "~> 1.2")
 	s.add_runtime_dependency("json", "~> 1.8")
 	s.add_runtime_dependency("license-generator", '~> 0')
+	s.add_runtime_dependency("diffy", '>= 3.0')
 
     #
     # One call to add_dependency('gem_name', 'gem version requirement') for each

data/lib/falkorlib/common.rb

@@ -1,12 +1,12 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Thu 2014-08-28 23:12 svarrette>
+# Time-stamp: <Sat 2014-08-30 21:05 svarrette>
 ################################################################################
 
 require "falkorlib"
 require 'open3'
 require 'erb'      # required for module generation
-
+require 'diffy'
 
 module FalkorLib #:nodoc:
 
@@ -170,7 +170,7 @@ module FalkorLib #:nodoc:
         # Supported options:
         #   :only_files      [boolean]: list only files in the glob
         #   :only_dirs       [boolean]: list only directories in the glob
-        #   :pattern_include [array of strings]: pattern(s) to include for listing   
+        #   :pattern_include [array of strings]: pattern(s) to include for listing
         #   :pattern_exclude [array of strings]: pattern(s) to exclude for listing
         #   :text            [string]: text to put
         def list_items(glob_pattern, options = {})
@@ -207,8 +207,8 @@ module FalkorLib #:nodoc:
             text        = options[:text].nil?    ? "select the index" : options[:text]
             default_idx = options[:default].nil? ? 0 : options[:default]
             raise SystemExit.new('Empty list') if index == 1
-	        #ap list
-	        #ap raw_list
+            #ap list
+            #ap raw_list
             # puts list.to_yaml
             # answer = ask("=> #{text}", "#{default_idx}")
             # raise SystemExit.new('exiting selection') if answer == '0'
@@ -264,10 +264,10 @@ module FalkorLib #:nodoc:
         # feed ERB files which **should** have the extension .erb.
         # The initialization is performed as follows:
         # * a rsync process is initiated to duplicate the directory structure
-        #   and the symlinks, and exclude .erb files 
+        #   and the symlinks, and exclude .erb files
         # * each erb files (thus with extension .erb) is interpreted, the
         #   corresponding file is generated without the .erb extension
-        # Supported options: 
+        # Supported options:
         #   :erb_exclude [array of strings]: pattern(s) to exclude from erb file
         #                                    interpretation and thus to copy 'as is'
         def init_from_template(templatedir, rootdir, config = {}, options = {})
@@ -277,65 +277,78 @@ module FalkorLib #:nodoc:
             run %{ mkdir -p #{rootdir} } unless File.directory?( rootdir )
             run %{ rsync --exclude '*.erb' -avzu #{templatedir}/ #{rootdir}/ }
             Dir["#{templatedir}/**/*.erb"].each do |erbfile|
-		        relative_outdir = Pathname.new( File.realpath( File.dirname(erbfile) )).relative_path_from Pathname.new(templatedir)
-		        filename = File.basename(erbfile, '.erb')
-		        outdir   = File.realpath( File.join(rootdir, relative_outdir.to_s) )		        
-		        outfile  = File.join(outdir, filename)
-		        unless options[:erb_exclude].nil?
-			        exclude_entry = false
-			        options[:erb_exclude].each do |pattern|
-				        exclude_entry |= erbfile =~ /#{pattern}/
-			        end
-			        if exclude_entry
-				        info "copying non-interpreted ERB file"
-				        # copy this file since it has been probably excluded from teh rsync process
-				        run %{ cp #{erbfile} #{outdir}/ }
-				        next 
-			        end 
-		        end 
-		        # Let's go
-		        info "updating '#{relative_outdir.to_s}/#{filename}'"
-		        puts "  using ERB template '#{erbfile}'"
-		        template = File.read("#{erbfile}")
-                output   = ERB.new(template, nil, '<>')
-		        if File.exists?( outfile )
-			        warn "the file '#{outfile}' already exists and will be overwritten."
-			        error "TODO: watch the diff ;)"
-		        else 
-			        watch =  ask( cyan("  ==> Do you want to see the generated file before commiting the writing (y|N)"), 'No')
-			        puts output.result(binding) if watch =~ /y.*/i
-		        end 
-		        proceed = ask( cyan("  ==> proceed with the writing (Y|n)"), 'Yes')
-		        next if proceed =~ /n.*/i
-		        info("=> writing #{outfile}")
-                File.open("#{outfile}", "w+") do |f|
-			        f.puts output.result(binding)
+                relative_outdir = Pathname.new( File.realpath( File.dirname(erbfile) )).relative_path_from Pathname.new(templatedir)
+                filename = File.basename(erbfile, '.erb')
+                outdir   = File.realpath( File.join(rootdir, relative_outdir.to_s) )
+                outfile  = File.join(outdir, filename)
+                unless options[:erb_exclude].nil?
+                    exclude_entry = false
+                    options[:erb_exclude].each do |pattern|
+                        exclude_entry |= erbfile =~ /#{pattern}/
+                    end
+                    if exclude_entry
+                        info "copying non-interpreted ERB file"
+                        # copy this file since it has been probably excluded from teh rsync process
+                        run %{ cp #{erbfile} #{outdir}/ }
+                        next
+                    end
                 end
-            end    
+                # Let's go
+                info "updating '#{relative_outdir.to_s}/#{filename}'"
+                puts "  using ERB template '#{erbfile}'"
+                write_from_erb_template(erbfile, outfile, config)
+            end
         end
 
+        ## ERB generation of the file destfile usung the source template file `erbsrc`
+        def write_from_erb_template(erbfile, outfile, config = {})
+            error "Unable to find the template file #{erbfile}" unless File.exists? (erbfile )
+            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 =  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 = ask( cyan("  ==> proceed with the writing (Y|n)"), 'Yes')
+            return if proceed =~ /n.*/i
+            info("=> writing #{outfile}")
+            File.open("#{outfile}", "w+") do |f|
+		        f.puts content
+            end
+        end 
+
+
+
         ### RVM init
         def init_rvm(rootdir = Dir.pwd, gemset = '')
-	        rvm_files = {
-		        :version => File.join(rootdir, '.ruby-version'),
-		        :gemset  => File.join(rootdir, '.ruby-gemset')
-	        }
-	        unless File.exists?( "#{rvm_files[:version]}")
-		        v = select_from(FalkorLib.config[:rvm][:rubies], 
-		                        "Select RVM ruby to configure for this directory", 
-		                        3)
-		        File.open( rvm_files[:version], 'w') do |f|
-			        f.puts v
-		        end
-	        end 
-	        unless File.exists?( "#{rvm_files[:gemset]}")
-		        g = gemset.empty? ? ask("Enter RVM gemset name for this directory", File.basename(rootdir)) : gemset
-		        File.open( rvm_files[:gemset], 'w') do |f|
-			        f.puts g
-		        end
-	        end 
-	        
-        end 
+            rvm_files = {
+                :version => File.join(rootdir, '.ruby-version'),
+                :gemset  => File.join(rootdir, '.ruby-gemset')
+            }
+            unless File.exists?( "#{rvm_files[:version]}")
+                v = select_from(FalkorLib.config[:rvm][:rubies],
+                                "Select RVM ruby to configure for this directory",
+                                3)
+                File.open( rvm_files[:version], 'w') do |f|
+                    f.puts v
+                end
+            end
+            unless File.exists?( "#{rvm_files[:gemset]}")
+                g = gemset.empty? ? ask("Enter RVM gemset name for this directory", File.basename(rootdir)) : gemset
+                File.open( rvm_files[:gemset], 'w') do |f|
+                    f.puts g
+                end
+            end
+
+        end
 
 
     end

data/lib/falkorlib/puppet/modules.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sat 2014-08-30 14:24 svarrette>
+# Time-stamp: <Sat 2014-08-30 21:23 svarrette>
 ################################################################################
 # Interface for the main Puppet Module operations
 #
@@ -29,6 +29,7 @@ module FalkorLib  #:nodoc:
                         :source       => '',
                         :project_page => '',
                         :issues_url   => '',
+			            :forge_url    => 'https://forge.puppetlabs.com/',       
                         :dependencies => [],
                         :operatingsystem_support => [],
                         :tags         => []
@@ -53,23 +54,23 @@ module FalkorLib  #:nodoc:
         # Management of Puppet Modules operations
         module Modules
 
-	        module_function
-	                    
+            module_function
+
             def _get_classdefs(moduledir = Dir.pwd, type = 'classes')
-	            name     = File.basename( moduledir )
-	            error "The module #{name} does not exist" unless File.directory?( moduledir )
-	            t = case type
-	                when /class*/i 
-		                'class'
-	                when /def*/    
-		                'define'
-	                else 
-		                ''		            
-	            end
-	            error "Undefined type #{type}" if t.empty?	            
+                name     = File.basename( moduledir )
+                error "The module #{name} does not exist" unless File.directory?( moduledir )
+                t = case type
+                    when /class*/i
+                        'class'
+                    when /def*/
+                        'define'
+                    else
+                        ''
+                    end
+                error "Undefined type #{type}" if t.empty?
                 result = []
                 Dir["#{moduledir}/manifests/**/*.pp"].each do |ppfile|
-		            File.read(ppfile).scan(/^[ \t]*#{t}[\s]+([0-9a-zA-z:-]+).*$/).each do |line|
+                    File.read(ppfile).scan(/^[ \t]*#{t}[\s]+([0-9a-zA-z:-]+).*$/).each do |line|
                         result << line[0]
                     end
                 end
@@ -88,7 +89,7 @@ module FalkorLib  #:nodoc:
                 config = {}
                 login = `whoami`.chomp
                 config[:name] = name unless name.empty?
-	            moduledir = name.empty? ? rootdir : File.join(rootdir, name)
+                moduledir = name.empty? ? rootdir : File.join(rootdir, name)
                 FalkorLib::Config::Puppet::Modules::DEFAULTS[:metadata].each do |k,v|
                     next if v.kind_of?(Array) or k == :license
                     next if k == :name and ! name.empty?
@@ -99,6 +100,8 @@ module FalkorLib  #:nodoc:
                                          File.basename(rootdir).gsub(/^puppet-/, '')
                                      when :issues_url
                                          config[:project_page].nil? ? v : "#{config[:project_page]}/issues"
+                                     when :forge_url
+	                                     v + '/' + config[:name].gsub(/-/,'/')
                                      when :description
                                          config[:summary].nil? ? v : "#{config[:summary]}"
                                      when :source
@@ -109,21 +112,24 @@ module FalkorLib  #:nodoc:
                     config[k.to_sym] = ask( "\t" + sprintf("%-20s", "Module #{k}"), default_answer)
                 end
                 name = config[:name].gsub(/.*-/, '')
-	            tags = ask("\tKeywords (comma-separated list of tags)", name)
+                tags = ask("\tKeywords (comma-separated list of tags)", name)
                 config[:tags] = tags.split(',')
-	            list_license    = FalkorLib::Config::Puppet::Modules::DEFAULTS[:licenses]
-	            default_license = FalkorLib::Config::Puppet::Modules::DEFAULTS[:metadata][:license]
-	            idx = list_license.index(default_license) unless default_license.nil?
-	            license = select_from(list_license,
+                list_license    = FalkorLib::Config::Puppet::Modules::DEFAULTS[:licenses]
+                default_license = FalkorLib::Config::Puppet::Modules::DEFAULTS[:metadata][:license]
+                idx = list_license.index(default_license) unless default_license.nil?
+                license = select_from(list_license,
                                       'Select the license index for the Puppet module:',
-	                                  idx.nil? ? 1 : idx + 1)
+                                      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' ]
 
                 #ap config
                 # Bootstrap the directory
                 templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
-	            init_from_template(templatedir, moduledir, config, {
+                init_from_template(templatedir, moduledir, config, {
                                        :erb_exclude => [ 'templates\/[^\/]*\.erb$' ]
                                    })
                 # Rename the files / element templatename
@@ -143,8 +149,9 @@ module FalkorLib  #:nodoc:
                 init_rvm(moduledir)
                 unless FalkorLib::GitFlow.init?(moduledir)
                     warn "Git [Flow] is not initialized in #{moduledir}."
-                    a = ask("Proceed to git-flow initialization (Y|n)", 'Yes')
-                    FalkorLib::GitFlow.init(moduledir) unless a =~ /n.*/i
+                    a = ask("Proceed to git-flow initialization (y|N)", 'No')
+	                return if a =~ /n.*/i
+                    FalkorLib::GitFlow.init(moduledir) 
                 end
 
                 # Propose to commit the key files
@@ -165,96 +172,122 @@ module FalkorLib  #:nodoc:
             def parse(moduledir = Dir.pwd)
                 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 ) )
-	            metadata["classes"]     = classes(moduledir)
-	            metadata["definitions"] = definitions(moduledir)
-	            deps        = deps(moduledir)
-	            listed_deps = metadata["dependencies"]
-	            missed_deps = []
-	            metadata["dependencies"].each do |dep|
-		            lib = dep["name"].gsub(/^[^\/-]+[\/-]/,'')
-		            if deps.include?( lib )
-			            deps.delete( lib ) 
-		            else 
-			            unless lib =~ /stdlib/
-				            warn "The library '#{dep["name"]}' is not analyzed as part of the #{name} 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}'")
-			            version = ask("Version requirement (ex: '>=1.0.0 <2.0.0' or '1.2.3' or '1.x')")
-			            metadata["dependencies"] << {
-				            "name"                => "#{login}/#{l}",
-				            "version_requirement" => "#{version}"
-			            }
-		            end
-	            end
-	            info "Metadata configuration for the module '#{name}'"
-	            puts JSON.pretty_generate( metadata )
-	            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 )
+                jsonfile = File.join( moduledir, 'metadata.json')
+                error "Unable to find #{jsonfile}" unless File.exist?( jsonfile )
+                metadata = JSON.parse( IO.read( jsonfile ) )
+                metadata["classes"]     = classes(moduledir)
+                metadata["definitions"] = definitions(moduledir)
+                deps        = deps(moduledir)
+                listed_deps = metadata["dependencies"]
+                missed_deps = []
+                metadata["dependencies"].each do |dep|
+                    lib = dep["name"].gsub(/^[^\/-]+[\/-]/,'')
+                    if deps.include?( lib )
+                        deps.delete( lib )
+                    else
+                        unless lib =~ /stdlib/
+                            warn "The library '#{dep["name"]}' is not analyzed as part of the #{name} 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}'")
+                        version = ask("Version requirement (ex: '>=1.0.0 <2.0.0' or '1.2.3' or '1.x')")
+                        metadata["dependencies"] << {
+                            "name"                => "#{login}/#{l}",
+                            "version_requirement" => "#{version}"
+                        }
+                    end
+                end
+                info "Metadata configuration for the module '#{name}'"
+                puts JSON.pretty_generate( metadata )
+                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
+                metadata
+            end # parse
+
+            ##Upgrade the repository README etc. with the
+            def upgrade(moduledir = Dir.pwd)
+                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)
+                end
+	            metadata[:platforms] = []
+	            metadata[:operatingsystem_support].each do |e| 
+		            metadata[:platforms] << e["operatingsystem"].downcase
 	            end
 
-            end # parse
+                [ 'README.md', 'doc/contributing.md'].each do |f|
+		            info "Upgrade the content of #{f}"
+                    write_from_erb_template(File.join(templatedir, "#{f}.erb"),
+                                            File.join(moduledir,  f),
+                                            metadata)
+                end
+            end
+
+
 
 
             #######
             # Find the classes of a given module
             ###
             def classes(moduledir = Dir.pwd)
-	            _get_classdefs(moduledir, 'classes')
+                _get_classdefs(moduledir, 'classes')
             end
 
             #######
             # Find the definitions of a given module
             ###
             def definitions(moduledir = Dir.pwd)
-	            _get_classdefs(moduledir, 'definitions')
+                _get_classdefs(moduledir, 'definitions')
             end
 
             #######
             # Find the dependencies of a given module
             ###
             def deps(moduledir = Dir.pwd)
-	            name     = File.basename( moduledir )
-	            error "The module #{name} does not exist" unless File.directory?( moduledir )
+                name     = File.basename( moduledir )
+                error "The module #{name} does not exist" unless File.directory?( moduledir )
 
-	            result    = Array.new
-	            result2   = Array.new
-	            resulttmp = Array.new
+                result    = Array.new
+                result2   = Array.new
+                resulttmp = Array.new
 
-	            result << name
+                result << name
 
-	            while result != result2 do
-		            resulttmp = result.dup
-		            (result - result2).each do |x|
-			            Dir["#{moduledir}/**/*.pp"].each do |ppfile|
-				            File.read(ppfile).scan(/^[ \t]*include.*$|^[ \t]*require.*$/).each do |line|
-					            if line.scan(">").length == 0
-						            result << line.gsub(/^[ \t]*(include|require) ([\"']|)([0-9a-zA-Z:{$}\-]*)([\"']|)/, '\3').split("::").first
-					            end
-				            end
-			            end
-		            end
-		            result.uniq!
-		            result2 = resulttmp.dup
-	            end
-	            result.delete "#{name}"
-	            result
+                while result != result2 do
+                    resulttmp = result.dup
+                    (result - result2).each do |x|
+                        Dir["#{moduledir}/**/*.pp"].each do |ppfile|
+                            File.read(ppfile).scan(/^[ \t]*include.*$|^[ \t]*require.*$/).each do |line|
+                                if line.scan(">").length == 0
+                                    result << line.gsub(/^[ \t]*(include|require) ([\"']|)([0-9a-zA-Z:{$}\-]*)([\"']|)/, '\3').split("::").first
+                                end
+                            end
+                        end
+                    end
+                    result.uniq!
+                    result2 = resulttmp.dup
+                end
+                result.delete "#{name}"
+                result
             end
 
-
-        end # module FalkorLib::Puppet::Modules
+        end
     end # module FalkorLib::Puppet
 end # module FalkorLib

data/lib/falkorlib/tasks/puppet_modules.rake

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
 # puppet_modules.rake - Special tasks for the management of Puppet modules
-# Time-stamp: <Thu 2014-08-28 23:04 svarrette>
+# Time-stamp: <Sat 2014-08-30 21:16 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -13,31 +13,66 @@ require 'falkorlib/puppet'
 
 #.....................
 namespace :bootstrap do
-	#.....................
-	namespace :puppet do
-		
-		###########  bootstrap:puppet:module   ###########
-		desc "Bootstrap a new Puppet module"
-		task :module, [:name] do |t, args|
-			info "#{t.comment}"
-			name = args.name == 'name' ? ask("Enter the module name") : args.name 
-			error "You need to provide a module name" unless name != ''
-			error "The module name cannot contain spaces" if name =~ /\s+/
-			moduledir = File.join( FalkorLib.config[:puppet][:modulesdir], name)
-			dir = ask("Destination directory:", moduledir)
-			error "The module '#{name}' already exists" if File.directory?(dir)
-			FalkorLib::Puppet::Modules.init(dir)
-		end 
+    #.....................
+    namespace :puppet do
+
+        ###########  bootstrap:puppet:module   ###########
+        desc "Bootstrap a new Puppet module"
+        task :module, [:name] do |t, args|
+            info "#{t.comment}"
+            name = args.name == 'name' ? ask("Enter the module name") : args.name
+            error "You need to provide a module name" unless name != ''
+            error "The module name cannot contain spaces" if name =~ /\s+/
+            moduledir = File.join( FalkorLib.config[:puppet][:modulesdir], name)
+            dir = ask("Destination directory:", moduledir)
+            error "The module '#{name}' already exists" if File.directory?(dir)
+            FalkorLib::Puppet::Modules.init(dir)
+        end
 
 
-	end # namespace bootstrap:puppet
+    end # namespace bootstrap:puppet
 end # namespace bootstrap
 
 
 
 #.....................
 namespace :puppet do
-	include FalkorLib::Common
+    include FalkorLib::Common
+
+    if command?('puppet')
+        #.....................
+        namespace :module do
+
+            ###########   puppet:module:build   ###########
+            desc "Build the puppet module to publish it on the Puppet Forge"
+            task :build do |t|
+                info "#{t.comment}"
+                run %{ puppet module build }
+                warn "you can now upload the generated file on the puppet forge"
+                warn "         https://forge.puppetlabs.com/"
+            end # task build
+
+            ###########   puppet:module:parse   ###########
+            desc "Parse a given module"
+            task :parse do |t|
+                info "#{t.comment}"
+                FalkorLib::Puppet::Modules.parse()
+            end # task parse
 
 
+        end
+    end # namespace module
 end # namespace puppet
+
+#.....................
+namespace :module do
+	namespace :upgrade do
+		###########   module:upgrade:readme   ###########
+		task :readme do |t|
+			#info "#{t.comment}"
+			FalkorLib::Puppet::Modules.upgrade()
+		end 
+
+
+	end # namespace upgrade
+end # namespace module

data/lib/falkorlib/tasks/rspec.rake

@@ -32,7 +32,7 @@ begin
     # Glob pattern to match files.
     #t.pattern = "spec/**/test_*.rb"
 	#t.pattern = "spec/**/*_spec.rb"
-		#t.pattern = "spec/**/puppet*spec.rb"
+		t.pattern = "spec/**/puppet*spec.rb"
 
     # Whether or not to fail Rake when an error occurs (typically when
     # examples fail).

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, 3  
+	    MAJOR, MINOR, PATCH = 0, 3, 4  
 	    
 	    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: <Sat 2014-08-30 15:28 svarrette>
+# Time-stamp: <Sat 2014-08-30 21:23 svarrette>
 #
 # @description Check the Puppet Modules operations
 #
@@ -37,13 +37,8 @@ describe FalkorLib::Puppet::Modules do
 
         it "#init -- create a puppet module" do
 			# Prepare answer to the questions
-			Array.new(11).each { |e|  STDIN.should_receive(:gets).and_return('') }
-			STDIN.should_receive(:gets).and_return('Yes') ## initialize/update the directory
-			Array.new(14).each { |e|  STDIN.should_receive(:gets).and_return('') }
-            STDIN.should_receive(:gets).and_return('')   ## RVM version
-			STDIN.should_receive(:gets).and_return(name) ## RVM gemset
-			STDIN.should_receive(:gets).and_return('No')
-
+			Array.new(32).each { |e|  STDIN.should_receive(:gets).and_return('') }
+			
             FalkorLib::Puppet::Modules.init(moduledir)
             templatedir = File.join( FalkorLib.templates, 'puppet', 'modules')
             s = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Sebastien Varrette
@@ -128,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement