falkorlib 0.6.19 → 0.7.0

data/completion/_falkor

@@ -1,7 +1,7 @@
 #compdef falkor
 ########################################################################################
 # -*- mode:sh; -*-
-# Time-stamp: <Sat 2016-10-15 22:20 svarrette>
+# Time-stamp: <Mon 2016-11-14 15:24 svarrette>
 #
 # ZSH completion for [FalkorLib](https://github.com/Falkor/falkorlib)
 #
@@ -17,7 +17,12 @@
 ########################################################################################
 # You can inspired from the (unfortunately buggy) automatic generation of the ZSH
 # completion file (see https://github.com/labocho/thor-zsh_completion) using:
+#
 #      bundle exec falkor zsh-completion > completion/_falkor.autogen
+#
+# Test modification in live in your shell:
+#
+#  unfunction _falkor && autoload -U _falkor
 
 typeset -A opt_args
 
@@ -35,7 +40,9 @@ _falkor()
     _falkor_cmds=(
         'config:Print the current configuration of FalkorLib'
         'help:Describe available commands or one specific command'
-        'link:link:Initialize a special symlink (.root, .makefile.d etc.)'
+        'init:Bootstrap a Git Repository the falkor way'
+        'link:Initialize a special symlink (.root, .makefile.d etc.)'
+        'motd:bootstrap a Message of the Day (motd) file'
         'new:Initialize the directory PATH with one of Falkors template(s)'
         'version:Prints the FalkorLib version information'
     )
@@ -63,10 +70,14 @@ _falkor()
                     ;;
                 (config)
                     __falkor_config && ret=0 ;;
-                (new)
-                    __falkor_new    && ret=0 ;;
+                (init)
+                    __falkor_init && ret=0   ;;
                 (link)
                     __falkor_link   && ret=0 ;;
+                (motd)
+                    __falkor_motd && ret=0   ;;
+                (new)
+                    __falkor_new    && ret=0 ;;
                 (version|*)
                     _nothing
                     ;;
@@ -112,8 +123,8 @@ __falkor_new()
                 (letter)
                     _arguments -C \
                                '(-n --name)'{-n,--name}'[Name of the LaTeX project]' \
-                               '(-d --dir)'{-d,--dir=}':Project directory (relative to the git root directory):_directories' && ret=0
-                               ;;
+                               '(-d --dir)'{-d,--dir}':Project directory (relative to the git root directory):_directories' && ret=0
+                    ;;
                 (repo)
                     _arguments -C \
                                '(--no-git-flow)--git-flow[Bootstrap the repository with Git-flow]' \
@@ -130,7 +141,7 @@ __falkor_new()
                     case "$state" in
                         (path)
                             _directories ;;
-                        esac
+                    esac
                     ;;
             esac
             ;;
@@ -200,4 +211,41 @@ __falkor_config() {
 }
 
 
+##################
+__falkor_init() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+               {--git-flow,--no-git-flow}'[Bootstrap the repository with (or without) Git-flow]' \
+               {-i,--interactive}'[Interactive mode, in particular to confirm Gitflow branch names]' \
+               {-r,--remote-sync}'[Operate a git remote synchronization with remote. By default, all commits stay local]' \
+               '--master[Master Branch name for production releases]' \
+               {-b,--branch,--devel,--develop}'[Branch name for development commits]' \
+               '--make[Use a Makefile to pilot the repository actions (default)]' \
+               '--rake[Use a Rakefile (and FalkorLib) to pilot the repository actions]' \
+               '*:directory:_directories'
+}
+
+
+##################
+__falkor_motd() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+               {--file,-f}'[File storing the message of the day]:filename:_files' \
+               {--width,-w}'[Width for the text]:[0-9]#' \
+               {--title,-t}'[Title to be placed in the motd (using asciify or figlet)]:title' \
+               '--subtitle[Eventual subtitle to place below the title]:subtitle' \
+               '--hostname[Hostname]:hostname' \
+               {--support,-s}"[Support/Contact mail]:email:($(git config user.email) hpc-sysadmins@uni.lu)" \
+               {--desc,-d}'[Short Description of the host]:desc' \
+               {--nodemodel,-n}'[Node Model]:model'  \
+               '*:directory:_files -/'
+}
+
+
+
+
 _falkor "$@"

data/falkorlib.gemspec

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require "falkorlib/version"
-$version = FalkorLib::Version.to_s
+#$version = FalkorLib::Version.to_s
 
 Gem::Specification.new do |s|
   s.name         = "falkorlib"
-  s.version      = $version
+  s.version      = FalkorLib::Version.to_s #$version
   s.date         = Time.now.strftime('%Y-%m-%d')
   s.summary      = "Sebastien Varrette aka Falkor's Common library to share Ruby code and {rake,cap} tasks"
   s.description  = "This is my personal library I use to share the Ruby tidbits and Rake tasks I made it for my various projects, and also to bootstrap easily several element of my daily workflow (new git repository, new beamer slides etc.).\nThis is also my first gem so any comments on the code/organization are welcome, I'm a newbie in this domain. \nNote that I used [Noe](https://github.com/blambeau/noe) to bootstrap this project and get a fully documented environment."
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir["test/**/*"] + Dir["spec/**/*"]
 
   # Alternative:
-  s.files         = `git ls-files`.split("\n")
+  s.files = `git ls-files`.split("\n")
   #s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   #s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   #
   #s.bindir = "bin"
 
-  s.executables = (Dir["bin/*"]).collect{|f| File.basename(f)}
+  s.executables = (Dir["bin/*"]).collect { |f| File.basename(f) }
 
   ################################################################### REQUIREMENTS & INSTALL
   # Remember the gem version requirements operators and schemes:
@@ -83,9 +83,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("thor",   '>= 0.19')
   s.add_runtime_dependency("artii",  '>= 2.1')
   s.add_runtime_dependency("facter", '~> 2.4.1')
-
+  s.add_runtime_dependency("thor-zsh_completion", '>= 0')
+  s.add_runtime_dependency("activesupport", '~> 4.0')
+  #s.add_runtime_dependency("benchmark", '~> 4.0')
   #s.add_runtime_dependency("mercenary", '>= 0.3.5')
 
+
   #
   #
   # One call to add_dependency('gem_name', 'gem version requirement') for each
@@ -94,15 +97,15 @@ Gem::Specification.new do |s|
   # for each development dependency. These gems are required for developers
   #
   #s.add_development_dependency("rake",           ">= 10.1.0") #"~> 0.9.2")
-  s.add_development_dependency("bundler",        "~> 1.0")
-  s.add_development_dependency 'rspec', '~> 3.0'   #, '>= 2.7.0'
+  s.add_development_dependency("bundler", "~> 1.0")
+  s.add_development_dependency 'rspec', '~> 3.0' #, '>= 2.7.0'
   s.add_development_dependency("pry",    "~> 0.9")
   s.add_development_dependency("yard",   "~> 0.8")
-  #s.add_development_dependency("minitest",   "~> 5.3")
-  s.add_development_dependency("rubygems-tasks",   "~> 0.2")
+  s.add_development_dependency('rubocop', '~> 0.45.0')
+  s.add_development_dependency("rubygems-tasks", "~> 0.2")
   s.add_development_dependency("travis",        "~> 1.6")
   s.add_development_dependency("travis-lint",   "~> 1.8")
-
+  s.add_development_dependency('simplecov', '~> 0.12.0')
   s.add_development_dependency("codeclimate-test-reporter", '~> 0') #, group: :test, require: nil)
   #s.add_development_dependency("bluecloth",      "~> 2.2.0")
   #s.add_development_dependency("wlang",          "~> 0.10.2")
@@ -130,7 +133,7 @@ Gem::Specification.new do |s|
   s.extensions = []
 
   # External (to RubyGems) requirements that must be met for this gem to work.
-  # It’s simply information for the user.
+  # It's simply information for the user.
   #
   s.requirements = nil
 
@@ -163,5 +166,4 @@ Gem::Specification.new do |s|
   # Extra files to add to RDoc such as README
   #
   s.extra_rdoc_files = Dir["README.md"] + Dir["CHANGELOG.md"] + Dir["LICENCE.md"]
-
 end

data/lib/falkorlib.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mar 2015-01-13 21:24 svarrette>
+# Time-stamp: <Mon 2016-11-07 22:06 svarrette>
 ################################################################################
 #                   _____     _ _              _     _ _
 #                   |  ___|_ _| | | _____  _ __| |   (_) |__
@@ -15,15 +15,17 @@
 # * [Official Gem](https://rubygems.org/gems/falkorlib)
 ################################################################################
 
-require "awesome_print"
+require 'awesome_print'
+# require 'active_support'  # provides so many nice extensions
+require 'active_support/core_ext/hash'
 
 begin
-    require 'term/ansicolor'
-    COLOR = true
-rescue Exception => e
-    puts "/!\\ cannot find the 'term/ansicolor' library"
-    puts "    Consider installing it by 'gem install term-ansicolor'"
-    COLOR = false
+  require 'term/ansicolor'
+  COLOR = true
+rescue LoadError
+  puts "/!\\ cannot find the 'term/ansicolor' library"
+  puts "    Consider installing it by 'gem install term-ansicolor'"
+  COLOR = false
 end
 
 require 'yaml'
@@ -32,21 +34,20 @@ require 'yaml'
 # and `{rake,cap}` tasks
 module FalkorLib
 
-    # Return the root directory of the gem
-	def self.root
-        File.expand_path '../..', __FILE__
-    end
+  # Return the root directory of the gem
+  def self.root
+    File.expand_path '../..', __FILE__
+  end
 
-	def self.lib
-		File.join root, 'lib'
-	end
+  def self.lib
+    File.join root, 'lib'
+  end
 
-	def self.templates
-		File.join root, 'templates'
-	end
+  def self.templates
+    File.join root, 'templates'
+  end
 
 end # module FalkorLib
 
-
-require "falkorlib/version"
-require "falkorlib/loader"
+require 'falkorlib/version'
+require 'falkorlib/loader'

data/lib/falkorlib/bootstrap.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sun 2016-03-27 23:21 svarrette>
+# Time-stamp: <Tue 2016-11-01 10:05 svarrette>
 ################################################################################
 # Management of Bootstrapping operations
 
@@ -12,4 +12,8 @@ end # module FalkorLib
 
 require "falkorlib/bootstrap/base"
 require "falkorlib/bootstrap/link"
+require "falkorlib/bootstrap/ruby"
+require "falkorlib/bootstrap/git"
+require "falkorlib/bootstrap/latex"
+
 #require "falkorlib/bootstrap/repo"

data/lib/falkorlib/bootstrap/base.rb

@@ -1,718 +1,410 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sat 2016-10-15 23:44 svarrette>
+# Time-stamp: <Sat 2016-11-12 09:21 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
 
 require "falkorlib"
 require "falkorlib/common"
-require 'erb'      # required for module generation
+require "falkorlib/bootstrap"
+
+require 'erb' # required for module generation
 require 'artii'
 require 'facter'
 
 include FalkorLib::Common
 
-module FalkorLib  #:nodoc:
-    module Config
+module FalkorLib #:nodoc:
+  module Config
+    # Default configuration for Bootstrapping processes
+    module Bootstrap
+
+      DEFAULTS =
+        {
+          :motd => {
+            :file     => 'motd',
+            :hostname => `hostname -f`.chomp,
+            :title    => "Title",
+            :desc     => "Brief server description",
+            :support  => `git config user.email`.chomp,
+            :width    => 80
+          },
+          :latex => {
+            :name     => '',
+            :author   => `git config user.name`.chomp,
+            :mail     => `git config user.email`.chomp,
+            :title    => 'Title',
+            :subtitle => 'Overview and Open Challenges',
+            :image    => 'images/logo_ULHPC.pdf',
+            :logo     => 'images/logo_UL.pdf',
+            :url      => 'http://csc.uni.lu/sebastien.varrette'
+          },
+          :letter => {
+            :author_title    => 'PhD',
+            :institute       => 'University of Luxembourg',
+            :department      => 'Parallel Computing and Optimization Group',
+            :department_acro => 'PCOG',
+            :address         => '7, rue Richard Coudenhove-Kalergie',
+            :zipcode         => 'L-1359',
+            :location        => 'Luxembourg',
+            :phone           => '(+352) 46 66 44 6600',
+            :twitter         => 'svarrette',
+            :linkedin        => 'svarrette',
+            :skype           => 'sebastien.varrette',
+            :scholar         => '6PTStIcAAAAJ'
+          },
+          :metadata => {
+            :name         => '',
+            :type         => [],
+            :by           => (ENV['USER']).to_s,
+            :author       => `git config user.name`.chomp,
+            :mail         => `git config user.email`.chomp,
+            :summary      => "rtfm",
+            :description  => '',
+            :forge        => '',
+            :source       => '',
+            :project_page => '',
+            :origin       => '',
+            :license      => '',
+            :issues_url   => '',
+            :tags         => []
+          },
+          :trashdir => '.Trash',
+          :types    => [ :none, :latex, :gem, :octopress, :puppet_module, :rvm, :pyenv ],
+          :licenses => {
+            "none"       => {},
+            "Apache-2.0" => {
+              :url  => "http://www.apache.org/licenses/LICENSE-2.0",
+              :logo => "https://www.apache.org/images/feather-small.gif"
+            },
+            "BSD" => {
+              :url  => "http://www.linfo.org/bsdlicense.html",
+              :logo => "http://upload.wikimedia.org/wikipedia/commons/thumb/b/bf/License_icon-bsd.svg/200px-License_icon-bsd.svg.png"
+            },
+            "CC by-nc-sa" => {
+              :name => "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International",
+              :url  => "http://creativecommons.org/licenses/by-nc-sa/4.0",
+              :logo => "https://licensebuttons.net/l/by-nc-sa/4.0/88x31.png"
+            },
+            "GPL-2.0" => {
+              :url  => "http://www.gnu.org/licenses/gpl-2.0.html",
+              :logo => "https://licensebuttons.net/l/GPL/2.0/88x62.png"
+            },
+            "GPL-3.0" => {
+              :url  => "http://www.gnu.org/licenses/gpl-3.0.html",
+              :logo => "https://www.gnu.org/graphics/gplv3-88x31.png"
+            },
+            "LGPL-2.1" => {
+              :url  => "https://www.gnu.org/licenses/lgpl-2.1.html",
+              :logo => "https://licensebuttons.net/l/LGPL/2.1/88x62.png"
+            },
+            "LGPL-3.0" => {
+              :url  => "https://www.gnu.org/licenses/lgpl.html",
+              :logo => "https://www.gnu.org/graphics/lgplv3-88x31.png"
+            },
+            "MIT" => {
+              :url  => "http://opensource.org/licenses/MIT",
+              :logo => "http://upload.wikimedia.org/wikipedia/commons/thumb/0/0b/License_icon-mit-2.svg/200px-License_icon-mit-2.svg.png"
+            }
+          },
+          :puppet => {},
+          :forge => {
+            :none   => { :url => '', :name => "None" },
+            :gforge => { :url => 'gforge.uni.lu', :name => 'GForge @ Uni.lu' },
+            :github => { :url => 'github.com',    :name => 'Github', :login => (`whoami`.chomp.capitalize).to_s },
+            :gitlab => { :url => 'gitlab.uni.lu', :name => 'Gitlab @ Uni.lu', :login => (`whoami`.chomp.capitalize).to_s }
+          }
+        }
 
-        # Default configuration for Bootstrapping processes
-        module Bootstrap
-            DEFAULTS =
-              {
-               :motd    => {
-                            :title    => "Title",
-                            :support  => "#{ENV['GIT_AUTHOR_EMAIL']}",
-                            :width    => 80,
-                            :hostname => "`hostname -f`",
-                           },
-               :latex => {
-                          :name     => '',
-                          :author   => %x( git config user.name ).chomp,
-                          :mail     => %x( git config user.email ).chomp,
-                          :title    => 'Title',
-                          :subtitle => 'Overview and Open Challenges',
-                          :image    => 'images/logo_ULHPC.pdf',
-                          :logo     => 'images/logo_UL.pdf',
-                          :url      => 'http://csc.uni.lu/sebastien.varrette'
-                         },
-               :letter => {
-                           :author_title    => 'PhD',
-                           :institute       => 'University of Luxembourg',
-                           :department      => 'Parallel Computing and Optimization Group',
-                           :department_acro => 'PCOG',
-                           :address         => '7, rue Richard Coudenhove-Kalergie',
-                           :zipcode         => 'L-1359',
-                           :location        => 'Luxembourg',
-                           :phone           => '(+352) 46 66 44 6600',
-                           :twitter         => 'svarrette',
-                           :linkedin        => 'svarrette',
-                           :skype           => 'sebastien.varrette',
-                           :scholar         => '6PTStIcAAAAJ'
-                          },
-               :metadata => {
-                             :name         => '',
-                             :type         => [],
-                             :by           => "#{ENV['USER']}",
-                             :author       => "#{ENV['GIT_AUTHOR_NAME']}",
-                             :mail         => "#{ENV['GIT_AUTHOR_EMAIL']}",
-                             :summary      => "rtfm",
-                             :description  => '',
-                             :forge        => '',
-                             :source       => '',
-                             :project_page => '',
-                             :origin       => '',
-                             :license      => '',
-                             :issues_url   => '',
-                             :tags         => []
-                            },
-               :trashdir => '.Trash',
-               :types    => [ :none, :latex, :gem, :octopress, :puppet_module, :rvm, :pyenv ],
-               :licenses => {
-                             "none"       => {},
-                             "Apache-2.0" => {
-                                              :url  => "http://www.apache.org/licenses/LICENSE-2.0",
-                                              :logo => "https://www.apache.org/images/feather-small.gif"
-                                             },
-                             "BSD"        => {
-                                              :url  => "http://www.linfo.org/bsdlicense.html",
-                                              :logo => "http://upload.wikimedia.org/wikipedia/commons/thumb/b/bf/License_icon-bsd.svg/200px-License_icon-bsd.svg.png"
-                                             },
-                             "CC by-nc-sa" => {
-                                               :name => "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International",
-                                               :url  => "http://creativecommons.org/licenses/by-nc-sa/4.0",
-                                               :logo => "https://licensebuttons.net/l/by-nc-sa/4.0/88x31.png"
-                                              },
-                             "GPL-2.0"    => {
-                                              :url  => "http://www.gnu.org/licenses/gpl-2.0.html",
-                                              :logo => "https://licensebuttons.net/l/GPL/2.0/88x62.png"
-                                             },
-                             "GPL-3.0"    => {
-                                              :url  => "http://www.gnu.org/licenses/gpl-3.0.html",
-                                              :logo => "https://www.gnu.org/graphics/gplv3-88x31.png",
-                                             },
-                             "LGPL-2.1"   => {
-                                              :url  => "https://www.gnu.org/licenses/lgpl-2.1.html",
-                                              :logo => "https://licensebuttons.net/l/LGPL/2.1/88x62.png",
-                                             },
-                             "LGPL-3.0"   => {
-                                              :url  => "https://www.gnu.org/licenses/lgpl.html",
-                                              :logo => "https://www.gnu.org/graphics/lgplv3-88x31.png",
-                                             },
-                             "MIT"        => {
-                                              :url  => "http://opensource.org/licenses/MIT",
-                                              :logo => "http://upload.wikimedia.org/wikipedia/commons/thumb/0/0b/License_icon-mit-2.svg/200px-License_icon-mit-2.svg.png"
-                                             },
-                            },
-               :puppet   => {},
-               :forge => {
-                          :none   => { :url => '', :name => "None"},
-                          :gforge => { :url => 'gforge.uni.lu', :name => 'GForge @ Uni.lu' },
-                          :github => { :url => 'github.com',    :name => 'Github', :login => "#{`whoami`.chomp.capitalize}" },
-                          :gitlab => { :url => 'gitlab.uni.lu', :name => 'Gitlab @ Uni.lu', :login => "#{`whoami`.chomp.capitalize}" },
-                         },
-              }
-        end
     end
+  end
 end
 
 
 
 module FalkorLib
-    module Bootstrap
-        module_function
-
-        ###
-        # Initialize a trash directory in path
-        ##
-        def trash(path = Dir.pwd, dirname = FalkorLib.config[:templates][:trashdir], options = {})
-            #args = method(__method__).parameters.map { |arg| arg[1].to_s }.map { |arg| { arg.to_sym => eval(arg) } }.reduce Hash.new, :merge
-            #ap args
-            exit_status = 0
-            trashdir = File.join(path, dirname)
-            if Dir.exists?(trashdir)
-                warning "The trash directory '#{dirname}' already exists"
-                return 1
-            end
-            Dir.chdir(path) do
-                info "creating the trash directory '#{dirname}'"
-                exit_status = run %{
+  module Bootstrap #:nodoc:
+
+    module_function
+
+    ###
+    # Initialize a trash directory in path
+    ##
+    def trash(path = Dir.pwd, dirname = FalkorLib.config[:templates][:trashdir], _options = {})
+      #args = method(__method__).parameters.map { |arg| arg[1].to_s }.map { |arg| { arg.to_sym => eval(arg) } }.reduce Hash.new, :merge
+      #ap args
+      exit_status = 0
+      trashdir = File.join(File.realpath(path), dirname)
+      if Dir.exist?(trashdir)
+        warning "The trash directory '#{dirname}' already exists"
+        return 1
+      end
+      Dir.chdir(path) do
+        info "creating the trash directory '#{dirname}'"
+        exit_status = run %(
           mkdir -p #{dirname}
           echo '*' > #{dirname}/.gitignore
-                }
-                if FalkorLib::Git.init?(path)
-                    exit_status = FalkorLib::Git.add(File.join(path, dirname, '.gitignore' ),
-                                                     'Add Trash directory',
-                                                     { :force => true } )
-                end
-            end
-            exit_status.to_i
-        end # trash
-
-        ###### rvm ######
-        # Initialize RVM in the current directory
-        # Supported options:
-        #  * :force       [boolean] force overwritting
-        #  * :ruby        [string]  Ruby version to configure for RVM
-        #  * :versionfile [string]  Ruby Version file
-        #  * :gemset      [string]  RVM Gemset to configure
-        #  * :gemsetfile  [string]  RVM Gemset file
-        #  * :commit      [boolean] Commit the changes NOT YET USED
-        ##
-        def rvm(dir = Dir.pwd, options = {})
-            info "Initialize Ruby Version Manager (RVM)"
-            ap options if options[:debug]
-            path = normalized_path(dir)
-            use_git = FalkorLib::Git.init?(path)
-            rootdir = use_git ? FalkorLib::Git.rootdir(path) : path
-            files = {}
-            exit_status = 1
-            [:versionfile, :gemsetfile].each do |type|
-                f = options[type.to_sym].nil? ? FalkorLib.config[:rvm][type.to_sym] : options[type.to_sym]
-                if File.exists?( File.join( rootdir, f ))
-                    content = `cat #{File.join( rootdir, f)}`.chomp
-                    warning "The RVM file '#{f}' already exists (and contains '#{content}')"
-                    next unless options[:force]
-                    warning "... and it WILL BE overwritten"
-                end
-                files[type.to_sym] = f
-            end
-            # ==== Ruby version ===
-            unless files[:versionfile].nil?
-                file = File.join(rootdir, files[:versionfile])
-                v =
-                  options[:ruby] ?
-                  options[:ruby] :
-                  select_from(FalkorLib.config[:rvm][:rubies],
-                              "Select RVM ruby to configure for this directory",
-                              1)
-                info " ==>  configuring RVM version file '#{files[:versionfile]}' for ruby version '#{v}'"
-                File.open(file, 'w') do |f|
-                    f.puts v
-                end
-                exit_status = (File.exists?(file) and `cat #{file}`.chomp == v) ? 0 : 1
-                FalkorLib::Git.add(File.join(rootdir, files[:versionfile])) if use_git
-            end
-            # === Gemset ===
-            if files[:gemsetfile]
-                file = File.join(rootdir, files[:gemsetfile])
-                default_gemset = File.basename(rootdir)
-                default_gemset = `cat #{file}`.chomp if File.exists?( file )
-                g = options[:gemset] ? options[:gemset] : ask("Enter RVM gemset name for this directory", default_gemset)
-                info " ==>  configuring RVM gemset file '#{files[:gemsetfile]}' with content '#{g}'"
-                File.open( File.join(rootdir, files[:gemsetfile]), 'w') do |f|
-                    f.puts g
-                end
-                exit_status = (File.exists?(file) and `cat #{file}`.chomp == g) ? 0 : 1
-                FalkorLib::Git.add(File.join(rootdir, files[:gemsetfile])) if use_git
-            end
-            # ==== Gemfile ===
-            gemfile = File.join(rootdir, 'Gemfile')
-            unless File.exists?( gemfile )
-                # Dir.chdir(rootdir) do
-                #     run %{ bundle init }
-                # end
-                info " ==>  configuring Gemfile with Falkorlib"
-                File.open( gemfile, 'a') do |f|
-                    f.puts "source 'https://rubygems.org'"
-                    f.puts ""
-                    f.puts "gem 'falkorlib' #, :path => '~/git/github.com/Falkor/falkorlib'"
-                end
-                FalkorLib::Git.add(gemfile) if use_git
-            end
-            exit_status
-        end # rvm
-
-        ###### repo ######
-        # Initialize a Git repository for a project with my favorite layout
-        # Supported options:
-        # * :no_interaction [boolean]: do not interact
-        # * :gitflow     [boolean]: bootstrap with git-flow
-        # * :interactive [boolean] Confirm Gitflow branch names
-        # * :master      [string]  Branch name for production releases
-        # * :develop     [string]  Branch name for development commits
-        # * :make        [boolean] Use a Makefile to pilot the repository actions
-        # * :rake        [boolean] Use a Rakefile (and FalkorLib) to pilot the repository action
-        # * :remote_sync [boolean] Operate a git remote synchronization
-        # * :latex       [boolean] Initiate a LaTeX project
-        # * :gem         [boolean] Initiate a Ruby gem project
-        # * :rvm         [boolean] Initiate a RVM-based Ruby project
-        # * :pyenv       [boolean] Initiate a pyenv-based Python project
-        # * :octopress   [boolean] Initiate an Octopress web site
-        ##
-        def repo(name, options = {})
-            ap options if options[:debug]
-            path    = normalized_path(name)
-            project = File.basename(path)
-            use_git = FalkorLib::Git.init?(path)
-            if options[:rake]
-                options[:make] = false
-                options[:rvm]  = true
-            end
-            info "Bootstrap a [Git] repository for the project '#{project}'"
-            if use_git
-                warning "Git is already initialized for the repository '#{name}'"
-                really_continue? unless options[:force]
-            end
-            if options[:git_flow]
-                info " ==> initialize Git flow in #{path}"
-                FalkorLib::GitFlow.init(path, options)
-                gitflow_branches = {}
-                [ :master, :develop ].each do |t|
-                    gitflow_branches[t.to_sym] = FalkorLib::GitFlow.branches(t, path)
-                end
-            else
-                FalkorLib::Git.init(path, options)
-            end
-            # === prepare Git submodules ===
-            info " ==> prepare the relevant Git submodules"
-            submodules = {}
-            #'gitstats' => { :url => 'https://github.com/hoxu/gitstats.git' }
-            #             }
-            if options[:make]
-                submodules['Makefiles'] = {
-                                           :url    => 'https://github.com/Falkor/Makefiles.git',
-                                           :branch => 'devel'
-                                          }
-            end
-            FalkorLib::Git.submodule_init(path, submodules)
-            # === Prepare root [M|R]akefile ===
-            if options[:make]
-                info " ==> prepare Root Makefile"
-                makefile = File.join(path, "Makefile")
-                unless File.exist?( makefile )
-                    src_makefile = File.join(path, FalkorLib.config.git[:submodulesdir],
-                                             'Makefiles', 'repo', 'Makefile')
-                    FileUtils.cp src_makefile, makefile
-                    info "adapting Makefile to the gitflow branches"
-                    Dir.chdir( path ) do
-                        run %{
-   sed -i '' \
-        -e \"s/^GITFLOW_BR_MASTER=production/GITFLOW_BR_MASTER=#{gitflow_branches[:master]}/\" \
-        -e \"s/^GITFLOW_BR_DEVELOP=devel/GITFLOW_BR_DEVELOP=#{gitflow_branches[:develop]}/\" \
-        Makefile
-                        }
-                    end
-                    FalkorLib::Git.add(makefile, 'Initialize root Makefile for the repo')
-                else
-                    puts "  ... not overwriting the root Makefile which already exists"
-                end
-            end
-            if options[:rake]
-                info " ==> prepare Root Rakefile"
-                rakefile = File.join(path, "Rakefile")
-                unless File.exist?( rakefile )
-                    templatedir = File.join( FalkorLib.templates, 'Rakefile')
-                    erbfiles = [ 'header_rakefile.erb' ]
-                    erbfiles << 'rakefile_gitflow.erb' if FalkorLib::GitFlow.init?(path)
-                    erbfiles << 'footer_rakefile.erb'
-                    write_from_erb_template(erbfiles, rakefile, {}, { :srcdir => "#{templatedir}" })
-                end
-            end
-
-            # === VERSION file ===
-            FalkorLib::Bootstrap.versionfile(path, :tag => 'v0.0.0')
-
-            # === RVM ====
-            FalkorLib::Bootstrap.rvm(path, options) if options[:rvm]
-
-            # === README ===
-            FalkorLib::Bootstrap.readme(path, options)
-
-            #===== remote synchro ========
-            if options[:remote_sync]
-                remotes  = FalkorLib::Git.remotes(path)
-                if remotes.include?( 'origin' )
-                    info "perform remote synchronization"
-                    [ :master, :develop ].each do |t|
-                        FalkorLib::Git.publish(gitflow_branches[t.to_sym], path, 'origin')
-                    end
-                else
-                    warning "no Git remote  'origin' found, thus no remote synchronization performed"
-                end
-            end
-
-        end # repo
-
-        ###### versionfile ######
-        # Bootstrap a VERSION file at the root of a project
-        # Supported options:
-        # * :file    [string] filename
-        # * :version [string] version to mention in the file
-        ##
-        def versionfile(dir = Dir.pwd, options = {})
-            file    = options[:file]    ? options[:file]    : 'VERSION'
-            version = options[:version] ? options[:version] : '0.0.0'
-            info " ==> bootstrapping a VERSION file"
-            path = normalized_path(dir)
-            path = FalkorLib::Git.rootdir(path) if FalkorLib::Git.init?(path)
-            unless Dir.exists?( path )
-                warning "The directory #{path} does not exists and will be created"
-                really_continue?
-                FileUtils.mkdir_p path
-            end
-            versionfile = File.join(path, file)
-            unless File.exists?( versionfile )
-                FalkorLib::Versioning.set_version(version, path, {
-                                                                  :type => 'file',
-                                                                  :source => { :filename => file }
-                                                                 })
-                Dir.chdir( path ) do
-                    run %{ git tag #{options[:tag]} } if options[:tag]
-                end
-            else
-                puts "  ... not overwriting the #{file} file which already exists"
-            end
-
-            # unless File.exists?( versionfile )
-            #     run %{  echo "#{version}" > #{versionfile} }
-            #     if FalkorLib::Git.init?(path)
-            #         FalkorLib::Git.add(versionfile, "Initialize #{file} file")
-            #         Dir.chdir( path ) do
-            #             run %{ git tag #{options[:tag]} } if options[:tag]
-            #         end
-            #     end
-            # else
-            #     puts "  ... not overwriting the #{file} file which already exists"
-            # end
-        end # versionfile
-
-
-        ###### motd ######
-        # Generate a new motd (Message of the Day) file
-        # Supported options:
-        #  * :force [boolean] force action
-        ##
-        def motd(dir = Dir.pwd, options = {})
-            config = FalkorLib::Config::Bootstrap::DEFAULTS[:motd].merge!(options)
-            path = normalized_path(dir)
-            erbfile = File.join( FalkorLib.templates, 'motd', 'motd.erb')
-            outfile = (options[:file] =~ /^\//) ? options[:file] : File.join(path, options[:file])
-            info "Generate a motd (Message of the Day) file '#{outfile}'"
-            config[:os] = Facter.value(:lsbdistdescription) if Facter.value(:lsbdistdescription)
-            config[:os] = "Mac " + Facter.value(:sp_os_version) if Facter.value(:sp_os_version)
-            write_from_erb_template(erbfile, outfile, config, options)
-        end # motd
-
-
-
-        ###### readme ######
-        # Bootstrap a README file for various context
-        # Supported options:
-        #  * :no_interaction [boolean]: do not interact
-        #  * :force     [boolean] force overwritting
-        #  * :latex     [boolean] describe a LaTeX project
-        #  * :octopress [boolean] octopress site
-        ##
-        def readme(dir = Dir.pwd, options = {})
-            info "Bootstrap a README file for this project"
-            # get the local configuration
-            local_config = FalkorLib::Config.get(dir)
-            config = FalkorLib::Config::Bootstrap::DEFAULTS[:metadata].clone
-            name = get_project_name(dir)
-            if local_config[:project]
-                config.deep_merge!( local_config[:project])
-            else
-                config[:name]     = ask("\tProject name: ", name) unless options[:name]
-            end
-            if options[:rake]
-                options[:make] = false
-                options[:rvm]  = true
-            end
-            config[:type] << :rvm  if options[:rake]
-            # Type of project
-            config[:type] << :latex if options[:latex]
-            if config[:type].empty?
-                t = select_from( FalkorLib::Config::Bootstrap::DEFAULTS[:types],
-                                'Select the type of project to describe:', 1)
-                config[:type] << t
-                config[:type] << [ :ruby, :rvm ] if [ :gem, :rvm, :octopress, :puppet_module ].include?( t )
-                config[:type] << :python if t == :pyenv
-            end
-            config[:type].uniq!
-            ap config
-            config[:type] = config[:type].uniq.flatten
-            # Apply options (if provided)
-            [ :name, :forge ].each do |k|
-                config[k.to_sym] = options[k.to_sym] if options[k.to_sym]
-            end
-            path = normalized_path(dir)
-            config[:filename] = options[:filename] ? options[:filename] : File.join(path, 'README.md')
-            if ( FalkorLib::Git.init?(dir) && FalkorLib::Git.remotes(dir).include?( 'origin' ))
-                config[:origin] = FalkorLib::Git.config('remote.origin.url')
-                if config[:origin] =~ /((gforge|gitlab|github)[\.\w_-]+)[:\d\/]+(\w*)/
-                    config[:forge] = $2.to_sym
-                    config[:by]    = $3
-                end
-            else
-                config[:forge] = select_forge(config[:forge]).to_sym if config[:forge].empty?
-            end
-            forges = FalkorLib::Config::Bootstrap::DEFAULTS[:forge][ config[:forge].to_sym ]
-            #ap config
-            default_source = case config[:forge]
-                             when :gforge
-                                 'https://' + forges[:url] + "/projects/" + name.downcase
-                             when :github, :gitlab
-                                 'https://' + forges[:url] + "/" + config[:by] + "/" + name.downcase
-                             else
-                                 ""
-                             end
-            FalkorLib::Config::Bootstrap::DEFAULTS[:metadata].each do |k,v|
-                next if v.kind_of?(Array) or [ :license, :forge ].include?( k )
-                next if k == :name and ! config[:name].empty?
-                next if k == :issues_url and ! [ :github, :gitlab ].include?( config[:forge] )
-                #next unless [ :name, :summary, :description ].include?(k.to_sym)
-                default_answer = case k
-                                 when :author
-                                     (config[:by] == 'ULHPC') ? 'UL HPC Management Team' : config[:author]
-                                 when :mail
-                                     (config[:by] == 'ULHPC') ? 'hpc-sysadmins@uni.lu'   : config[:mail]
-                                 when :description
-                                     config[:description].empty? ? "#{config[:summary]}" : "#{config[:description]}"
-                                 when :source
-                                     config[:source].empty? ? default_source : "#{config[:source]}"
-                                 when :project_page
-                                     config[:source].empty? ? v : config[:source]
-                                 when :issues_url
-                                     config[:project_page].empty? ? v : "#{config[:project_page]}/issues"
-                                 else
-                                     config[k.to_sym].empty? ? v : config[k.to_sym]
-                                 end
-                config[k.to_sym] = ask( "\t" + sprintf("Project %-20s", "#{k}"), default_answer)
-            end
-            tags = ask("\tKeywords (comma-separated list of tags)", config[:tags].join(','))
-            config[:tags]    = tags.split(',')
-            config[:license] = select_licence() if config[:license].empty?
-            # stack the ERB files required to generate the README
-            templatedir = File.join( FalkorLib.templates, 'README')
-            erbfiles = [ 'header_readme.erb',  ]
-            [ :latex ].each do |type|
-                erbfiles << "readme_#{type}.erb" if options[type.to_sym] and File.exist?( File.join(templatedir, "readme_#{type}.erb"))
-            end
-            erbfiles << "readme_issues.erb"
-            erbfiles << "readme_git.erb"     if FalkorLib::Git.init?(dir)
-            erbfiles << "readme_gitflow.erb" if FalkorLib::GitFlow.init?(dir)
-            erbfiles << "readme_rvm.erb"     if config[:type].include?(:rvm)
-            erbfiles << "footer_readme.erb"
-
-            content = ""
-            erbfiles.each do |f|
-                erbfile = File.join(templatedir, f)
-                content += ERB.new(File.read("#{erbfile}"), nil, '<>').result(binding)
-            end
-            show_diff_and_write(content, config[:filename], options)
-
-            # Eventually save/upgrade local config
-            info "=> saving customization of the FalkorLib configuration in #{FalkorLib.config[:config_files][:local]}"
-            really_continue?
-            FalkorLib::Config::Bootstrap::DEFAULTS[:metadata].keys.each do |k|
-                local_config[:project] = {} unless local_config[:project]
-                local_config[:project][k.to_sym] = config[k.to_sym]
-            end
-            if FalkorLib::GitFlow.init?(dir)
-                local_config[:gitflow]  = {} unless local_config[:gitflow]
-                local_config[:gitflow][:branches] = FalkorLib.config[:gitflow][:branches].clone unless local_config[:gitflow][:branches]
-                [ :master, :develop ].each do |b|
-                    local_config[:gitflow][:branches][b.to_sym] = FalkorLib::GitFlow.branches(b.to_sym)
-                end
-            end
-            FalkorLib::Config.save(dir, local_config, :local)
-            #
-        end # readme
-
-
-
-        ###### latex ######
-        # Bootstrap a LaTeX sub-project of type <type> within a given repository <dir>.
-        # Supported types:
-        #  * :beamer    LaTeX Beamer Slides
-        #  * :article   LaTeX article
-        #  * :letter    LaTeX Letter
-        # Supported options:
-        #  * :force [boolean] force action
-        ##
-        def latex(dir = Dir.pwd, type = :beamer, options = {})
-            ap options if options[:debug]
-            print_error_and_exit "Unsupported type" unless [ :beamer, :article, :letter ].include?( type )
-            path   = normalized_path(dir)
-            config = FalkorLib::Config::Bootstrap::DEFAULTS[:latex].clone
-            if type == :letter
-              config.merge!(FalkorLib::Config::Bootstrap::DEFAULTS[:letter].clone)
-              [ :title, :subtitle, :image ].each { |k| config.delete k }
-            end
-            config.deep_merge!(FalkorLib::Config::Bootstrap::DEFAULTS[:letter].clone) if type == :letter
-            # initiate the repository if needed
-            unless File.directory?( path )
-                warn "The directory '#{path}' does not exists and will be created"
-                really_continue? unless options[:force]
-                run %{ mkdir -p #{path} }
-            end
-            repo(path, options) unless FalkorLib::Git.init?(path)
-            rootdir = FalkorLib::Git.rootdir(path)
-            info "Initiate a LaTeX #{type} project from the Git root directory: '#{rootdir}'"
-            really_continue? unless options[:force]
-            relative_path_to_root = (Pathname.new( FalkorLib::Git.rootdir(dir) ).relative_path_from Pathname.new( File.realpath(path))).to_s
-            config[:name] = options[:name] ? options[:name] : ask("\tEnter the name of the #{type} LaTeX project: ", File.basename(path))
-            raise FalkorLib::ExecError "Empty project name" if config[:name].empty?
-            default_project_dir =  (Pathname.new( File.realpath(path) ).relative_path_from Pathname.new( FalkorLib::Git.rootdir(dir))).to_s
-            if relative_path_to_root == '.'
-                default_project_dir = case type
-                                      when :article
-                                          "articles/#{Time.now.year}/#{config[:name]}"
-                                      when :beamer
-                                          "slides/#{Time.now.year}/#{config[:name]}"
-                                      when :bookchapter
-                                          "chapters/#{config[:name]}"
-                                      when :letter
-                                          "letters/#{Time.now.year}/#{config[:name]}"
-                                      else
-                                          "#{config[:name]}"
-                                      end
-            else
-                default_project_dir += "/#{config[:name]}" unless default_project_dir =~ /#{config[:name]}$/
-            end
-            project_dir = options[:dir] ? options[:dir] : ask("\tLaTeX Sources directory (relative to the Git root directory)", "#{default_project_dir}")
-            raise FalkorLib::ExecError "Empty project directory" if project_dir.empty?
-            src_project_dir = File.join(project_dir, 'src')
-            srcdir = File.join(rootdir, src_project_dir)
-            if File.exists?(File.join(srcdir, '.root'))
-                warn "The directory '#{project_dir}' seems to have been already initialized"
-                really_continue? unless options[:force]
-            end
-            FalkorLib::GitFlow.start('feature', config[:name], rootdir) if FalkorLib::GitFlow.init?(rootdir)
-            # === prepare Git submodules ===
-            info " ==> prepare the relevant Git submodules"
-            submodules = {}
-            submodules['Makefiles'] = { :url   => 'https://github.com/Falkor/Makefiles.git',
-                                       :branch => 'devel'
-                                      } if [ :article, :beamer, :bookchapter].include?(type)
-            submodules['beamerthemeFalkor'] = { :url => 'https://github.com/Falkor/beamerthemeFalkor' } if type == :beamer
-            FalkorLib::Git.submodule_init(rootdir, submodules)
-            info "bootstrapping the #{type} project sources in '#{src_project_dir}'"
-            # Create the project directory
-            Dir.chdir( rootdir ) do
-                run %{ mkdir -p #{src_project_dir}/images } unless File.directory?("#{srcdir}/images")
-            end
-            info "populating '#{src_project_dir}'"
-            #FalkorLib::Bootstrap::Link.root(srcdir, { :verbose => true} )
-            FalkorLib::Bootstrap::Link.makefile(srcdir, { :no_interaction => true })
-            [ '_style.sty', '.gitignore' ].each do |f|
-              Dir.chdir( srcdir ) do
-                dst = ".makefile.d/latex/#{f}"
-                run %{ ln -s #{dst} #{f} } unless File.exist?( File.join(srcdir, f) )
-              end
-            end
-            if type == :beamer
-              f = 'beamerthemeFalkor.sty'
-              dst = "#{FalkorLib.config[:git][:submodulesdir]}/beamerthemeFalkor/#{f}"
-              Dir.chdir( srcdir ) do
-                run %{ ln -s .root/#{dst} #{f} } unless File.exist?( File.join(srcdir, f) )
-              end
-            end
-
-            # Bootstrap the directory
-            templatedir = File.join( FalkorLib.templates, 'latex', "#{type}")
-            unless File.exists?( File.join(srcdir, "#{config[:name]}.tex"))
-                info "gathering information for the LaTeX templates"
-                prefix = case type
-                         when :article
-                             'Article '
-                         when :beamer
-                             'Slides '
-                         when :bookchapter
-                             'Book Chapter '
-                         when :letter
-                             'Letter '
+                )
+        if FalkorLib::Git.init?(path)
+          exit_status = FalkorLib::Git.add(File.join(trashdir.to_s, '.gitignore' ),
+                                           'Add Trash directory',
+                                           :force => true )
+        end
+      end
+      exit_status.to_i
+    end # trash
+
+    ###### versionfile ######
+    # Bootstrap a VERSION file at the root of a project
+    # Supported options:
+    # * :file    [string] filename
+    # * :version [string] version to mention in the file
+    ##
+    def versionfile(dir = Dir.pwd, options = {})
+      file    = (options[:file])    ? options[:file]    : 'VERSION'
+      version = (options[:version]) ? options[:version] : '0.0.0'
+      info " ==> bootstrapping a VERSION file"
+      path = normalized_path(dir)
+      path = FalkorLib::Git.rootdir(path) if FalkorLib::Git.init?(path)
+      unless Dir.exist?( path )
+        warning "The directory #{path} does not exists and will be created"
+        really_continue?
+        FileUtils.mkdir_p path
+      end
+      versionfile = File.join(path, file)
+      if File.exist?( versionfile )
+        puts "  ... not overwriting the #{file} file which already exists"
+      else
+        FalkorLib::Versioning.set_version(version, path, :type => 'file',
+                                                         :source => { :filename => file })
+        Dir.chdir( path ) do
+          run %( git tag #{options[:tag]} ) if options[:tag]
+        end
+      end
+
+      # unless File.exists?( versionfile )
+      #     run %{  echo "#{version}" > #{versionfile} }
+      #     if FalkorLib::Git.init?(path)
+      #         FalkorLib::Git.add(versionfile, "Initialize #{file} file")
+      #         Dir.chdir( path ) do
+      #             run %{ git tag #{options[:tag]} } if options[:tag]
+      #         end
+      #     end
+      # else
+      #     puts "  ... not overwriting the #{file} file which already exists"
+      # end
+    end # versionfile
+
+
+    ###### motd ######
+    # Generate a new motd (Message of the Day) file
+    # Supported options:
+    #  * :force    [boolean] force action
+    #  * :title    [string]  title of the motd (in figlet)
+    #  * :support  [string]  email address to use for  getting support
+    #  * :hostname [string]  hostname of the server to mention in the motd
+    #  * :width    [number]  width of the line used
+    ##
+    def motd(dir = Dir.pwd, options = {})
+      config = FalkorLib::Config::Bootstrap::DEFAULTS[:motd].merge!(::ActiveSupport::HashWithIndifferentAccess.new(options).symbolize_keys)
+      path = normalized_path(dir)
+      erbfile = File.join( FalkorLib.templates, 'motd', 'motd.erb')
+      outfile = (config[:file] =~ /^\//) ? config[:file] : File.join(path, config[:file])
+      info "Generate a motd (Message of the Day) file '#{outfile}'"
+      FalkorLib::Config::Bootstrap::DEFAULTS[:motd].keys.each do |k|
+        next if [:file, :width].include?(k)
+        config[k.to_sym] = ask( "\t" + format("Message of the Day (MotD) %-10s", k.to_s), config[k.to_sym]) unless options[:no_interaction]
+      end
+      config[:os] = Facter.value(:lsbdistdescription) if Facter.value(:lsbdistdescription)
+      config[:os] = "Mac " + Facter.value(:sp_os_version) if Facter.value(:sp_os_version)
+      unless options[:nodemodel]
+        config[:nodemodel] = Facter.value(:sp_machine_name) if Facter.value(:sp_machine_name)
+        config[:nodemodel] += " (#{Facter.value(:sp_cpu_type)}" if Facter.value(:sp_cpu_type)
+        config[:nodemodel] += " " + Facter.value(:sp_current_processor_speed) if Facter.value(:sp_current_processor_speed)
+        config[:nodemodel] += " #{Facter.value(:sp_number_processors)} cores )" if Facter.value(:sp_number_processors)
+      end
+      config[:nodemodel] = Facter.value(:sp_machine_name) unless options[:nodemodel]
+      write_from_erb_template(erbfile, outfile, config, options)
+    end # motd
+
+
+
+    ###### readme ######
+    # Bootstrap a README file for various context
+    # Supported options:
+    #  * :no_interaction [boolean]: do not interact
+    #  * :force          [boolean] force overwritting
+    #  * :latex          [boolean] describe a LaTeX project
+    #  * :octopress      [boolean] octopress site
+    ##
+    def readme(dir = Dir.pwd, options = {})
+      info "Bootstrap a README file for this project"
+      # get the local configuration
+      local_config = FalkorLib::Config.get(dir)
+      config = FalkorLib::Config::Bootstrap::DEFAULTS[:metadata].clone
+      name = get_project_name(dir)
+      if local_config[:project]
+        config.deep_merge!( local_config[:project])
+      else
+        config[:name] = ask("\tProject name: ", name) unless options[:name]
+      end
+      if options[:rake]
+        options[:make] = false
+        options[:rvm]  = true
+      end
+      config[:type] << :rvm if options[:rake]
+      # Type of project
+      config[:type] << :latex if options[:latex]
+      if config[:type].empty?
+        t = select_from( FalkorLib::Config::Bootstrap::DEFAULTS[:types],
+                         'Select the type of project to describe:', 1)
+        config[:type] << t
+        config[:type] << [ :ruby, :rvm ] if [ :gem, :rvm, :octopress, :puppet_module ].include?( t )
+        config[:type] << :python if t == :pyenv
+      end
+      config[:type].uniq!
+      ap config
+      config[:type] = config[:type].uniq.flatten
+      # Apply options (if provided)
+      [ :name, :forge ].each do |k|
+        config[k.to_sym] = options[k.to_sym] if options[k.to_sym]
+      end
+      path = normalized_path(dir)
+      config[:filename] = (options[:filename]) ? options[:filename] : File.join(path, 'README.md')
+      if ( FalkorLib::Git.init?(dir) && FalkorLib::Git.remotes(dir).include?( 'origin' ))
+        config[:origin] = FalkorLib::Git.config('remote.origin.url')
+        if config[:origin] =~ /((gforge|gitlab|github)[\.\w_-]+)[:\d\/]+(\w*)/
+          config[:forge] = Regexp.last_match(2).to_sym
+          config[:by]    = Regexp.last_match(3)
+        end
+      elsif config[:forge].empty?
+        config[:forge] = select_forge(config[:forge]).to_sym
+      end
+      forges = FalkorLib::Config::Bootstrap::DEFAULTS[:forge][ config[:forge].to_sym ]
+      #ap config
+      default_source = case config[:forge]
+                       when :gforge
+                         'https://' + forges[:url] + "/projects/" + name.downcase
+                       when :github, :gitlab
+                         'https://' + forges[:url] + "/" + config[:by] + "/" + name.downcase
+                       else
+                         ""
+                       end
+      FalkorLib::Config::Bootstrap::DEFAULTS[:metadata].each do |k, v|
+        next if v.is_a?(Array) || [ :license, :forge ].include?( k )
+        next if (k == :name) && !config[:name].empty?
+        next if (k == :issues_url) && ![ :github, :gitlab ].include?( config[:forge] )
+        #next unless [ :name, :summary, :description ].include?(k.to_sym)
+        default_answer = case k
+                         when :author
+                           (config[:by] == 'ULHPC') ? 'UL HPC Management Team' : config[:author]
+                         when :mail
+                           (config[:by] == 'ULHPC') ? 'hpc-sysadmins@uni.lu'   : config[:mail]
+                         when :description
+                           (config[:description].empty?) ? (config[:summary]).to_s : (config[:description]).to_s
+                         when :source
+                           (config[:source].empty?) ? default_source : (config[:source]).to_s
+                         when :project_page
+                           (config[:source].empty?) ? v : config[:source]
+                         when :issues_url
+                           (config[:project_page].empty?) ? v : "#{config[:project_page]}/issues"
                          else
-                             ''
+                           (config[k.to_sym].empty?) ? v : config[k.to_sym]
                          end
-                config.each do |k,v|
-                    next if k == :name
-                    config[k.to_sym] = ask( "\t" + sprintf("%-20s", "#{prefix}#{k.capitalize}"), v)
-                end
-                init_from_template(templatedir, srcdir, config, {:no_interaction => true,
-                                                                 :no_commit      => true })
-                # Rename the main file
-                Dir.chdir( srcdir ) do
-                    run %{ mv main.tex #{config[:name]}.tex }
-                end
-            end
-            # Create the trash directory
-            trash(srcdir)
-
-            # populate the images/ directory
-            baseimages  = File.join( FalkorLib.templates, 'latex', 'images')
-            #images_makefile_src = "#{FalkorLib.config[:git][:submodulesdir]}/Makefiles/generic/Makefile.insrcdir"
-            images = File.join(srcdir, 'images')
-            info "populating the image directory"
-            Dir.chdir( images ) do
-                run %{ rsync -avzu #{baseimages}/ . }
-                run %{ ln -s ../.root .root } unless File.exists?(File.join(images, '.root'))
-                #run %{ ln -s .root/#{images_makefile_src} Makefile } unless File.exists?(File.join(images, 'Makefile'))
-            end
-            FalkorLib::Bootstrap::Link.makefile(images, { :images => true, :no_interaction => true } )
-
-            # Prepare the src/ directory
-            FalkorLib::Bootstrap::Link.makefile(File.join(rootdir, project_dir), { :src => true, :no_interaction => true } )
-
-
-            # default_project_dir = case type
-            #               when :beamer
-            #                   "slides/#{Time.new.yea}"
-            #               end
-        end # project
-
-
-        ###
-        # Select the forge (gforge, github, etc.) hosting the project sources
-        ##
-        def select_forge(default = :gforge, options = {})
-            forge = FalkorLib::Config::Bootstrap::DEFAULTS[:forge]
-            #ap forge
-            default_idx = forge.keys.index(default)
-            default_idx = 0 if default_idx.nil?
-            v = select_from(forge.map{ |k,v| v[:name] },
-                            "Select the Forge hosting the project sources",
-                            default_idx+1,
-                            forge.keys)
-            v
-        end # select_forge
-
-        ###### select_licence ######
-        # Select a given licence for the project
-        ##
-        def select_licence(default_licence = FalkorLib::Config::Bootstrap::DEFAULTS[:metadata][:license],
-                           options = {})
-            list_license    = FalkorLib::Config::Bootstrap::DEFAULTS[:licenses].keys
-            idx = list_license.index(default_licence) unless default_licence.nil?
-            select_from(list_license,
-                        'Select the license index for this project:',
-                        idx.nil? ? 1 : idx + 1)
-            #licence
-        end # select_licence
-
-        ###### get_badge ######
-        # Return a Markdown-formatted string for a badge to display, typically in a README.
-        # Based on http://shields.io/
-        # Supported options:
-        #  * :style [string] style of the badge, Elligible: ['plastic', 'flat', 'flat-square']
-        ##
-        def get_badge(subject, status, color = 'blue', options = {})
-            st = status.gsub(/-/, '--').gsub(/_/, '__')
-            res = "https://img.shields.io/badge/#{subject}-#{st}-#{color}.svg"
-            res += "?style=#{options[:style]}" if options[:style]
-            res
-        end # get_licence_badge
-
-        ###### get_project_name ######
-        # Return a "reasonable" project name from a given [sub] directory i.e. its basename
-        ##
-        def get_project_name(dir = Dir.pwd, options = {})
-            path = normalized_path(dir)
-            path = FalkorLib::Git.rootdir(path) if FalkorLib::Git.init?(path)
-            File.basename(path)
-        end # get_project_name
-
-
-    end # module Bootstrap
+        config[k.to_sym] = ask( "\t" + Kernel.format("Project %-20s", k.to_s), default_answer)
+      end
+      tags = ask("\tKeywords (comma-separated list of tags)", config[:tags].join(','))
+      config[:tags]    = tags.split(',')
+      config[:license] = select_licence if config[:license].empty?
+      # stack the ERB files required to generate the README
+      templatedir = File.join( FalkorLib.templates, 'README')
+      erbfiles = [ 'header_readme.erb' ]
+      [ :latex ].each do |type|
+        erbfiles << "readme_#{type}.erb" if options[type.to_sym] && File.exist?( File.join(templatedir, "readme_#{type}.erb"))
+      end
+      erbfiles << "readme_issues.erb"
+      erbfiles << "readme_git.erb"     if FalkorLib::Git.init?(dir)
+      erbfiles << "readme_gitflow.erb" if FalkorLib::GitFlow.init?(dir)
+      erbfiles << "readme_rvm.erb"     if config[:type].include?(:rvm)
+      erbfiles << "footer_readme.erb"
+
+      content = ""
+      erbfiles.each do |f|
+        erbfile = File.join(templatedir, f)
+        content += ERB.new(File.read(erbfile.to_s), nil, '<>').result(binding)
+      end
+      show_diff_and_write(content, config[:filename], options)
+
+      # Eventually save/upgrade local config
+      info "=> saving customization of the FalkorLib configuration in #{FalkorLib.config[:config_files][:local]}"
+      really_continue?
+      FalkorLib::Config::Bootstrap::DEFAULTS[:metadata].keys.each do |k|
+        local_config[:project] = {} unless local_config[:project]
+        local_config[:project][k.to_sym] = config[k.to_sym]
+      end
+      if FalkorLib::GitFlow.init?(dir)
+        local_config[:gitflow] = {} unless local_config[:gitflow]
+        local_config[:gitflow][:branches] = FalkorLib.config[:gitflow][:branches].clone unless local_config[:gitflow][:branches]
+        [ :master, :develop ].each do |b|
+          local_config[:gitflow][:branches][b.to_sym] = FalkorLib::GitFlow.branches(b.to_sym)
+        end
+      end
+      FalkorLib::Config.save(dir, local_config, :local)
+      #
+    end # readme
+
+
+    ###
+    # Select the forge (gforge, github, etc.) hosting the project sources
+    ##
+    def select_forge(default = :gforge, _options = {})
+      forge = FalkorLib::Config::Bootstrap::DEFAULTS[:forge]
+      #ap forge
+      default_idx = forge.keys.index(default)
+      default_idx = 0 if default_idx.nil?
+      v = select_from(forge.map { |_k, u| u[:name] },
+                      "Select the Forge hosting the project sources",
+                      default_idx + 1,
+                      forge.keys)
+      v
+    end # select_forge
+
+    ###### select_licence ######
+    # Select a given licence for the project
+    ##
+    def select_licence(default_licence = FalkorLib::Config::Bootstrap::DEFAULTS[:metadata][:license],
+                       _options = {})
+      list_license = FalkorLib::Config::Bootstrap::DEFAULTS[:licenses].keys
+      idx = list_license.index(default_licence) unless default_licence.nil?
+      select_from(list_license,
+                  'Select the license index for this project:',
+                  (idx.nil?) ? 1 : idx + 1)
+      #licence
+    end # select_licence
+
+    ###### get_badge ######
+    # Return a Markdown-formatted string for a badge to display, typically in a README.
+    # Based on http://shields.io/
+    # Supported options:
+    #  * :style [string] style of the badge, Elligible: ['plastic', 'flat', 'flat-square']
+    ##
+    def get_badge(subject, status, color = 'blue', options = {})
+      st = status.gsub(/-/, '--').gsub(/_/, '__')
+      res = "https://img.shields.io/badge/#{subject}-#{st}-#{color}.svg"
+      res += "?style=#{options[:style]}" if options[:style]
+      res
+    end # get_licence_badge
+
+    ###### get_project_name ######
+    # Return a "reasonable" project name from a given [sub] directory i.e. its basename
+    ##
+    def get_project_name(dir = Dir.pwd, _options = {})
+      path = normalized_path(dir)
+      path = FalkorLib::Git.rootdir(path) if FalkorLib::Git.init?(path)
+      File.basename(path)
+    end # get_project_name
+
+
+  end # module Bootstrap
 end # module FalkorLib