falkorlib 0.8.10 → 0.9.0
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +56 -116
- data/README.md +1 -1
- data/binscripts/bootstrap.sh +8 -10
- data/falkorlib.gemspec +12 -12
- data/lib/falkorlib/bootstrap/base.rb +29 -25
- data/lib/falkorlib/bootstrap/latex.rb +7 -2
- data/lib/falkorlib/bootstrap/vagrant.rb +17 -10
- data/lib/falkorlib/common.rb +3 -3
- data/lib/falkorlib/config.rb +3 -3
- data/lib/falkorlib/gem_tasks.rb +1 -1
- data/lib/falkorlib/git_tasks.rb +1 -1
- data/lib/falkorlib/puppet_tasks.rb +1 -1
- data/lib/falkorlib/version.rb +2 -1
- data/spec/falkorlib/bootstrap_latex_spec.rb +6 -5
- data/spec/falkorlib/git_spec.rb +2 -2
- data/spec/falkorlib/gitflow_spec.rb +5 -4
- data/templates/latex/beamer/.Makefile.local +1 -0
- data/templates/latex/beamer/_content.md.erb +1 -1
- data/templates/latex/beamer/main.tex.erb +20 -8
- data/templates/latex/images/logo_ANSSI.png +0 -0
- data/templates/latex/images/logo_RF.png +0 -0
- data/templates/vagrant/.gitignore +14 -0
- data/templates/vagrant/Vagrantfile.erb +53 -15
- data/templates/vagrant/vagrant/config.yaml.sample +9 -6
- data/templates/vagrant/vagrant/scripts/bootstrap.sh +32 -14
- metadata +80 -76
- data/templates/latex/images/logo_UL.pdf +0 -0
- data/templates/latex/images/logo_ULHPC.pdf +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4ae8ef45ffb46b834d80ae5283fd1f57f983f5e35e78e693b803aa69f1296c6b
|
4
|
+
data.tar.gz: f2242b749de366b28514a0bb459513133d4a35fc0a4d8960247d69ce3463a159
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9c5512437e4d6cbfc8b0db32ab89c061cb4336fcb48f1098b0a2bd8f6a48da089f5c7ff68775763c60c81d9d7c5b8afbeba13b7d48528e2f254e6fe035fe788f
|
7
|
+
data.tar.gz: b49a6c039a985245c7f91af5c055d15cf4097eee0c97db7a93e0efae854a02bcc83ed58d92a76dbe4a4f0493db2b43c34ac2739f00e59a227050f9c0fc4a8a8e
|
data/Gemfile.lock
CHANGED
@@ -1,130 +1,86 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
falkorlib (0.
|
5
|
-
activesupport (~> 5
|
6
|
-
artii (>= 2.1)
|
7
|
-
awesome_print (
|
4
|
+
falkorlib (0.9.0)
|
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.
|
10
|
+
diffy (~> 3.4, >= 3.4.2)
|
11
11
|
facter (~> 2.4.1)
|
12
12
|
git_remote_branch (~> 0)
|
13
|
-
json (
|
13
|
+
json (~> 2.6, >= 2.6.3)
|
14
14
|
license-generator (~> 0)
|
15
|
-
logger (
|
15
|
+
logger (~> 1.6)
|
16
16
|
minigit (~> 0)
|
17
|
-
rake (
|
17
|
+
rake (~> 13.1)
|
18
18
|
term-ansicolor (> 1.3)
|
19
|
-
thor (
|
19
|
+
thor (~> 1.3)
|
20
20
|
|
21
21
|
GEM
|
22
22
|
remote: http://rubygems.org/
|
23
23
|
specs:
|
24
|
-
|
25
|
-
activesupport (5.2.8)
|
24
|
+
activesupport (6.1.7.6)
|
26
25
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
27
|
-
i18n (>=
|
28
|
-
minitest (
|
29
|
-
tzinfo (~>
|
30
|
-
|
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.
|
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
|
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 (2.4.6)
|
77
41
|
git_remote_branch (0.3.8)
|
78
|
-
|
79
|
-
highline (2.0.3)
|
80
|
-
i18n (1.10.0)
|
42
|
+
i18n (1.14.1)
|
81
43
|
concurrent-ruby (~> 1.0)
|
82
|
-
io-console (0.
|
83
|
-
irb (1.
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
launchy (2.4.3)
|
88
|
-
addressable (~> 2.3)
|
44
|
+
io-console (0.6.0)
|
45
|
+
irb (1.10.0)
|
46
|
+
rdoc
|
47
|
+
reline (>= 0.3.8)
|
48
|
+
json (2.7.0)
|
89
49
|
license-generator (0.4.1)
|
90
50
|
thor
|
91
|
-
logger (1.
|
51
|
+
logger (1.6.0)
|
92
52
|
method_source (1.0.0)
|
93
53
|
minigit (0.0.4)
|
94
|
-
minitest (5.
|
95
|
-
|
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)
|
54
|
+
minitest (5.20.0)
|
55
|
+
parallel (1.23.0)
|
100
56
|
parser (2.7.2.0)
|
101
57
|
ast (~> 2.4.1)
|
102
58
|
powerpack (0.1.3)
|
103
|
-
pry (0.14.
|
59
|
+
pry (0.14.2)
|
104
60
|
coderay (~> 1.1)
|
105
61
|
method_source (~> 1.0)
|
106
|
-
|
107
|
-
|
108
|
-
json
|
109
|
-
websocket (~> 1.0)
|
62
|
+
psych (5.1.1.1)
|
63
|
+
stringio
|
110
64
|
rainbow (2.2.2)
|
111
65
|
rake
|
112
|
-
rake (13.0
|
113
|
-
|
66
|
+
rake (13.1.0)
|
67
|
+
rdoc (6.6.0)
|
68
|
+
psych (>= 4.0.0)
|
69
|
+
reline (0.4.1)
|
114
70
|
io-console (~> 0.5)
|
115
|
-
rspec (3.
|
116
|
-
rspec-core (~> 3.
|
117
|
-
rspec-expectations (~> 3.
|
118
|
-
rspec-mocks (~> 3.
|
119
|
-
rspec-core (3.
|
120
|
-
rspec-support (~> 3.
|
121
|
-
rspec-expectations (3.
|
71
|
+
rspec (3.12.0)
|
72
|
+
rspec-core (~> 3.12.0)
|
73
|
+
rspec-expectations (~> 3.12.0)
|
74
|
+
rspec-mocks (~> 3.12.0)
|
75
|
+
rspec-core (3.12.2)
|
76
|
+
rspec-support (~> 3.12.0)
|
77
|
+
rspec-expectations (3.12.3)
|
122
78
|
diff-lcs (>= 1.2.0, < 2.0)
|
123
|
-
rspec-support (~> 3.
|
124
|
-
rspec-mocks (3.
|
79
|
+
rspec-support (~> 3.12.0)
|
80
|
+
rspec-mocks (3.12.6)
|
125
81
|
diff-lcs (>= 1.2.0, < 2.0)
|
126
|
-
rspec-support (~> 3.
|
127
|
-
rspec-support (3.
|
82
|
+
rspec-support (~> 3.12.0)
|
83
|
+
rspec-support (3.12.1)
|
128
84
|
rubocop (0.49.1)
|
129
85
|
parallel (~> 1.10)
|
130
86
|
parser (>= 2.3.3.1, < 3.0)
|
@@ -132,56 +88,40 @@ GEM
|
|
132
88
|
rainbow (>= 1.99.1, < 3.0)
|
133
89
|
ruby-progressbar (~> 1.7)
|
134
90
|
unicode-display_width (~> 1.0, >= 1.0.1)
|
135
|
-
ruby-progressbar (1.
|
136
|
-
|
137
|
-
rubygems-tasks (0.2.5)
|
91
|
+
ruby-progressbar (1.13.0)
|
92
|
+
rubygems-tasks (0.2.6)
|
138
93
|
irb (~> 1.0)
|
139
|
-
|
94
|
+
rake (>= 10.0.0)
|
140
95
|
simplecov (0.17.1)
|
141
96
|
docile (~> 1.1)
|
142
97
|
json (>= 1.8, < 3)
|
143
98
|
simplecov-html (~> 0.10.0)
|
144
99
|
simplecov-html (0.10.2)
|
100
|
+
stringio (3.1.0)
|
145
101
|
sync (0.5.0)
|
146
102
|
term-ansicolor (1.7.1)
|
147
103
|
tins (~> 1.0)
|
148
|
-
thor (1.
|
149
|
-
|
150
|
-
tins (1.31.1)
|
104
|
+
thor (1.3.0)
|
105
|
+
tins (1.32.1)
|
151
106
|
sync
|
152
|
-
|
153
|
-
|
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)
|
107
|
+
tzinfo (2.0.6)
|
108
|
+
concurrent-ruby (~> 1.0)
|
165
109
|
unicode-display_width (1.8.0)
|
166
|
-
|
167
|
-
|
168
|
-
yard (0.9.28)
|
169
|
-
webrick (~> 1.7.0)
|
110
|
+
yard (0.9.34)
|
111
|
+
zeitwerk (2.6.12)
|
170
112
|
|
171
113
|
PLATFORMS
|
172
|
-
x86_64-
|
114
|
+
x86_64-linux
|
173
115
|
|
174
116
|
DEPENDENCIES
|
175
|
-
bundler (~> 2.
|
117
|
+
bundler (~> 2.4)
|
176
118
|
falkorlib!
|
177
119
|
pry (~> 0.9)
|
178
120
|
rspec (~> 3.0)
|
179
121
|
rubocop (~> 0.49.0)
|
180
122
|
rubygems-tasks (~> 0.2)
|
181
123
|
simplecov (<= 0.17.1)
|
182
|
-
travis (~> 1.11)
|
183
|
-
travis-lint (~> 1.8)
|
184
124
|
yard (>= 0.9.20)
|
185
125
|
|
186
126
|
BUNDLED WITH
|
187
|
-
2.
|
127
|
+
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-
|
16
|
+
Copyright (c) 2012-2023 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
|
data/binscripts/bootstrap.sh
CHANGED
@@ -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
|
-
#
|
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@
|
9
|
-
# http://varrette.gforge.uni.lu
|
7
|
+
# Copyright (c) 2014-2023 Sebastien Varrette <Sebastien.Varrette@gmail.com>
|
10
8
|
################################################################################
|
11
9
|
|
12
|
-
RUBY_VERSION='
|
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/falkorlib.gemspec
CHANGED
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
|
|
15
15
|
|
16
16
|
s.authors = ['Sebastien Varrette']
|
17
17
|
# The list of author names who wrote this gem.
|
18
|
-
s.email = ['Sebastien.Varrette@
|
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', '
|
72
|
-
s.add_runtime_dependency("activesupport", '~>
|
73
|
-
s.add_runtime_dependency("awesome_print", '
|
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.
|
79
|
+
s.add_runtime_dependency("diffy", '~> 3.4', '>= 3.4.2')
|
80
80
|
s.add_runtime_dependency("facter", '~> 2.4.1')
|
81
81
|
s.add_runtime_dependency 'git_remote_branch', '~> 0'
|
82
|
-
s.add_runtime_dependency("json", '
|
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", '
|
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", '
|
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.
|
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: <
|
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
|
-
|
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/
|
55
|
-
:logo => 'images/
|
56
|
-
:url => 'http://
|
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 => '
|
61
|
-
:department => '
|
62
|
-
:department_acro => '
|
63
|
-
:address => '
|
64
|
-
:zipcode => '
|
65
|
-
:location => '
|
66
|
-
:phone => '(+
|
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, :
|
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
|
-
:
|
130
|
-
:
|
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 => :
|
130
|
+
:os => :debian12,
|
135
131
|
:ram => 1024,
|
136
132
|
:vcpus => 2,
|
137
133
|
:domain => 'vagrant.dev',
|
138
|
-
:range => '
|
134
|
+
:range => '192.168.56.0/21',
|
135
|
+
:provider => 'virtualbox',
|
139
136
|
:boxes => {
|
140
|
-
:
|
141
|
-
:
|
142
|
-
:
|
143
|
-
:
|
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
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# -*- encoding: utf-8 -*-
|
2
2
|
################################################################################
|
3
|
-
# Time-stamp: <
|
3
|
+
# Time-stamp: <Thu 2023-11-23 18:13 svarrette>
|
4
4
|
################################################################################
|
5
5
|
# Interface for the main Bootstrapping operations
|
6
6
|
#
|
@@ -100,12 +100,17 @@ module FalkorLib
|
|
100
100
|
info "populating '#{src_project_dir}'"
|
101
101
|
#FalkorLib::Bootstrap::Link.root(srcdir, { :verbose => true} )
|
102
102
|
FalkorLib::Bootstrap::Link.makefile(srcdir, :no_interaction => true)
|
103
|
-
[ '_style.sty'
|
103
|
+
[ '_style.sty' ].each do |f|
|
104
104
|
Dir.chdir( srcdir ) do
|
105
105
|
dst = ".makefile.d/latex/#{f}"
|
106
106
|
run %( ln -s #{dst} #{f} ) unless File.exist?( File.join(srcdir, f) )
|
107
107
|
end
|
108
108
|
end
|
109
|
+
[ '.gitignore' ].each do |f| # .gitignore no longer accepted as symlink
|
110
|
+
Dir.chdir( srcdir ) do
|
111
|
+
run %( cp .makefile.d/latex/#{f} #{f} ) unless File.exist?( File.join(srcdir, f) )
|
112
|
+
end
|
113
|
+
end
|
109
114
|
if type == :beamer
|
110
115
|
f = 'beamerthemeFalkor.sty'
|
111
116
|
dst = "#{FalkorLib.config[:git][:submodulesdir]}/beamerthemeFalkor/#{f}"
|
@@ -1,6 +1,6 @@
|
|
1
1
|
# -*- encoding: utf-8 -*-
|
2
2
|
################################################################################
|
3
|
-
# Time-stamp: <Mon
|
3
|
+
# Time-stamp: <Mon 2023-12-04 16:37 svarrette>
|
4
4
|
################################################################################
|
5
5
|
# Interface for Bootstrapping MkDocs
|
6
6
|
#
|
@@ -39,9 +39,23 @@ module FalkorLib
|
|
39
39
|
"Select OS to configure within your vagrant boxes by default",
|
40
40
|
(config[:boxes].keys.find_index(config[:os]) + 1))
|
41
41
|
end
|
42
|
+
# Eventually adapt default provider and IP range
|
43
|
+
providers = ['virtualbox', 'libvirt']
|
44
|
+
default_provider = (config[:os] =~ /_uefi$/) ? 'libvirt': 'virtualbox'
|
45
|
+
info "OS selected: #{config[:os]} (thus with default provider: #{default_provider})"
|
46
|
+
config[:provider] = select_from(providers,
|
47
|
+
"Confirm vagrant hypervisor provider:",
|
48
|
+
providers.find_index(default_provider)+1)
|
49
|
+
config[:range] = case config[:provider]
|
50
|
+
when 'libvirt'
|
51
|
+
'192.168.122.1/24'
|
52
|
+
else
|
53
|
+
'192.168.56.0/21'
|
54
|
+
end
|
42
55
|
[ :ram, :vcpus, :domain, :range ].each do |k|
|
43
56
|
config[k.to_sym] = ask("\tDefault #{k.capitalize}:", config[k.to_sym])
|
44
57
|
end
|
58
|
+
|
45
59
|
puts config.to_yaml
|
46
60
|
FalkorLib::GitFlow.start('feature', 'vagrant', rootdir) if (use_git && FalkorLib::GitFlow.init?(rootdir))
|
47
61
|
init_from_template(templatedir, rootdir, config,
|
@@ -55,15 +69,8 @@ module FalkorLib
|
|
55
69
|
[ 'bootstrap.sh'].each do |f|
|
56
70
|
FalkorLib::Git.add(File.join(scriptsdir, "#{f}")) if use_git
|
57
71
|
end
|
58
|
-
|
59
|
-
|
60
|
-
run %(git ignore '.vagrant/' ) if command?('git-ignore')
|
61
|
-
# run %(ln -s README.md index.md )
|
62
|
-
# run %(ln -s README.md contributing/index.md )
|
63
|
-
# run %(ln -s README.md setup/index.md )
|
64
|
-
end
|
65
|
-
if File.exist?(File.join(rootdir, '.gitignore'))
|
66
|
-
FalkorLib::Git.add(File.join(rootdir, '.gitignore')) if use_git
|
72
|
+
[ '.gitignore', '.ruby-version' ].each do |f|
|
73
|
+
FalkorLib::Git.add(File.join(rootdir, "#{f}")) if (use_git && File.exist?(File.join(rootdir, "#{f}")))
|
67
74
|
end
|
68
75
|
return 0
|
69
76
|
#exit_status.to_i
|
data/lib/falkorlib/common.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# -*- encoding: utf-8 -*-
|
2
2
|
################################################################################
|
3
|
-
# Time-stamp: <
|
3
|
+
# Time-stamp: <Thu 2023-11-23 23:06 svarrette>
|
4
4
|
################################################################################
|
5
5
|
|
6
6
|
require "falkorlib"
|
@@ -66,7 +66,7 @@ module FalkorLib #:nodoc:
|
|
66
66
|
def warning(str)
|
67
67
|
puts cyan("/!\\ WARNING: " + str)
|
68
68
|
end
|
69
|
-
alias_method :warn, :warning
|
69
|
+
# alias_method :warn, :warning # FIXME erb invokes also its own warn method
|
70
70
|
|
71
71
|
## Print an error message and abort
|
72
72
|
def error(str)
|
@@ -375,7 +375,7 @@ module FalkorLib #:nodoc:
|
|
375
375
|
next
|
376
376
|
end
|
377
377
|
#puts config.to_yaml
|
378
|
-
content += ERB.new(File.read(erb.to_s),
|
378
|
+
content += ERB.new(File.read(erb.to_s), trim_mode: '<>').result(binding)
|
379
379
|
end
|
380
380
|
# error "Unable to find the template file #{erbfile}" unless File.exists? (erbfile )
|
381
381
|
# template = File.read("#{erbfile}")
|
data/lib/falkorlib/config.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# -*- encoding: utf-8 -*-
|
2
2
|
################################################################################
|
3
|
-
# Time-stamp: <
|
3
|
+
# Time-stamp: <Tue 2023-11-21 17:21 svarrette>
|
4
4
|
################################################################################
|
5
5
|
# FalkorLib Configuration
|
6
6
|
#
|
@@ -56,8 +56,8 @@ module FalkorLib #:nodoc:
|
|
56
56
|
#:custom_cfg => '.falkorlib.yaml',
|
57
57
|
:rvm => {
|
58
58
|
# See https://www.ruby-lang.org/en/downloads/branches/ for stable branches
|
59
|
-
:rubies => [ '3.
|
60
|
-
:version => '3.1.
|
59
|
+
:rubies => [ '3.2.2', '3.1.4', '3.0.6', '2.7.8'],
|
60
|
+
:version => '3.1.4',
|
61
61
|
:versionfile => '.ruby-version',
|
62
62
|
:gemsetfile => '.ruby-gemset'
|
63
63
|
},
|
data/lib/falkorlib/gem_tasks.rb
CHANGED
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
tasks/gem.rb
|
data/lib/falkorlib/git_tasks.rb
CHANGED
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
tasks/git.rb
|
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
tasks/puppet.rb
|
data/lib/falkorlib/version.rb
CHANGED
@@ -19,7 +19,7 @@ module FalkorLib #:nodoc:
|
|
19
19
|
# MAJOR: Defines the major version
|
20
20
|
# MINOR: Defines the minor version
|
21
21
|
# PATCH: Defines the patch version
|
22
|
-
MAJOR, MINOR, PATCH = 0,
|
22
|
+
MAJOR, MINOR, PATCH = 0, 9, 0
|
23
23
|
|
24
24
|
module_function
|
25
25
|
|
@@ -75,3 +75,4 @@ module FalkorLib #:nodoc:
|
|
75
75
|
end
|
76
76
|
|
77
77
|
|
78
|
+
|
@@ -3,7 +3,7 @@
|
|
3
3
|
#########################################
|
4
4
|
# bootstrap_latex_spec.rb
|
5
5
|
# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
|
6
|
-
# Time-stamp: <Thu
|
6
|
+
# Time-stamp: <Thu 2023-11-23 18:18 svarrette>
|
7
7
|
#
|
8
8
|
# @description Check the Bootstrapping operations for LaTeX-based projects
|
9
9
|
#
|
@@ -92,17 +92,18 @@ describe FalkorLib::Bootstrap do
|
|
92
92
|
|
93
93
|
# check src directory
|
94
94
|
expect(Dir.exist?(srcdir)).to be true
|
95
|
-
src_latex_symlinks = [ 'Makefile', '_style.sty'
|
95
|
+
src_latex_symlinks = [ 'Makefile', '_style.sty' ]
|
96
96
|
src_latex_symlinks.each do |f|
|
97
97
|
file = File.join(srcdir, f)
|
98
98
|
expect(File.exist?(file)).to be true
|
99
99
|
expect(File.readlink(file)).to include '.makefile.d/latex'
|
100
100
|
end
|
101
101
|
|
102
|
-
src_latex_files = [ "#{name}.tex" ]
|
103
|
-
src_latex_files
|
104
|
-
src_latex_files
|
102
|
+
src_latex_files = [ "#{name}.tex", '.gitignore' ]
|
103
|
+
src_latex_files += [ '_content.md', '.Makefile.local' ] if type == :beamer
|
104
|
+
src_latex_files += [ '_abstract.tex', '_conclusion.tex', '_experiments.tex', '_introduction.tex', 'biblio.bib', '_related_works.tex' ] if type == :article
|
105
105
|
src_latex_files.each do |f|
|
106
|
+
# $stderr.puts "=> checking file: #{f}"
|
106
107
|
file = File.join(srcdir, f)
|
107
108
|
expect(File.exist?(file)).to be true
|
108
109
|
end
|