takelage 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 538945fb85f82fd2bd5d1d04bdb136ec12c2f6571af2f9ec31b02dc31ced3612
-  data.tar.gz: 2e97f00e3d8f495804b6cb4f081f94f1fb5b19d0bba1349f10123b63cb676eea
+  metadata.gz: cbec52f4209df1292ec9dd024191c2ba6533e27dc65201cc05e6e33b64c87b99
+  data.tar.gz: 99636dbf0b456eb779cc2015858cb5bffc473a8261f2c837b2186b159691141d
 SHA512:
-  metadata.gz: 057decaadace56f6a317f9a5a4c590cad1d8addb0fe631c5d067c0184f49d3f4d98a235203ced9865a65d5019a851588cfcdaa7062d357d25fd2804c1eaba060
-  data.tar.gz: bab3f913ab44cadb088fde74ad71e03162b93a272027822fe0e4f3765f4708052b704436a3d33dd20ab7fa273fc26eefadc7686d3a5bcadde207db7a4d61634c
+  metadata.gz: 3a947cd1617a0624819121f1dae76c411866176f1dc268cbde6a7ce9852b40a07d6b740b0c37ff10879b536331bbdafca691b1ccd81c9b37a5341a1be8b4fea8
+  data.tar.gz: 62276fe4ed7dd93652bb7889098d35ca188a633e5ea78276b8ff75ab02c0619aefddd2cc46b9f88e30a69917f2595bdccb5884cd078b5f60ec0e23444a6c9157

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

@@ -100,9 +100,7 @@ module BitClipboardLib
     cmd_bit_clipboard_git_pull =
       config.active['cmd_bit_clipboard_git_pull']
 
-    result_git_pull = try cmd_bit_clipboard_git_pull
-
-    return true unless result_git_pull
+    return true if try cmd_bit_clipboard_git_pull
 
     log.error 'Unable to update git workspace'
     false

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

@@ -26,35 +26,22 @@ module Takelage
     include DockerSocketStart
 
     # Initialize docker container
-    # rubocop:disable Metrics/MethodLength
     # rubocop:disable Metrics/AbcSize
     def initialize(args = [], local_options = {}, configuration = {})
       # initialize thor parent class
       super args, local_options, configuration
 
-      @docker_debug = config.active['docker_debug']
       @docker_user = config.active['docker_user']
       @docker_repo = config.active['docker_repo']
       @docker_tag = config.active['docker_tag']
       @docker_registry = config.active['docker_registry']
-      @dockersock = '/var/run/docker.sock'
-      @dockerrun_options = config.active['docker_run_options']
-      @entrypoint_extra = config.active['docker_entrypoint_extra']
-      @entrypoint_options = config.active['docker_entrypoint_options']
-      @gpg_agent_port = config.active['docker_socket_gpg_agent_port']
-      @gpg_ssh_agent_port = config.active['docker_socket_gpg_ssh_agent_port']
-      @socket_host = docker_socket_host
-      @sockets = docker_socket_scheme
       @username = ENV['USER'] || 'noname'
-      @uid = Etc.getpwnam(@username).uid
-      @gid = Etc.getpwnam(@username).gid
-      @homedir = ENV['HOME'] || '/tmp'
       @workdir = Dir.getwd
       @hostname = "#{@docker_repo}_#{File.basename(@workdir)}"
-      @timezone = 'Europe/Berlin'
+      @socket_host = docker_socket_host
+      @sockets = docker_socket_scheme
     end
     # rubocop:enable Metrics/AbcSize
-    # rubocop:enable Metrics/MethodLength
 
     desc 'check [COMMAND]', 'Check docker container'
     subcommand 'check', DockerContainerCheck

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

@@ -50,6 +50,7 @@ module DockerContainerLib
 
   # Create docker container.
   # rubocop:disable Metrics/MethodLength
+  # rubocop:disable Metrics/AbcSize
   def _docker_container_lib_create_container(container)
     log.debug "Creating container \"#{container}\""
 
@@ -63,37 +64,38 @@ module DockerContainerLib
       addhost = "--add-host host.docker.internal:#{@socket_host}"
     end
 
+    docker_debug = config.active['docker_debug']
     entrypoint = '/entrypoint.py '
     volume_dev = ''
     if options[:development]
       entrypoint += ' --debug '
-      volume_dev = "--volume #{@workdir}/#{@docker_debug}:/debug "
+      volume_dev = "--volume #{@workdir}/#{docker_debug}:/debug "
     end
 
     cmd_docker_create = format(
       config.active['cmd_docker_container_create'],
       workdir: @workdir,
-      timezone: @timezone,
+      timezone: 'Europe/Berlin',
       container: container,
-      dockersock: @dockersock,
-      homedir: @homedir,
+      dockersock: '/var/run/docker.sock',
+      homedir: ENV['HOME'] || '/tmp',
       volume_dev: volume_dev,
       image: image,
       addhost: addhost,
-      dockerrun_options: @dockerrun_options,
+      dockerrun_options: config.active['docker_run_options'],
       entrypoint: entrypoint,
-      gid: @gid,
-      uid: @uid,
+      uid: Etc.getpwnam(@username).uid,
+      gid: Etc.getpwnam(@username).gid,
       username: @username,
-      gpg_agent_port: @gpg_agent_port,
-      gpg_ssh_agent_port: @gpg_ssh_agent_port,
-      extra: @entrypoint_extra,
-      entrypoint_options: @entrypoint_options
+      gpg_agent_port: config.active['docker_socket_gpg_agent_port'],
+      gpg_ssh_agent_port: config.active['docker_socket_gpg_ssh_agent_port'],
+      extra: config.active['docker_entrypoint_extra'],
+      entrypoint_options: config.active['docker_entrypoint_options']
     )
 
     try cmd_docker_create
   end
-
+  # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
   # Check if docker image is available

data/lib/takelage/version

@@ -1 +1 @@
-0.14.1
+0.14.2

metadata

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