falkorlib 0.6.19 → 0.7.0

data/lib/falkorlib/tasks/git.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Jeu 2014-06-26 10:29 svarrette>
+# Time-stamp: <Fri 2016-11-11 14:29 svarrette>
 ################################################################################
 #
 # FalkorLib rake tasks to pilot Git [flow] operations
@@ -11,42 +11,42 @@ require 'falkorlib'
 require 'falkorlib/tasks'
 
 module FalkorLib #:nodoc:
+  # Rake tasks to pilot Git operations
+  class GitTasks
 
-    # Rake tasks to pilot Git operations
-    class GitTasks
-        include Rake::DSL if defined? Rake::DSL
+    include Rake::DSL if defined? Rake::DSL
 
-        # Install the git[flow] tasks for Rake
-        def install_tasks
-            load 'falkorlib/tasks/git.rake'
-            load 'falkorlib/tasks/gitflow.rake'
-        end
-    end # class FalkorLib::GitTasks
+    # Install the git[flow] tasks for Rake
+    def install_tasks
+      load 'falkorlib/tasks/git.rake'
+      load 'falkorlib/tasks/gitflow.rake'
+    end
+
+  end # class FalkorLib::GitTasks
 end # module FalkorLib
 
 
 if FalkorLib::Git.init?
-    # Now install them ;)
-    FalkorLib::GitTasks.new.install_tasks
+  # Now install them ;)
+  FalkorLib::GitTasks.new.install_tasks
 else
-    warn "Git is not initialized for this directory."
-    warn "==> consider running 'rake git[:flow]:init' to be able to access the regular git Rake tasks"
+  warn "Git is not initialized for this directory."
+  warn "==> consider running 'rake git[:flow]:init' to be able to access the regular git Rake tasks"
+  #.....................
+  namespace :git do
+    ###########  git:init   ###########
+    desc "Initialize Git repository"
+    task :init do
+      FalkorLib::Git.init
+    end
+
     #.....................
-    namespace :git do
-        ###########  git:init   ###########
-        desc "Initialize Git repository"
-        task :init do
-            FalkorLib::Git.init
-        end
-
-        #.....................
-        namespace :flow do
-            ###########  git:flow:init   ###########
-            desc "Initialize the Git-flow repository"
-            task :init do
-                FalkorLib::GitFlow.init
-            end
-        end # namespace git:flow
-
-    end # namespace git
+    namespace :flow do
+      ###########  git:flow:init   ###########
+      desc "Initialize the Git-flow repository"
+      task :init do
+        FalkorLib::GitFlow.init
+      end
+    end # namespace git:flow
+  end # namespace git
 end

data/lib/falkorlib/tasks/gitflow.rake

@@ -1,6 +1,6 @@
 ################################################################################
 # gitflow.rake - Special tasks for the management of Git [Flow] operations
-# Time-stamp: <Sam 2014-08-23 15:19 svarrette>
+# Time-stamp: <Fri 2016-11-11 15:43 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -12,154 +12,144 @@ require 'falkorlib/git'
 
 #.....................
 namespace :git do
-
-    include FalkorLib::Common
-    git_root_dir = FalkorLib::Git.rootdir
-
-    ###########  git:init   ###########
-    #desc "Initialize Git repository"
-    task :init => [ 'git:flow:init' ]
-
-    #.....................
-    namespace :flow do
-
-        ###########   git:flow:init   ###########
-        desc "Initialize your local clone of the repository for the git-flow management"
-        task :init do |t|
-            info t.comment
-            FalkorLib::GitFlow.init(git_root_dir)
-        end # task init
-
-    end # namespace git::flow
-
-    #.....................
-    namespace :feature do
-
-        #########   git:feature:start ##########################
-        desc "Start a new feature operation on the repository using the git-flow framework"
-        task :start, [:name] do |t, args|
-            #args.with_default[:name => '']
-            name = args.name == 'name' ? ask("Name of the feature (the git branch will be 'feature/<name>')") : args.name
-            info t.comment + " with name 'feature/#{name}'"
-            really_continue?
-            Rake::Task['git:up'].invoke unless FalkorLib::Git.remotes.empty?
-            info "=> prepare new 'feature' using git flow"
-            o = FalkorLib::GitFlow.start('feature', name)
-            error "Git flow feature operation failed" unless o == 0
-            # Now you should be in the new branch
-        end
-
-        #########   git:feature:finish ##########################
-        desc "Finalize the feature operation"
-        task :finish do |t|
-            branch = FalkorLib::Git.branch?
-            expected_branch_prefix = FalkorLib.config.gitflow[:prefix][:feature]
-            if branch !~ /^#{expected_branch_prefix}/
-                error "You are not in the expected branch (with prefix '#{expected_branch_prefix}')"
-            end
-            name = branch.sub(/^#{expected_branch_prefix}/, '')
-            info t.comment
-            o = FalkorLib::GitFlow.finish('feature', name)
-            error "Git flow feature operation failed" unless o == 0
-            unless FalkorLib::Git.remotes.empty?
-                info "=> about to update remote tracked branches"
-                really_continue?
-                Rake::Task['git:push'].invoke
-            end
-        end
-    end # End namespace 'git:feature'
-
+  include FalkorLib::Common
+  git_root_dir = FalkorLib::Git.rootdir
+
+  ###########  git:init   ###########
+  #desc "Initialize Git repository"
+  task :init => [ 'git:flow:init' ]
+
+  #.....................
+  namespace :flow do
+    ###########   git:flow:init   ###########
+    desc "Initialize your local clone of the repository for the git-flow management"
+    task :init do |t|
+      info t.comment
+      FalkorLib::GitFlow.init(git_root_dir)
+    end # task init
+  end # namespace git::flow
+
+  #.....................
+  namespace :feature do
+    #########   git:feature:start ##########################
+    desc "Start a new feature operation on the repository using the git-flow framework"
+    task :start, [:name] do |t, args|
+      #args.with_default[:name => '']
+      name = (args.name == 'name') ? ask("Name of the feature (the git branch will be 'feature/<name>')") : args.name
+      info t.comment + " with name 'feature/#{name}'"
+      really_continue?
+      Rake::Task['git:up'].invoke unless FalkorLib::Git.remotes.empty?
+      info "=> prepare new 'feature' using git flow"
+      o = FalkorLib::GitFlow.start('feature', name)
+      error "Git flow feature operation failed" unless o.zero?
+      # Now you should be in the new branch
+    end
+
+    #########   git:feature:finish ##########################
+    desc "Finalize the feature operation"
+    task :finish do |t|
+      branch = FalkorLib::Git.branch?
+      expected_branch_prefix = FalkorLib.config.gitflow[:prefix][:feature]
+      if branch !~ /^#{expected_branch_prefix}/
+        error "You are not in the expected branch (with prefix '#{expected_branch_prefix}')"
+      end
+      name = branch.sub(/^#{expected_branch_prefix}/, '')
+      info t.comment
+      o = FalkorLib::GitFlow.finish('feature', name)
+      error "Git flow feature operation failed" unless o.zero?
+      unless FalkorLib::Git.remotes.empty?
+        info "=> about to update remote tracked branches"
+        really_continue?
+        Rake::Task['git:push'].invoke
+      end
+    end
+  end # End namespace 'git:feature'
 end # namespace git
 
 
 #.....................
 namespace :version do
-
-    ###########   version:info   ###########
-    #desc "Get versioning information"
-    task :info do |t|
-        include FalkorLib::Versioning
-        version = get_version
-        #major, minor, patch =  bump(version, :major), bumpversion, :minor), bump(version, :patch)
-        info "Get versioning information" #  t.comment
-        puts "Current version: " + bold(version)
-        FalkorLib.config[:versioning][:levels].reverse.each do |level|
-            puts "- next #{level} version: " + bump(version, level.to_sym)
-        end
-    end # task info
-
-
-    #.....................
-    namespace :bump do
-        [ 'major', 'minor', 'patch' ].each do |level|
-
-            #################   version:bump:{major,minor,patch} ##################################
-            desc "Prepare the #{level} release of the repository"
-            task level.to_sym do |t|
-                version = FalkorLib::Versioning.get_version
-                release_version = FalkorLib::Versioning.bump(version, level.to_sym)
-                info t.comment + " (from version '#{version}' to '#{release_version}')"
-                really_continue?
-                Rake::Task['git:up'].invoke unless FalkorLib::Git.remotes.empty?
-                info "=> prepare release using git flow"
-                o = FalkorLib::GitFlow.start('release', release_version)
-                error "Git flow release process failed" unless o == 0
-                # Now you should be in the new branch
-                current_branch = FalkorLib::Git.branch?
-                expected_branch = FalkorLib.config[:gitflow][:prefix][:release] + release_version
-                if (current_branch == expected_branch)
-                    FalkorLib::Versioning.set_version(release_version)
-                    if (! FalkorLib.config[:versioning].nil?) &&
-                            FalkorLib.config[:versioning][:type] == 'gem' &&
-                            File.exists?(File.join(FalkorLib::Git.rootdir, 'Gemfile'))
-                        info "Updating Gemfile information"
-                        run %{
+  ###########   version:info   ###########
+  #desc "Get versioning information"
+  task :info do |_t|
+    include FalkorLib::Versioning
+    version = get_version
+    #major, minor, patch =  bump(version, :major), bumpversion, :minor), bump(version, :patch)
+    info "Get versioning information" #  t.comment
+    puts "Current version: " + bold(version)
+    FalkorLib.config[:versioning][:levels].reverse.each do |level|
+      puts "- next #{level} version: " + bump(version, level.to_sym)
+    end
+  end # task info
+
+
+  #.....................
+  namespace :bump do
+    %w(major minor patch).each do |level|
+      #################   version:bump:{major,minor,patch} ##################################
+      desc "Prepare the #{level} release of the repository"
+      task level.to_sym do |t|
+        version = FalkorLib::Versioning.get_version
+        release_version = FalkorLib::Versioning.bump(version, level.to_sym)
+        info t.comment + " (from version '#{version}' to '#{release_version}')"
+        really_continue?
+        Rake::Task['git:up'].invoke unless FalkorLib::Git.remotes.empty?
+        info "=> prepare release using git flow"
+        o = FalkorLib::GitFlow.start('release', release_version)
+        error "Git flow release process failed" unless o.zero?
+        # Now you should be in the new branch
+        current_branch = FalkorLib::Git.branch?
+        expected_branch = FalkorLib.config[:gitflow][:prefix][:release] + release_version
+        if (current_branch == expected_branch)
+          FalkorLib::Versioning.set_version(release_version)
+          if (!FalkorLib.config[:versioning].nil?) &&
+             FalkorLib.config[:versioning][:type] == 'gem' &&
+             File.exist?(File.join(FalkorLib::Git.rootdir, 'Gemfile'))
+            info "Updating Gemfile information"
+            run %(
                            # Update cache info
                            bundle list > /dev/null
                            git commit -s -m "Update Gemfile.lock accordingly" Gemfile.lock
-                        }
-                    end
-                    warning "The version number has already been bumped"
-                    warning "==> run 'rake version:release' to finalize the release and merge the current version of the repository into the '#{FalkorLib.config[:gitflow][:branches][:master]}' branch"
-                else
-                    error "You are in the '#{branch}' branch and not the expected one, i.e. #{expected_branch}"
-                end
-            end
+            )
+          end
+          warning "The version number has already been bumped"
+          warning "==> run 'rake version:release' to finalize the release and merge the current version of the repository into the '#{FalkorLib.config[:gitflow][:branches][:master]}' branch"
+        else
+          error "You are in the '#{branch}' branch and not the expected one, i.e. #{expected_branch}"
         end
-    end # namespace version:bump
-
-    ###########   release   ###########
-    desc "Finalize the release of a given bumped version"
-    task :release do |t|
-        version = FalkorLib::Versioning.get_version
-        branch  = FalkorLib::Git.branch?
-        expected_branch = FalkorLib.config[:gitflow][:prefix][:release] + version
-        error "You are not in the '#{expected_branch}' branch but in the '#{branch}' one. May be you forgot to run 'rake version:bump:{patch,minor,major}' first" if branch != expected_branch
-        info "=> Finalize the release of the version '#{version}' into the '#{FalkorLib.config[:gitflow][:branches][:master]}' branch/environment"
-        o = FalkorLib::GitFlow.finish('release', version, Dir.pwd, '-s')
-        error "Git flow release process failed" unless o == 0
-        if FalkorLib::Git.remotes?
-            info("=> about to update remote tracked branches")
-            really_continue?
-            FalkorLib.config[:gitflow][:branches].each do |type, branch|
-                run %{
-                   git checkout #{branch}
+      end
+    end
+  end # namespace version:bump
+
+  ###########   release   ###########
+  desc "Finalize the release of a given bumped version"
+  task :release do |_t|
+    version = FalkorLib::Versioning.get_version
+    branch  = FalkorLib::Git.branch?
+    expected_branch = FalkorLib.config[:gitflow][:prefix][:release] + version
+    error "You are not in the '#{expected_branch}' branch but in the '#{branch}' one. May be you forgot to run 'rake version:bump:{patch,minor,major}' first" if branch != expected_branch
+    info "=> Finalize the release of the version '#{version}' into the '#{FalkorLib.config[:gitflow][:branches][:master]}' branch/environment"
+    o = FalkorLib::GitFlow.finish('release', version, Dir.pwd, '-s')
+    error "Git flow release process failed" unless o.zero?
+    if FalkorLib::Git.remotes?
+      info("=> about to update remote tracked branches")
+      really_continue?
+      FalkorLib.config[:gitflow][:branches].each do |_type, br|
+        run %(
+                   git checkout #{br}
                    git push origin
-                }
-            end
-            run %{ git push origin --tags }
-        end
-        #info "Update the changelog"
-        if (! FalkorLib.config[:versioning].nil?) &&
-                FalkorLib.config[:versioning][:type] == 'gem'
-            warn "About to push the released new gem (version #{version}) to the gem server (rybygems.org)"
-            really_continue?
-            Rake::Task['gem:release'].invoke
-        end
-
-        #Rake::Task['git:push'].invoke
-    end # task version:release
-
-
-
+        )
+      end
+      run %( git push origin --tags )
+    end
+    #info "Update the changelog"
+    if (!FalkorLib.config[:versioning].nil?) &&
+       FalkorLib.config[:versioning][:type] == 'gem'
+      warn "About to push the released new gem (version #{version}) to the gem server (rybygems.org)"
+      really_continue?
+      Rake::Task['gem:release'].invoke
+    end
+
+    #Rake::Task['git:push'].invoke
+  end # task version:release
 end # namespace version

data/lib/falkorlib/tasks/puppet.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Lun 2014-08-25 21:46 svarrette>
+# Time-stamp: <Fri 2016-11-11 14:45 svarrette>
 ################################################################################
 #
 # FalkorLib rake tasks to pilot Puppet operations
@@ -11,14 +11,17 @@ require 'falkorlib'
 require 'falkorlib/tasks'
 
 module FalkorLib #:nodoc:
-	class PuppetTasks
-		include Rake::DSL if defined? Rake::DSL
+  # Puppet tasks for Rake
+  class PuppetTasks
 
-		# Install the puppet tasks for Rake
-        def install_tasks
-            load 'falkorlib/tasks/puppet_modules.rake'
-        end
-	end
+    include Rake::DSL if defined? Rake::DSL
+
+    # Install the puppet tasks for Rake
+    def install_tasks
+      load 'falkorlib/tasks/puppet_modules.rake'
+    end
+
+  end
 end
 
 FalkorLib::PuppetTasks.new.install_tasks

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: <Tue 2015-05-26 19:21 svarrette>
+# Time-stamp: <Fri 2016-11-11 15:49 svarrette>
 #
 # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
 #               http://varrette.gforge.uni.lu
@@ -14,158 +14,147 @@ 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.nil? or args.name.empty? or args.name == 'name') ? ask("Enter the module name (ex: 'ULHPC/modulename')") : 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.gsub(/^\w*\//,'puppet-'))
-            dir = ask("Destination directory:", moduledir)
-            error "The module '#{name}' already exists" if File.directory?(dir)
-            FalkorLib::Puppet::Modules.init(dir, name)
-        end
-
-
-    end # namespace bootstrap:puppet
+  #.....................
+  namespace :puppet do
+    ###########  bootstrap:puppet:module   ###########
+    desc "Bootstrap a new Puppet module"
+    task :module, [:name] do |t, args|
+      info(t.comment).to_s
+      name = (args.name.nil? || args.name.empty? || (args.name == 'name')) ? ask("Enter the module name (ex: 'ULHPC/modulename')") : 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.gsub(/^\w*\//, 'puppet-'))
+      dir = ask("Destination directory:", moduledir)
+      error "The module '#{name}' already exists" if File.directory?(dir)
+      FalkorLib::Puppet::Modules.init(dir, name)
+    end
+  end # namespace bootstrap:puppet
 end # namespace bootstrap
 
 require 'json'
 
 #.....................
 namespace :puppet do
-    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 }
-				if File.exists? ('metadata.json')
-					metadata = JSON.parse( IO.read( 'metadata.json' ) )
-					name    = metadata["name"]
-					version = metadata["version"]
-					url = metadata["forge_url"].nil? ? "https://forge.puppetlabs.com/#{name.gsub(/-/,'/')}" : metadata["forge_url"]
-					warn "you can now upload the generated file 'pkg/#{name}-#{version}.tar.gz' on the puppet forge"
-					warn "         #{url}"
-				end 
-            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
-
-			###########   puppet:module:validate   ###########
-			desc "Validate the module by checking the syntax and programming style of the module"
-			task :validate => [
-			                #:syntax,
-			                :lint
-			               ]
-#			do
-# 				info "validate parsing"
-# 				Dir['manifests/**/*.pp'].each do |manifest|
-# 					sh "puppet parser validate --noop #{manifest}"
-# 				end
-# 				Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file|
-# 					sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/
-# 				end
-# 				Dir['templates/**/*.erb'].each do |template|
-# 					sh "erb -P -x -T '-' #{template} | ruby -c"
-# 				end
-# 				info "checking  style guidelines with puppet-lint"
-# 				Rake::Task[:lint].invoke
-# 				info "checking syntax"
-# 				Rake::Task[:syntax].invoke
-# 			end
-			
-			###########   puppet:module:classes   ###########
-			desc "Parse the module for classes definitions"
-			task :classes do |t|
-				c = FalkorLib::Puppet::Modules.classes()
-				info "Implemented classes:"
-				puts c.empty? ? red('NONE') : c.to_yaml				
-			end # task classes 
-
-			###########   puppet:module:definitions   ###########
-			desc "Parse the module for definitions"
-			task :definitions do |t|
-				d = FalkorLib::Puppet::Modules.definitions()
-				info "Implemented definitions:"
-				puts d.empty? ? red('NONE') : d.to_yaml				
-			end # task definitions
-
-			###########   puppet:module:deps   ###########
-			desc "Parse the module for its exact dependencies"
-			task :deps do |t|
-				d = FalkorLib::Puppet::Modules.deps()
-				info "Module dependencies:"
-				puts d.empty? ? red('NONE') : d.to_yaml				
-			end # task deps
-
+  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).to_s
+        run %( puppet module build )
+        if File.exist?('metadata.json')
+          metadata = JSON.parse( IO.read( 'metadata.json' ) )
+          name    = metadata["name"]
+          version = metadata["version"]
+          url = (metadata["forge_url"].nil?) ? "https://forge.puppetlabs.com/#{name.tr('-', '/')}" : metadata["forge_url"]
+          warn "you can now upload the generated file 'pkg/#{name}-#{version}.tar.gz' on the puppet forge"
+          warn "         #{url}"
         end
-    end # namespace module
+      end # task build
+
+      ###########   puppet:module:parse   ###########
+      desc "Parse a given module"
+      task :parse do |t|
+        info(t.comment).to_s
+        FalkorLib::Puppet::Modules.parse
+      end # task parse
+
+      ###########   puppet:module:validate   ###########
+      desc "Validate the module by checking the syntax and programming style of the module"
+      task :validate => [
+        #:syntax,
+        :lint
+      ]
+      #     do
+      #         info "validate parsing"
+      #         Dir['manifests/**/*.pp'].each do |manifest|
+      #           sh "puppet parser validate --noop #{manifest}"
+      #         end
+      #         Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file|
+      #           sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/
+      #         end
+      #         Dir['templates/**/*.erb'].each do |template|
+      #           sh "erb -P -x -T '-' #{template} | ruby -c"
+      #         end
+      #         info "checking  style guidelines with puppet-lint"
+      #         Rake::Task[:lint].invoke
+      #         info "checking syntax"
+      #         Rake::Task[:syntax].invoke
+      #       end
+
+      ###########   puppet:module:classes   ###########
+      desc "Parse the module for classes definitions"
+      task :classes do |_t|
+        c = FalkorLib::Puppet::Modules.classes
+        info "Implemented classes:"
+        puts((c.empty?) ? red('NONE') : c.to_yaml)
+      end # task classes
+
+      ###########   puppet:module:definitions   ###########
+      desc "Parse the module for definitions"
+      task :definitions do |_t|
+        d = FalkorLib::Puppet::Modules.definitions
+        info "Implemented definitions:"
+        puts((d.empty?) ? red('NONE') : d.to_yaml)
+      end # task definitions
+
+      ###########   puppet:module:deps   ###########
+      desc "Parse the module for its exact dependencies"
+      task :deps do |_t|
+        d = FalkorLib::Puppet::Modules.deps
+        info "Module dependencies:"
+        puts((d.empty?) ? red('NONE') : d.to_yaml)
+      end # task deps
+    end
+  end # namespace module
 end # namespace puppet
 
 #.....................
 namespace :templates do
-
-	namespace :upgrade do
-		###########   templates:upgrade:all   ###########
-		task :all do 
-			info "Upgrade all key module files from FalkorLib templates"
-			FalkorLib::Puppet::Modules.upgrade()
-		end
-
-		[ 'docs', 'readme', 'rake', 'vagrant' ].each do |t|
-			###########   templates:upgrade:{readme,rake,vagrant}   ###########
-            desc "Upgrade (overwrite) #{t.capitalize} using the current FalkorLib template"
-			task t.to_sym do
-				list = case t
-				       when 'readme'
-					       [ 'README.md' ]
-                       when 'docs'
-                           [ 'docs/contacts.md',  'docs/contributing/index.md', 'docs/contributing/layout.md', 'docs/contributing/setup.md', 'docs/contributing/versioning.md', 'docs/index.md', 'docs/rtfd.md', 'docs/vagrant.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
+  namespace :upgrade do
+    ###########   templates:upgrade:all   ###########
+    task :all do
+      info "Upgrade all key module files from FalkorLib templates"
+      FalkorLib::Puppet::Modules.upgrade
+    end
+
+    %w(docs readme rake vagrant).each do |t|
+      ###########   templates:upgrade:{readme,rake,vagrant}   ###########
+      desc "Upgrade (overwrite) #{t.capitalize} using the current FalkorLib template"
+      task t.to_sym do
+        list = case t
+               when 'readme'
+                 [ 'README.md' ]
+               when 'docs'
+                 [ 'docs/contacts.md', 'docs/contributing/index.md', 'docs/contributing/layout.md', 'docs/contributing/setup.md', 'docs/contributing/versioning.md', 'docs/index.md', 'docs/rtfd.md', 'docs/vagrant.md' ]
+               when 'rake'
+                 %w(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
 
 
 #.....................
 require 'rake/clean'
-CLEAN.add   'pkg'
+CLEAN.add 'pkg'
 
-exclude_tests_paths = ['pkg/**/*','spec/**/*','manifests.old/**/*']
+exclude_tests_paths = ['pkg/**/*', 'spec/**/*', 'manifests.old/**/*']
 
 #.........................................................................
 # puppet-lint tasks -- see http://puppet-lint.com/checks/
@@ -177,9 +166,9 @@ PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.ignore_paths = exclude_tests_paths
 
-task :lint_info do 
-	info "checking  style guidelines with puppet-lint"
-end 
+task :lint_info do
+  info "checking  style guidelines with puppet-lint"
+end
 task :lint => :lint_info
 
 #.........................................................................
@@ -187,11 +176,11 @@ task :lint => :lint_info
 #
 require 'puppet-syntax/tasks/puppet-syntax'
 PuppetSyntax.future_parser = true
-PuppetSyntax.exclude_paths = exclude_tests_paths  
+PuppetSyntax.exclude_paths = exclude_tests_paths
 
-# task :syntax_info do 
-# 	info "checking syntax for Puppet manifests, templates, and Hiera YAML"
-# end 
+# task :syntax_info do
+#   info "checking syntax for Puppet manifests, templates, and Hiera YAML"
+# end
 # task :syntax => :syntax_info
 
 #.........................................................................
@@ -202,19 +191,19 @@ PuppetSyntax.exclude_paths = exclude_tests_paths
 # ########## rspec #################
 # desc "Run all RSpec code examples"
 # RSpec::Core::RakeTask.new(:rspec) do |t|
-# 	t.rspec_opts = File.read("spec/spec.opts").chomp || ""
+#   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
+#   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
 
@@ -223,9 +212,9 @@ PuppetSyntax.exclude_paths = exclude_tests_paths
 
 ################################################
 
-[ 'major', 'minor', 'patch' ].each do |level|
-	task "version:bump:#{level}" => 'puppet:module:validate'
-end 
+%w(major minor patch).each do |level|
+  task "version:bump:#{level}" => 'puppet:module:validate'
+end
 
 #task 'version:release' => 'puppet:module:build'
 Rake::Task["version:release"].enhance do