falkorlib 0.8.10 → 0.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +60 -117
  3. data/README.md +46 -10
  4. data/binscripts/bootstrap.sh +8 -10
  5. data/completion/_falkor +16 -1
  6. data/falkorlib.gemspec +14 -14
  7. data/lib/falkorlib/bootstrap/base.rb +37 -32
  8. data/lib/falkorlib/bootstrap/git.rb +19 -4
  9. data/lib/falkorlib/bootstrap/latex.rb +7 -2
  10. data/lib/falkorlib/bootstrap/vagrant.rb +17 -10
  11. data/lib/falkorlib/cli.rb +16 -1
  12. data/lib/falkorlib/common.rb +3 -3
  13. data/lib/falkorlib/config.rb +3 -3
  14. data/lib/falkorlib/gem_tasks.rb +1 -1
  15. data/lib/falkorlib/git_tasks.rb +1 -1
  16. data/lib/falkorlib/puppet_tasks.rb +1 -1
  17. data/lib/falkorlib/version.rb +2 -1
  18. data/spec/falkorlib/bootstrap_latex_spec.rb +6 -5
  19. data/spec/falkorlib/bootstrap_spec.rb +45 -1
  20. data/spec/falkorlib/git_spec.rb +2 -2
  21. data/spec/falkorlib/gitflow_spec.rb +5 -4
  22. data/templates/gitignore/All.gitignore +2 -0
  23. data/templates/gitignore/Python.gitignore +162 -0
  24. data/templates/gitignore/TeX.gitignore +309 -0
  25. data/templates/latex/beamer/.Makefile.local +1 -0
  26. data/templates/latex/beamer/_content.md.erb +1 -1
  27. data/templates/latex/beamer/main.tex.erb +20 -8
  28. data/templates/latex/images/logo_ANSSI.png +0 -0
  29. data/templates/latex/images/logo_RF.png +0 -0
  30. data/templates/motd/motd.erb +2 -2
  31. data/templates/vagrant/.gitignore +14 -0
  32. data/templates/vagrant/Vagrantfile.erb +53 -15
  33. data/templates/vagrant/vagrant/config.yaml.sample +9 -6
  34. data/templates/vagrant/vagrant/scripts/bootstrap.sh +32 -14
  35. metadata +86 -79
  36. data/templates/latex/images/logo_UL.pdf +0 -0
  37. data/templates/latex/images/logo_ULHPC.pdf +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: db8ca53a3ecb0adfbf404f4e0842295f96989c19c53ac931bd7fa38b037bec3c
4
- data.tar.gz: 40b40ad9380541e56c92c90f8adaf83e9587ddcbadf4832c517d49b5eed3f24e
3
+ metadata.gz: 37fcb8b97b1d69855519e107c3b498b224b4c58b82aaba45b517186726d2d3e7
4
+ data.tar.gz: 71829736e0e1d1b9998f1bc337ff54f966436fa453883f38808a3f200154cd1d
5
5
  SHA512:
6
- metadata.gz: ae8f5b217f1ba4336ad2cee401064f576e3f9c893ceb7bdd8c41e2b81fd3fef11846299d3f06b9e555510565a3479318997771b94c84be4c44cfe9225ff4f033
7
- data.tar.gz: 9a000a8b6c9c1d515493a5bf4cd147bbb8615fbe3dfe545e7934bb558225d3337d7d1520660a02dbe0e549c84e415f987735cb1e9a95bb170bf4fbe94d9aed07
6
+ metadata.gz: 76ef2f5dcf9894e58198a734b96ef835cc8d30797a5325e25bd074a6472f9c9a84a758c5e0f97e3223ebaa97398ab9f6bf827542a593e5199dd78c77710a31d8
7
+ data.tar.gz: 64190b4118bd42dade6007d705365b2f753737a07a31ac3a95d9dcc1f16e9fa08a3d0ffb7311dfe51cbddd75195d74f08d97ce87e02092bf482fdb386ab2072a
data/Gemfile.lock CHANGED
@@ -1,130 +1,89 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- falkorlib (0.8.10)
5
- activesupport (~> 5.0)
6
- artii (>= 2.1)
7
- awesome_print (> 1.2)
4
+ falkorlib (0.9.1)
5
+ activesupport (~> 6.1, >= 6.1.7.5)
6
+ artii (~> 2.1, >= 2.1.2)
7
+ awesome_print (~> 1.9, >= 1.9.2)
8
8
  configatron (~> 3.0)
9
9
  deep_merge (~> 1.0)
10
- diffy (>= 3.0)
11
- facter (~> 2.4.1)
10
+ diffy (~> 3.4, >= 3.4.2)
11
+ facter (~> 4.6.1)
12
12
  git_remote_branch (~> 0)
13
- json (> 2.0)
13
+ json (~> 2.6, >= 2.6.3)
14
14
  license-generator (~> 0)
15
- logger (>= 1.2.8)
15
+ logger (~> 1.6)
16
16
  minigit (~> 0)
17
- rake (>= 12.3.3)
17
+ rake (~> 13.1)
18
18
  term-ansicolor (> 1.3)
19
- thor (>= 1.0)
19
+ thor (~> 1.3)
20
20
 
21
21
  GEM
22
22
  remote: http://rubygems.org/
23
23
  specs:
24
- CFPropertyList (2.2.8)
25
- activesupport (5.2.8)
24
+ activesupport (6.1.7.6)
26
25
  concurrent-ruby (~> 1.0, >= 1.0.2)
27
- i18n (>= 0.7, < 2)
28
- minitest (~> 5.1)
29
- tzinfo (~> 1.1)
30
- addressable (2.8.0)
31
- public_suffix (>= 2.0.2, < 5.0)
26
+ i18n (>= 1.6, < 2)
27
+ minitest (>= 5.1)
28
+ tzinfo (~> 2.0)
29
+ zeitwerk (~> 2.3)
32
30
  artii (2.1.2)
33
31
  ast (2.4.2)
34
32
  awesome_print (1.9.2)
35
33
  coderay (1.1.3)
36
- concurrent-ruby (1.1.10)
34
+ concurrent-ruby (1.2.2)
37
35
  configatron (3.2.0)
38
36
  deep_merge (1.2.2)
39
37
  diff-lcs (1.5.0)
40
38
  diffy (3.4.2)
41
39
  docile (1.4.0)
42
- facter (2.4.6-universal-darwin)
43
- CFPropertyList (~> 2.2.6)
44
- faraday (1.10.0)
45
- faraday-em_http (~> 1.0)
46
- faraday-em_synchrony (~> 1.0)
47
- faraday-excon (~> 1.1)
48
- faraday-httpclient (~> 1.0)
49
- faraday-multipart (~> 1.0)
50
- faraday-net_http (~> 1.0)
51
- faraday-net_http_persistent (~> 1.0)
52
- faraday-patron (~> 1.0)
53
- faraday-rack (~> 1.0)
54
- faraday-retry (~> 1.0)
55
- ruby2_keywords (>= 0.0.4)
56
- faraday-em_http (1.0.0)
57
- faraday-em_synchrony (1.0.0)
58
- faraday-excon (1.1.0)
59
- faraday-httpclient (1.0.1)
60
- faraday-multipart (1.0.3)
61
- multipart-post (>= 1.2, < 3)
62
- faraday-net_http (1.0.1)
63
- faraday-net_http_persistent (1.2.0)
64
- faraday-patron (1.0.0)
65
- faraday-rack (1.0.0)
66
- faraday-retry (1.0.3)
67
- faraday_middleware (1.2.0)
68
- faraday (~> 1.0)
69
- gh (0.18.0)
70
- activesupport (~> 5.0)
71
- addressable (~> 2.4)
72
- faraday (~> 1.0)
73
- faraday_middleware (~> 1.0)
74
- multi_json (~> 1.0)
75
- net-http-persistent (~> 2.9)
76
- net-http-pipeline
40
+ facter (4.6.1)
41
+ hocon (~> 1.3)
42
+ thor (>= 1.0.1, < 2.0)
77
43
  git_remote_branch (0.3.8)
78
- hashr (0.0.22)
79
- highline (2.0.3)
80
- i18n (1.10.0)
44
+ hocon (1.4.0)
45
+ i18n (1.14.1)
81
46
  concurrent-ruby (~> 1.0)
82
- io-console (0.5.11)
83
- irb (1.4.1)
84
- reline (>= 0.3.0)
85
- json (2.6.2)
86
- json_pure (2.6.2)
87
- launchy (2.4.3)
88
- addressable (~> 2.3)
47
+ io-console (0.6.0)
48
+ irb (1.10.0)
49
+ rdoc
50
+ reline (>= 0.3.8)
51
+ json (2.7.0)
89
52
  license-generator (0.4.1)
90
53
  thor
91
- logger (1.5.1)
54
+ logger (1.6.0)
92
55
  method_source (1.0.0)
93
56
  minigit (0.0.4)
94
- minitest (5.15.0)
95
- multi_json (1.15.0)
96
- multipart-post (2.2.0)
97
- net-http-persistent (2.9.4)
98
- net-http-pipeline (1.0.1)
99
- parallel (1.22.1)
57
+ minitest (5.20.0)
58
+ parallel (1.23.0)
100
59
  parser (2.7.2.0)
101
60
  ast (~> 2.4.1)
102
61
  powerpack (0.1.3)
103
- pry (0.14.1)
62
+ pry (0.14.2)
104
63
  coderay (~> 1.1)
105
64
  method_source (~> 1.0)
106
- public_suffix (4.0.7)
107
- pusher-client (0.6.2)
108
- json
109
- websocket (~> 1.0)
65
+ psych (5.1.2)
66
+ stringio
110
67
  rainbow (2.2.2)
111
68
  rake
112
- rake (13.0.6)
113
- reline (0.3.1)
69
+ rake (13.1.0)
70
+ rdoc (6.6.3.1)
71
+ psych (>= 4.0.0)
72
+ reline (0.4.1)
114
73
  io-console (~> 0.5)
115
- rspec (3.11.0)
116
- rspec-core (~> 3.11.0)
117
- rspec-expectations (~> 3.11.0)
118
- rspec-mocks (~> 3.11.0)
119
- rspec-core (3.11.0)
120
- rspec-support (~> 3.11.0)
121
- rspec-expectations (3.11.0)
74
+ rspec (3.12.0)
75
+ rspec-core (~> 3.12.0)
76
+ rspec-expectations (~> 3.12.0)
77
+ rspec-mocks (~> 3.12.0)
78
+ rspec-core (3.12.2)
79
+ rspec-support (~> 3.12.0)
80
+ rspec-expectations (3.12.3)
122
81
  diff-lcs (>= 1.2.0, < 2.0)
123
- rspec-support (~> 3.11.0)
124
- rspec-mocks (3.11.1)
82
+ rspec-support (~> 3.12.0)
83
+ rspec-mocks (3.12.6)
125
84
  diff-lcs (>= 1.2.0, < 2.0)
126
- rspec-support (~> 3.11.0)
127
- rspec-support (3.11.0)
85
+ rspec-support (~> 3.12.0)
86
+ rspec-support (3.12.1)
128
87
  rubocop (0.49.1)
129
88
  parallel (~> 1.10)
130
89
  parser (>= 2.3.3.1, < 3.0)
@@ -132,56 +91,40 @@ GEM
132
91
  rainbow (>= 1.99.1, < 3.0)
133
92
  ruby-progressbar (~> 1.7)
134
93
  unicode-display_width (~> 1.0, >= 1.0.1)
135
- ruby-progressbar (1.11.0)
136
- ruby2_keywords (0.0.5)
137
- rubygems-tasks (0.2.5)
94
+ ruby-progressbar (1.13.0)
95
+ rubygems-tasks (0.2.6)
138
96
  irb (~> 1.0)
139
- safe_yaml (0.9.7)
97
+ rake (>= 10.0.0)
140
98
  simplecov (0.17.1)
141
99
  docile (~> 1.1)
142
100
  json (>= 1.8, < 3)
143
101
  simplecov-html (~> 0.10.0)
144
102
  simplecov-html (0.10.2)
103
+ stringio (3.1.0)
145
104
  sync (0.5.0)
146
105
  term-ansicolor (1.7.1)
147
106
  tins (~> 1.0)
148
- thor (1.2.1)
149
- thread_safe (0.3.6)
150
- tins (1.31.1)
107
+ thor (1.3.0)
108
+ tins (1.32.1)
151
109
  sync
152
- travis (1.11.0)
153
- faraday (~> 1.0)
154
- faraday_middleware (~> 1.0)
155
- gh (~> 0.13)
156
- highline (~> 2.0)
157
- json_pure (~> 2.3)
158
- launchy (~> 2.1, < 2.5.0)
159
- pusher-client (~> 0.4)
160
- travis-lint (1.8.0)
161
- hashr (~> 0.0.22)
162
- safe_yaml (~> 0.9.0)
163
- tzinfo (1.2.9)
164
- thread_safe (~> 0.1)
110
+ tzinfo (2.0.6)
111
+ concurrent-ruby (~> 1.0)
165
112
  unicode-display_width (1.8.0)
166
- webrick (1.7.0)
167
- websocket (1.2.9)
168
- yard (0.9.28)
169
- webrick (~> 1.7.0)
113
+ yard (0.9.36)
114
+ zeitwerk (2.6.12)
170
115
 
171
116
  PLATFORMS
172
- x86_64-darwin-19
117
+ x86_64-linux
173
118
 
174
119
  DEPENDENCIES
175
- bundler (~> 2.3)
120
+ bundler (~> 2.4)
176
121
  falkorlib!
177
122
  pry (~> 0.9)
178
123
  rspec (~> 3.0)
179
124
  rubocop (~> 0.49.0)
180
125
  rubygems-tasks (~> 0.2)
181
126
  simplecov (<= 0.17.1)
182
- travis (~> 1.11)
183
- travis-lint (~> 1.8)
184
127
  yard (>= 0.9.20)
185
128
 
186
129
  BUNDLED WITH
187
- 2.3.17
130
+ 2.4.22
data/README.md CHANGED
@@ -13,7 +13,7 @@ Coverage](https://api.codeclimate.com/v1/badges/9f1c7762f29572b3f8f0/test_covera
13
13
  |_| \__,_|_|_|\_\___/|_| |_____|_|_.__/
14
14
 
15
15
 
16
- Copyright (c) 2012-2022 Sebastien Varrette <Sebastien.Varrette@uni.lu>
16
+ Copyright (c) 2012-2024 Sebastien Varrette <Sebastien.Varrette@gmail.com>
17
17
 
18
18
  Sebastien Varrette aka Falkor's Common library to share Ruby code, `{rake,cap}`
19
19
  tasks and project templates
@@ -116,15 +116,16 @@ This library comes with a CLI `falkor`, providing the following [sub] commands.
116
116
 
117
117
  __Base commands__
118
118
 
119
- | Command | Description |
120
- |------------------------------------|-------------------------------------------------------------------|
121
- | `falkor --version, -V` | Print the version number of Falkor[Lib] |
122
- | `falkor help [COMMAND]` | Describe available commands or one specific command |
123
- | `falkor gitcrypt <PATH> [options]` | Initialize git-crypt for the current repository |
124
- | `falkor init <PATH> [options]` | Bootstrap a Git[flow] Repository |
125
- | `falkor mkdocs [options]` | Initialize mkdocs for the current project |
126
- | `falkor motd <PATH> [options]` | Initiate a 'motd' file - message of the day |
127
- | `falkor vagrant [options]` | Initialize vagrant for the current project |
119
+ | Command | Description |
120
+ |-------------------------------------+-----------------------------------------------------|
121
+ | `falkor --version, -V` | Print the version number of Falkor[Lib] |
122
+ | `falkor help [COMMAND]` | Describe available commands or one specific command |
123
+ | `falkor gitcrypt <PATH> [options]` | Initialize git-crypt for the repository |
124
+ | `falkor gitignore <PATH> [options]` | Populate .gitignore |
125
+ | `falkor init <PATH> [options]` | Bootstrap a Git[flow] Repository |
126
+ | `falkor mkdocs [options]` | Initialize mkdocs for the current project |
127
+ | `falkor motd <PATH> [options]` | Initiate a 'motd' file - message of the day |
128
+ | `falkor vagrant [options]` | Initialize vagrant for the current project |
128
129
 
129
130
  __`falkor link <type> [path]`__
130
131
 
@@ -491,6 +492,41 @@ Then install the required dependent gems as follows:
491
492
 
492
493
  $> bundle install
493
494
 
495
+ ### Using bundle during developments
496
+
497
+ When you are developping /contributing to this module, you can test *locally* the `falkor` CLI with:
498
+
499
+ ```bash
500
+ bundle exec falkor [...] /path/to/testing/directory
501
+ ```
502
+
503
+ ### Release a new gem
504
+
505
+ (notes for myself ;))
506
+
507
+ Once satisfied with the changes:
508
+
509
+ * disable (temporarily) git commit signing as it slow downs the rspec tests `~/.config/git/git.local`
510
+
511
+ ```bash
512
+ rake version:bump:{patch,minor,major} # Select accordingly
513
+ # Ensure all tests pass - otherwise correct them in the release/<new-version> branch
514
+ rake version:release
515
+ ```
516
+
517
+ The follow the [guide for publishing your gem](https://guides.rubygems.org/publishing/):
518
+
519
+ * Sign-in on [RubyGem Dashboard](https://rubygems.org/dashboard)
520
+ * **DO NOT** save your credentials under `~//.gem/credentials` as suggested (just why would you do that?)
521
+ * Run:
522
+
523
+ ```bash
524
+ gem push pkg/falkorlib-<version>.gem
525
+ ```
526
+
527
+ Check the status on <https://rubygems.org/gems/falkorlib>
528
+
529
+ * Restore your [local] git configuration to sign back all your commits
494
530
 
495
531
  ### Git Branching Model
496
532
 
@@ -1,15 +1,13 @@
1
1
  #! /bin/bash
2
2
  ################################################################################
3
3
  # bootstrap.sh - Bootstrap a fresh new directory for using FalkorLib and its
4
- # associated Rake tasks.
5
- # Creation : 26 Jun 2014
6
- # Time-stamp: <Jeu 2014-06-26 11:33 svarrette>
4
+ # associated Rake tasks.
5
+ # Time-stamp: <Tue 2023-11-21 17:31 svarrette>
7
6
  #
8
- # Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
9
- # http://varrette.gforge.uni.lu
7
+ # Copyright (c) 2014-2023 Sebastien Varrette <Sebastien.Varrette@gmail.com>
10
8
  ################################################################################
11
9
 
12
- RUBY_VERSION='2.1.0'
10
+ RUBY_VERSION='3.1.2'
13
11
  GEMSET=`basename $PWD`
14
12
 
15
13
  echo "=> initialize RVM -- see http://rvm.io"
@@ -25,11 +23,11 @@ gem install bundler
25
23
 
26
24
  echo "=> setup the FalkorLib gem in the directory ${GEMSET}"
27
25
  bundle init
28
- if ! grep -Fq "falkorlib" Gemfile; then
26
+ if ! grep -Fq "falkorlib" Gemfile; then
29
27
  echo "gem 'falkorlib'" >> Gemfile
30
28
  fi
31
29
  bundle
32
- if [ ! -f Rakefile ]; then
30
+ if [ ! -f Rakefile ]; then
33
31
  cat > Rakefile <<EOF
34
32
  #
35
33
  # Rakefile - Configuration file for rake (http://rake.rubyforge.org/)
@@ -38,10 +36,10 @@ require 'falkorlib'
38
36
 
39
37
  ## placeholder for custom configuration of FalkorLib.config.*
40
38
  ## See https://github.com/Falkor/falkorlib
41
-
39
+
42
40
  require 'falkorlib/tasks/git'
43
41
  EOF
44
42
 
45
- fi
43
+ fi
46
44
 
47
45
  #echo "=> That's all folks!"
data/completion/_falkor CHANGED
@@ -1,7 +1,7 @@
1
1
  #compdef falkor
2
2
  ########################################################################################
3
3
  # -*- mode:sh; -*-
4
- # Time-stamp: <Wed 2018-11-21 11:53 svarrette>
4
+ # Time-stamp: <Sat 2024-08-31 16:27 svarrette>
5
5
  #
6
6
  # ZSH completion for [FalkorLib](https://github.com/Falkor/falkorlib)
7
7
  #
@@ -41,6 +41,7 @@ _falkor()
41
41
  'commands:Lists all available commands'
42
42
  'config:Print the current configuration of FalkorLib'
43
43
  'gitcrypt:Initialize git-crypt for the current repository'
44
+ 'gitignore:Initialize .gitignore for the current repository'
44
45
  'help:Describe available commands or one specific command'
45
46
  'init:Bootstrap a Git Repository the falkor way'
46
47
  'link:Initialize a special symlink (.root, .makefile.d etc.)'
@@ -77,6 +78,8 @@ _falkor()
77
78
  __falkor_config && ret=0 ;;
78
79
  (gitcrypt)
79
80
  __falkor_gitcrypt && ret=0 ;;
81
+ (gitignore)
82
+ __falkor_gitignore && ret=0 ;;
80
83
  (init)
81
84
  __falkor_init && ret=0 ;;
82
85
  (link)
@@ -340,6 +343,18 @@ __falkor_gitcrypt() {
340
343
  '*:directory:_files -/'
341
344
  }
342
345
 
346
+ ##################
347
+ __falkor_gitignore() {
348
+ local curcontext=$curcontext state line ret=1
349
+ declare -A opt_args
350
+
351
+ _arguments -C \
352
+ {--all,-a}'[Ignore all files (except .gitignore)]' \
353
+ {--latex,-l}'[Setup .gitignore for LaTeX sources]' \
354
+ {--python,-p}'[Setup .gitignore for Python project]' \
355
+ '*:directory:_files -/'
356
+ }
357
+
343
358
  ##################
344
359
  __falkor_init() {
345
360
  local curcontext=$curcontext state line ret=1
data/falkorlib.gemspec CHANGED
@@ -8,14 +8,14 @@ Gem::Specification.new do |s|
8
8
  s.version = FalkorLib::Version.to_s #$version
9
9
  s.date = Time.now.strftime('%Y-%m-%d')
10
10
  s.summary = "Sebastien Varrette aka Falkor's Common library to share Ruby code and {rake,cap} tasks"
11
- 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.).\n"
11
+ 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 elements of my daily workflow (new git repository, new beamer slides etc.).\n"
12
12
 
13
13
  s.homepage = "https://github.com/Falkor/falkorlib"
14
14
  s.licenses = 'MIT'
15
15
 
16
16
  s.authors = ['Sebastien Varrette']
17
17
  # The list of author names who wrote this gem.
18
- s.email = ['Sebastien.Varrette@uni.lu']
18
+ s.email = ['Sebastien.Varrette@gmail.com']
19
19
 
20
20
  # Paths in the gem to add to $LOAD_PATH when this gem is activated (required).
21
21
  #
@@ -68,24 +68,24 @@ Gem::Specification.new do |s|
68
68
  # "~> 2.2.0" (shortcut for ">= 2.2.0", "< 2.3.0")
69
69
  #
70
70
  #s.add_dependency("rake", ">= 10.1.0")
71
- s.add_runtime_dependency 'rake', '>= 12.3.3'
72
- s.add_runtime_dependency("activesupport", '~> 5.0')
73
- s.add_runtime_dependency("awesome_print", '> 1.2')
74
- s.add_runtime_dependency("artii", '>= 2.1')
71
+ s.add_runtime_dependency 'rake', '~> 13.1'
72
+ s.add_runtime_dependency("activesupport", '~> 6.1', '>= 6.1.7.5')
73
+ s.add_runtime_dependency("awesome_print", '~> 1.9', '>= 1.9.2')
74
+ s.add_runtime_dependency("artii", '~> 2.1', '>= 2.1.2')
75
75
  #s.add_runtime_dependency("benchmark", '~> 4.0')
76
76
  #s.add_runtime_dependency("bundler-stats", '~> 2.0')
77
77
  s.add_runtime_dependency("configatron", '~> 3.0')
78
78
  s.add_runtime_dependency("deep_merge", '~> 1.0')
79
- s.add_runtime_dependency("diffy", '>= 3.0')
80
- s.add_runtime_dependency("facter", '~> 2.4.1')
79
+ s.add_runtime_dependency("diffy", '~> 3.4', '>= 3.4.2')
80
+ s.add_runtime_dependency("facter", '~> 4.6.1')
81
81
  s.add_runtime_dependency 'git_remote_branch', '~> 0'
82
- s.add_runtime_dependency("json", '> 2.0')
82
+ s.add_runtime_dependency("json", '~> 2.6', '>= 2.6.3')
83
83
  s.add_runtime_dependency("license-generator", '~> 0')
84
- s.add_runtime_dependency("logger", '>= 1.2.8')
84
+ s.add_runtime_dependency("logger", '~> 1.6')
85
85
  #s.add_runtime_dependency("mercenary", '>= 0.3.5')
86
86
  s.add_runtime_dependency('minigit', '~> 0')
87
87
  s.add_runtime_dependency("term-ansicolor", '> 1.3')
88
- s.add_runtime_dependency("thor", '>= 1.0')
88
+ s.add_runtime_dependency("thor", '~> 1.3')
89
89
 
90
90
  #
91
91
  #
@@ -94,7 +94,7 @@ Gem::Specification.new do |s|
94
94
  # One call to add_development_dependency('gem_name', 'gem version requirement')
95
95
  # for each development dependency. These gems are required for developers
96
96
  #
97
- s.add_development_dependency("bundler", "~> 2.3")
97
+ s.add_development_dependency("bundler", "~> 2.4")
98
98
  #s.add_development_dependency("bluecloth", "~> 2.2.0")
99
99
  #s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
100
100
  #s.add_development_dependency("codeclimate-test-reporter", '~> 0') #, group: :test, require: nil)
@@ -104,8 +104,8 @@ Gem::Specification.new do |s|
104
104
  s.add_development_dependency('rubocop', '~> 0.49.0')
105
105
  s.add_development_dependency('simplecov', '<= 0.17.1')
106
106
  #s.add_development_dependency("thor-zsh_completion", '>= 0.1.5')
107
- s.add_development_dependency("travis", "~> 1.11")
108
- s.add_development_dependency("travis-lint", "~> 1.8")
107
+ # s.add_development_dependency("travis", "~> 1.11")
108
+ # s.add_development_dependency("travis-lint", "~> 1.8")
109
109
  s.add_development_dependency("yard", ">= 0.9.20")
110
110
 
111
111
 
@@ -1,6 +1,6 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  ################################################################################
3
- # Time-stamp: <Thu 2022-06-02 19:08 svarrette>
3
+ # Time-stamp: <Mon 2023-12-04 16:10 svarrette>
4
4
  ################################################################################
5
5
  # Interface for the main Bootstrapping operations
6
6
  #
@@ -29,10 +29,7 @@ module FalkorLib #:nodoc:
29
29
  :hook => 'pre-commit.git-crypt.sh',
30
30
  :ulhpc => [
31
31
  #'0x5D08BCDD4F156AD7', # S. Varrette
32
- '0x37183CEF550DF40B', # H. Cartiaux
33
- '0x7E1457DB75803F41', # T. Valette
34
- '7F883C928BC48E98', # A. Olloh
35
- ],
32
+ ],
36
33
  # :hooks => {
37
34
  # :precommit => 'https://gist.github.com/848c82daa63710b6c132bb42029b30ef.git',
38
35
  # },
@@ -51,19 +48,19 @@ module FalkorLib #:nodoc:
51
48
  :mail => `git config user.email`.chomp,
52
49
  :title => 'Title',
53
50
  :subtitle => 'Overview and Open Challenges',
54
- :image => 'images/logo_ULHPC.pdf',
55
- :logo => 'images/logo_UL.pdf',
56
- :url => 'http://csc.uni.lu/sebastien.varrette'
51
+ :image => 'images/logo_ANSSI.png',
52
+ :logo => 'images/logo_RF.png',
53
+ :url => 'http://cyber.gouv.fr'
57
54
  },
58
55
  :letter => {
59
56
  :author_title => 'PhD',
60
- :institute => 'University of Luxembourg',
61
- :department => 'Parallel Computing and Optimization Group',
62
- :department_acro => 'PCOG',
63
- :address => '2, avenue de l\'Université',
64
- :zipcode => 'L-4365',
65
- :location => 'Esch-sur-Alzette, Luxembourg',
66
- :phone => '(+352) 46 66 44 6600',
57
+ :institute => 'French National Cybersecurity Agency (ANSSI)',
58
+ :department => 'Laboratoire Architectures Matérielles et logicielles',
59
+ :department_acro => 'LAM',
60
+ :address => '51, boulevard de La Tour-Maubourg',
61
+ :zipcode => '75007',
62
+ :location => 'Paris, France',
63
+ :phone => '(+33) n/a',
67
64
  :twitter => 'svarrette',
68
65
  :linkedin => 'svarrette',
69
66
  :skype => 'sebastien.varrette',
@@ -86,7 +83,7 @@ module FalkorLib #:nodoc:
86
83
  :tags => []
87
84
  },
88
85
  :trashdir => '.Trash',
89
- :types => [ :none, :latex, :gem, :octopress, :puppet_module, :rvm, :pyenv ],
86
+ :types => [ :none, :latex, :gem, :vagrant, :puppet_module, :rvm, :pyenv ],
90
87
  :licenses => {
91
88
  "none" => {},
92
89
  "Apache-2.0" => {
@@ -126,21 +123,28 @@ module FalkorLib #:nodoc:
126
123
  :puppet => {},
127
124
  :forge => {
128
125
  :none => { :url => '', :name => "None" },
129
- :gforge => { :url => 'gforge.uni.lu', :name => 'GForge @ Uni.lu' },
130
- :github => { :url => 'github.com', :name => 'Github', :login => (`whoami`.chomp.capitalize).to_s },
131
- :gitlab => { :url => 'gitlab.uni.lu', :name => 'Gitlab @ Uni.lu', :login => (`whoami`.chomp.capitalize).to_s }
126
+ :github => { :url => 'github.com', :name => 'Github', :login => (`whoami`.chomp.capitalize).to_s },
127
+ :gitlab => { :url => 'gitlab.com', :name => 'Gitlab', :login => (`whoami`.chomp.capitalize).to_s }
132
128
  },
133
129
  :vagrant => {
134
- :os => :centos7,
130
+ :os => :debian12,
135
131
  :ram => 1024,
136
132
  :vcpus => 2,
137
133
  :domain => 'vagrant.dev',
138
- :range => '10.10.1.0/24',
134
+ :range => '192.168.56.0/21',
135
+ :provider => 'virtualbox',
139
136
  :boxes => {
140
- :centos8 => 'generic/centos8', #'centos/8' is having issue - see https://github.com/dotless-de/vagrant-vbguest/issues/367
141
- :centos7 => 'centos/7',
142
- :debian8 => 'debian/contrib-jessie64',
143
- :ubuntu14 => 'ubuntu/trusty64'
137
+ :debian12 => 'generic/debian12',
138
+ :debian12_uefi => 'ncrmro/debian-bookworm64-uefi',
139
+ :almalinux9 => 'almalinux/9',
140
+ :almalinux8 => 'almalinux/8',
141
+ :almalinux8_uefi => 'almalinux/8.uefi',
142
+ :rockylinux8 => 'rockylinux/8',
143
+ :centosstream8 => 'centos/stream8',
144
+ :ubuntu22 => 'ubuntu/jammy64',
145
+ :ubuntu20 => 'ubuntu/focal64',
146
+ :fedora38 => 'generic/fedora38',
147
+ :archlinux => 'archlinux/archlinux'
144
148
  },
145
149
  }
146
150
  }
@@ -222,6 +226,7 @@ module FalkorLib
222
226
  exit_status = run %(
223
227
  mkdir -p #{dirname}
224
228
  echo '*' > #{dirname}/.gitignore
229
+ echo '!.gitignore' >> #{dirname}/.gitignore
225
230
  )
226
231
  if FalkorLib::Git.init?(path)
227
232
  exit_status = FalkorLib::Git.add(File.join(trashdir.to_s, '.gitignore' ),
@@ -293,15 +298,15 @@ module FalkorLib
293
298
  next if [:file, :width].include?(k)
294
299
  config[k.to_sym] = ask( "\t" + format("Message of the Day (MotD) %-10s", k.to_s), config[k.to_sym]) unless options[:no_interaction]
295
300
  end
296
- config[:os] = Facter.value(:lsbdistdescription) if Facter.value(:lsbdistdescription)
297
- config[:os] = "Mac " + Facter.value(:sp_os_version) if Facter.value(:sp_os_version)
301
+ config[:os] = Facter.value('os.distro.description') if Facter.value('os.distro.description')
302
+ config[:os] = "Mac " + Facter.value('system_profiler.system_version') if Facter.value('system_profiler.system_version')
298
303
  unless options[:nodemodel]
299
- config[:nodemodel] = Facter.value(:sp_machine_name) if Facter.value(:sp_machine_name)
300
- config[:nodemodel] += " (#{Facter.value(:sp_cpu_type)}" if Facter.value(:sp_cpu_type)
301
- config[:nodemodel] += " " + Facter.value(:sp_current_processor_speed) if Facter.value(:sp_current_processor_speed)
302
- config[:nodemodel] += " #{Facter.value(:sp_number_processors)} cores )" if Facter.value(:sp_number_processors)
304
+ config[:nodemodel] = Facter.value('system_profiler.model_name') if Facter.value('system_profiler.model_name')
305
+ config[:nodemodel] += " (#{Facter.value('system_profiler.processor_name')}" if Facter.value('system_profiler.processor_name')
306
+ config[:nodemodel] += " " + Facter.value('system_profiler.processor_speed') if Facter.value('system_profiler.processor_speed')
307
+ config[:nodemodel] += " #{Facter.value('system_profiler.cores')} cores )" if Facter.value('system_profiler.cores')
303
308
  end
304
- config[:nodemodel] = Facter.value(:sp_machine_name) unless options[:nodemodel]
309
+ config[:nodemodel] = Facter.value('system_profiler.model_name') unless options[:nodemodel]
305
310
  write_from_erb_template(erbfile, outfile, config, options)
306
311
  end # motd
307
312