takelage 0.7.0 → 0.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/takelage/bit/clipboard/module.rb +1 -1
- data/lib/takelage/default.yml +3 -2
- data/lib/takelage/docker/container/cli.rb +2 -0
- data/lib/takelage/docker/container/module.rb +1 -1
- data/lib/takelage/lib/system.rb +1 -1
- data/lib/takelage/version +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0df44a4deea08af733d4924e973b0ba224cf714d9029ad89816ea85136ae55ff
|
4
|
+
data.tar.gz: f7d6c3ab70630d55abe94e2ab7fa4abf0992c3cb0eecb6f0c0c60d691636655f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d82e4b3f53b3ab2fb1cd9776e14821be2bb223bbcc9655e8dd6ec713bf3c35f32b415a825c4b99fb8120022afb90b39f135be06cd9eb598f9071ac2ec6ccb761
|
7
|
+
data.tar.gz: 0f7876213596e6b57323fded9c38d67aeb0413aca193fb9b4050e4de0b601932a68e30443a23765abb4f5054e9f5d05a41963439be6ae0c64ed72168d1b05036
|
data/README.md
CHANGED
@@ -118,7 +118,7 @@ module BitClipboardModule
|
|
118
118
|
bit_list_scope = run cmd_bit_list_scope
|
119
119
|
|
120
120
|
unless bit_list_scope.include? '"id": "' + cid + '",'
|
121
|
-
log.error "No remote
|
121
|
+
log.error "No remote component \"#{cid}\""
|
122
122
|
return false
|
123
123
|
end
|
124
124
|
|
data/lib/takelage/default.yml
CHANGED
@@ -9,7 +9,7 @@ bit_import_cid: 'bit import --ignore-package-json --skip-update -p %{dir} %{cid}
|
|
9
9
|
bit_list_remotes: 'bit remote --skip-update'
|
10
10
|
bit_list_scope: 'bit list --skip-update --json %{scope}'
|
11
11
|
bit_remote: ''
|
12
|
-
bit_repo: 'bit
|
12
|
+
bit_repo: 'bit list'
|
13
13
|
bit_scope_root: '/bit'
|
14
14
|
bit_scope_list: 'find -L %{root} -name scope.json'
|
15
15
|
bit_scope_new: 'mkdir -p %{root}/%{scope} && cd %{root}/%{scope} && bit init -b'
|
@@ -17,6 +17,7 @@ bit_scope_remove: 'rm -fr %{root}/%{scope}'
|
|
17
17
|
bit_ssh: ''
|
18
18
|
bit_tag_id: 'bit tag --skip-update --skip-tests %{id}'
|
19
19
|
bit_tag_all: 'bit tag --all'
|
20
|
+
docker_debug: 'ansible/roles/takel-takelage/files/pyscripts'
|
20
21
|
docker_image: 'takelage'
|
21
22
|
docker_info: 'docker info'
|
22
23
|
docker_repo: 'takelage'
|
@@ -38,4 +39,4 @@ git_uncommitted: 'git diff --cached --exit-code'
|
|
38
39
|
info_project_main: 'project.yml'
|
39
40
|
info_project_private: 'private/project.yml'
|
40
41
|
pwd: 'pwd'
|
41
|
-
sudo_true: 'sudo true'
|
42
|
+
sudo_true: 'sudo true'
|
@@ -20,6 +20,8 @@ module Takelage
|
|
20
20
|
# initialize thor parent class
|
21
21
|
super args, local_options, configuration
|
22
22
|
|
23
|
+
@docker_debug = config.active['docker_debug']
|
24
|
+
|
23
25
|
@docker_repo = config.active['docker_repo']
|
24
26
|
@docker_image = config.active['docker_image']
|
25
27
|
@docker_tag = config.active['docker_tag']
|
@@ -110,7 +110,7 @@ module DockerContainerModule
|
|
110
110
|
volume_dev = ''
|
111
111
|
if options[:development]
|
112
112
|
entrypoint = '/debug/entrypoint.py --debug '
|
113
|
-
volume_dev = "--volume #{@workdir}
|
113
|
+
volume_dev = "--volume #{@workdir}/#{@docker_debug}:/debug "
|
114
114
|
end
|
115
115
|
|
116
116
|
cmd_docker_create = 'docker run ' +
|
data/lib/takelage/lib/system.rb
CHANGED
@@ -59,7 +59,7 @@ module SystemModule
|
|
59
59
|
def run(command, realtime=false)
|
60
60
|
log.debug "Running command \"#{command}\""
|
61
61
|
stdout_str, stderr_str, status = Open3.capture3 command
|
62
|
-
log.debug "Command \"#{command}\" has stdout:\"\n#{stdout_str}\""
|
62
|
+
log.debug "Command \"#{command}\" has stdout:\n\"\"\"\n#{stdout_str}\"\"\""
|
63
63
|
stdout_str
|
64
64
|
end
|
65
65
|
|
data/lib/takelage/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.7.
|
1
|
+
0.7.1
|