falkorlib 0.8.6 → 0.8.9

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 (16) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +102 -78
  3. data/README.md +1 -1
  4. data/falkorlib.gemspec +24 -28
  5. data/lib/falkorlib/bootstrap/base.rb +3 -4
  6. data/lib/falkorlib/bootstrap/ruby.rb +1 -1
  7. data/lib/falkorlib/cli/new.rb +1 -1
  8. data/lib/falkorlib/config.rb +6 -5
  9. data/lib/falkorlib/git/base.rb +1 -1
  10. data/lib/falkorlib/version.rb +1 -1
  11. data/spec/falkorlib/git_spec.rb +1 -1
  12. data/templates/README/readme_git.erb +2 -24
  13. data/templates/README/readme_pyenv.erb +25 -22
  14. data/templates/mkdocs/docs/vagrant.md.erb +1 -1
  15. data/templates/vagrant/Vagrantfile.erb +7 -5
  16. metadata +85 -85
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 90a5f15ae97eb39936de7384fd80190a25ec572d3524e740f6d11fc9eeb46ded
4
- data.tar.gz: 1f6f2e77ba4781fcae3cf069c144cb0ab85a2e347e54e1b2f464b31a84132e5e
3
+ metadata.gz: f78dc680be273372a1c26984aad7734cd1ed04c80d5796928043f91d93b170cf
4
+ data.tar.gz: ad26d27e1dc1736c58e55fc17c7162861d51540db6417c96d8ce45772697c23a
5
5
  SHA512:
6
- metadata.gz: 94800fe66c39db12b8052daf513de624299852372f95683e3a155d9da9f8bf5b3a0ee753d3386d3c572addd3246b602900445c86ea145715ed703949bfcb04f4
7
- data.tar.gz: 41c9d9e4ab300564a5dff87b81bc43357f8a04f916b90b503b81c4752cf7beda5d3b656582228bc314384d54b220792f25502370126666779c7b58a5309e55d3
6
+ metadata.gz: 163741b3ab02ca7603a37ecf9b553d2204fa6f1da991d436fd1dd35a61de251035e9dce0ee4de80fc36d36325f152f2fc992199d9b729288b900da516a294ae5
7
+ data.tar.gz: f538232024dad298c62e357bac421f25dabca12c72e25dff51af4042e65ba87d1b8ce36c21c328c2bffbdb136e689570065554b6c56628d6602e1eadd3ee9fc1
data/Gemfile.lock CHANGED
@@ -1,103 +1,130 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- falkorlib (0.8.6)
5
- activesupport (~> 4.0)
4
+ falkorlib (0.8.9)
5
+ activesupport (~> 5.0)
6
6
  artii (>= 2.1)
7
- awesome_print (~> 1.2)
7
+ awesome_print (> 1.2)
8
8
  configatron (~> 3.0)
9
- deep_merge (~> 1.0.1)
9
+ deep_merge (~> 1.0)
10
10
  diffy (>= 3.0)
11
11
  facter (~> 2.4.1)
12
12
  git_remote_branch (~> 0)
13
- json (~> 2.0)
13
+ json (> 2.0)
14
14
  license-generator (~> 0)
15
15
  logger (>= 1.2.8)
16
16
  minigit (~> 0)
17
17
  rake (>= 12.3.3)
18
- term-ansicolor (~> 1.3)
18
+ term-ansicolor (> 1.3)
19
19
  thor (>= 1.0)
20
20
 
21
21
  GEM
22
22
  remote: http://rubygems.org/
23
23
  specs:
24
- activesupport (4.2.11.1)
25
- i18n (~> 0.7)
24
+ CFPropertyList (2.2.8)
25
+ activesupport (5.2.8)
26
+ concurrent-ruby (~> 1.0, >= 1.0.2)
27
+ i18n (>= 0.7, < 2)
26
28
  minitest (~> 5.1)
27
- thread_safe (~> 0.3, >= 0.3.4)
28
29
  tzinfo (~> 1.1)
29
- addressable (2.4.0)
30
+ addressable (2.8.0)
31
+ public_suffix (>= 2.0.2, < 5.0)
30
32
  artii (2.1.2)
31
- ast (2.4.0)
32
- awesome_print (1.8.0)
33
- backports (3.17.1)
34
- coderay (1.1.2)
35
- concurrent-ruby (1.1.6)
33
+ ast (2.4.2)
34
+ awesome_print (1.9.2)
35
+ coderay (1.1.3)
36
+ concurrent-ruby (1.1.10)
36
37
  configatron (3.2.0)
37
- deep_merge (1.0.1)
38
- diff-lcs (1.3)
39
- diffy (3.3.0)
40
- docile (1.3.2)
41
- ethon (0.12.0)
42
- ffi (>= 1.3.0)
43
- facter (2.4.6)
44
- faraday (0.17.3)
38
+ deep_merge (1.2.2)
39
+ diff-lcs (1.5.0)
40
+ diffy (3.4.0)
41
+ 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)
45
61
  multipart-post (>= 1.2, < 3)
46
- faraday_middleware (0.14.0)
47
- faraday (>= 0.7.4, < 1.0)
48
- ffi (1.12.2)
49
- gh (0.15.1)
50
- addressable (~> 2.4.0)
51
- backports
52
- faraday (~> 0.8)
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)
53
74
  multi_json (~> 1.0)
54
75
  net-http-persistent (~> 2.9)
55
76
  net-http-pipeline
56
77
  git_remote_branch (0.3.8)
57
78
  hashr (0.0.22)
58
- highline (1.7.10)
59
- i18n (0.9.5)
79
+ highline (2.0.3)
80
+ i18n (1.10.0)
60
81
  concurrent-ruby (~> 1.0)
61
- irb (1.1.1)
62
- json (2.3.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)
63
87
  launchy (2.4.3)
64
88
  addressable (~> 2.3)
65
89
  license-generator (0.4.1)
66
90
  thor
67
- logger (1.4.2)
91
+ logger (1.5.1)
68
92
  method_source (1.0.0)
69
93
  minigit (0.0.4)
70
- minitest (5.14.0)
71
- multi_json (1.14.1)
72
- multipart-post (2.1.1)
94
+ minitest (5.15.0)
95
+ multi_json (1.15.0)
96
+ multipart-post (2.2.0)
73
97
  net-http-persistent (2.9.4)
74
98
  net-http-pipeline (1.0.1)
75
- parallel (1.19.1)
76
- parser (2.7.1.0)
77
- ast (~> 2.4.0)
78
- powerpack (0.1.2)
79
- pry (0.13.0)
99
+ parallel (1.22.1)
100
+ parser (2.7.2.0)
101
+ ast (~> 2.4.1)
102
+ powerpack (0.1.3)
103
+ pry (0.14.1)
80
104
  coderay (~> 1.1)
81
105
  method_source (~> 1.0)
106
+ public_suffix (4.0.7)
82
107
  pusher-client (0.6.2)
83
108
  json
84
109
  websocket (~> 1.0)
85
110
  rainbow (2.2.2)
86
111
  rake
87
- rake (13.0.1)
88
- rspec (3.9.0)
89
- rspec-core (~> 3.9.0)
90
- rspec-expectations (~> 3.9.0)
91
- rspec-mocks (~> 3.9.0)
92
- rspec-core (3.9.1)
93
- rspec-support (~> 3.9.1)
94
- rspec-expectations (3.9.1)
112
+ rake (13.0.6)
113
+ reline (0.3.1)
114
+ 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)
95
122
  diff-lcs (>= 1.2.0, < 2.0)
96
- rspec-support (~> 3.9.0)
97
- rspec-mocks (3.9.1)
123
+ rspec-support (~> 3.11.0)
124
+ rspec-mocks (3.11.1)
98
125
  diff-lcs (>= 1.2.0, < 2.0)
99
- rspec-support (~> 3.9.0)
100
- rspec-support (3.9.2)
126
+ rspec-support (~> 3.11.0)
127
+ rspec-support (3.11.0)
101
128
  rubocop (0.49.1)
102
129
  parallel (~> 1.10)
103
130
  parser (>= 2.3.3.1, < 3.0)
@@ -105,7 +132,8 @@ GEM
105
132
  rainbow (>= 1.99.1, < 3.0)
106
133
  ruby-progressbar (~> 1.7)
107
134
  unicode-display_width (~> 1.0, >= 1.0.1)
108
- ruby-progressbar (1.10.1)
135
+ ruby-progressbar (1.11.0)
136
+ ruby2_keywords (0.0.5)
109
137
  rubygems-tasks (0.2.5)
110
138
  irb (~> 1.0)
111
139
  safe_yaml (0.9.7)
@@ -117,47 +145,43 @@ GEM
117
145
  sync (0.5.0)
118
146
  term-ansicolor (1.7.1)
119
147
  tins (~> 1.0)
120
- thor (1.0.1)
148
+ thor (1.2.1)
121
149
  thread_safe (0.3.6)
122
- tins (1.24.1)
150
+ tins (1.31.1)
123
151
  sync
124
- travis (1.8.13)
125
- backports
126
- faraday (~> 0.9)
127
- faraday_middleware (~> 0.9, >= 0.9.1)
152
+ travis (1.11.0)
153
+ faraday (~> 1.0)
154
+ faraday_middleware (~> 1.0)
128
155
  gh (~> 0.13)
129
- highline (~> 1.6)
130
- launchy (~> 2.1)
156
+ highline (~> 2.0)
157
+ json_pure (~> 2.3)
158
+ launchy (~> 2.1, < 2.5.0)
131
159
  pusher-client (~> 0.4)
132
- typhoeus (~> 0.6, >= 0.6.8)
133
160
  travis-lint (1.8.0)
134
161
  hashr (~> 0.0.22)
135
162
  safe_yaml (~> 0.9.0)
136
- typhoeus (0.8.0)
137
- ethon (>= 0.8.0)
138
- tzinfo (1.2.7)
163
+ tzinfo (1.2.9)
139
164
  thread_safe (~> 0.1)
140
- unicode-display_width (1.7.0)
141
- websocket (1.2.8)
142
- yard (0.9.24)
165
+ 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)
143
170
 
144
171
  PLATFORMS
145
- ruby
146
- x86_64-darwin-16
147
- x86_64-darwin-17
148
- x86_64-darwin-18
172
+ x86_64-darwin-19
149
173
 
150
174
  DEPENDENCIES
151
- bundler (~> 1.0)
175
+ bundler (~> 2.3)
152
176
  falkorlib!
153
177
  pry (~> 0.9)
154
178
  rspec (~> 3.0)
155
179
  rubocop (~> 0.49.0)
156
180
  rubygems-tasks (~> 0.2)
157
181
  simplecov (<= 0.17.1)
158
- travis (~> 1.6)
182
+ travis (~> 1.11)
159
183
  travis-lint (~> 1.8)
160
184
  yard (>= 0.9.20)
161
185
 
162
186
  BUNDLED WITH
163
- 1.17.3
187
+ 2.3.15
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-2020 Sebastien Varrette <Sebastien.Varrette@uni.lu>
16
+ Copyright (c) 2012-2022 Sebastien Varrette <Sebastien.Varrette@uni.lu>
17
17
 
18
18
  Sebastien Varrette aka Falkor's Common library to share Ruby code, `{rake,cap}`
19
19
  tasks and project templates
data/falkorlib.gemspec CHANGED
@@ -68,26 +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'
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')
75
+ #s.add_runtime_dependency("benchmark", '~> 4.0')
76
+ #s.add_runtime_dependency("bundler-stats", '~> 2.0')
77
+ s.add_runtime_dependency("configatron", '~> 3.0')
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')
72
81
  s.add_runtime_dependency 'git_remote_branch', '~> 0'
73
- #s.add_runtime_dependency 'git', '~> 1.2', '>= 1.2.5'
74
- s.add_runtime_dependency('minigit', '~> 0')
75
- s.add_runtime_dependency("term-ansicolor", "~> 1.3")
76
- s.add_runtime_dependency("configatron", "~> 3.0")
77
- s.add_runtime_dependency("awesome_print", "~> 1.2")
78
- s.add_runtime_dependency("json", "~> 2.0")
82
+ s.add_runtime_dependency("json", '> 2.0')
79
83
  s.add_runtime_dependency("license-generator", '~> 0')
80
- s.add_runtime_dependency("deep_merge", '~> 1.0.1')
81
- s.add_runtime_dependency("diffy", '>= 3.0')
82
- s.add_runtime_dependency("logger", '>= 1.2.8')
83
- s.add_runtime_dependency("thor", '>= 1.0')
84
- s.add_runtime_dependency("artii", '>= 2.1')
85
- s.add_runtime_dependency("facter", '~> 2.4.1')
86
- s.add_runtime_dependency("activesupport", '~> 4.0')
87
- #s.add_runtime_dependency("bundler-stats", '~> 2.0')
88
- #s.add_runtime_dependency("benchmark", '~> 4.0')
84
+ s.add_runtime_dependency("logger", '>= 1.2.8')
89
85
  #s.add_runtime_dependency("mercenary", '>= 0.3.5')
90
-
86
+ s.add_runtime_dependency('minigit', '~> 0')
87
+ s.add_runtime_dependency("term-ansicolor", '> 1.3')
88
+ s.add_runtime_dependency("thor", '>= 1.0')
91
89
 
92
90
  #
93
91
  #
@@ -96,21 +94,19 @@ Gem::Specification.new do |s|
96
94
  # One call to add_development_dependency('gem_name', 'gem version requirement')
97
95
  # for each development dependency. These gems are required for developers
98
96
  #
99
- #s.add_development_dependency("rake", ">= 10.1.0") #"~> 0.9.2")
100
- s.add_development_dependency("bundler", "~> 1.0")
101
- s.add_development_dependency 'rspec', '~> 3.0' #, '>= 2.7.0'
97
+ s.add_development_dependency("bundler", "~> 2.3")
98
+ #s.add_development_dependency("bluecloth", "~> 2.2.0")
99
+ #s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
100
+ #s.add_development_dependency("codeclimate-test-reporter", '~> 0') #, group: :test, require: nil)
102
101
  s.add_development_dependency("pry", "~> 0.9")
103
- s.add_development_dependency("yard", ">= 0.9.20")
104
- s.add_development_dependency('rubocop', '~> 0.49.0')
102
+ s.add_development_dependency 'rspec', '~> 3.0' #, '>= 2.7.0'
105
103
  s.add_development_dependency("rubygems-tasks", "~> 0.2")
106
- s.add_development_dependency("travis", "~> 1.6")
107
- s.add_development_dependency("travis-lint", "~> 1.8")
104
+ s.add_development_dependency('rubocop', '~> 0.49.0')
108
105
  s.add_development_dependency('simplecov', '<= 0.17.1')
109
- #s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
110
- #s.add_development_dependency("codeclimate-test-reporter", '~> 0') #, group: :test, require: nil)
111
106
  #s.add_development_dependency("thor-zsh_completion", '>= 0.1.5')
112
- #s.add_development_dependency("bluecloth", "~> 2.2.0")
113
- #s.add_development_dependency("wlang", "~> 0.10.2")
107
+ s.add_development_dependency("travis", "~> 1.11")
108
+ s.add_development_dependency("travis-lint", "~> 1.8")
109
+ s.add_development_dependency("yard", ">= 0.9.20")
114
110
 
115
111
 
116
112
  # The version of ruby required by this gem
data/lib/falkorlib/bootstrap/base.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  ################################################################################
3
- # Time-stamp: <Mon 2020-04-20 17:21 svarrette>
3
+ # Time-stamp: <Thu 2022-06-02 19:08 svarrette>
4
4
  ################################################################################
5
5
  # Interface for the main Bootstrapping operations
6
6
  #
@@ -29,10 +29,9 @@ module FalkorLib #:nodoc:
29
29
  :hook => 'pre-commit.git-crypt.sh',
30
30
  :ulhpc => [
31
31
  #'0x5D08BCDD4F156AD7', # S. Varrette
32
- '0x6429C2514EBC4737', # S. Peter
33
32
  '0x37183CEF550DF40B', # H. Cartiaux
34
- '0x10717CE35947FEDF', # E. Kieffer
35
- '0x710A74A36A99455A', # F. Pinel
33
+ '0x7E1457DB75803F41', # T. Valette
34
+ '7F883C928BC48E98', # A. Olloh
36
35
  ],
37
36
  # :hooks => {
38
37
  # :precommit => 'https://gist.github.com/848c82daa63710b6c132bb42029b30ef.git',
data/lib/falkorlib/bootstrap/ruby.rb CHANGED
@@ -57,7 +57,7 @@ module FalkorLib
57
57
  if options[:ruby]
58
58
  v = options[:ruby]
59
59
  else
60
- select_from(FalkorLib.config[:rvm][:rubies],
60
+ v = select_from(FalkorLib.config[:rvm][:rubies],
61
61
  "Select RVM ruby to configure for this directory",
62
62
  (FalkorLib.config[:rvm][:rubies].find_index(FalkorLib.config[:rvm][:version]) + 1))
63
63
  end
data/lib/falkorlib/cli/new.rb CHANGED
@@ -177,7 +177,7 @@ PYENV_LONG_DESC
177
177
  #......................................
178
178
  desc "slides [options]", "Bootstrap LaTeX Beamer slides"
179
179
  method_option :name, :aliases => '-n', :desc => 'Name of the LaTeX project'
180
- #method_option :dir, :aliases => '-d', :desc => 'Project directory (relative to the git root directory)'
180
+ method_option :dir, :aliases => '-d', :desc => 'Project directory (relative to the git root directory)'
181
181
  #___________________
182
182
  def slides(path = Dir.pwd)
183
183
  (help(__method__) and exit 0) if options[:help]
data/lib/falkorlib/config.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  ################################################################################
3
- # Time-stamp: <Sun 2020-04-12 14:57 svarrette>
3
+ # Time-stamp: <Thu 2022-06-02 19:14 svarrette>
4
4
  ################################################################################
5
5
  # FalkorLib Configuration
6
6
  #
@@ -56,14 +56,15 @@ 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 => [ '2.7.0', '2.6.5', '2.5.6', '2.4.9' ],
60
- :version => '2.6.5',
59
+ :rubies => [ '3.1.2', '3.0.4', '2.7.6'],
60
+ :version => '3.1.2',
61
61
  :versionfile => '.ruby-version',
62
62
  :gemsetfile => '.ruby-gemset'
63
63
  },
64
64
  :pyenv => {
65
- :versions => ['2.7.16', '3.7.4' ],
66
- :version => '3.7.4',
65
+ # See https://devguide.python.org/#status-of-python-branches
66
+ :versions => ['3.9.13', '3.8.13', '3.7.13', '2.7.18' ],
67
+ :version => '3.7.13',
67
68
  :versionfile => '.python-version',
68
69
  :virtualenvfile => '.python-virtualenv',
69
70
  :direnvfile => '.envrc',
data/lib/falkorlib/git/base.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  ################################################################################
3
- # Time-stamp: <Wed 2018-11-21 13:31 svarrette>
3
+ # Time-stamp: <Sun 2022-06-05 17:16 svarrette>
4
4
  ################################################################################
5
5
  # Interface for the main Git operations
6
6
  #
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, 8, 6
22
+ MAJOR, MINOR, PATCH = 0, 8, 9
23
23
 
24
24
  module_function
25
25
 
data/spec/falkorlib/git_spec.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  #########################################
3
3
  # git_spec.rb
4
4
  # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
5
- # Time-stamp: <Thu 2018-10-04 08:05 svarrette>
5
+ # Time-stamp: <Sun 2022-06-05 17:15 svarrette>
6
6
  #
7
7
  # @description Check the Git operations
8
8
  #
data/templates/README/readme_git.erb CHANGED
@@ -1,15 +1,8 @@
1
- ## Advanced Topics
1
+ ## Misc.
2
2
 
3
3
  ### Git
4
4
 
5
- This repository make use of [Git](http://git-scm.com/) such that you should have it installed on your working machine:
6
-
7
- $> apt-get install git-core # On Debian-like systems
8
- $> yum install git # On CentOS-like systems
9
- $> brew install git # On Mac OS, using [Homebrew](http://mxcl.github.com/homebrew/)
10
- $> port install git # On Mac OS, using MacPort
11
-
12
- Consider these resources to become more familiar (if not yet) with Git:
5
+ This repository make use of [Git](http://git-scm.com/). Consider these resources to become more familiar (if not yet) with Git:
13
6
 
14
7
  * [Simple Git Guide](http://rogerdudler.github.io/git-guide/)
15
8
  * [Git book](http://book.git-scm.com/index.html)
@@ -25,18 +18,3 @@ At least, you shall configure the following variables
25
18
  $> git config --global color.status auto
26
19
  $> git config --global color.branch auto
27
20
 
28
- Note that you can create git command aliases in `~/.gitconfig` as follows:
29
-
30
- [alias]
31
- up = pull origin
32
- pu = push origin
33
- st = status
34
- df = diff
35
- ci = commit -s
36
- br = branch
37
- w = whatchanged --abbrev-commit
38
- ls = ls-files
39
- gr = log --graph --oneline --decorate
40
- amend = commit --amend
41
-
42
- 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 CHANGED
@@ -1,11 +1,21 @@
1
1
  ## Python Virtualenv / Pyenv and Direnv
2
2
 
3
- 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/).
3
+ 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.
4
+ 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/).
4
5
 
5
- You can run the following command to setup your local machine in a compliant way:
6
+ 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) :
6
7
 
8
+ ```bash
9
+ make setup-direnv
10
+ make setup-pyenv # OR make setup-venv
7
11
  ```
8
- make setup-pyenv # AND/OR 'make setup-direnv'
12
+
13
+ Adapt your favorite shell configuration as suggested. You may want to add the following:
14
+
15
+ ``` bash
16
+ for f in $XDG_CONFIG_HOME/*/init.sh; do
17
+ . ${f}
18
+ done
9
19
  ```
10
20
 
11
21
  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 ..
18
28
  cd -
19
29
  ```
20
30
 
21
- From that point, you should install the required packages using:
22
-
23
- pip install -r requirements.txt
24
-
25
- Alternatively, you can use `make setup-python`
26
-
27
- ## Python Code Development
31
+ 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
28
32
 
29
- The Python code for `<%= name.downcase %>` is developed as a Python package, i.e. following the [official guidelines](https://packaging.python.org/overview/).
30
-
31
- To play in live with the code while developing it, install it in "_editable_" mode by running:
32
-
33
- pip install -e ./
34
-
35
- In practice:
33
+ ```bash
34
+ # Alternative using venv
35
+ source venv/<%= name.downcase %>/bin/activate
36
+ ```
36
37
 
37
- cd src
38
- make
38
+ From that point, you should install the required packages using:
39
39
 
40
- Later on, you can clean the directory using
40
+ ``` bash
41
+ make setup-python
41
42
 
42
- make clean
43
+ # OR (manually)
44
+ pip install --upgrade pip
45
+ pip install -r requirements.txt
46
+ ```
43
47
 
44
- Now you can enjoy live runs.
data/templates/mkdocs/docs/vagrant.md.erb CHANGED
@@ -14,7 +14,7 @@ Once installed, check the list of VMs ready to be deployed using
14
14
 
15
15
  ```bash
16
16
  $> vagrant status
17
- # Follow instructions to (eventually) install the missing plugings
17
+ # Follow instructions to (eventually) install the missing plugins
18
18
  $> vagrant plugin install
19
19
  $> vagrant plugin install vagrant-hosts
20
20
  $> vagrant plugin install vagrant-vbguest
data/templates/vagrant/Vagrantfile.erb CHANGED
@@ -39,10 +39,12 @@ VAGRANTFILE_API_VERSION = "2"
39
39
 
40
40
  # Eventually a local YAML configuration for the deployment
41
41
  TOP_SRCDIR = File.expand_path File.dirname(__FILE__)
42
- TOP_CONFDIR = File.join(TOP_SRCDIR, 'vagrant')
43
- TOP_PUPPETDIR = File.join(TOP_CONFDIR, 'puppet')
44
- TOP_PUPPET_MODULEDIR = File.join(TOP_PUPPETDIR, 'modules')
45
- config_file = File.join(TOP_CONFDIR, 'config.yaml')
42
+ CONFDIR = 'vagrant'
43
+ config_file = File.join(TOP_SRCDIR, CONFDIR, 'config.yaml')
44
+
45
+ PUPPETDIR = File.join(CONFDIR, 'puppet')
46
+ TOP_PUPPETDIR = File.join(TOP_SRCDIR, PUPPETDIR)
47
+ PUPPET_MODULEDIR = File.join(PUPPETDIR, 'modules')
46
48
 
47
49
  #SHARED_DIR = File.join('vagrant', 'shared')
48
50
 
@@ -195,7 +197,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
195
197
  # Install required puppet modules, if any
196
198
  puppet_modules.each do |mod|
197
199
  config.vm.provision "shell",
198
- inline: "puppet module install --target-dir #{TOP_PUPPET_MODULEDIR} #{mod}"
200
+ inline: "puppet module install --target-dir /vagrant/#{PUPPET_MODULEDIR} #{mod}"
199
201
  end
200
202
 
201
203
  # A role fact MUST be defined (default: 'default') as it is used in Hiera config
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: falkorlib
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.6
4
+ version: 0.8.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sebastien Varrette
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-04-20 00:00:00.000000000 Z
11
+ date: 2022-06-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -25,47 +25,47 @@ dependencies:
25
25
  - !ruby/object:Gem::Version
26
26
  version: 12.3.3
27
27
  - !ruby/object:Gem::Dependency
28
- name: git_remote_branch
28
+ name: activesupport
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '0'
33
+ version: '5.0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '0'
40
+ version: '5.0'
41
41
  - !ruby/object:Gem::Dependency
42
- name: minigit
42
+ name: awesome_print
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ">"
46
46
  - !ruby/object:Gem::Version
47
- version: '0'
47
+ version: '1.2'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ">"
53
53
  - !ruby/object:Gem::Version
54
- version: '0'
54
+ version: '1.2'
55
55
  - !ruby/object:Gem::Dependency
56
- name: term-ansicolor
56
+ name: artii
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
- version: '1.3'
61
+ version: '2.1'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
- version: '1.3'
68
+ version: '2.1'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: configatron
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -81,201 +81,201 @@ dependencies:
81
81
  - !ruby/object:Gem::Version
82
82
  version: '3.0'
83
83
  - !ruby/object:Gem::Dependency
84
- name: awesome_print
84
+ name: deep_merge
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '1.2'
89
+ version: '1.0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '1.2'
96
+ version: '1.0'
97
97
  - !ruby/object:Gem::Dependency
98
- name: json
98
+ name: diffy
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
- version: '2.0'
103
+ version: '3.0'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - "~>"
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
- version: '2.0'
110
+ version: '3.0'
111
111
  - !ruby/object:Gem::Dependency
112
- name: license-generator
112
+ name: facter
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: '0'
117
+ version: 2.4.1
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: '0'
124
+ version: 2.4.1
125
125
  - !ruby/object:Gem::Dependency
126
- name: deep_merge
126
+ name: git_remote_branch
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.0.1
131
+ version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.0.1
138
+ version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
- name: diffy
140
+ name: json
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - ">"
144
144
  - !ruby/object:Gem::Version
145
- version: '3.0'
145
+ version: '2.0'
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - ">"
151
151
  - !ruby/object:Gem::Version
152
- version: '3.0'
152
+ version: '2.0'
153
153
  - !ruby/object:Gem::Dependency
154
- name: logger
154
+ name: license-generator
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 1.2.8
159
+ version: '0'
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: 1.2.8
166
+ version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
- name: thor
168
+ name: logger
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
171
  - - ">="
172
172
  - !ruby/object:Gem::Version
173
- version: '1.0'
173
+ version: 1.2.8
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
178
  - - ">="
179
179
  - !ruby/object:Gem::Version
180
- version: '1.0'
180
+ version: 1.2.8
181
181
  - !ruby/object:Gem::Dependency
182
- name: artii
182
+ name: minigit
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ">="
185
+ - - "~>"
186
186
  - !ruby/object:Gem::Version
187
- version: '2.1'
187
+ version: '0'
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - "~>"
193
193
  - !ruby/object:Gem::Version
194
- version: '2.1'
194
+ version: '0'
195
195
  - !ruby/object:Gem::Dependency
196
- name: facter
196
+ name: term-ansicolor
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - "~>"
199
+ - - ">"
200
200
  - !ruby/object:Gem::Version
201
- version: 2.4.1
201
+ version: '1.3'
202
202
  type: :runtime
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - "~>"
206
+ - - ">"
207
207
  - !ruby/object:Gem::Version
208
- version: 2.4.1
208
+ version: '1.3'
209
209
  - !ruby/object:Gem::Dependency
210
- name: activesupport
210
+ name: thor
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - "~>"
213
+ - - ">="
214
214
  - !ruby/object:Gem::Version
215
- version: '4.0'
215
+ version: '1.0'
216
216
  type: :runtime
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - "~>"
220
+ - - ">="
221
221
  - !ruby/object:Gem::Version
222
- version: '4.0'
222
+ version: '1.0'
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: bundler
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
227
  - - "~>"
228
228
  - !ruby/object:Gem::Version
229
- version: '1.0'
229
+ version: '2.3'
230
230
  type: :development
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
234
  - - "~>"
235
235
  - !ruby/object:Gem::Version
236
- version: '1.0'
236
+ version: '2.3'
237
237
  - !ruby/object:Gem::Dependency
238
- name: rspec
238
+ name: pry
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
241
  - - "~>"
242
242
  - !ruby/object:Gem::Version
243
- version: '3.0'
243
+ version: '0.9'
244
244
  type: :development
245
245
  prerelease: false
246
246
  version_requirements: !ruby/object:Gem::Requirement
247
247
  requirements:
248
248
  - - "~>"
249
249
  - !ruby/object:Gem::Version
250
- version: '3.0'
250
+ version: '0.9'
251
251
  - !ruby/object:Gem::Dependency
252
- name: pry
252
+ name: rspec
253
253
  requirement: !ruby/object:Gem::Requirement
254
254
  requirements:
255
255
  - - "~>"
256
256
  - !ruby/object:Gem::Version
257
- version: '0.9'
257
+ version: '3.0'
258
258
  type: :development
259
259
  prerelease: false
260
260
  version_requirements: !ruby/object:Gem::Requirement
261
261
  requirements:
262
262
  - - "~>"
263
263
  - !ruby/object:Gem::Version
264
- version: '0.9'
264
+ version: '3.0'
265
265
  - !ruby/object:Gem::Dependency
266
- name: yard
266
+ name: rubygems-tasks
267
267
  requirement: !ruby/object:Gem::Requirement
268
268
  requirements:
269
- - - ">="
269
+ - - "~>"
270
270
  - !ruby/object:Gem::Version
271
- version: 0.9.20
271
+ version: '0.2'
272
272
  type: :development
273
273
  prerelease: false
274
274
  version_requirements: !ruby/object:Gem::Requirement
275
275
  requirements:
276
- - - ">="
276
+ - - "~>"
277
277
  - !ruby/object:Gem::Version
278
- version: 0.9.20
278
+ version: '0.2'
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: rubocop
281
281
  requirement: !ruby/object:Gem::Requirement
@@ -291,33 +291,33 @@ dependencies:
291
291
  - !ruby/object:Gem::Version
292
292
  version: 0.49.0
293
293
  - !ruby/object:Gem::Dependency
294
- name: rubygems-tasks
294
+ name: simplecov
295
295
  requirement: !ruby/object:Gem::Requirement
296
296
  requirements:
297
- - - "~>"
297
+ - - "<="
298
298
  - !ruby/object:Gem::Version
299
- version: '0.2'
299
+ version: 0.17.1
300
300
  type: :development
301
301
  prerelease: false
302
302
  version_requirements: !ruby/object:Gem::Requirement
303
303
  requirements:
304
- - - "~>"
304
+ - - "<="
305
305
  - !ruby/object:Gem::Version
306
- version: '0.2'
306
+ version: 0.17.1
307
307
  - !ruby/object:Gem::Dependency
308
308
  name: travis
309
309
  requirement: !ruby/object:Gem::Requirement
310
310
  requirements:
311
311
  - - "~>"
312
312
  - !ruby/object:Gem::Version
313
- version: '1.6'
313
+ version: '1.11'
314
314
  type: :development
315
315
  prerelease: false
316
316
  version_requirements: !ruby/object:Gem::Requirement
317
317
  requirements:
318
318
  - - "~>"
319
319
  - !ruby/object:Gem::Version
320
- version: '1.6'
320
+ version: '1.11'
321
321
  - !ruby/object:Gem::Dependency
322
322
  name: travis-lint
323
323
  requirement: !ruby/object:Gem::Requirement
@@ -333,19 +333,19 @@ dependencies:
333
333
  - !ruby/object:Gem::Version
334
334
  version: '1.8'
335
335
  - !ruby/object:Gem::Dependency
336
- name: simplecov
336
+ name: yard
337
337
  requirement: !ruby/object:Gem::Requirement
338
338
  requirements:
339
- - - "<="
339
+ - - ">="
340
340
  - !ruby/object:Gem::Version
341
- version: 0.17.1
341
+ version: 0.9.20
342
342
  type: :development
343
343
  prerelease: false
344
344
  version_requirements: !ruby/object:Gem::Requirement
345
345
  requirements:
346
- - - "<="
346
+ - - ">="
347
347
  - !ruby/object:Gem::Version
348
- version: 0.17.1
348
+ version: 0.9.20
349
349
  description: 'This is my personal library I use to share the Ruby tidbits and Rake
350
350
  tasks I made it for my various projects, and also to bootstrap easily several element
351
351
  of my daily workflow (new git repository, new beamer slides etc.).
@@ -565,8 +565,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
565
565
  - !ruby/object:Gem::Version
566
566
  version: '0'
567
567
  requirements: []
568
- rubygems_version: 3.0.8
569
- signing_key:
568
+ rubygems_version: 3.1.6
569
+ signing_key:
570
570
  specification_version: 4
571
571
  summary: Sebastien Varrette aka Falkor's Common library to share Ruby code and {rake,cap}
572
572
  tasks