kameleon-builder 2.10.4 → 2.10.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6efa8300acf90e4c5889f75b3682ff4e2d7e27cedfd1bb4d1856aa45b4c474d4
4
- data.tar.gz: 9307cd1aecbd38b8e81b20ef4b6234c246e1eefb0960d316989c56959576fbef
3
+ metadata.gz: aeb30622025baa485ebc09845773b1e39db3b701494c01e6a3ac32b94d9f4faa
4
+ data.tar.gz: ea307b68b21479e3f930ffdd53536d9616332037524efca18b25804cb02e616b
5
5
  SHA512:
6
- metadata.gz: e9e8fe682ad005bcf49d8845658251b53b626da2759822ee59162372db962fc79e574685e615330dc6d437864477379984a1821953d57cdae9958553b1c2dfd0
7
- data.tar.gz: 376ff16804dd6a321401463f37612140d9b9b493e143db623586cb15830817d92095c8809b6c140f47095bab18401cc2e1fa5e50323a6392e61feeb8b83f4e65
6
+ metadata.gz: 4cd740a9d6156e3e6c0ab480e103b8cf4b2d4cb67634c599c2a3fa4f99553d8b067bd00eee821b49a66cec4816450c59cf021298117f413f07b1796e2c0c682e
7
+ data.tar.gz: ea1d8fa490900e1263c9603008df2b174422f6026ae5d8b31b21d71ad56daf4330bc18ade35a9488c12ab3665b468604d1b56baa944553fc95299596107f44a5
data/.bumpversion.cfg CHANGED
@@ -1,13 +1,13 @@
1
1
  [bumpversion]
2
2
  commit = True
3
3
  tag = True
4
- current_version = 2.10.4
4
+ current_version = 2.10.5
5
5
  parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
6
6
  serialize =
7
7
  {major}.{minor}.{patch}.{release}
8
8
  {major}.{minor}.{patch}
9
9
 
10
- [bumpversion:file:version.txt]
10
+ [bumpversion:file:lib/kameleon/version.rb]
11
11
 
12
12
  [bumpversion:part:release]
13
13
  optional_value = gamma
data/CHANGES CHANGED
@@ -1,6 +1,16 @@
1
1
  Kameleon CHANGELOG
2
2
  ==================
3
3
 
4
+ Version 2.10.5
5
+ --------------
6
+
7
+ Released on July 29th 2021
8
+
9
+ - Remove polipo from the software dependencies as it is not maintained anymore. This breaks the caching feature.
10
+ - Some changes to allow a debian packaging.
11
+ - Update authors.
12
+ - Change the version information file and update scripts accordingly.
13
+
4
14
  Version 2.10.4
5
15
  --------------
6
16
 
data/lib/kameleon.rb CHANGED
@@ -30,7 +30,12 @@ module Kameleon
30
30
  end
31
31
 
32
32
  def erb_dirpath
33
- File.join(Kameleon.source_root, 'erb')
33
+ d = File.join(Kameleon.source_root, 'erb')
34
+ if File::directory?(d)
35
+ return d
36
+ elsif File::directory?(d = '/usr/share/kameleon/erb')
37
+ return d
38
+ end
34
39
  end
35
40
 
36
41
  def userdir
@@ -25,12 +25,17 @@ module Kameleon
25
25
  @bash_history_file = File.join(@bash_scripts_dir, "bash_history")
26
26
  @bash_env_file = File.join(@bash_scripts_dir, "bash_env")
27
27
  @bash_status_file = File.join(@bash_scripts_dir, "bash_status")
28
- @default_bashrc_file = File.join(Kameleon.source_root, "contrib", "kameleon_bashrc.sh")
29
- @cmd_tpl = ERB.new(File.read(File.join(Kameleon.source_root,
30
- "contrib",
28
+ if File::directory?(f = File.join(Kameleon.source_root, "contrib"))
29
+ @contrib_dir = f
30
+ elsif File::directory?(f = '/usr/share/kameleon/contrib')
31
+ @contrib_dir = f
32
+ else
33
+ raise "Could not find contrib dir"
34
+ end
35
+ @default_bashrc_file = File.join(@contrib_dir, 'kameleon_bashrc.sh')
36
+ @cmd_tpl = ERB.new(File.read(File.join(@contrib_dir,
31
37
  "kameleon_exec_cmd.sh")))
32
- @cmd_wrapper_tpl = ERB.new(File.read(File.join(Kameleon.source_root,
33
- "contrib",
38
+ @cmd_wrapper_tpl = ERB.new(File.read(File.join(@contrib_dir,
34
39
  "kameleon_exec_cmd_wrapper.sh")))
35
40
 
36
41
  if @shell_workdir
@@ -1,4 +1,3 @@
1
1
  module Kameleon
2
- VERSION = File.read(
3
- File.expand_path("../../../version.txt", __FILE__)).chomp
2
+ VERSION = '2.10.5'
4
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kameleon-builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.10.4
4
+ version: 2.10.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Salem Harrache
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2020-05-11 00:00:00.000000000 Z
15
+ date: 2021-07-29 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: childprocess
@@ -214,7 +214,6 @@ files:
214
214
  - tests/test_context.rb
215
215
  - tests/test_recipe.rb
216
216
  - tests/test_version.rb
217
- - version.txt
218
217
  homepage: http://kameleon.imag.fr/
219
218
  licenses:
220
219
  - GPL-2.0
data/version.txt DELETED
@@ -1 +0,0 @@
1
- 2.10.4