falkorlib 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f6c753e462c35ce2c8cb3f896315931ef6eedb0cc8a2976955fc45baee50a1b
-  data.tar.gz: 2d6f11affc72651b6156fcf905d6498d2e2d1a925619d366fc5a1be233ebea25
+  metadata.gz: 78758647f5f8fa786afc72d81e8b57866f774e548fd956237c417d9d9c53f871
+  data.tar.gz: 6107fcdcf59e970dac03f536d51a641c665e1505d9c3f8ca257747a46fa0fc6f
 SHA512:
-  metadata.gz: 4f04f7cdaaf56fe15cda4632bdb0f7ae37dc94eeb01a5b03b6c8070cae836b77ad4398bbd7d46d6a46c94ec0f57d667fc99b020737ad59c8e63b35e3cd68db4b
-  data.tar.gz: bfd68a396b5063be6f044851d23927ad8cf2919423a94834aaec7c74fd16235e399d435c76fd9569d3445c48048c0ee5efccc3698eebb598be1f3654a42ff554
+  metadata.gz: af645b81860ddcb17091a3ae3f046f7e33d74c72aa90f5a431f967efd77d116bb9067b3fce96dd83e7d244ff4a37f2d093fddbc20197120102a050d430a7999d
+  data.tar.gz: f066036ac70f16331bc14c4ebdf1fd08a79fdd3cdd81e09cf50227aee45b05bf871b8dce8121b8381e8c063684123df0befd2240abd0862f3733afd2749ab52c

data/Gemfile.lock

@@ -1,23 +1,22 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.8.3)
+    falkorlib (0.8.4)
       activesupport (~> 4.0)
       artii (>= 2.1)
       awesome_print (~> 1.2)
-      configatron (~> 3.2)
+      configatron (~> 3.0)
       deep_merge (~> 1.0.1)
       diffy (>= 3.0)
       facter (~> 2.4.1)
       git_remote_branch (~> 0)
-      json (~> 1.8)
+      json (~> 2.0)
       license-generator (~> 0)
       logger (>= 1.2.8)
       minigit (~> 0)
       rake (>= 12.3.3)
       term-ansicolor (~> 1.3)
-      thor (>= 0.19)
-      thor-zsh_completion
+      thor (>= 1.0)
 
 GEM
   remote: http://rubygems.org/
@@ -63,12 +62,12 @@ GEM
       concurrent-ruby (~> 1.0)
     irb (1.1.1)
     jaro_winkler (1.5.4)
-    json (1.8.6)
+    json (2.3.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     license-generator (0.4.1)
       thor
-    logger (1.3.0)
+    logger (1.4.2)
     method_source (1.0.0)
     minigit (0.0.4)
     minitest (5.14.0)
@@ -111,16 +110,14 @@ GEM
     rubygems-tasks (0.2.5)
       irb (~> 1.0)
     safe_yaml (0.9.7)
-    simplecov (0.17.1)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
     sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (1.0.1)
-    thor-zsh_completion (0.1.2)
     thread_safe (0.3.6)
     tins (1.24.1)
       sync

data/falkorlib.gemspec

@@ -73,18 +73,18 @@ Gem::Specification.new do |s|
   #s.add_runtime_dependency 'git', '~> 1.2', '>= 1.2.5'
   s.add_runtime_dependency('minigit', '~> 0')
   s.add_runtime_dependency("term-ansicolor", "~> 1.3")
-  s.add_runtime_dependency("configatron",    "~> 3.2")
+  s.add_runtime_dependency("configatron",    "~> 3.0")
   s.add_runtime_dependency("awesome_print", "~> 1.2")
-  s.add_runtime_dependency("json", "~> 1.8")
+  s.add_runtime_dependency("json", "~> 2.0")
   s.add_runtime_dependency("license-generator", '~> 0')
   s.add_runtime_dependency("deep_merge", '~> 1.0.1')
   s.add_runtime_dependency("diffy", '>= 3.0')
   s.add_runtime_dependency("logger", '>= 1.2.8')
-  s.add_runtime_dependency("thor",   '>= 0.19')
+  s.add_runtime_dependency("thor",   '>= 1.0')
   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("bundler-stats", '~> 2.0')
   #s.add_runtime_dependency("benchmark", '~> 4.0')
   #s.add_runtime_dependency("mercenary", '>= 0.3.5')
 
@@ -107,6 +107,7 @@ Gem::Specification.new do |s|
   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("thor-zsh_completion", '>= 0.1.5')
   #s.add_development_dependency("bluecloth",      "~> 2.2.0")
   #s.add_development_dependency("wlang",          "~> 0.10.2")
 

data/lib/falkorlib/bootstrap/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Thu 2018-11-29 11:39 svarrette>
+# Time-stamp: <Sun 2020-04-12 14:37 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -28,11 +28,12 @@ module FalkorLib #:nodoc:
             :hooksdir => 'config/hooks',
             :hook     => 'pre-commit.git-crypt.sh',
             :ulhpc    => [
-              #'Ox5D08BCDD4F156AD7',  # S. Varrette
-              '0x3F3242C5B34D98C2',   # V. Plugaru
+              #'0x5D08BCDD4F156AD7',  # S. Varrette
+              #'0x3F3242C5B34D98C2',   # V. Plugaru
               '0x6429C2514EBC4737',   # S. Peter
-              '0x07FEA8BA69203C2D',   # C. Parisot
+              #'0x07FEA8BA69203C2D',   # C. Parisot
               '0x37183CEF550DF40B',   # H. Cartiaux
+
             ],
             # :hooks    => {
             #   :precommit => 'https://gist.github.com/848c82daa63710b6c132bb42029b30ef.git',
@@ -534,7 +535,9 @@ module FalkorLib
         config[k.to_sym] = ask( "\t" + Kernel.format("Project %-20s", k.to_s))
       end
       config[:description] = config[:summary]
-      config[:gitflow] = FalkorLib::GitFlow.guess_gitflow_config(rootdir)
+      if FalkorLib::GitFlow.init?(rootdir)
+        config[:gitflow] = FalkorLib::GitFlow.guess_gitflow_config(rootdir)
+      end
       config[:make] = File.exists?(File.join(rootdir, 'Makefile'))
       config[:rake] = File.exists?(File.join(rootdir, 'Rakefile'))
       config

data/lib/falkorlib/bootstrap/gems.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+################################################################################
+# Time-stamp: <Mon 2017-01-16 10:14 svarrette>
+################################################################################
+# Interface for Bootstrapping a Ruby gem
+#
+
+require "falkorlib"
+require "falkorlib/common"
+require "falkorlib/bootstrap"
+
+include FalkorLib::Common
+
+module FalkorLib
+  module Bootstrap #:nodoc:
+
+    module_function
+
+    ###### gem ######
+    # Initialize a Ruby gem project
+    # Supported options:
+    #  * :force [boolean] force action
+    ##
+    def gem(dir = Dir.pwd, options = {})
+      info "Initialize a Ruby gem "
+
+    end # gem
+
+
+
+  end # module Bootstrap
+end # module FalkorLib

data/lib/falkorlib/bootstrap/git.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Thu 2018-11-08 18:27 svarrette>
+# Time-stamp: <Sun 2020-04-12 14:35 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -120,6 +120,7 @@ module FalkorLib
           warning "no Git remote  'origin' found, thus no remote synchronization performed"
         end
       end
+      return 0
     end # repo
 
     ###### gitcrypt ######

data/lib/falkorlib/bootstrap/python.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Wed 2018-11-21 11:46 svarrette>
+# Time-stamp: <Sun 2020-04-12 09:04 svarrette>
 ################################################################################
 # Interface for the main python Bootstrapping operations
 #
@@ -149,6 +149,7 @@ Now you probably need to perform the following actions:
     direnv allow .
     # Eventually install the pyenv version
     pyenv install #{config[:version]}
+    cd ..; cd - # To reload the appropriate version
 
 You can then enjoy your newly configured sand-boxed environment
 
@@ -164,6 +165,8 @@ To freeze your environment to pass it around
     pip freeze -l > requirements.txt  # Dump it to a requirements file
     git add requirements.txt
     git commit -s -m 'Python package list' requirements.txt
+    # Later for collaborators upon clone
+    pip install -r requirements.txt
 
 MOTD
       exit_status.to_i

data/lib/falkorlib/cli.rb

@@ -8,7 +8,7 @@
 require 'thor'
 require 'thor/actions'
 require 'thor/group'
-require 'thor/zsh_completion'
+#require 'thor/zsh_completion'
 
 require 'falkorlib'
 
@@ -31,7 +31,7 @@ module FalkorLib
 
       include Thor::Actions
       include FalkorLib::Common
-      include ZshCompletion::Command
+      # include ZshCompletion::Command
 
       #default_command :info
 

data/lib/falkorlib/common.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Fri 2016-11-11 14:17 svarrette>
+# Time-stamp: <Sun 2020-04-12 14:38 svarrette>
 ################################################################################
 
 require "falkorlib"
@@ -374,6 +374,7 @@ module FalkorLib #:nodoc:
           really_continue? unless options[:no_interaction]
           next
         end
+        #puts config.to_yaml
         content += ERB.new(File.read(erb.to_s), nil, '<>').result(binding)
       end
       # error "Unable to find the template file #{erbfile}" unless File.exists? (erbfile )

data/lib/falkorlib/config.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mon 2018-11-12 07:15 svarrette>
+# Time-stamp: <Sun 2020-04-12 14:57 svarrette>
 ################################################################################
 # FalkorLib Configuration
 #
@@ -55,8 +55,9 @@ module FalkorLib #:nodoc:
       },
       #:custom_cfg   => '.falkorlib.yaml',
       :rvm => {
-        :rubies      => [ '2.4.1', '2.3.4', '2.2.7', '2.1.10', '2.0.0', '1.9.3' ],
-        :version     => '2.3.4',
+        # See https://www.ruby-lang.org/en/downloads/branches/ for stable branches
+        :rubies      => [ '2.7.0', '2.6.5', '2.5.6', '2.4.9' ],
+        :version     => '2.6.5',
         :versionfile => '.ruby-version',
         :gemsetfile  => '.ruby-gemset'
       },

data/lib/falkorlib/version.rb

@@ -19,7 +19,7 @@ module FalkorLib #:nodoc:
     # MAJOR: Defines the major version
     # MINOR: Defines the minor version
     # PATCH: Defines the patch version
-    MAJOR, MINOR, PATCH = 0, 8, 3
+    MAJOR, MINOR, PATCH = 0, 8, 4
 
     module_function
 

data/spec/falkorlib/bootstrap_mkdocs_spec.rb

@@ -0,0 +1,78 @@
+#!/usr/bin/ruby
+#########################################
+# bootstrap_mkdocs_spec.rb
+# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# Time-stamp: <Sun 2020-04-12 12:25 svarrette>
+#
+# @description Check the Bootstrapping operations for mkdocs
+#
+# Copyright (c) 2020 Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# .             http://varrette.gforge.uni.lu
+##############################################################################
+
+require 'spec_helper'
+require 'tmpdir'
+require 'fileutils'
+
+describe FalkorLib::Bootstrap do
+
+  include FalkorLib::Common
+
+  dirs = {
+    :without_git => Dir.mktmpdir,
+    :with_git    => Dir.mktmpdir,
+  }
+
+  #_____________
+  before :all do
+    $stdout.sync = true
+    FalkorLib.config[:no_interaction] = true
+  end
+
+  #____________
+  after :all do
+    dirs.each do |t,d|
+      #next if t == :with_git
+      FileUtils.remove_entry_secure d
+    end
+    FalkorLib.config[:no_interaction] = false
+  end
+
+  [ :without_git, :with_git ].each do |ctx|
+    # [ :without_git ].each do |ctx|
+    # [ :with_git ].each do |ctx|
+    dir = dirs[ctx]
+    ########################################################################
+    context "bootstrap/mkdocs (#{ctx}) within temporary directory '#{dir}'" do
+
+      if ctx == :with_git
+        it "initialize Git in the temporary directory #{dir}" do
+          c = FalkorLib::Git.init(dir)
+          expect(c).to eq(0)
+          t = FalkorLib::Git.init?(dir)
+          expect(t).to be true
+        end
+      end
+
+      ######### mkdocs #########
+      it "#mkdocs -- #{ctx}" do
+        c = FalkorLib::Bootstrap.mkdocs(dir)
+        expect(c).to eq(0)
+        d = File.join(dir, 'docs')
+        conffile = File.join(dir, 'mkdocs.yml')
+        expect(File.directory?(d)).to be true
+        expect(File.exists?(conffile)).to be true
+        File.read(File.realpath(conffile)) do |f|
+          [
+            "site_name: #{File.basename(dir)}",
+            "nav:"
+          ].each do |pattern|
+            f.should include "#{pattern}"
+          end
+        end
+      end
+
+    end # context "bootstrap/mkdocs"
+  end # each
+
+end

data/spec/falkorlib/bootstrap_repo_spec.rb

@@ -0,0 +1,86 @@
+#!/usr/bin/ruby
+#########################################
+# bootstrap_vagrant_spec.rb
+# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# Time-stamp: <Sun 2020-04-12 15:35 svarrette>
+#
+# @description Check the Bootstrapping operations for a new repo
+#
+# Copyright (c) 2020 Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# .             http://varrette.gforge.uni.lu
+##############################################################################
+
+require 'spec_helper'
+require 'tmpdir'
+require 'fileutils'
+
+describe FalkorLib::Bootstrap do
+
+  include FalkorLib::Common
+
+  dirs = {
+    :with_make => Dir.mktmpdir,
+    :with_rake => Dir.mktmpdir,
+  }
+
+  #_____________
+  before :all do
+    $stdout.sync = true
+    FalkorLib.config[:no_interaction] = true
+  end
+
+  #____________
+  after :all do
+    dirs.each do |t,d|
+      FileUtils.remove_entry_secure d
+    end
+    FalkorLib.config[:no_interaction] = false
+  end
+
+  [ :with_make, :with_rake ].each do |ctx|
+    # [ :with_make ].each do |ctx|
+    # [ :with_rake ].each do |ctx|
+    dir = dirs[ctx]
+    ########################################################################
+    context "bootstrap/repo (#{ctx}) within temporary directory '#{dir}'" do
+
+      it "#repo -- bootstrap a new repository" do
+        c = FalkorLib::Bootstrap.repo(dir,
+                                      {
+                                        :no_interaction => true,
+                                        :make => (ctx == :with_make),
+                                        :rake => (ctx == :with_rake),
+                                        :git_flow => true
+                                      })
+        expect(c).to eq(0)
+        files_to_check = (ctx == :with_make) ? [ 'Makefile' ] : [ 'Rakefile', 'Gemfile', '.ruby-version', '.ruby-gemset' ]
+        files_to_check += [ 'VERSION', 'README.md', '.falkor/config' ]
+        files_to_check.each do |f|
+          expect(File).to exist( File.join(dir, f))
+        end
+        if (ctx == :with_make)
+          [ '.submodules/Makefiles' ].each do |d|
+            expect(File.directory?(File.join(dir, d))).to be true
+          end
+        end
+      end
+
+      it "#repo -- repeat bootstrap" do
+        c = capture(:stdout) {
+          FalkorLib::Bootstrap.repo(dir,
+                                    {
+                                      :no_interaction => true,
+                                      :make => (ctx == :with_make),
+                                      :rake => (ctx == :with_rake)
+                                    })
+        }
+        [
+          "Git is already initialized for the repository "
+        ].each do |pattern|
+          expect(c).to include pattern
+        end
+      end
+
+    end # context "bootstrap/repo"
+  end # each
+end

data/spec/falkorlib/bootstrap_vagrant_spec.rb

@@ -0,0 +1,81 @@
+#!/usr/bin/ruby
+#########################################
+# bootstrap_vagrant_spec.rb
+# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# Time-stamp: <Sun 2020-04-12 14:22 svarrette>
+#
+# @description Check the Bootstrapping operations for Vagrant
+#
+# Copyright (c) 2020 Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# .             http://varrette.gforge.uni.lu
+##############################################################################
+
+require 'spec_helper'
+require 'tmpdir'
+require 'fileutils'
+
+describe FalkorLib::Bootstrap do
+
+  include FalkorLib::Common
+
+  dirs = {
+    :without_git => Dir.mktmpdir,
+    :with_git    => Dir.mktmpdir,
+  }
+
+  #_____________
+  before :all do
+    $stdout.sync = true
+    FalkorLib.config[:no_interaction] = true
+  end
+
+  #____________
+  after :all do
+    dirs.each do |t,d|
+      #next if t == :with_git
+      FileUtils.remove_entry_secure d
+    end
+    FalkorLib.config[:no_interaction] = false
+  end
+
+  #[ :without_git, :with_git ].each do |ctx|
+    # [ :without_git ].each do |ctx|
+    [ :with_git ].each do |ctx|
+    dir = dirs[ctx]
+    ########################################################################
+    context "bootstrap/vagrant (#{ctx}) within temporary directory '#{dir}'" do
+
+      if ctx == :with_git
+        it "initialize Git in the temporary directory #{dir}" do
+          c = FalkorLib::Git.init(dir)
+          expect(c).to eq(0)
+          t = FalkorLib::Git.init?(dir)
+          expect(t).to be true
+        end
+      end
+
+      ######### vagrant #########
+      it "#vagrant -- #{ctx}" do
+        c = FalkorLib::Bootstrap.vagrant(dir)
+        expect(c).to eq(0)
+        confdir = File.join(dir, 'vagrant')
+        conffile = File.join(dir, 'Vagrantfile')
+        expect(File.directory?(confdir)).to be true
+        expect(File.exists?(conffile)).to be true
+        bootstrap = File.join(confdir, 'bootstrap.sh')
+        expect(File.exists?(bootstrap)).to be true
+
+        # File.read(File.realpath(conffile)) do |f|
+        #   [
+        #     "site_name: #{File.basename(dir)}",
+        #     "nav:"
+        #   ].each do |pattern|
+        #     f.should include "#{pattern}"
+        #   end
+        # end
+      end
+
+    end # context "bootstrap/mkdocs"
+  end # each
+
+end

data/spec/falkorlib/gitflow_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # gitflow_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Wed 2016-11-09 09:16 svarrette>
+# Time-stamp: <Sun 2020-04-12 15:15 svarrette>
 #
 # @description Check the Git Flow operations -- see https://github.com/nvie/gitflow
 #
@@ -77,6 +77,26 @@ describe FalkorLib::GitFlow do
           expect(br).to eq(FalkorLib.config[:gitflow][:branches][:develop])
         end
       end
+
+      it "#guess_gitflow_config" do
+        c = FalkorLib::GitFlow.guess_gitflow_config(dir)
+        {
+          :master  => 'production',
+          :develop => 'devel'
+        }.each do |type,v|
+          expect(c[:branches][type.to_sym]).to eq(v)
+        end
+        {
+          :feature    => 'feature/',
+          :release    => 'release/',
+          :hotfix     => 'hotfix/',
+          :support    => 'support/',
+          :versiontag => 'v'
+        }.each do |type,v|
+          expect(c[:prefix][type.to_sym]).to eq(v)
+        end
+      end
+
     end
 
   end

data/spec/falkorlib_spec.rb

@@ -1,13 +1,33 @@
 require 'spec_helper'
 describe FalkorLib do
 
-    it "should have a version number" do
-        expect(FalkorLib.const_defined?(:VERSION)).to be true
-    end
+  it "should have a version number" do
+    expect(FalkorLib.const_defined?(:VERSION)).to be true
+  end
 
-    it "self.lib" do
-      expect(FalkorLib.lib).to include 'lib'
+  it "should have a Major/Minor/Patch number" do
+    [ :MAJOR, :MINOR, :PATCH].each do |t|
+      expect(FalkorLib::Version.const_defined?(t)).to be true
     end
+  end
+
+  it "#self.lib" do
+    expect(FalkorLib.lib).to include 'lib'
+  end
+
+  it "#self.major" do
+    v = FalkorLib::Version::MAJOR
+    expect(FalkorLib::Version.major).to eq(v)
+  end
+
+  it "#self.minor" do
+    v = FalkorLib::Version::MINOR
+    expect(FalkorLib::Version.minor).to eq(v)
+  end
 
+  it "#self.patch" do
+    v = FalkorLib::Version::PATCH
+    expect(FalkorLib::Version.patch).to eq(v)
+  end
 
 end

data/templates/mkdocs/docs/README.md.erb

@@ -1,18 +1,13 @@
--*- mode: markdown; mode: visual-line; fill-column: 80 -*-
-
 <% unless (config[:license].empty? or config[:license] == "none") %>
 [![Licence](<%= FalkorLib::Bootstrap::get_badge("license", config[:license], 'blue') %>)](<%= FalkorLib::Config::Bootstrap::DEFAULTS[:licenses][ config[:license] ][:url] %>)
 <% end %>
 ![By <%= config[:by] %>](https://img.shields.io/badge/by-<%= config[:by] %>-blue.svg) [![<%= config[:forge] %>](https://img.shields.io/badge/git-<%= config[:forge] %>-lightgray.svg)](<%= config[:source] %>) [![Issues](https://img.shields.io/badge/issues-<%= config[:forge] %>-green.svg)](<%= config[:issues_url] %>)
 
-       Time-stamp: <Sun 2017-01-15 16:58 svarrette>
-
        <%= ::Artii::Base.new().asciify( config[:name] ).split("\n").join("\n       ") %>
        Copyright (c) <%= Time.now.year %> <%= config[:author] %> <<%= config[:mail] %>>
 
 <%= config[:description] %>
 
-
 This is the main page of the documentation for this repository, which relies on [MkDocs](http://www.mkdocs.org/) and the [Read the Docs](http://readthedocs.io) theme. It proposes to detail the following elements:
 
 * The [organization and directory layout](layout.md)

data/templates/mkdocs/docs/setup/install.md.erb

@@ -1,3 +1,4 @@
+<% unless config[:forge].empty? %>
 
 This repository is hosted on [<%= FalkorLib::Config::Bootstrap::DEFAULTS[:forge][ config[:forge].to_sym ][:name] %>](<%= config[:project_page] %>).
 
@@ -9,6 +10,7 @@ This repository is hosted on [<%= FalkorLib::Config::Bootstrap::DEFAULTS[:forge]
         $> mkdir -p ~/git/<%= FalkorLib::Config::Bootstrap::DEFAULTS[:forge][ config[:forge].to_sym ][:url] %>/<%= config[:by] %>
         $> cd ~/git/<%= FalkorLib::Config::Bootstrap::DEFAULTS[:forge][ config[:forge].to_sym ][:url] %>/<%= config[:by] %>
         $> git clone <%= config[:origin] %>
+<% end %>
 
 <% if config[:type].include?( :rvm ) %>
 Now ensure [RVM](https://rvm.io/) is correctly configured for this repository:
@@ -25,26 +27,35 @@ Configure the dependencies detailed in the [`Gemfile`](Gemfile) through the [Bun
 **`/!\ IMPORTANT`**: Once cloned, initiate your local copy of the repository by running:
 
     $> cd <%= name.downcase %>
-<% if options[:make] %>
+<% if config[:make] %>
     $> make setup
 <% else %>
     $> rake setup
 <% end %>
 
-This will initiate the [Git submodules of this repository](.gitmodules) and setup the [git flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) layout for this repository.
+This will initiate the [Git submodules of this repository](.gitmodules), setup the [git flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) layout for this repository.
+Later on, instead of pulling, you may want you can update **all** of your local branches by running:
 
-Later on, you can upgrade the [Git submodules](.gitmodules) to the latest version by running:
+```
+make up
+```
 
-<% if options[:make] %>
-    $> make upgrade
+If upon pulling the repository, you end in a state where another collaborator have upgraded the Git submodules for this repository, you'll end in a dirty state (as reported by modifications within the `.submodules/` directory). In that case, just after the pull, you **have to run** the following command to ensure consistency with regards the Git submodules:
+
+```bash
+<% if config[:make] %>
+$> make update     # OR make up
 <% else %>
-    $> rake git:submodules:upgrade
+$> rake git:submodules:update
 <% end %>
+# OR
+git submodule update
+```
 
-If upon pulling the repository, you end in a state where another collaborator have upgraded the Git submodules for this repository, you'll end in a dirty state (as reported by modifications within the `.submodules/` directory). In that case, just after the pull, you **have to run** the following to ensure consistency with regards the Git submodules:
+finally, if you want to upgrade the [Git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) (see `.gitmodules`) to the latest version by running:
 
 <% if options[:make] %>
-    $> make update
+    $> make upgrade
 <% else %>
-    $> rake git:submodules:update
+    $> rake git:submodules:upgrade
 <% end %>

data/templates/mkdocs/docs/setup/preliminaries.md.erb

@@ -57,15 +57,17 @@ $> git config –-global user.name  "Firstname LastName"              # Adapt ac
 $> git config –-global user.email "Firstname.LastName@domain.org"   # Adapt with your mail
 ~~~
 
-Clone the [project repository](<%= FalkorLib::Config::Bootstrap::DEFAULTS[:forge][ config[:forge].to_sym ][:name] %><%=config[:project_page] %> from a Terminal (Powershell as `administrator` under windows):
+<% unless config[:forge].empty? %>
+Clone the [project repository](<%= FalkorLib::Config::Bootstrap::DEFAULTS[:forge][ config[:forge].to_sym ][:name] %><%= config[:project_page] %> from a Terminal (Powershell as `administrator` under windows):
 
 ~~~bash
 $> mkdir -p ~/git/<%= FalkorLib::Config::Bootstrap::DEFAULTS[:forge][ config[:forge].to_sym ][:url] %>/<%= config[:by] %>
 $> cd ~/git/<%= FalkorLib::Config::Bootstrap::DEFAULTS[:forge][ config[:forge].to_sym ][:url] %>/<%= config[:by] %>
 $> git clone <%= config[:origin] %>
-<% if options[:make] %>
+<% if config[:make] %>
 $> make setup    # Under Mac OS / Linux
 <% else %>
 $> rake setup    # Under Mac OS / Linux
 <% end %>
 ~~~
+<% end %>

data/templates/mkdocs/mkdocs.yml.erb

@@ -1,5 +1,5 @@
 site_name: <%= config[:sitename] %>
-pages:
+nav:
 - Home: 'index.md'
 - Organization: 'layout.md'
 - Getting Started:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-10 00:00:00.000000000 Z
+date: 2020-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: license-generator
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: artii
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.1
-- !ruby/object:Gem::Dependency
-  name: thor-zsh_completion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -374,8 +360,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-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.).
+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.).
+
+  '
 email:
 - Sebastien.Varrette@uni.lu
 executables:
@@ -407,6 +396,7 @@ files:
 - lib/falkorlib.rb
 - lib/falkorlib/bootstrap.rb
 - lib/falkorlib/bootstrap/base.rb
+- lib/falkorlib/bootstrap/gems.rb
 - lib/falkorlib/bootstrap/git.rb
 - lib/falkorlib/bootstrap/latex.rb
 - lib/falkorlib/bootstrap/link.rb
@@ -447,9 +437,12 @@ files:
 - spec/falkorlib/bootstrap_helpers_spec.rb
 - spec/falkorlib/bootstrap_latex_spec.rb
 - spec/falkorlib/bootstrap_link_spec.rb
+- spec/falkorlib/bootstrap_mkdocs_spec.rb
 - spec/falkorlib/bootstrap_python_spec.rb
+- spec/falkorlib/bootstrap_repo_spec.rb
 - spec/falkorlib/bootstrap_ruby_spec.rb
 - spec/falkorlib/bootstrap_spec.rb
+- spec/falkorlib/bootstrap_vagrant_spec.rb
 - spec/falkorlib/common_spec.rb
 - spec/falkorlib/config_spec.rb
 - spec/falkorlib/error_spec.rb
@@ -560,8 +553,9 @@ homepage: https://github.com/Falkor/falkorlib
 licenses:
 - MIT
 metadata: {}
-post_install_message: |
-  Thanks for installing FalkorLib.
+post_install_message: 'Thanks for installing FalkorLib.
+
+  '
 rdoc_options: []
 require_paths:
 - lib
@@ -576,8 +570,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Sebastien Varrette aka Falkor's Common library to share Ruby code and {rake,cap}
@@ -599,4 +592,7 @@ test_files:
 - spec/falkorlib/versioning_spec.rb
 - spec/falkorlib/puppet_modules_spec.rb
 - spec/falkorlib/versioning_puppet_module_spec.rb
+- spec/falkorlib/bootstrap_vagrant_spec.rb
+- spec/falkorlib/bootstrap_mkdocs_spec.rb
 - spec/falkorlib/versioning_gem_spec.rb
+- spec/falkorlib/bootstrap_repo_spec.rb