falkorlib 0.7.11 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76ac30acb34753aee392761a3d3d3bb779a0e40e
-  data.tar.gz: 0fbb0c3f20f1ac99e8e070a3e4eafadf2606f044
+  metadata.gz: 1241d0b0ac6c35f26b8bc4c6cd4590f87da72adc
+  data.tar.gz: 42b0b755cf2d606c68f2f43b3059111842eeac4c
 SHA512:
-  metadata.gz: 7dc680e984085557b1ef548c755f3362a4095c50408548d67d9e0d55b578347b31611cb95baecd3d79936d2174908abb1cff9c436d2d582b7e66ff518c02bfa1
-  data.tar.gz: 4ec409045636b70f04d067b13bea17cfddfda02f7c5fc89f1aa520f135b17a85717ff766a79306730aa6a8a71417b1047b0277ce3df6d5c1f44a4e58ce1a914f
+  metadata.gz: 0c3b9749fe46d00311ec2b88d75d93e4f29ce546804902dfa78f021f4c39b8c807b16b05dcb7028600d32b4be8b11d47ff935b460cf441e694311d346d80cf87
+  data.tar.gz: d7cbee49ac0992c9ab5a2148a6e6fa2228eb11eb9fef52f58ae3924c4238028b0890aa02377a17119185c9d3e2b0d7eef3f6e6b4916787028705d1385512586d

data/Gemfile.lock

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

data/completion/_falkor

@@ -1,7 +1,7 @@
 #compdef falkor
 ########################################################################################
 # -*- mode:sh; -*-
-# Time-stamp: <Tue 2017-04-04 11:43 svarrette>
+# Time-stamp: <Fri 2018-04-27 15:36 svarrette>
 #
 # ZSH completion for [FalkorLib](https://github.com/Falkor/falkorlib)
 #
@@ -46,6 +46,7 @@ _falkor()
         'mkdocs:Initialize mkdocs for the current project'
         'motd:bootstrap a Message of the Day (motd) file'
         'new:Initialize the directory PATH with one of Falkors template(s)'
+        'vagrant:Initialize vagrant in the current project'
         'version:Prints the FalkorLib version information'
     )
 
@@ -82,6 +83,8 @@ _falkor()
                     __falkor_motd   && ret=0   ;;
                 (new)
                     __falkor_new    && ret=0 ;;
+                (vagrant)
+                    __falkor_vagrant   && ret=0   ;;
                 (version|*)
                     _nothing
                     ;;
@@ -279,6 +282,15 @@ __falkor_motd() {
                '*:directory:_files -/'
 }
 
+##################
+__falkor_vagrant() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+               {--force,-f}'[Force generation]' \
+               '*:directory:_directories'
+}
 
 
 

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

data/templates/vagrant/Vagrantfile.erb

@@ -1,6 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-# Time-stamp: <Fri 2018-04-27 15:16 svarrette>
+# Time-stamp: <Fri 2018-04-27 15:36 svarrette>
 ###########################################################################################
 #             __     __                          _    __ _ _
 #             \ \   / /_ _  __ _ _ __ __ _ _ __ | |_ / _(_) | ___
@@ -132,12 +132,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # network settings
   ipaddr   = IPAddr.new network[:range]
   ip_range = ipaddr.to_range.to_a
-  ip_index = {
-    :frontend     => 2,
-    :controller   => 11,
-    :node         => 101,
-    :easybuild    => 1,
-  }
+  ip_index = 2
 
   # cosmetics for the post-up message
   __table = {
@@ -159,9 +154,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
     abort "Non-existing box OS '#{os}' for the VM '#{name}'" if  settings[:boxes][os.to_sym].nil?
     abort "Empty IP address range" if ip_range.empty?
-    abort "Unknown role '#{role}' for the VM '#{name}'" unless ip_index[role.to_sym]
-    ip = ip_range[ ip_index[role.to_sym].to_i ].to_s
-    ip_index[role.to_sym] += 1   # increment index for the next VM of this type
+    ip = ip_range[ ip_index.to_i ].to_s
+    ip_index += 1   # increment index for the next VM of this type
 
     config.vm.define "#{name}" do |c|
       c.vm.box      = settings[:boxes][os.to_sym]

data/templates/vagrant/vagrant/bootstrap.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Time-stamp: <Fri 2018-04-27 11:57 svarrette>
+# Time-stamp: <Fri 2018-04-27 15:53 svarrette>
 ###########################################################################################
 # __     __                          _     ____              _       _
 # \ \   / /_ _  __ _ _ __ __ _ _ __ | |_  | __ )  ___   ___ | |_ ___| |_ _ __ __ _ _ __
@@ -202,57 +202,6 @@ EOF
 EOF
 }
 
-setup_easybuild() {
-    cat <<EOF > /etc/profile.d/easybuild.sh
-export EASYBUILD_PREFIX=\$HOME/.local/easybuild
-export GLOBAL_EASYBUILD_PREFIX=/opt/apps/
-export EASYBUILD_MODULES_TOOL=Lmod
-export EASYBUILD_MODULE_NAMING_SCHEME=CategorizedModuleNamingScheme
-# Use the below variable to run:
-#    module use $LOCAL_MODULES
-#    module load tools/EasyBuild
-export LOCAL_MODULES=\$EASYBUILD_PREFIX/modules/all
-export GLOBAL_MODULES=\$GLOBAL_EASYBUILD_PREFIX/modules/all
-
-alias ma="module avail"
-alias ml="module list"
-function mu(){
-    module use \$GLOBAL_MODULES
-    module use \$LOCAL_MODULES
-    module load tools/EasyBuild
-}
-
-# Prepend directories holding eb file for this turorial to the robot path
-# See http://easybuild.readthedocs.io/en/latest/Using_the_EasyBuild_command_line.html?highlight=EASYBUILD_ROBOT#prepending-and-or-appending-to-the-default-robot-search-path
-# export EASYBUILD_ROBOT_PATHS=\$(find /vagrant/resources/ -name *.eb | xargs dirname | sort | uniq | xargs echo | tr ' ' ':'):
-
-alias global_eb='eb --installpath=\$GLOBAL_EASYBUILD_PREFIX'
-
-EOF
-    pip install --upgrade pip
-    pip install functools32
-    if [ ! -f "${EB_INSTALL_SCRIPT}" ]; then
-        curl -o ${EB_INSTALL_SCRIPT} ${EB_INSTALL_SCRIPT_URL}
-    fi
-
-    info 'Installing Easybuild'
-    sudo -u vagrant EASYBUILD_MODULE_NAMING_SCHEME=CategorizedModuleNamingScheme python ${EB_INSTALL_SCRIPT} ~vagrant/.local/easybuild
-}
-
-setup_pyenv() {
-    cat <<EOF > /etc/profile.d/pyenv.sh
-if [ -d "\$HOME/.pyenv" ]; then
-    export PATH="\$HOME/.pyenv/bin:\$PATH"
-    eval "\$(pyenv init -)"
-    eval "\$(pyenv virtualenv-init -)"
-fi
-EOF
-    if [ ! -h "/home/vagrant/.config/direnv" ]; then
-        sudo -u vagrant mkdir -p /home/vagrant/.config
-        sudo -u vagrant ln -sf /vagrant/config/direnv /home/vagrant/.config/direnv
-    fi
-}
-
 
 ######################################################################################
 [ $UID -gt 0 ] && error "You must be root to execute this script (current uid: $UID)"
@@ -284,5 +233,3 @@ esac
 
 setup_dotfiles
 setup_motd
-setup_easybuild
-setup_pyenv

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.13
 platform: ruby
 authors:
 - Sebastien Varrette