falkorlib 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a2be7e401bb0c048852b5055a11052a3127592eb29c92e842b965ab514c52ac
-  data.tar.gz: 6fb44cf204d9133d5bcf393cc1fee5804eef4dbb140d8fe7f7a96f41b4614807
+  metadata.gz: 90a5f15ae97eb39936de7384fd80190a25ec572d3524e740f6d11fc9eeb46ded
+  data.tar.gz: 1f6f2e77ba4781fcae3cf069c144cb0ab85a2e347e54e1b2f464b31a84132e5e
 SHA512:
-  metadata.gz: dbb376c66b0d1227c437bdeeac132df2266bf55292a2dff93f1ee301785963483cd699ec572919a3a4635a801c9680444152e675446c9ffc54d3bf985a925409
-  data.tar.gz: df0242f9a3587564db11786ee415184dfba69ccafe31167a7a859af7f50a565b00bae25533f20a0326aa2e57765e63a06b9f536acd0f12826e1d19342c84f2a0
+  metadata.gz: 94800fe66c39db12b8052daf513de624299852372f95683e3a155d9da9f8bf5b3a0ee753d3386d3c572addd3246b602900445c86ea145715ed703949bfcb04f4
+  data.tar.gz: 41c9d9e4ab300564a5dff87b81bc43357f8a04f916b90b503b81c4752cf7beda5d3b656582228bc314384d54b220792f25502370126666779c7b58a5309e55d3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.8.5)
+    falkorlib (0.8.6)
       activesupport (~> 4.0)
       artii (>= 2.1)
       awesome_print (~> 1.2)

data/lib/falkorlib/bootstrap/base.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sun 2020-04-12 14:37 svarrette>
+# Time-stamp: <Mon 2020-04-20 17:21 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -29,11 +29,10 @@ module FalkorLib #:nodoc:
             :hook     => 'pre-commit.git-crypt.sh',
             :ulhpc    => [
               #'0x5D08BCDD4F156AD7',  # S. Varrette
-              #'0x3F3242C5B34D98C2',   # V. Plugaru
               '0x6429C2514EBC4737',   # S. Peter
-              #'0x07FEA8BA69203C2D',   # C. Parisot
               '0x37183CEF550DF40B',   # H. Cartiaux
-
+              '0x10717CE35947FEDF',   # E. Kieffer
+              '0x710A74A36A99455A',   # F. Pinel
             ],
             # :hooks    => {
             #   :precommit => 'https://gist.github.com/848c82daa63710b6c132bb42029b30ef.git',
@@ -62,9 +61,9 @@ module FalkorLib #:nodoc:
             :institute       => 'University of Luxembourg',
             :department      => 'Parallel Computing and Optimization Group',
             :department_acro => 'PCOG',
-            :address         => '7, rue Richard Coudenhove-Kalergie',
-            :zipcode         => 'L-1359',
-            :location        => 'Luxembourg',
+            :address         => '2, avenue de l\'Université',
+            :zipcode         => 'L-4365',
+            :location        => 'Esch-sur-Alzette, Luxembourg',
             :phone           => '(+352) 46 66 44 6600',
             :twitter         => 'svarrette',
             :linkedin        => 'svarrette',
@@ -139,6 +138,7 @@ module FalkorLib #:nodoc:
             :domain => 'vagrant.dev',
             :range  => '10.10.1.0/24',
             :boxes => {
+              :centos8  => 'generic/centos8', #'centos/8' is having issue - see https://github.com/dotless-de/vagrant-vbguest/issues/367
               :centos7  => 'centos/7',
               :debian8  => 'debian/contrib-jessie64',
               :ubuntu14 => 'ubuntu/trusty64'
@@ -313,13 +313,17 @@ module FalkorLib
     # Supported options:
     #  * :no_interaction [boolean]: do not interact
     #  * :force          [boolean] force overwritting
-    #  * :license     [string]  License to use
-    #  * :licensefile [string]  License filename (default: LICENSE)
+    #  * :gem            [boolean] Ruby Gem
     #  * :latex          [boolean] describe a LaTeX project
+    #  * :license        [string]  License to use
+    #  * :licensefile    [string]  License filename (default: LICENSE)
     #  * :octopress      [boolean] octopress site
+    #  * :pyenv          [boolean] Python virtualenv/pyenv/direnv
+    #  * :rvm            [boolean] Ruby RVM
     ##
     def readme(dir = Dir.pwd, options = {})
       info "Bootstrap a README file for this project"
+      path = normalized_path(dir)
       # get the local configuration
       local_config = FalkorLib::Config.get(dir)
       config = FalkorLib::Config::Bootstrap::DEFAULTS[:metadata].clone
@@ -381,7 +385,7 @@ module FalkorLib
                          when :author
                            (config[:by] == 'ULHPC') ? 'UL HPC Team' : config[:author]
                          when :mail
-                           (config[:by] == 'ULHPC') ? 'hpc-sysadmins@uni.lu'   : config[:mail]
+                           (config[:by] == 'ULHPC') ? 'hpc-team@uni.lu' : config[:mail]
                          when :description
                            (config[:description].empty?) ? (config[:summary]).to_s : (config[:description]).to_s
                          when :source
@@ -398,6 +402,7 @@ module FalkorLib
       tags = ask("\tKeywords (comma-separated list of tags)", config[:tags].join(','))
       config[:tags]    = tags.split(',')
       config[:license] = select_licence if config[:license].empty?
+      config[:rootdir] = path
       # stack the ERB files required to generate the README
       templatedir = File.join( FalkorLib.templates, 'README')
       erbfiles = [ 'header_readme.erb' ]
@@ -409,6 +414,7 @@ module FalkorLib
       erbfiles << "readme_gitflow.erb" if FalkorLib::GitFlow.init?(dir)
       erbfiles << "readme_rvm.erb"     if config[:type].include?(:rvm)
       erbfiles << "readme_mkdocs.erb"  if options[:mkdocs]
+      erbfiles << "readme_pyenv.erb"   if config[:type].include?(:pyenv)
       erbfiles << "footer_readme.erb"
 
       content = ""
@@ -502,6 +508,9 @@ module FalkorLib
       use_git = FalkorLib::Git.init?(path)
       rootdir = (use_git) ? FalkorLib::Git.rootdir(path) : path
       local_config = FalkorLib::Config.get(rootdir, :local)
+      if FalkorLib::GitFlow.init?(rootdir)
+        local_config[:project][:gitflow] = FalkorLib::GitFlow.guess_gitflow_config(rootdir) if local_config[:project]
+      end
       return local_config[:project] if local_config[:project]
       # Otherwise, guess the rest of the configuration
       config = FalkorLib::Config::Bootstrap::DEFAULTS[:metadata].clone
@@ -538,9 +547,7 @@ module FalkorLib
       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
+       config
     end # guess_project_config
 
 

data/lib/falkorlib/bootstrap/git.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sun 2020-04-12 14:35 svarrette>
+# Time-stamp: <Mon 2020-04-20 16:13 svarrette>
 ################################################################################
 # Interface for the main Bootstrapping operations
 #
@@ -38,7 +38,7 @@ module FalkorLib
     # * :gem         [boolean] Initiate a Ruby gem project           **NOT YET IMPLEMENTED**
     # * :mkdocs      [boolean] Initiate MkDocs within your project
     # * :rvm         [boolean] Initiate a RVM-based Ruby project
-    # * :pyenv       [boolean] Initiate a pyenv-based Python project **NOT YET IMPLEMENTED**
+    # * :pyenv       [boolean] Initiate a pyenv-based Python project
     # * :octopress   [boolean] Initiate an Octopress web site        **NOT YET IMPLEMENTED**
     ##
     def repo(name, options = {})
@@ -92,6 +92,9 @@ module FalkorLib
       # === RVM ====
       FalkorLib::Bootstrap.rvm(path, options) if options[:rvm]
 
+      # === Pyenv/Virtualenv/Direnv ====
+      FalkorLib::Bootstrap.pyenv(path, options) if options[:pyenv]
+
       # === README ===
       FalkorLib::Bootstrap.readme(path, options) # This should also save the project configuration
       # collect the set options

data/lib/falkorlib/bootstrap/mkdocs.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Mon 2017-01-16 10:13 svarrette>
+# Time-stamp: <Mon 2020-04-20 17:52 svarrette>
 ################################################################################
 # Interface for Bootstrapping MkDocs
 #
@@ -32,8 +32,8 @@ module FalkorLib
       rootdir = (use_git) ? FalkorLib::Git.rootdir(path) : path
       templatedir = File.join( FalkorLib.templates, 'mkdocs')
       config = guess_project_config(rootdir, options)
-      config[:sitename] = ask("\tSite name: ", config[:name].capitalize)
-      puts config.to_yaml
+      config[:rootdir]  = rootdir
+      config[:sitename] = ask("\tSite name: ", config[:name])
       #FalkorLib::GitFlow.start('feature', 'mkdocs', rootdir) if (use_git && FalkorLib::GitFlow.init?(rootdir))
       init_from_template(templatedir, rootdir, config,
                          :no_interaction => true,
@@ -41,7 +41,6 @@ module FalkorLib
       Dir.chdir( File.join(rootdir, 'docs')) do
         run %(ln -s README.md index.md )
         run %(ln -s README.md contributing/index.md )
-        run %(ln -s README.md setup/index.md )
       end
       #exit_status.to_i
     end # mkdocs

data/lib/falkorlib/bootstrap/vagrant.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sun 2020-04-12 16:47 svarrette>
+# Time-stamp: <Mon 2020-04-20 10:23 svarrette>
 ################################################################################
 # Interface for Bootstrapping MkDocs
 #
@@ -47,9 +47,15 @@ module FalkorLib
       init_from_template(templatedir, rootdir, config,
                          :no_interaction => true,
                          :no_commit => true)
-      [ 'bootstrap.sh', 'config.yaml.sample' ].each do |f|
-        FalkorLib::Git.add(File.join(rootdir, 'vagrant', "#{f}")) if use_git
+      confdir    = File.join(dir, 'vagrant')
+      [ 'config.yaml.sample' ].each do |f|
+        FalkorLib::Git.add(File.join(confdir, "#{f}")) if use_git
       end
+      scriptsdir = File.join(confdir, 'scripts')
+      [ 'bootstrap.sh'].each do |f|
+        FalkorLib::Git.add(File.join(scriptsdir, "#{f}")) if use_git
+      end
+      #puppetdir  = File.join(confdir, 'puppet')
       Dir.chdir( rootdir ) do
         run %(git ignore '.vagrant/' ) if command?('git-ignore')
         #   run %(ln -s README.md index.md )

data/lib/falkorlib/cli.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Thu 2018-11-08 23:16 svarrette>
+# Time-stamp: <Mon 2020-04-20 17:04 svarrette>
 ################################################################################
 # Interface for the CLI
 #
@@ -17,15 +17,27 @@ require 'falkorlib/cli/link'
 require 'falkorlib/cli/make'
 
 
-
 module FalkorLib
   # Falkor CLI Application, based on [Thor](http://whatisthor.com)
   module CLI
     # Main Application
     class App < ::Thor
 
+      # https://stackoverflow.com/questions/49042591/how-to-add-help-h-flag-to-thor-command
+      def self.start(*args)
+        if (Thor::HELP_MAPPINGS & ARGV).any? and subcommands.grep(/^#{ARGV[0]}/).empty?
+          Thor::HELP_MAPPINGS.each do |cmd|
+            if match = ARGV.delete(cmd)
+              ARGV.unshift match
+            end
+          end
+        end
+        super
+      end
+
       package_name 'Falkor[Lib]'
       map %w(--version -V) => :version
+      map %w[--help -h] => :help
 
       namespace :falkor
 
@@ -34,13 +46,13 @@ module FalkorLib
       # include ZshCompletion::Command
 
       #default_command :info
-
+      class_option :help, :aliases => ['-h', '--help'], type: :boolean
       class_option :verbose, :aliases => '-v', :type => :boolean,
-                             :desc => "Enable verbose output mode"
+                   :desc => "Enable verbose output mode"
       class_option :debug,   :type => :boolean, :default => FalkorLib.config[:debug],
-                             :desc => "Enable debug output mode"
+                   :desc => "Enable debug output mode"
       class_option :dry_run, :aliases => '-n', :type => :boolean,
-                             :desc => "Perform a trial run with (normally) no changes made"
+                   :desc => "Perform a trial run with (normally) no changes made"
 
       ###### commands ######
       desc "commands", "Lists all available commands"
@@ -56,9 +68,9 @@ FalkorLib retrieves its configuration from the local repository (in '<git_rootdi
 environment variables (NOT YET IMPLEMENTED), and the user's home directory (<home>/.falkor/config), in that order of priority.
 CONFIG_LONG_DESC
       method_option :global, :aliases => '-g', :type => :boolean,
-                             :desc => 'Operate on the global configuration'
+                    :desc => 'Operate on the global configuration'
       method_option :local,  :aliases => '-l', :type => :boolean,
-                             :desc => 'Operate on the local configuration of the repository'
+                    :desc => 'Operate on the local configuration of the repository'
       def config(_key = '')
         info "Thor options:"
         puts options.to_yaml
@@ -66,7 +78,7 @@ CONFIG_LONG_DESC
         puts FalkorLib.config.to_yaml
       end # config
 
-      #map %w[--help -h] => :help
+
 
       ###### gitcrypt ######
       method_option :owner, :aliases => '-o',
@@ -93,20 +105,20 @@ By default, <PATH> is '.' meaning that the repository will be initialized in the
       INIT_LONG_DESC
       #......................................................
       method_option :git_flow, :default => true, :type => :boolean,
-                               :desc => 'Bootstrap the repository with Git-glow'
+                    :desc => 'Bootstrap the repository with Git-glow'
       method_option :make, :default => true,     :type => :boolean,
-                           :desc => 'Use a Makefile to pilot the repository actions'
+                    :desc => 'Use a Makefile to pilot the repository actions'
       method_option :rake, :type => :boolean,
-                           :desc => 'Use a Rakefile (and FalkorLib) to pilot the repository actions'
+                    :desc => 'Use a Rakefile (and FalkorLib) to pilot the repository actions'
       method_option :interactive, :aliases => '-i', :default => true, :type => :boolean,
-                                  :desc => "Interactive mode, in particular to confirm Gitflow branch names"
+                    :desc => "Interactive mode, in particular to confirm Gitflow branch names"
       method_option :remote_sync, :aliases => '-r', :type => :boolean,
-                                  :desc => "Operate a git remote synchronization with remote. By default, all commits stay local"
+                    :desc => "Operate a git remote synchronization with remote. By default, all commits stay local"
       method_option :master, :default => 'production', :banner => 'BRANCH',
-                             :desc => "Master Branch name for production releases"
+                    :desc => "Master Branch name for production releases"
       method_option :develop, :aliases => [ '-b', '--branch', '--devel'],
-                              :default => 'devel', :banner => 'BRANCH',
-                              :desc => "Branch name for development commits"
+                    :default => 'devel', :banner => 'BRANCH',
+                    :desc => "Branch name for development commits"
       # method_option :latex, :aliases => '-l', :type => :boolean, :desc => "Initiate a LaTeX project"
       # #method_option :gem,   :type => :boolean, :desc => "Initiate a Ruby gem project"
       # method_option :rvm,   :type => :boolean, :desc => "Initiate a RVM-based Ruby project"
@@ -140,11 +152,11 @@ By default, <PATH> is '.' meaning that the repository will be initialized in the
 
       ###### motd ######
       method_option :file,     :aliases => '-f', :default => '/etc/motd',
-                               :desc => "File storing the message of the day"
+                    :desc => "File storing the message of the day"
       method_option :width,    :aliases => '-w', :default => 80, :type => :numeric,
-                               :desc => "Width for the text"
+                    :desc => "Width for the text"
       method_option :title,    :aliases => '-t',
-                               :desc => "Title to be placed in the motd (using asciify/figlet)"
+                    :desc => "Title to be placed in the motd (using asciify/figlet)"
       method_option :subtitle, :desc => "Eventual subtitle to place below the title"
       method_option :hostname, :desc => "Hostname"
       method_option :support,  :aliases => '-s', :desc => "Support/Contact mail"
@@ -160,7 +172,9 @@ By default, <PATH> is '.' meaning that the repository will be initialized in the
       desc "new <type> [<path>]", "Initialize the directory PATH with one of FalkorLib's template(s)"
       subcommand "new", FalkorLib::CLI::New
 
+
       ###### vagrant ######
+      #method_option :help, :aliases => '-h'
       method_option :force, :aliases => '-f', :default => false, :type => :boolean,
                     :desc => "Force generation (might overwrite files)"
       #......................................
@@ -176,161 +190,6 @@ By default, <PATH> is '.' meaning that the repository will be initialized in the
       end
 
     end # class App
-
     #puts Thor::ZshCompletion::Generator.new(App, "falkor").generate
   end # module CLI
 end
-
-
-
-
-
-# require_relative "commands/init"
-
-# module FalkorLib
-#   module CLI
-#     def self.const_missing(c)
-#       Object.const_get(c)
-#     end
-#   end
-# end
-
-# require 'falkorlib'
-
-
-# require 'thor'
-# require "thor/group"
-
-
-#require "falkorlib/commands/init"
-
-# require 'logger'
-
-# # Declare a logger to log messages:
-# LOGGER       = Logger.new(STDERR)
-# LOGGER.level = Logger::INFO
-
-
-# module FalkorLib
-#   # Falkor CLI Application, based on [Thor](http://whatisthor.com)
-
-#   require_relative "commands/init"
-
-#   module CLI
-
-#     def self.const_missing(c)
-#       Object.const_get(c)
-#     end
-
-
-# # Main CLI command for FalkorLib
-# class Command < Thor
-
-#   class_option :verbose, :type => :boolean
-
-#   require "falkorlib/commands/init"
-
-#   # ----------
-#   # desc "init <PATH> [options]", "Initialize the directory PATH with FalkorLib's template(s)"
-#   # subcommand "init", FalkorLib::CLI::Init
-
-# end # class FalkorLib::CLI::Command
-#   end
-# end
-
-
-
-
-# # Mercenary version
-
-# module FalkorLib
-
-#   # Falkor CLI Application, based on (finally) [Mercenary](http://www.rubydoc.info/gems/mercenary)
-#   # instead of [Thor](http://whatisthor.com)
-#   class Command
-
-#     # Keep a list of subclasses of FalkorLib::Command every time it's inherited
-#     # Called automatically.
-#     #
-#     # base - the subclass
-#     #
-#     # Returns nothing
-#     def self.inherited(base)
-#       subclasses << base
-#     end
-
-#     # A list of subclasses of FalkorLib::Command
-#     def self.subclasses
-#       @subclasses ||= []
-#     end
-
-#     def init_with_program(p)
-#       raise NotImplementedError.new("")
-#     end
-#   end
-# end
-
-
-
-
-
-
-
-
-
-
-
-# module FalkorLib  #:nodoc:
-#   module Config
-
-#     # Default configuration for FalkorLib::App
-#     module CLI
-#       # App defaults for FalkorLib
-#       DEFAULTS = {
-#                   # command-line options
-#                   :options   => {},
-#                   #:type      => "latex"
-#                  }
-#     end
-#   end
-# end
-
-
-# # ---------------------------
-# #    Command line parsing
-# # ---------------------------
-# module FalkorCLI
-#   class Init < Thor
-#     # # exit if bad parsing happen
-#     # def self.exit_on_failure?
-#     #   true
-#     # end
-
-#     class_option :verbose,
-#       :type    => :boolean,
-#       :default => false,
-#       :aliases => "-v",
-#       :desc    => "Verbose  mode"
-#     class_option :debug,
-#       :type    => :boolean,
-#       :default => false,
-#       :aliases => "-d",
-#       :desc    => "Debug  mode"
-
-
-#     desc "init", "Initialise a given template"
-#     long_desc <<-LONGDESC
-# Initialize a new directory according to <type> of template
-#     LONGDESC
-#     option :type,
-#       :required => true,
-#       :default  => 'repo',
-#       :type     => :string,
-#       :desc     => "Type of template to use to initialize this repository"
-#     def init(type)
-#       LOGGER.level = Logger::DEBUG if options[:verbose]
-#       puts "Hello, world!"
-
-#     end
-#   end
-# end # module FalkorLib