takelage 0.16.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9896e54bf6d9a27b749947fae7a56376e4059008c2f1dfd0629e1deff0e62e5
-  data.tar.gz: ab905f968d34dd7828840534c9234428dcafed5a6a950697108d60c15009de33
+  metadata.gz: c9f51ce427b8a3bd4c6939cc75b79caff5408604745851a9fefd1d4a8dab3512
+  data.tar.gz: 86cd99aead208edb2b10c2754cacc179583672d5a936fe37e7e071f2ebccf6c8
 SHA512:
-  metadata.gz: 9ed5d9ea6a7ed25a6e81ae0a12d83899921878481df76bb0a4773c5eee71bc065a560e84e512fb1eaf55d8c2442901e899d93aa6d998e605ec4d5cd40c0d1c53
-  data.tar.gz: 64fbfa02f1e430c621b877c9e66ab4bdf43f12b41a7003895c58d881bd0d6f38e06312eaf9ea6f723552abd1a98a29525d77d67c83a5b4526723687767aa3c75
+  metadata.gz: b3861bb762966a410dd3014891b6b3ebe606f0cb2180be8d8b7c7cb180f5b0df05b1265882e655a7a6ae85c80714eec62d96c2a9ce26b52d598f4b91d0ddfaa4
+  data.tar.gz: 5ff862c254d0a49e2e7670f048c26d5e5c925d9df24f09ebbb45bcd6cb0f804719787f2ed1c460c324637e7e58c42ad32b91d28ff7247589e00cd5263aefe7c0

data/lib/takelage/default.yml

@@ -28,7 +28,7 @@ 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_container_create: 'docker run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --shm-size %{shmsize} --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{dockerrun_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} --extra=%{extra} %{entrypoint_options}'
+cmd_docker_container_create: 'docker run --detach --env TAKELAGE_PROJECT_BASE_DIR=%{workdir} --env TZ=%{timezone} --hostname %{container} --name %{container} --network %{container} --privileged --rm --shm-size %{shmsize} --tty --volume %{dockersock}:/var/run/docker.sock --volume %{homedir}:/hostdir --volume %{workdir}:/project %{volume_dev} --workdir /project %{addhost} %{docker_run_options} %{image} %{entrypoint} --gid %{gid} --home %{homedir} --uid %{uid} --username %{username} --gpg_agent_port %{gpg_agent_port} --gpg_ssh_agent_port %{gpg_ssh_agent_port} --extra=%{extra} %{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}}"'

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

@@ -46,6 +46,18 @@ module Takelage
     desc 'check [COMMAND]', 'Check docker container'
     subcommand 'check', DockerContainerCheck
 
+    #
+    # docker container clean
+    #
+    desc 'clean', 'Remove all docker containers'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Remove all docker containers
+    LONGDESC
+    # Remove all docker containers.
+    def clean
+      docker_container_clean
+    end
+
     #
     # docker container command
     #
@@ -87,18 +99,6 @@ module Takelage
       docker_container_login
     end
 
-    #
-    # docker container clean
-    #
-    desc 'clean', 'Remove all docker containers'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Remove all docker containers
-    LONGDESC
-    # Remove all docker containers.
-    def clean
-      docker_container_clean
-    end
-
     #
     # docker container prune
     #

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

@@ -2,6 +2,7 @@
 
 # takelage docker container lib
 # rubocop:disable Metrics/ModuleLength
+# rubocop:disable Style/IfUnlessModifier
 module DockerContainerLib
   private
 
@@ -77,7 +78,7 @@ module DockerContainerLib
       config.active['cmd_docker_container_create'],
       addhost: addhost,
       container: container,
-      dockerrun_options: config.active['docker_run_options'],
+      docker_run_options: config.active['docker_run_options'],
       dockersock: '/var/run/docker.sock',
       entrypoint: entrypoint,
       entrypoint_options: config.active['docker_entrypoint_options'],
@@ -151,4 +152,5 @@ module DockerContainerLib
     run cmd_docker_stop
   end
 end
+# rubocop:enable Style/IfUnlessModifier
 # rubocop:enable Metrics/ModuleLength

data/lib/takelage/lib/config.rb

@@ -38,16 +38,33 @@ module ConfigModule
   def configured?(config_keys)
     @configured = true
     config_keys.each do |config_key|
-      unless TakelageConfig.instance.active.key? config_key
-        log.error "Please configure \"#{config_key}\""
-        @configured = false
-      end
+      next unless _check_key_defined? config_key
+      next unless _check_key_set? config_key
     end
     @configured
   end
 
   private
 
+  # Check if config key is defined.
+  def _check_key_defined?(config_key)
+    return true if TakelageConfig.instance.active.key? config_key
+
+    log.error "Undefined config key. Please configure \"#{config_key}\""
+    @configured = false
+    false
+  end
+
+  # Check if config key is nil or empty
+  def _check_key_set?(config_key)
+    takel_config_key = TakelageConfig.instance.active[config_key]
+    return true unless takel_config_key.nil? || takel_config_key.empty?
+
+    log.error "Unset config key. Please configure \"#{config_key}\""
+    @configured = false
+    false
+  end
+
   # Read default config file in lib.
   def _config_read_default
     default_file = File.expand_path("#{File.dirname(__FILE__)}/../default.yml")

data/lib/takelage/version

@@ -1 +1 @@
-0.16.0
+0.19.0

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Geospin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-12-08 00:00:00.000000000 Z
@@ -276,7 +276,7 @@ licenses:
 - GPL-3.0
 metadata:
   yard.run: yard
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -291,8 +291,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: takelage devops workflow cli
 test_files: []