takelage 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3317ab0e928960d0be0055030366be34f48d5ed125542070908e05e61122298
-  data.tar.gz: 1e0c63f18ed4e3d1c15cc7ab1c32f06248401ef745f0465561e6a39d59601ecf
+  metadata.gz: eaa220fbcacb62fadb2ff18b8cebf3f02ee8a9c52b5ac74cb552b1c415f44ea1
+  data.tar.gz: 6e2868060bdd4e9d7c7a8f2f3c008b7ab32c529af0e96f130c8e154274bdb857
 SHA512:
-  metadata.gz: 689a6d073393485e9db17d99817f83c426ce2b82b11ad948a4534f7abed58176b1e7a5de37b011b25d6054ba5fed79104364c4e4b22292801a6857c366ae3490
-  data.tar.gz: ed13f91551353142defe290d8b1e2c5ef685c82f773ab7c64836597379847219b310e669ab404ef5cf5dfe12f4f185881dc28d7cd91b68975f95af7aa75e9354
+  metadata.gz: 6accaf12dae526c5a2b86ea6cbb0406ebfd4137ad919a2074d3e7bc8e6aa0b9acc3043199d88d10bab63e3b561ec9a18f764063dd95be86181740ef5bd3352f1
+  data.tar.gz: 5e66d4ba1c4575e63a8558814ecfa490d7a594c126fabe86ff704521e990af919a0a0bb1d93589af7c906d7626d3f8db6872e16e96ab4dde63d4ebbe00b1499e

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

@@ -84,8 +84,7 @@ module BitClipboardModule
     cmd_bit_export_to_scope = config.active['bit_export_to_scope'] % {scope: scope}
     run cmd_bit_export_to_scope
 
-    # remove node_modules directory
-    _rm_node_modules
+    _remove_bit_artifacts
 
     log.info "Copied directory \"#{dir}\" " +
                  "as bit component \"#{id}\" " +
@@ -112,10 +111,7 @@ module BitClipboardModule
     cmd_bit_import_cid = config.active['bit_import_cid'] % {cid: cid, dir: dir}
     run cmd_bit_import_cid
 
-    # remove node_modules directory
-    _rm_node_modules
-
-    FileUtils.remove_entry_secure("#{dir}/index.bit", force: true)
+    _remove_bit_artifacts
 
     log.info "Pasted bit component \"#{cid}\"" +
                  "to directory \"#{dir}\""
@@ -145,8 +141,7 @@ module BitClipboardModule
     cmd_bit_checkout_all = config.active['bit_checkout_all']
     run cmd_bit_checkout_all
 
-    # remove node_modules directory
-    _rm_node_modules
+    _remove_bit_artifacts
 
     log.info "Pulled bit components"
   end
@@ -175,8 +170,7 @@ module BitClipboardModule
     cmd_bit_export_all = config.active['bit_export_all']
     run cmd_bit_export_all
 
-    # remove node_modules directory
-    _rm_node_modules
+    _remove_bit_artifacts
 
     log.info "Pushed bit components"
   end
@@ -205,8 +199,21 @@ module BitClipboardModule
     id
   end
 
+  # Remove bit artifacts.
+  def _remove_bit_artifacts
+    _remove_node_modules
+    _remove_index_bit
+  end
+
   # Remove node_modules directory.
-  def _rm_node_modules
+  def _remove_node_modules
     FileUtils.remove_entry_secure('node_modules', force: true)
   end
+
+  # Remove index.bit files recursively.
+  def _remove_index_bit
+    Dir.glob("./**/index.bit").each do |file|
+      FileUtils.remove_entry_secure(file, force: true)
+    end
+  end
 end

data/lib/takelage/default.yml

@@ -37,3 +37,4 @@ git_uncommitted: 'git diff --cached --exit-code'
 info_project_main: 'project.yml'
 info_project_private: 'private/project.yml'
 pwd: 'pwd'
+sudo_true: 'sudo true'

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

@@ -22,6 +22,20 @@ module Takelage
       exit docker_container_check_existing container
     end
 
+    #
+    # docker container check network
+    #
+    desc 'network [NETWORK]', 'Check if docker [NETWORK] is existing'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Check if docker network is existing
+    This check looks for a network with a given name.
+    If such a network is existing the result is true else false.
+    LONGDESC
+    # Check if docker network is existing.
+    def network(network)
+      exit docker_container_check_network network
+    end
+
     #
     # docker container check orphaned
     #

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

@@ -21,6 +21,26 @@ module DockerContainerCheckModule
     true
   end
 
+  # Backend method for docker container check network.
+  # @return [Boolean] is network existing?
+  def docker_container_check_network(network)
+    log.debug "Checking if network \"#{network}\" is existing"
+
+    cmd_docker_network = 'docker network ls ' +
+        '--quiet ' +
+        "--filter name=#{network}"
+
+    stdout_str, stderr_str, status = run_and_check cmd_docker_network
+
+    if stdout_str.to_s.strip.empty?
+      log.debug "Network \"#{network}\" is not existing"
+      return false
+    end
+
+    log.debug "Network \"#{network}\" is existing"
+    true
+  end
+
   # Backend method for docker container check orphaned.
   # @return [Boolean] is container orphaned?
   def docker_container_check_orphaned(container)

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

@@ -9,7 +9,7 @@ module DockerContainerModule
 
     docker_socket_start
 
-    _create_network @hostname unless _network_check_existing @hostname
+    _create_network @hostname unless docker_container_check_network @hostname
     _create_container @hostname unless docker_container_check_existing @hostname
     _run_command_in_container @hostname, command
   end
@@ -20,7 +20,7 @@ module DockerContainerModule
 
     exit false unless configured? %w(docker_repo docker_image docker_tag)
 
-    _create_network @hostname unless _network_check_existing @hostname
+    _create_network @hostname unless docker_container_check_network @hostname
     _create_container @hostname unless docker_container_check_existing @hostname
   end
 
@@ -32,7 +32,7 @@ module DockerContainerModule
 
     docker_socket_start
 
-    _create_network @hostname unless _network_check_existing @hostname
+    _create_network @hostname unless docker_container_check_network @hostname
     _create_container @hostname unless docker_container_check_existing @hostname
     _enter_container @hostname
   end
@@ -52,7 +52,7 @@ module DockerContainerModule
     end
 
     networks.each do |network|
-      _remove_network network if _network_check_existing network
+      _remove_network network if docker_container_check_network network
     end
   end
 
@@ -73,7 +73,7 @@ module DockerContainerModule
     end
 
     networks.each do |network|
-      _remove_network network if _network_check_existing network
+      _remove_network network if docker_container_check_network network
     end
   end
 
@@ -194,25 +194,6 @@ module DockerContainerModule
     stdout_str.split(/\n+/)
   end
 
-  # Check if docker network exists.
-  def _network_check_existing(network)
-    log.debug "Checking if network \"#{network}\" is existing"
-
-    cmd_docker_network_exist = 'docker network ls ' +
-        '--quiet ' +
-        "--filter name=#{network}"
-
-    stdout_str, stderr_str, status = run_and_check cmd_docker_network_exist
-
-    if stdout_str.to_s.strip.empty?
-      log.debug "Network \"#{network}\" is not existing"
-      return false
-    end
-
-    log.debug "Network \"#{network}\" is existing"
-    true
-  end
-
   # Remove docker network.
   def _remove_network network
     log.debug "Remove network \"#{network}\""

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

@@ -10,7 +10,7 @@ module DockerSocketModule
     unless cmds_start_socket.empty?
       log.debug 'Request sudo so that subsequent background tasks run without delay'
 
-      cmd_sudo_true = 'sudo true'
+      cmd_sudo_true = config.active['sudo_true']
 
       run cmd_sudo_true
     end

data/lib/takelage/version

@@ -1 +1 @@
-0.4.1
+0.4.2

metadata

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