takelage 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f66a9c3c1c62c23deef953a07c15ec08e90325ea20989461836d5fe9bb3827d7
-  data.tar.gz: 312841983390a8fbcd11e8c51ab591d37b44bec0c745a6f83dd10fbed5dbe358
+  metadata.gz: ab8abe1d25c97442acec36bb9ab580d2c49efb64572ececd587f4caa7ab30892
+  data.tar.gz: 49253eba927e0091bcc151d6f20424df56436df23c97669f18654202a7d40257
 SHA512:
-  metadata.gz: e969702e08c786cb712f9f804a16aa612760c8859faaa3e363eb354308351833369eb79bd2f58d3dac1f1f0301bb7eb9e70f9fdf658eb82289ddb448d85e315c
-  data.tar.gz: 71f2c1baa7255ae59a0ba15e859db9c04dcde1a33c4f9e90fe58c978f28798b663432ca5018fe17eee1d3b9d44b9f3f3e602be8ece86be6eda018a710d43bd46
+  metadata.gz: e8c69a6cbe268b971f2eb07b786cf3b6f4ea8d333dd0e8c047bbdc5394727fc3a6e3b35cbb03bac3676c3b1ce5d4eda64d71c990ffff2d49c43d95967d4cdd8d
+  data.tar.gz: f643e564fe3db829fad180f9948cc2381782c5410efa9d2386e05f7bc9cc0d45ff50ff24c7a4586a838e8f3e6c369eac445a2aa6db4bb97609371347060d8bdd

data/README.md

@@ -118,8 +118,8 @@ or *tau config*.
 | *takelage.yml* | highest | Project-specific configuration file next to your main Rakefile. Some projects need special configuration. |
 
 ### Configuration Examples
- 
-- You should the following configuration items in your *~/.takelage.yml*
+
+- You should add the following configuration items in your *~/.takelage.yml*
 if you want to use a private bit remote server:
 
 ```yaml
@@ -128,6 +128,15 @@ bit_remote: 'ssh://bit@bit.example.com:222:/bit'
 bit_ssh: 'ssh -p 222 bit@bit.example.com'
 ```
 
+- By default, takelage uses bright prompt colors which are best viewed on a
+dark background. If you prefer a light background (or want less bright colors)
+you can add an option to your *~/.takelage.yml*:
+
+```yaml
+---
+docker_daynight: 'day'
+```
+
 - If you want to pin a specific docker tag for one of your projects
 then create an *takelage.yml* file with:
 
@@ -144,6 +153,8 @@ to overwrite defaults like:
 docker_repo: takelage-mock
 ```
 
+Furthermore, every external command can be reconfigured.
+
 ### Project Files
 
 *tau* reads two different YAML project files

data/lib/takelage/bit/scope/module.rb

@@ -63,7 +63,7 @@ module BitScopeModule
 
     # prepare scope list command
     root =
-        config.active['bit_scope_root']
+        config.active['bit_root']
 
     cmd_bit_scope_list =
         config.active['cmd_bit_scope_list_find_scopes'] % {
@@ -102,7 +102,7 @@ module BitScopeModule
 
     # prepare scope list command
     root =
-        config.active['bit_scope_root']
+        config.active['bit_root']
 
     cmd_bit_scope_new =
         config.active['cmd_bit_scope_new_bit_init'] % {

data/lib/takelage/default.yml

@@ -1,7 +1,7 @@
 ---
 bit_dev_user: 'takelage'
 bit_remote: ''
-bit_scope_root: '/bit'
+bit_root: '/bit'
 bit_ssh: ''
 cmd_bit_check_workspace_bit_list: 'bit list'
 cmd_bit_check_workspace_pwd: 'pwd'
@@ -23,21 +23,21 @@ cmd_docker_check_running_docker_info: 'docker info'
 cmd_docker_container_check_existing_docker_ps: 'docker ps --filter name=^%{container}$ --quiet'
 cmd_docker_container_check_network_docker_network: 'docker network ls --quiet --filter name=^%{network}$'
 cmd_docker_container_check_orphaned_docker_exec: 'docker exec --interactive %{container} ps a'
-cmd_docker_create_container_docker_run: 'docker run --detach --env GEOSPIN_PROJECT_BASE_DIR=%{workdir} --env GOOGLE_APPLICATION_CREDENTIALS=/srv/google/default.json --env TAKELAGE_DAYNIGHT=%{daynight} --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} %{entrypoint_options}'
-cmd_docker_create_network_docker_network: 'docker network create %{network}'
-cmd_docker_enter_container_docker_exec: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
-cmd_docker_get_container_name_by_id: 'docker ps --filter id=%{container} --format "{{.Names}}"'
-cmd_docker_get_containers: 'docker ps --all --filter name=^%{docker_repo}_ --quiet'
-cmd_docker_remove_network: 'docker network rm %{network}'
-cmd_docker_run_command_in_container: 'docker exec %{container} su %{username} -c "LANG=en_US.UTF-8 %{command}"'
-cmd_docker_stop_container: 'docker stop %{container}'
+cmd_docker_container_create: 'docker run --detach --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} %{entrypoint_options}'
+cmd_docker_container_create_network: 'docker network create %{network}'
+cmd_docker_container_enter_container: 'docker exec --interactive --tty %{container} %{loginpoint} --username %{username}'
+cmd_docker_container_get_container_name: 'docker ps --filter id=%{container} --format "{{.Names}}"'
+cmd_docker_container_get_containers: 'docker ps --all --filter name=^%{docker_repo}_ --quiet'
+cmd_docker_container_remove_network: 'docker network rm %{network}'
+cmd_docker_container_docker_exec: 'docker exec %{container} su %{username} -c "LANG=en_US.UTF-8 %{command}"'
+cmd_docker_container_stop_container: 'docker stop %{container}'
 cmd_docker_image_tag_check_local_docker_images: 'docker images --quiet %{image}'
 cmd_docker_image_tag_list_local_docker_images: 'docker images %{docker_user}\/%{docker_repo} --format "{{.Tag}}"'
 cmd_docker_image_update_docker_pull_latest: 'docker pull %{docker_user}/%{docker_repo}:%{tag_latest_remote}'
 cmd_docker_socket_stop_docker_socket_ps: 'sudo ps a -o pid,command'
 cmd_docker_socket_stop_docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
-cmd_docker_get_socket_start_commands_docker_socket_start: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
-cmd_docker_get_socket_paths_docker_socket_gpgconf: 'gpgconf --list-dirs'
+cmd_docker_socket_get_socket_socat: 'sudo socat TCP-LISTEN:%{port},bind=%{host},reuseaddr,fork UNIX-CLIENT:%{path}'
+cmd_docker_socket_get_socket_gpgconf: 'gpgconf --list-dirs'
 cmd_docker_socket_start_sudo_true: 'sudo true'
 cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
 cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
@@ -45,16 +45,15 @@ cmd_git_check_clean_git_status: 'git status --porcelain'
 cmd_git_check_master_git_branch: 'git symbolic-ref HEAD'
 cmd_git_check_workspace_git_repo: 'git -C . rev-parse'
 cmd_git_check_workspace_pwd: 'pwd'
-docker_daynight: 'night'
 docker_debug: 'ansible/roles/takel-takelage/files/pyscripts'
 docker_entrypoint_options: ''
+docker_registry: 'https://registry.hub.docker.com'
 docker_repo: 'takelage'
-docker_user: 'takelage'
 docker_socket_agent_port: 20000
 docker_socket_agent_ssh_port: 20001
 docker_socket_agent_extra_port: 20002
 docker_socket_agent_browser_port: 20003
 docker_tag: 'latest'
-docker_tagsurl: 'https://hub.docker.com/v2/repositories/takelage/takelage/tags'
+docker_user: 'takelage'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'

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

@@ -28,8 +28,6 @@ module Takelage
 
       @entrypoint_options = config.active['docker_entrypoint_options']
 
-      @daynight = config.active['docker_daynight']
-
       @dockersock = '/var/run/docker.sock'
 
       @username = ENV['USER'] ? ENV['USER'] : 'username'

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

@@ -7,8 +7,6 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_user docker_repo docker_tag)
-
     docker_socket_start
 
     _create_network @hostname unless docker_container_check_network @hostname
@@ -22,8 +20,6 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
-    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
   end
@@ -34,8 +30,6 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_user docker_repo docker_tag)
-
     docker_socket_start
 
     _create_network @hostname unless docker_container_check_network @hostname
@@ -49,8 +43,6 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_repo)
-
     networks = []
 
     _get_containers.each do |container|
@@ -70,8 +62,6 @@ module DockerContainerModule
 
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_repo)
-
     networks = []
 
     _get_containers.each do |container|
@@ -114,9 +104,8 @@ module DockerContainerModule
     end
 
     cmd_docker_create =
-        config.active['cmd_docker_create_container_docker_run'] % {
+        config.active['cmd_docker_container_create'] % {
             workdir: @workdir,
-            daynight: @daynight,
             timezone: @timezone,
             container: container,
             dockersock: @dockersock,
@@ -138,7 +127,7 @@ module DockerContainerModule
     log.debug "Create network \"#{network}\""
 
     cmd_create_network =
-        config.active['cmd_docker_create_network_docker_network'] % {
+        config.active['cmd_docker_container_create_network'] % {
             network: network
         }
 
@@ -155,7 +144,7 @@ module DockerContainerModule
     end
 
     cmd_docker_enter =
-        config.active['cmd_docker_enter_container_docker_exec'] % {
+        config.active['cmd_docker_container_enter_container'] % {
             container: container,
             loginpoint: loginpoint,
             username: @username
@@ -169,7 +158,7 @@ module DockerContainerModule
     log.debug "Getting name of container \"#{container}\""
 
     cmd_get_container_name_by_id =
-        config.active['cmd_docker_get_container_name_by_id'] % {
+        config.active['cmd_docker_container_get_container_name'] % {
             container: container
         }
 
@@ -188,7 +177,7 @@ module DockerContainerModule
     log.debug "Getting all containers of image \"#{@docker_repo}\""
 
     cmd_docker_get =
-        config.active['cmd_docker_get_containers'] % {
+        config.active['cmd_docker_container_get_containers'] % {
             docker_repo: @docker_repo
         }
 
@@ -203,7 +192,7 @@ module DockerContainerModule
     log.debug "Remove network \"#{network}\""
 
     cmd_remove_network =
-        config.active['cmd_docker_remove_network'] % {
+        config.active['cmd_docker_container_remove_network'] % {
             network: network
         }
 
@@ -215,7 +204,7 @@ module DockerContainerModule
     log.debug "Running command \"#{command}\" in container \"#{container}\""
 
     cmd_docker_run_command =
-        config.active['cmd_docker_run_command_in_container'] % {
+        config.active['cmd_docker_container_docker_exec'] % {
             container: container,
             username: @username,
             command: command
@@ -229,7 +218,7 @@ module DockerContainerModule
     log.debug "Stopping container \"#{container}\""
 
     cmd_docker_stop =
-        config.active['cmd_docker_stop_container'] % {
+        config.active['cmd_docker_container_stop_container'] % {
             container: container
         }
 

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

@@ -19,7 +19,7 @@ module Takelage
 
       @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
-      @docker_tagsurl = config.active['docker_tagsurl']
+      @docker_registry = config.active['docker_registry']
     end
 
     desc 'tag [COMMAND]', 'Handle docker image tags'

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

@@ -5,8 +5,6 @@ module DockerImageModule
   def docker_image_update
     return false unless docker_check_running
 
-    return false unless configured? %w(docker_user docker_repo docker_tagsurl)
-
     tag_latest_remote = docker_image_tag_latest_remote
 
     if tag_latest_remote.to_s.strip.empty?

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

@@ -18,7 +18,7 @@ module Takelage
 
       @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
-      @docker_tagsurl = config.active['docker_tagsurl']
+      @docker_registry = config.active['docker_registry']
     end
 
     #

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

@@ -8,8 +8,6 @@ module DockerImageTagCheckModule
 
     return false unless docker_check_running
 
-    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
@@ -40,8 +38,6 @@ module DockerImageTagCheckModule
 
     return false unless docker_check_running
 
-    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

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

@@ -18,7 +18,7 @@ module Takelage
 
       @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
-      @docker_tagsurl = config.active['docker_tagsurl']
+      @docker_registry = config.active['docker_registry']
     end
 
     #

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

@@ -17,7 +17,7 @@ module Takelage
 
       @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
-      @docker_tagsurl = config.active['docker_tagsurl']
+      @docker_registry = config.active['docker_registry']
     end
 
     #

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

@@ -22,25 +22,17 @@ module DockerImageTagListModule
   # Backend method for docker image tag list remote.
   # @return [Array] remote docker image tags
   def docker_image_tag_list_remote
-    log.debug "Getting docker remote tags from \"#{@docker_tagsurl}\""
-
-    begin
-      @res = Net::HTTP.get_response URI(@docker_tagsurl)
-      unless @res.code.eql? '200'
-        log.error "Unable to connect to \"#{@docker_tagsurl}\""
-        return false
-      end
-    rescue SocketError => e
-      log.debug e
-      return false
-    end
-
-    begin
-      tags = JSON.parse @res.body
-    rescue JSON::ParserError
-      log.error 'Unable to parse JSON'
-      return false
-    end
+    log.debug "Getting docker remote tags " +
+                  "of \"#{@docker_user}/#{@docker_repo}\" " +
+                  "from \"#{@docker_registry}\""
+
+    registry = DockerRegistry2.connect(@docker_registry)
+
+    log.debug ("Connected to registry \"#{@docker_registry}\"")
+
+    user = File.basename @docker_user
+
+    tags = registry.tags("#{user}/#{@docker_repo}")
 
     VersionSorter.sort(tags['tags'])
   end

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

@@ -76,7 +76,7 @@ module DockerSocketModule
     # loop over sockets
     @sockets.each do |socket, socket_config|
       cmd_start_socket =
-          config.active['cmd_docker_get_socket_start_commands_docker_socket_start'] % {
+          config.active['cmd_docker_socket_get_socket_socat'] % {
           host: socket_config[:host],
           port: socket_config[:port],
           path: socket_config[:path],
@@ -99,7 +99,7 @@ module DockerSocketModule
   # get socket paths
   def _get_socket_paths
     cmd_gpgconf_listdirs =
-        config.active['cmd_docker_get_socket_paths_docker_socket_gpgconf']
+        config.active['cmd_docker_socket_get_socket_gpgconf']
 
     stdout_str = run cmd_gpgconf_listdirs
 

data/lib/takelage/version

@@ -1 +1 @@
-0.9.2
+0.10.0

data/lib/takelage.rb

@@ -1,9 +1,9 @@
+require 'docker_registry2'
 require 'etc'
 require 'fileutils'
 require 'fylla'
 require 'json'
 require 'logger'
-require 'net/http'
 require 'rake'
 require 'socket'
 require 'thor'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Geospin
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2019-12-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: docker_registry2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: fylla
   requirement: !ruby/object:Gem::Requirement