takelage 0.14.5 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efef3f7c259afc5739386addf7cc6dd0c81fd9c87924dea67db84e6b9f8eb27d
-  data.tar.gz: ed51faa6153d22eacc379bb951afe48cf5730acec70efbb2981e1182b235b39f
+  metadata.gz: cc2254d636048ddf28ea83ce7862973ec8c04fb47dd445d7e98543d11c0b0d9f
+  data.tar.gz: 4d5d1d664d8984321e3c7c9199a22e390ac2674b931f86d2a054c95da003ecee
 SHA512:
-  metadata.gz: bb475d9cb8915cdd23cc5cff5130855f82fae30108e4cf2383eaae3595070261a5304bdca02e759c6c401f339518962942450853e5e2e800e5f108f1f6891057
-  data.tar.gz: 6dc3c756110ce72b726e62a32590575ed56120dbe904be4f90cd3652184816481bf02956db5b75ebe500c320ce413e54eaa22d02c469ec7250b8b4dcd3d4cffe
+  metadata.gz: fd2a2b107c85b35b49f4fe3e8b3b53dc93d4209e20ffda644fbab530a60374d5d43634b2032f07dbfecf1e89eabe05b92a5e7b5af1f09c5a93e7ea3d09d32181
+  data.tar.gz: 6adda557b7f192298dd2512de7bf470dcb5ac4dbf8ae37cbf9e7a8c0ed1af20d5452b90ce1a0ae1cb0ad6f54d70230b114e16721e9fb8e8ba2f2c31d88978c60

data/README.md

@@ -64,8 +64,8 @@ tau [docker container check orphaned](features/takelage/docker/docker.container.
 tau [docker container command](features/takelage/docker/docker.container.command.feature) [CMD] | Run [CMD] in a docker container
 tau [docker container daemon](features/takelage/docker/docker.container.daemon.feature) | Run docker container in daemon mode
 tau [docker container login](features/takelage/docker/docker.container.login.feature) | Log in to latest local docker container
-tau [docker container nuke](features/takelage/docker/docker.container.nuke.feature) | Remove all docker containers
-tau [docker container purge](features/takelage/docker/docker.container.purge.feature) | Remove orphaned docker containers
+tau [docker container clean](features/takelage/docker/docker.container.clean.feature) | Remove all docker containers
+tau [docker container prune](features/takelage/docker/docker.container.prune.feature) | Remove orphaned docker containers
 tau [docker image check outdated](features/takelage/docker/docker.image.check.outdated.feature) | Check if a docker image is outdated
 tau [docker image tag check local](features/takelage/docker/docker.image.tag.check.local.feature) [TAG] | Check if local docker image [TAG] exists
 tau [docker image tag check remote](features/takelage/docker/docker.image.tag.check.remote.feature) [TAG] | Check if remote docker image [TAG] exists
@@ -94,11 +94,11 @@ tau config | Alias for tau [self config active](features/takelage/self/self.conf
 tau copy [DIR] [SCOPE] | Alias for tau [bit clipboard copy](features/takelage/bit/bit.clipboard.copy.feature)
 tau list | Alias for tau [self list](features/takelage/self/self.list.feature)
 tau login | Alias for tau [docker container login](features/takelage/docker/docker.container.login.feature)
-tau nuke | Alias for tau [docker container nuke](features/takelage/docker/docker.container.nuke.feature)
+tau clean | Alias for tau [docker container clean](features/takelage/docker/docker.container.clean.feature)
 tau paste [COMPONENT] [DIR] | Alias for tau [bit clipboard paste](features/takelage/bit/bit.clipboard.paste.feature)
 tau project | Alias for tau [info project active](features/takelage/info/info.project.active.feature)
 tau pull | Alias for tau [bit clipboard pull](features/takelage/bit/bit.clipboard.pull.feature)
-tau purge | Alias for tau [docker container purge](features/takelage/docker/docker.container.purge.feature)
+tau prune | Alias for tau [docker container prune](features/takelage/docker/docker.container.prune.feature)
 tau push | Alias for tau [bit clipboard push](features/takelage/bit/bit.clipboard.push.feature)
 tau update | Alias for tau [docker image update](features/takelage/docker/docker.image.update.feature)
 tau version | Alias for tau [self version](features/takelage/self/self.version.feature)

data/lib/takelage.rb

@@ -70,8 +70,8 @@ require_relative 'takelage/docker/container/lib'
 require_relative 'takelage/docker/container/command'
 require_relative 'takelage/docker/container/daemon'
 require_relative 'takelage/docker/container/login'
-require_relative 'takelage/docker/container/nuke'
-require_relative 'takelage/docker/container/purge'
+require_relative 'takelage/docker/container/clean'
+require_relative 'takelage/docker/container/prune'
 require_relative 'takelage/docker/container/cli'
 require_relative 'takelage/docker/cli'
 require_relative 'takelage/info/project/cli'
@@ -175,10 +175,10 @@ module Takelage
       Takelage::Self.new.list
     end
 
-    desc 'nuke', 'Alias for tau docker container nuke'
-    # takelage nuke: {takelage::DockerContainer#nuke}
-    def nuke
-      Takelage::DockerContainer.new.nuke
+    desc 'clean', 'Alias for tau docker container clean'
+    # takelage clean: {takelage::DockerContainer#clean}
+    def clean
+      Takelage::DockerContainer.new.clean
     end
 
     desc 'paste [COMPONENT] [DIR]', 'Alias for tau bit clipboard paste'
@@ -193,10 +193,10 @@ module Takelage
       Takelage::BitClipboard.new.pull
     end
 
-    desc 'purge', 'Alias for tau docker container purge'
-    # takelage purge: {takelage::DockerContainer#purge}
-    def purge
-      Takelage::DockerContainer.new.purge
+    desc 'prune', 'Alias for tau docker container prune'
+    # takelage prune: {takelage::DockerContainer#prune}
+    def prune
+      Takelage::DockerContainer.new.prune
     end
 
     desc 'push', 'Alias for tau bit clipboard push'

data/lib/takelage/bit/clipboard/lib.rb

@@ -106,25 +106,6 @@ module BitClipboardLib
     false
   end
 
-  # Genereate .gitignore if bitignore is present
-  def _bit_clipboard_lib_handle_bitignore
-    log.debug 'Handling bitgnore files'
-
-    # find all bitgnore files
-    Dir.glob('./**/bitignore').each do |file|
-      # get directory of bitignore file
-      dir = File.dirname file
-
-      # build gitignore filepath
-      gitignore_file = "#{dir}/.gitignore"
-
-      unless File.exist? gitignore_file
-        log.debug "Creating \".gitignore\" in \"#{dir}\""
-        File.open(gitignore_file, 'w') { |gitignore| gitignore.write('*') }
-      end
-    end
-  end
-
   # Generate bit component ID.
   def _bit_clipboard_lib_id(name)
     id = ''

data/lib/takelage/bit/clipboard/paste.rb

@@ -11,7 +11,6 @@ module BitClipboardPaste
     return false unless _bit_clipboard_paste_cid_exists? cid
 
     _bit_clipboard_paste_import_cid cid, dir
-    _bit_clipboard_lib_handle_bitignore
     _bit_clipbpard_lib_remove_bit_artifacts
     _bit_clipboard_lib_sync_workspace
 

data/lib/takelage/bit/clipboard/pull.rb

@@ -10,7 +10,6 @@ module BitClipboardPull
 
     _bit_clipboard_pull_import_all
     _bit_clipboard_pull_checkout_all
-    _bit_clipboard_lib_handle_bitignore
     _bit_clipbpard_lib_remove_bit_artifacts
     _bit_clipboard_lib_sync_workspace
 

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/{nuke.rb → clean.rb}

@@ -1,33 +1,33 @@
 # frozen_string_literal: true
 
-# takelage docker container nuke
-module DockerContainerNuke
-  # Backend method for docker container nuke.
-  def docker_container_nuke
+# takelage docker container clean
+module DockerContainerClean
+  # Backend method for docker container clean.
+  def docker_container_clean
     log.debug 'Removing all docker containers'
 
     return false unless docker_check_running
 
-    return false if _docker_container_nuke_harakiri?
+    return false if _docker_container_clean_harakiri?
 
-    networks = _docker_container_nuke_kill_existing_containers
+    networks = _docker_container_clean_kill_existing_containers
     _docker_container_lib_remove_networks networks
   end
 
   private
 
-  # Check if we are running tau nuke inside a takelage container
-  def _docker_container_nuke_harakiri?
+  # Check if we are running tau clean inside a takelage container
+  def _docker_container_clean_harakiri?
     hostname = ENV['HOSTNAME'] || ''
     return false unless hostname.start_with? "#{@docker_repo}_"
 
-    log.error "Please run \"tau nuke\" outside of #{@docker_repo} containers"
-    log.info "Run \"tau purge\" to remove orphaned #{@docker_repo} containers"
+    log.error "Please run \"tau clean\" outside of #{@docker_repo} containers"
+    log.info "Run \"tau prune\" to remove orphaned #{@docker_repo} containers"
     true
   end
 
   # Kill all docker containers and return list of networks
-  def _docker_container_nuke_kill_existing_containers
+  def _docker_container_clean_kill_existing_containers
     networks = []
     _docker_container_lib_get_containers.each do |container|
       name = _docker_container_lib_get_container_name_by_id container

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

@@ -14,8 +14,8 @@ module Takelage
     include DockerContainerCommand
     include DockerContainerDaemon
     include DockerContainerLogin
-    include DockerContainerNuke
-    include DockerContainerPurge
+    include DockerContainerClean
+    include DockerContainerPrune
     include DockerImageTagLatestLocal
     include DockerImageTagListLocal
     include DockerImageTagCheckLocal
@@ -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
     #
@@ -73,7 +85,7 @@ module Takelage
     #
     # docker container login
     #
-    option :development,
+    option :debug,
            aliases: 'd',
            type: :boolean,
            default: false,
@@ -88,27 +100,15 @@ module Takelage
     end
 
     #
-    # docker container nuke
-    #
-    desc 'nuke', 'Remove all docker containers'
-    long_desc <<-LONGDESC.gsub("\n", "\x5")
-    Remove all docker containers
-    LONGDESC
-    # Remove all docker containers.
-    def nuke
-      docker_container_nuke
-    end
-
-    #
-    # docker container purge
+    # docker container prune
     #
-    desc 'purge', 'Remove orphaned docker containers'
+    desc 'prune', 'Remove orphaned docker containers'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Remove orphaned docker containers
     LONGDESC
     # Remove orphaned docker containers.
-    def purge
-      docker_container_purge
+    def prune
+      docker_container_prune
     end
   end
 end

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

@@ -6,6 +6,7 @@ module DockerContainerLib
   private
 
   # Create docker container and network.
+  # rubocop:disable Style/IfUnlessModifier
   def _docker_container_lib_create_net_and_ctr(name)
     unless docker_container_check_network name
       _docker_container_lib_create_network name
@@ -15,8 +16,10 @@ module DockerContainerLib
 
     _docker_container_lib_create_container name
   end
+  # rubocop:enable Style/IfUnlessModifier
 
   # Remove docker networks.
+  # rubocop:disable Style/IfUnlessModifier
   def _docker_container_lib_remove_networks(networks)
     networks.each do |network|
       if docker_container_check_network network
@@ -24,6 +27,7 @@ module DockerContainerLib
       end
     end
   end
+  # rubocop:enable Style/IfUnlessModifier
 
   # Create docker network.
   def _docker_container_lib_create_network(network)
@@ -52,6 +56,7 @@ module DockerContainerLib
   # Create docker container.
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Style/IfUnlessModifier
   def _docker_container_lib_create_container(container)
     log.debug "Creating container \"#{container}\""
 
@@ -68,8 +73,8 @@ module DockerContainerLib
     docker_debug = config.active['docker_debug']
     entrypoint = '/entrypoint.py '
     volume_dev = ''
-    if options[:development]
-      entrypoint += ' --debug '
+    if options[:debug]
+      entrypoint = '/debug/entrypoint.py --debug '
       volume_dev = "--volume #{@workdir}/#{docker_debug}:/debug "
     end
 
@@ -77,7 +82,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'],
@@ -97,6 +102,7 @@ module DockerContainerLib
 
     try cmd_docker_create
   end
+  # rubocop:enable Style/IfUnlessModifier
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 

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

@@ -34,7 +34,7 @@ module DockerContainerLogin
     log.debug "Entering container \"#{container}\""
 
     loginpoint = '/loginpoint.py'
-    loginpoint += ' --debug ' if options[:development]
+    loginpoint = '/debug/loginpoint.py --debug ' if options[:debug]
 
     format(
       config.active['cmd_docker_container_enter_container'],

data/lib/takelage/docker/container/{purge.rb → prune.rb}

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-# takelage docker container purge
-module DockerContainerPurge
-  # Backend method for docker container purge.
-  def docker_container_purge
+# takelage docker container prune
+module DockerContainerPrune
+  # Backend method for docker container prune.
+  def docker_container_prune
     log.debug 'Removing orphaned docker containers'
 
     return false unless docker_check_running
 
-    networks = _docker_container_purge_kill_orphaned_containers
+    networks = _docker_container_prune_kill_orphaned_containers
     _docker_container_lib_remove_networks networks
   end
 
   private
 
   # Kill orphaned docker containers and return list of networks
-  def _docker_container_purge_kill_orphaned_containers
+  def _docker_container_prune_kill_orphaned_containers
     networks = []
 
     _docker_container_lib_get_containers.each do |container|

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.14.5
+0.17.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.17.1
 platform: ruby
 authors:
 - Geospin
@@ -228,13 +228,13 @@ files:
 - lib/takelage/docker/container/check/existing.rb
 - lib/takelage/docker/container/check/network.rb
 - lib/takelage/docker/container/check/orphaned.rb
+- lib/takelage/docker/container/clean.rb
 - lib/takelage/docker/container/cli.rb
 - lib/takelage/docker/container/command.rb
 - lib/takelage/docker/container/daemon.rb
 - lib/takelage/docker/container/lib.rb
 - lib/takelage/docker/container/login.rb
-- lib/takelage/docker/container/nuke.rb
-- lib/takelage/docker/container/purge.rb
+- lib/takelage/docker/container/prune.rb
 - lib/takelage/docker/image/check/cli.rb
 - lib/takelage/docker/image/check/outdated.rb
 - lib/takelage/docker/image/cli.rb