falkorlib 0.8.6 → 0.8.7

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 90a5f15ae97eb39936de7384fd80190a25ec572d3524e740f6d11fc9eeb46ded
4
- data.tar.gz: 1f6f2e77ba4781fcae3cf069c144cb0ab85a2e347e54e1b2f464b31a84132e5e
3
+ metadata.gz: 0f786dce0ea4688bcc56a0b9e137c878c5fab6f23222aa07823586d8e83430bf
4
+ data.tar.gz: 23dd8c3abc0ca90109ae5a7efc343225958ef15917200e1859c09b82a1bff8e9
5
5
  SHA512:
6
- metadata.gz: 94800fe66c39db12b8052daf513de624299852372f95683e3a155d9da9f8bf5b3a0ee753d3386d3c572addd3246b602900445c86ea145715ed703949bfcb04f4
7
- data.tar.gz: 41c9d9e4ab300564a5dff87b81bc43357f8a04f916b90b503b81c4752cf7beda5d3b656582228bc314384d54b220792f25502370126666779c7b58a5309e55d3
6
+ metadata.gz: e80988389ff522f9251e7da09e06ad42d0e2d0134676472670cc4d7c9726b0229cc10f6aad2718cb30555d8f65ec2badd5498c4d4bb7fab5911c963302ea2df2
7
+ data.tar.gz: 6ba0d55a05f44cd2aa445141447ca5db6db1aa2f1b3844f4e3b6ea5c1f5f496075230afb7c1e4107e162504d246008700de187f23bef43dd5ea54acf27c862b5
@@ -1,21 +1,21 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- falkorlib (0.8.6)
4
+ falkorlib (0.8.7)
5
5
  activesupport (~> 4.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
@@ -34,7 +34,7 @@ GEM
34
34
  coderay (1.1.2)
35
35
  concurrent-ruby (1.1.6)
36
36
  configatron (3.2.0)
37
- deep_merge (1.0.1)
37
+ deep_merge (1.2.1)
38
38
  diff-lcs (1.3)
39
39
  diffy (3.3.0)
40
40
  docile (1.3.2)
@@ -68,22 +68,21 @@ 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
72
  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")
73
+ s.add_runtime_dependency('minigit', '~> 0')
74
+ s.add_runtime_dependency("term-ansicolor", '> 1.3')
75
+ s.add_runtime_dependency("configatron", '~> 3.0')
76
+ s.add_runtime_dependency("awesome_print", '> 1.2')
77
+ s.add_runtime_dependency("json", '> 2.0')
79
78
  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')
79
+ s.add_runtime_dependency("deep_merge", '~> 1.0')
80
+ s.add_runtime_dependency("diffy", '>= 3.0')
81
+ s.add_runtime_dependency("logger", '>= 1.2.8')
82
+ s.add_runtime_dependency("thor", '>= 1.0')
83
+ s.add_runtime_dependency("artii", '>= 2.1')
84
+ s.add_runtime_dependency("facter", '~> 2.4.1')
85
+ s.add_runtime_dependency("activesupport", '~> 4.0')
87
86
  #s.add_runtime_dependency("bundler-stats", '~> 2.0')
88
87
  #s.add_runtime_dependency("benchmark", '~> 4.0')
89
88
  #s.add_runtime_dependency("mercenary", '>= 0.3.5')
@@ -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, 7
23
23
 
24
24
  module_function
25
25
 
@@ -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.
@@ -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.
@@ -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
@@ -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.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sebastien Varrette
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-04-20 00:00:00.000000000 Z
11
+ date: 2020-04-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -56,14 +56,14 @@ dependencies:
56
56
  name: term-ansicolor
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ">"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1.3'
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
68
  version: '1.3'
69
69
  - !ruby/object:Gem::Dependency
@@ -84,28 +84,28 @@ dependencies:
84
84
  name: awesome_print
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ">"
88
88
  - !ruby/object:Gem::Version
89
89
  version: '1.2'
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
96
  version: '1.2'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: json
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ">"
102
102
  - !ruby/object:Gem::Version
103
103
  version: '2.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
110
  version: '2.0'
111
111
  - !ruby/object:Gem::Dependency
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.0.1
131
+ version: '1.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: '1.0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: diffy
141
141
  requirement: !ruby/object:Gem::Requirement