takelage 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4557b8751329204617243e1549062dce48e11853d1d395f60df6699125cc9b
-  data.tar.gz: c997a19ee1a62f314116f8afc8ae81f0547336ecb8e96fd523d41509777aeb44
+  metadata.gz: 0d4e9f1786e7e4c7d21e9cada3ed8f29b332aba1e9a4c9d6ad9883aad14aa643
+  data.tar.gz: 73028ac09504b53a127cc8c02d9b7d912e1e24962513955f08fe401f2ab2931f
 SHA512:
-  metadata.gz: ed0c0f46b791f03bb63d97f6e447a9e012dec93f940827ddbf6acb661c8e8a51494ebc3a27f8452bcd2746aa82db25af2d0d927af431939010cff468d4732a7e
-  data.tar.gz: '0848f94cea6016d8ae9020564fe56805927600c7b7778310b10ab824a68b69141769de52e89c83d1d16087bb4907116b3e1db7c281403093eb4b83c3ea692f63'
+  metadata.gz: ff27f4263162d199b3aa7f9f54ee01b8eb537e3dc6f9a260689fa499f9fdc6e700483657d5d2b72198d431a3ca454c8a4cbc07e256c354bc538fe7bb5395bf86
+  data.tar.gz: 49dd92f06b1ad60f87f1af59ac96b6ad3fbc17005de3eaf29c748e396fd88d2232a1db4e0b7bd2e3400e6fb6fae8acba82c49b15ae15aa450a0c823f8840f386

data/README.md

@@ -16,6 +16,7 @@ The takelage devops framework consists of these projects:
 
 | App | Description |
 | --- | ----------- |
+| *[takelage-doc](https://github.com/geospin-takelage/takelage-doc)* | takelage documentation |
 | *[takelage-dev](https://github.com/geospin-takelage/takelage-dev)* | takelage development environment |
 | *[takelage-var](https://github.com/geospin-takelage/takelage-var)* | takelage test plugin |
 | *[takelage-cli](https://github.com/geospin-takelage/takelage-cli)* | takelage command line interface |
@@ -30,7 +31,7 @@ through the [gem](https://github.com/rubygems/rubygems)
 command line tool:
 
 ```bash
-gem install takelage fylla json version_sorter thor
+gem install takelage
 ```
 
 ## Commands
@@ -140,7 +141,7 @@ to overwrite defaults like:
 
 ```yaml
 ---
-docker_image: takelage-mock
+docker_repo: takelage-mock
 ```
 
 ### Project Files

data/lib/takelage/default.yml

@@ -5,22 +5,34 @@ bit_dev: 'takelage'
 bit_export_to_scope: 'bit export --skip-update %{scope}'
 bit_export_all: 'bit export --skip-update --all'
 bit_import_all: 'bit import --ignore-package-json --ignore-dist --skip-update'
-bit_import_cid: 'bit import --ignore-package-json --ignore-dist -p %{dir} %{cid}'
+bit_import_cid: 'bit import --ignore-package-json --ignore-dist --skip-update --path %{dir} %{cid}'
 bit_list_remotes: 'bit remote --skip-update'
 bit_list_scope: 'bit list --skip-update --json %{scope}'
 bit_remote: ''
 bit_repo: 'bit list'
 bit_scope_root: '/bit'
 bit_scope_list: 'find -L %{root} -name scope.json'
-bit_scope_new: 'mkdir -p %{root}/%{scope} && cd %{root}/%{scope} && bit init -b'
-bit_scope_remove: 'rm -fr %{root}/%{scope}'
+bit_scope_new: 'mkdir -p %{root}/%{scope} && cd %{root}/%{scope} && bit init --bare'
+bit_scope_remove: 'rm --force --recursive %{root}/%{scope}'
 bit_ssh: ''
 bit_tag_id: 'bit tag --skip-update --skip-tests %{id}'
 bit_tag_all: 'bit tag --skip-update --skip-tests --all'
+docker_create: 'docker run --detach --env GEOSPIN_PROJECT_BASE_DIR=%{workdir} --env GOOGLE_APPLICATION_CREDENTIALS=/srv/google/default.json --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}/.config/gcloud:/srv/gcloud --volume %{homedir}/.google:/srv/google --volume %{homedir}:/homedir --volume %{workdir}:/project %{volume_dev} --workdir /project %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username}'
+docker_create_network: 'docker network create %{network}'
 docker_debug: 'ansible/roles/takel-takelage/files/pyscripts'
-docker_image: 'takelage'
-docker_info: 'docker info'
+docker_enter: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
+docker_existing: 'docker ps --filter name=^%{container}$ --quiet'
+docker_get: 'docker ps --all --filter name=^%{docker_repo}_ --quiet'
+docker_get_container_name_by_id: 'docker ps --filter id=%{container} --format "{{.Names}}"'
 docker_repo: 'takelage'
+docker_images: 'docker images --quiet %{image}'
+docker_info: 'docker info'
+docker_network: 'docker network ls --quiet --filter name=^%{network}$'
+docker_orphaned: 'docker exec --interactive %{container} ps a'
+docker_pull_latest: 'docker pull %{docker_user}/%{docker_repo}:%{tag_latest_remote}'
+docker_remove_network: 'docker network rm %{network}'
+docker_user: 'takelage'
+docker_run_command: 'docker exec %{container} su %{username} -c "LANG=en_US.UTF-8 %{command}"'
 docker_socket_agent_port: 20000
 docker_socket_agent_ssh_port: 20001
 docker_socket_agent_extra_port: 20002
@@ -29,7 +41,9 @@ docker_socket_ps: 'sudo ps a -o pid,command'
 docker_socket_gpgconf: 'gpgconf --list-dirs'
 docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
 docker_socket_start: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
+docker_stop: 'docker stop %{container}'
 docker_tag: 'latest'
+docker_tags: 'docker images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
 docker_tagsurl: 'https://hub.docker.com/v2/repositories/takelage/takelage/tags'
 git_branch: 'git symbolic-ref HEAD'
 git_repo: 'git -C . rev-parse'

data/lib/takelage/docker/container/check/module.rb

@@ -8,9 +8,8 @@ module DockerContainerCheckModule
 
     return false unless docker_check_running
 
-    cmd_docker_existing = 'docker ps ' +
-        "--filter name=^#{container}$ " +
-        '--quiet'
+    cmd_docker_existing =
+        config.active['docker_existing'] % {container: container}
 
     stdout_str = run cmd_docker_existing
 
@@ -30,9 +29,8 @@ module DockerContainerCheckModule
 
     return false unless docker_check_running
 
-    cmd_docker_network = 'docker network ls ' +
-        '--quiet ' +
-        "--filter name=^#{network}$"
+    cmd_docker_network =
+        config.active['docker_network'] % {network: network}
 
     stdout_str = run cmd_docker_network
 
@@ -52,10 +50,8 @@ module DockerContainerCheckModule
 
     return false unless docker_check_running
 
-    cmd_docker_orphaned = 'docker exec ' +
-        '--interactive ' +
-        "#{container} " +
-        'ps a'
+    cmd_docker_orphaned =
+        config.active['docker_orphaned'] % {container: container}
 
     stdout_str = run cmd_docker_orphaned
 

data/lib/takelage/docker/container/cli.rb

@@ -22,8 +22,8 @@ module Takelage
 
       @docker_debug = config.active['docker_debug']
 
+      @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
-      @docker_image = config.active['docker_image']
       @docker_tag = config.active['docker_tag']
 
       @dockersock = '/var/run/docker.sock'
@@ -34,7 +34,7 @@ module Takelage
 
       @homedir = ENV['HOME'] ? ENV['HOME'] : '/tmp'
       @workdir = Dir.getwd
-      @hostname = "#{@docker_image}_#{File.basename(@workdir)}"
+      @hostname = "#{@docker_repo}_#{File.basename(@workdir)}"
 
       @timezone = 'Europe/Berlin'
 

data/lib/takelage/docker/container/module.rb

@@ -7,7 +7,7 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_repo docker_image docker_tag)
+    return false unless configured? %w(docker_user docker_repo docker_tag)
 
     docker_socket_start
 
@@ -22,7 +22,7 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_repo docker_image docker_tag)
+    return false unless configured? %w(docker_user docker_repo docker_tag)
 
     _create_network @hostname unless docker_container_check_network @hostname
     _create_container @hostname unless docker_container_check_existing @hostname
@@ -34,7 +34,7 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_repo docker_image docker_tag)
+    return false unless configured? %w(docker_user docker_repo docker_tag)
 
     docker_socket_start
 
@@ -49,7 +49,7 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_image)
+    return false unless configured? %w(docker_repo)
 
     networks = []
 
@@ -70,7 +70,7 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_image)
+    return false unless configured? %w(docker_repo)
 
     networks = []
 
@@ -97,7 +97,7 @@ module DockerContainerModule
       tag = docker_image_tag_latest_local
     end
 
-    image = "#{@docker_repo}/#{@docker_image}:#{tag}"
+    image = "#{@docker_user}/#{@docker_repo}:#{tag}"
 
     log.debug "Using docker image \"#{image}\""
 
@@ -113,31 +113,20 @@ module DockerContainerModule
       volume_dev = "--volume #{@workdir}/#{@docker_debug}:/debug "
     end
 
-    cmd_docker_create = 'docker run ' +
-        '--detach ' +
-        "--env GEOSPIN_PROJECT_BASE_DIR=#{@workdir} " +
-        '--env GOOGLE_APPLICATION_CREDENTIALS=/srv/google/default.json ' +
-        "--env TAKELAGE_PROJECT_BASE_DIR=#{@workdir} " +
-        "--env TZ=#{@timezone} " +
-        "--hostname #{container} " +
-        "--name #{container} " +
-        "--network #{container} " +
-        '--privileged ' +
-        '--rm ' +
-        '--tty ' +
-        "--volume #{@dockersock}:/var/run/docker.sock " +
-        "--volume #{@homedir}/.config/gcloud:/srv/gcloud " +
-        "--volume #{@homedir}/.google:/srv/google " +
-        "--volume #{@homedir}:/homedir " +
-        "--volume #{@workdir}:/project " +
-        volume_dev +
-        '--workdir /project ' +
-        "#{image} " +
-        entrypoint +
-        "--gid #{@gid} " +
-        "--home #{@homedir} " +
-        "--uid #{@uid} " +
-        "--username #{@username}"
+    cmd_docker_create =
+        config.active['docker_create'] % {
+            workdir: @workdir,
+            timezone: @timezone,
+            container: container,
+            dockersock: @dockersock,
+            homedir: @homedir,
+            volume_dev: volume_dev,
+            image: image,
+            entrypoint: entrypoint,
+            gid: @gid,
+            uid: @uid,
+            username: @username
+        }
 
     run cmd_docker_create
   end
@@ -146,8 +135,10 @@ module DockerContainerModule
   def _create_network(network)
     log.debug "Create network \"#{network}\""
 
-    cmd_create_network = 'docker network create ' +
-        "#{network}"
+    cmd_create_network =
+        config.active['docker_create_network'] % {
+            network: network
+        }
 
     run cmd_create_network
   end
@@ -161,12 +152,12 @@ module DockerContainerModule
       loginpoint = '/loginpoint.py --debug '
     end
 
-    cmd_docker_enter = 'docker exec ' +
-        '--interactive ' +
-        '--tty ' +
-        "#{container} " +
-        loginpoint +
-        "--username #{@username}"
+    cmd_docker_enter =
+        config.active['docker_enter'] % {
+            container: container,
+            loginpoint: loginpoint,
+            username: @username
+        }
 
     run_and_exit cmd_docker_enter
   end
@@ -175,9 +166,10 @@ module DockerContainerModule
   def _get_container_name_by_id container
     log.debug "Getting name of container \"#{container}\""
 
-    cmd_get_container_name_by_id = 'docker ps ' +
-        "--filter id=#{container} " +
-        '--format "{{.Names}}"'
+    cmd_get_container_name_by_id =
+        config.active['docker_get_container_name_by_id'] % {
+            container: container
+        }
 
     stdout_str = run cmd_get_container_name_by_id
 
@@ -191,12 +183,12 @@ module DockerContainerModule
   # Get all docker containers.
   # @return [Array] list of docker containers
   def _get_containers
-    log.debug "Getting all containers of image \"#{@docker_image}\""
+    log.debug "Getting all containers of image \"#{@docker_repo}\""
 
-    cmd_docker_get = 'docker ps ' +
-        '--all ' +
-        "--filter name=^#{@docker_image}_ " +
-        '--quiet'
+    cmd_docker_get =
+        config.active['docker_get'] % {
+            docker_repo: @docker_repo
+        }
 
     stdout_str = run cmd_docker_get
 
@@ -208,8 +200,10 @@ module DockerContainerModule
   def _remove_network network
     log.debug "Remove network \"#{network}\""
 
-    cmd_remove_network = 'docker network rm ' +
-        "#{network}"
+    cmd_remove_network =
+        config.active['docker_remove_network'] % {
+            network: network
+        }
 
     run cmd_remove_network
   end
@@ -218,10 +212,12 @@ module DockerContainerModule
   def _run_command_in_container(container, command)
     log.debug "Running command \"#{command}\" in container \"#{container}\""
 
-    cmd_docker_run_command = 'docker exec ' +
-        "#{container} " +
-        "su #{@username} " +
-        "-c 'LANG=en_US.UTF-8 #{command}'"
+    cmd_docker_run_command =
+        config.active['docker_run_command'] % {
+            container: container,
+            username: @username,
+            command: command
+        }
 
     run_and_exit cmd_docker_run_command
   end
@@ -230,8 +226,10 @@ module DockerContainerModule
   def _stop_container(container)
     log.debug "Stopping container \"#{container}\""
 
-    cmd_docker_stop = 'docker stop ' +
-        "#{container}"
+    cmd_docker_stop =
+        config.active['docker_stop'] % {
+            container: container
+        }
 
     run cmd_docker_stop
   end

data/lib/takelage/docker/image/cli.rb

@@ -17,8 +17,8 @@ module Takelage
       # initialize thor parent class
       super args, local_options, configuration
 
+      @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
-      @docker_image = config.active['docker_image']
       @docker_tagsurl = config.active['docker_tagsurl']
     end
 

data/lib/takelage/docker/image/module.rb

@@ -5,7 +5,7 @@ module DockerImageModule
   def docker_image_update
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_repo docker_image docker_tagsurl)
+    return false unless configured? %w(docker_user docker_repo docker_tagsurl)
 
     tag_latest_remote = docker_image_tag_latest_remote
 
@@ -23,9 +23,15 @@ module DockerImageModule
       end
     end
 
-    log.info "Updating to docker image \"#{@docker_repo}/#{@docker_image}:#{tag_latest_remote}\""
+    log.info "Updating to docker image \"#{@docker_user}/#{@docker_repo}:#{tag_latest_remote}\""
+
+    cmd_docker_pull_latest =
+        config.active['docker_pull_latest'] % {
+            docker_user: @docker_user,
+            docker_repo: @docker_repo,
+            tag_latest_remote: tag_latest_remote
+        }
 
-    cmd_docker_pull_latest = "docker pull #{@docker_repo}/#{@docker_image}:#{tag_latest_remote}"
     run_and_exit cmd_docker_pull_latest
   end
 end

data/lib/takelage/docker/image/tag/check/cli.rb

@@ -16,8 +16,8 @@ module Takelage
       # initialize thor parent class
       super args, local_options, configuration
 
+      @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
-      @docker_image = config.active['docker_image']
       @docker_tagsurl = config.active['docker_tagsurl']
     end
 

data/lib/takelage/docker/image/tag/check/module.rb

@@ -8,17 +8,19 @@ module DockerImageTagCheckModule
 
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_repo docker_image)
+    return false unless configured? %w(docker_user docker_repo)
 
     if tag.to_s.strip.empty?
       log.warn "No local docker image tag specified"
       return false
     end
 
-    image = "#{@docker_repo}/#{@docker_image}:#{tag}"
+    image = "#{@docker_user}/#{@docker_repo}:#{tag}"
 
-    cmd_docker_images = 'docker images --quiet ' +
-        image
+    cmd_docker_images =
+        config.active['docker_images'] % {
+            image: image
+        }
 
     stdout_str = run cmd_docker_images
 
@@ -38,14 +40,14 @@ module DockerImageTagCheckModule
 
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_repo docker_image docker_tagsurl)
+    return false unless configured? %w(docker_user docker_repo docker_tagsurl)
 
     if tag .to_s.strip.empty?
       log.warn "No remote docker image tag specified"
       return false
     end
 
-    image = "#{@docker_repo}/#{@docker_image}:#{tag}"
+    image = "#{@docker_user}/#{@docker_repo}:#{tag}"
 
     tags = docker_image_tag_list_remote
 

data/lib/takelage/docker/image/tag/latest/cli.rb

@@ -16,8 +16,8 @@ module Takelage
       # initialize thor parent class
       super args, local_options, configuration
 
+      @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
-      @docker_image = config.active['docker_image']
       @docker_tagsurl = config.active['docker_tagsurl']
     end
 

data/lib/takelage/docker/image/tag/list/cli.rb

@@ -15,8 +15,8 @@ module Takelage
       # initialize thor parent class
       super args, local_options, configuration
 
+      @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
-      @docker_image = config.active['docker_image']
       @docker_tagsurl = config.active['docker_tagsurl']
     end
 

data/lib/takelage/docker/image/tag/list/module.rb

@@ -6,11 +6,13 @@ module DockerImageTagListModule
   def docker_image_tag_list_local
     tags = []
 
-    cmd_docker_images = 'docker images ' +
-        "#{@docker_repo}\/#{@docker_image} " +
-        ' --format "{{.Tag}}"'
+    cmd_docker_tags =
+        config.active['docker_tags'] % {
+            docker_user: @docker_user,
+            docker_repo: @docker_repo
+        }
 
-    stdout_str = run cmd_docker_images
+    stdout_str = run cmd_docker_tags
 
     tags = stdout_str.split("\n")
 

data/lib/takelage/lib/system.rb

@@ -11,7 +11,7 @@ module SystemModule
     if hash == {}
       return nil.to_yaml
     end
-    return hash.to_yaml
+    return hash.to_yaml(options = {:line_width => -1})
   end
 
   # @return [Hash] content of yaml file

data/lib/takelage/version

@@ -1 +1 @@
-0.9.0
+0.9.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Geospin