falkorlib 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90a5f15ae97eb39936de7384fd80190a25ec572d3524e740f6d11fc9eeb46ded
-  data.tar.gz: 1f6f2e77ba4781fcae3cf069c144cb0ab85a2e347e54e1b2f464b31a84132e5e
+  metadata.gz: 0f786dce0ea4688bcc56a0b9e137c878c5fab6f23222aa07823586d8e83430bf
+  data.tar.gz: 23dd8c3abc0ca90109ae5a7efc343225958ef15917200e1859c09b82a1bff8e9
 SHA512:
-  metadata.gz: 94800fe66c39db12b8052daf513de624299852372f95683e3a155d9da9f8bf5b3a0ee753d3386d3c572addd3246b602900445c86ea145715ed703949bfcb04f4
-  data.tar.gz: 41c9d9e4ab300564a5dff87b81bc43357f8a04f916b90b503b81c4752cf7beda5d3b656582228bc314384d54b220792f25502370126666779c7b58a5309e55d3
+  metadata.gz: e80988389ff522f9251e7da09e06ad42d0e2d0134676472670cc4d7c9726b0229cc10f6aad2718cb30555d8f65ec2badd5498c4d4bb7fab5911c963302ea2df2
+  data.tar.gz: 6ba0d55a05f44cd2aa445141447ca5db6db1aa2f1b3844f4e3b6ea5c1f5f496075230afb7c1e4107e162504d246008700de187f23bef43dd5ea54acf27c862b5

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.8.6)
+    falkorlib (0.8.7)
       activesupport (~> 4.0)
       artii (>= 2.1)
-      awesome_print (~> 1.2)
+      awesome_print (> 1.2)
       configatron (~> 3.0)
-      deep_merge (~> 1.0.1)
+      deep_merge (~> 1.0)
       diffy (>= 3.0)
       facter (~> 2.4.1)
       git_remote_branch (~> 0)
-      json (~> 2.0)
+      json (> 2.0)
       license-generator (~> 0)
       logger (>= 1.2.8)
       minigit (~> 0)
       rake (>= 12.3.3)
-      term-ansicolor (~> 1.3)
+      term-ansicolor (> 1.3)
       thor (>= 1.0)
 
 GEM
@@ -34,7 +34,7 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.6)
     configatron (3.2.0)
-    deep_merge (1.0.1)
+    deep_merge (1.2.1)
     diff-lcs (1.3)
     diffy (3.3.0)
     docile (1.3.2)

data/falkorlib.gemspec

@@ -68,22 +68,21 @@ Gem::Specification.new do |s|
   #   "~> 2.2.0"              (shortcut for ">= 2.2.0", "< 2.3.0")
   #
   #s.add_dependency("rake", ">= 10.1.0")
-  s.add_runtime_dependency 'rake', '>= 12.3.3'
+  s.add_runtime_dependency 'rake',              '>= 12.3.3'
   s.add_runtime_dependency 'git_remote_branch', '~> 0'
-  #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.0")
-  s.add_runtime_dependency("awesome_print", "~> 1.2")
-  s.add_runtime_dependency("json", "~> 2.0")
+  s.add_runtime_dependency('minigit',           '~> 0')
+  s.add_runtime_dependency("term-ansicolor",    '> 1.3')
+  s.add_runtime_dependency("configatron",       '~> 3.0')
+  s.add_runtime_dependency("awesome_print",     '> 1.2')
+  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",   '>= 1.0')
-  s.add_runtime_dependency("artii",  '>= 2.1')
-  s.add_runtime_dependency("facter", '~> 2.4.1')
-  s.add_runtime_dependency("activesupport", '~> 4.0')
+  s.add_runtime_dependency("deep_merge",        '~> 1.0')
+  s.add_runtime_dependency("diffy",             '>= 3.0')
+  s.add_runtime_dependency("logger",            '>= 1.2.8')
+  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("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')

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, 6
+    MAJOR, MINOR, PATCH = 0, 8, 7
 
     module_function
 

data/templates/README/readme_git.erb

@@ -1,15 +1,8 @@
-## Advanced Topics
+## Misc.
 
 ### Git
 
-This repository make use of [Git](http://git-scm.com/) such that you should have it installed on your working machine: 
-
-       $> apt-get install git-core # On Debian-like systems
-       $> yum install git          # On CentOS-like systems
-       $> brew install git         # On Mac OS, using [Homebrew](http://mxcl.github.com/homebrew/)
-       $> port install git         # On Mac OS, using MacPort
-
-Consider these resources to become more familiar (if not yet) with Git:
+This repository make use of [Git](http://git-scm.com/). Consider these resources to become more familiar (if not yet) with Git:
 
 * [Simple Git Guide](http://rogerdudler.github.io/git-guide/)
 * [Git book](http://book.git-scm.com/index.html)
@@ -25,18 +18,3 @@ At least, you shall configure the following variables
        $> git config --global color.status auto
        $> git config --global color.branch auto
 
-Note that you can create git command aliases in `~/.gitconfig` as follows: 
-
-       [alias]
-           up = pull origin
-           pu = push origin
-           st = status
-           df = diff
-           ci = commit -s
-           br = branch
-           w  = whatchanged --abbrev-commit
-           ls = ls-files
-           gr = log --graph --oneline --decorate
-           amend = commit --amend
-
-Consider my personal [`.gitconfig`](https://github.com/Falkor/dotfiles/blob/master/git/.gitconfig) as an example -- if you decide to use it, simply copy it in your home directory and adapt the `[user]` section. 

data/templates/README/readme_pyenv.erb

@@ -1,11 +1,21 @@
 ## Python Virtualenv / Pyenv and Direnv
 
-You will have to ensure you have installed [direnv](https://direnv.net/) (configured by [`.envrc`](.envrc)), [pyenv](https://github.com/pyenv/pyenv) and [`pyenv-virtualenv`](https://github.com/pyenv/pyenv-virtualenv). This assumes also the presence of `~/.config/direnv/direnvrc` from [this page](https://github.com/Falkor/dotfiles/blob/master/direnv/direnvrc) - for more details, see [this blog post](https://varrette.gforge.uni.lu/blog/2019/09/10/using-pyenv-virtualenv-direnv/).
+You will have to ensure you have installed [direnv](https://direnv.net/) (configured by [`.envrc`](.envrc)), used to automatically activate the virtual environment associated to this project. 
+This assumes also the presence of `~/.config/direnv/direnvrc` from [this page](https://github.com/Falkor/dotfiles/blob/master/direnv/direnvrc) with will be automatically installed when issuing `make setup-direnv` - for more details, see [this blog post](https://varrette.gforge.uni.lu/blog/2019/09/10/using-pyenv-virtualenv-direnv/). 
 
-You can run the following command to setup your local machine in a compliant way:
+Then, you can either rely on [pyenv](https://github.com/pyenv/pyenv) and [`pyenv-virtualenv`](https://github.com/pyenv/pyenv-virtualenv) (most transparent approach). You can run the following command to setup your local machine in a compliant way (this was normally done as part of the `make setup` step) :
 
+```bash
+make setup-direnv
+make setup-pyenv   # OR make setup-venv
 ```
-make setup-pyenv   # AND/OR 'make setup-direnv'
+
+Adapt your favorite shell configuration as suggested. You may want to add the following:
+
+``` bash
+for f in $XDG_CONFIG_HOME/*/init.sh; do
+  . ${f}
+done
 ```
 
 Running `direnv allow` (this will have to be done only once), you should automatically enable the virtualenv `<%= name.downcase %>` based on the python version specified in [`.python-version`](.python-version). You'll eventually need to install the appropripriate Python version with `pyenv`:
@@ -18,27 +28,20 @@ cd ..
 cd -
 ```
 
-From that point, you should install the required packages using:
-
-    pip install -r requirements.txt
-
-Alternatively, you can use `make setup-python`
-
-## Python Code Development
+If you don't like [pyenv](https://github.com/pyenv/pyenv), you can rely on classical [python 3 venv](https://docs.python.org/fr/3/library/venv.html) initiated from `make setup-venv`. You can then activate it with 
 
-The Python code for `<%= name.downcase %>` is developed as a Python package, i.e. following the [official guidelines](https://packaging.python.org/overview/).
-
-To play in live with the code while developing it, install it in "_editable_" mode by running:
-
-    pip install -e ./
-
-In practice:
+```bash
+# Alternative using venv
+source venv/<%= name.downcase %>/bin/activate
+```
 
-    cd src
-    make
+From that point, you should install the required packages using:
 
-Later on, you can clean the directory using
+``` bash
+make setup-python
 
-    make clean
+# OR (manually)
+pip install --upgrade pip
+pip install -r requirements.txt
+```
 
-Now you can enjoy live runs.

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

@@ -14,7 +14,7 @@ Once installed, check the list of VMs ready to be deployed using
 
 ```bash
 $> vagrant status
-# Follow instructions to (eventually) install the missing plugings
+# Follow instructions to (eventually) install the missing plugins
 $> vagrant plugin install
 $> vagrant plugin install vagrant-hosts
 $> vagrant plugin install vagrant-vbguest

data/templates/vagrant/Vagrantfile.erb

@@ -39,10 +39,12 @@ VAGRANTFILE_API_VERSION = "2"
 
 # Eventually a local YAML configuration for the deployment
 TOP_SRCDIR  = File.expand_path File.dirname(__FILE__)
-TOP_CONFDIR = File.join(TOP_SRCDIR, 'vagrant')
-TOP_PUPPETDIR = File.join(TOP_CONFDIR, 'puppet')
-TOP_PUPPET_MODULEDIR = File.join(TOP_PUPPETDIR, 'modules')
-config_file = File.join(TOP_CONFDIR, 'config.yaml')
+CONFDIR     = 'vagrant'
+config_file = File.join(TOP_SRCDIR, CONFDIR, 'config.yaml')
+
+PUPPETDIR        = File.join(CONFDIR, 'puppet')
+TOP_PUPPETDIR    = File.join(TOP_SRCDIR, PUPPETDIR)
+PUPPET_MODULEDIR = File.join(PUPPETDIR, 'modules')
 
 #SHARED_DIR  = File.join('vagrant', 'shared')
 
@@ -195,7 +197,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       # Install required puppet modules, if any
       puppet_modules.each do |mod|
         config.vm.provision "shell",
-                            inline: "puppet module install --target-dir #{TOP_PUPPET_MODULEDIR} #{mod}"
+                            inline: "puppet module install --target-dir /vagrant/#{PUPPET_MODULEDIR} #{mod}"
       end
 
       # A role fact MUST be defined (default: 'default') as it is used in Hiera config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,14 +56,14 @@ dependencies:
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -84,28 +84,28 @@ dependencies:
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement