takelage 0.30.6 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b2e660e0895362a9d5839d3e28fbc90f4ce1d392ea38e91968616b81cdc93f
-  data.tar.gz: 6a776fe75895b398059e185fdf016fc04eda3a5b46210e4281ab7167bc402ac6
+  metadata.gz: 8e474304722d66fb300d61b9802a63887e813d4d6fa15894fc3ed8d7a325e798
+  data.tar.gz: 4eb757cb8eb7b441b7d3f2f700b4891201bcba0caf46ec8acaa256cde3ca8add
 SHA512:
-  metadata.gz: 30c6f389bc91b999c3545c94cc66f2b8bf6ad4a0701df042a2ab721656382c50b96252cfae756de9322d87f9462dcc2c0bd521bc2814304f6752a809fa31149d
-  data.tar.gz: 2769181f6787f7d8d264dae325f03d3eb3a34e7958571d633ac17078bfd5db391e1eae00bd45673c5006c405c0ed658d36d6bf0952353654212adb7c5f6dfd70
+  metadata.gz: f110bf58872049c6900262fa5eb28a7f58516845fc887917b605fe1eac90098f88073ba39a37e53bbed9e6cd5cdd88f1500afa8b6a5e5dbf4c9e09bc4b2b158c
+  data.tar.gz: 0fc82eb52b09b927079b470673b9adde8f4a28d5b8e4126f7ab7ed21dac548999bb993ffcf2d31e55bab2a97978a02f28619f9c11acab807461c9a9956854186

data/lib/takelage/default.yml

@@ -29,6 +29,7 @@ cmd_bit_scope_add_scope: 'bit remote add %{remote}/%{scope}'
 cmd_bit_scope_list_find_scopes: 'find -L %{root} -name scope.json'
 cmd_bit_scope_new_bit_init: 'mkdir -p %{root}/%{scope} && cd %{root}/%{scope} && bit init --bare'
 cmd_bit_scope_remove_scope: 'rm --force --recursive %{root}/%{scope}'
+cmd_docker: 'docker'
 cmd_docker_check_daemon_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}$'
@@ -60,6 +61,7 @@ cmd_info_status_gpg_agent: 'gpg-connect-agent /bye'
 cmd_info_status_gpg_keys: 'gpg --list-keys'
 cmd_info_status_ssh_keys: 'ssh-add -l'
 cmd_info_status_ssh_socket: 'gpgconf --list-dirs agent-ssh-socket'
+cmd_mutagen: 'mutagen'
 cmd_mutagen_check_daemon_host_connection: 'mutagen forward list --label-selector="%{hostlabel}"'
 cmd_mutagen_check_daemon_version: 'mutagen version'
 cmd_mutagen_forward_socket_create: 'mutagen forward create --name=%{socketname} --label=%{hostlabel} --label=%{takellabel} docker://%{username}@%{container}:unix:%{containersock} unix:%{hostsock}'

data/lib/takelage/docker/check/daemon.rb

@@ -8,7 +8,7 @@ module DockerCheckDaemon
   def docker_check_daemon
     return true if @docker_daemon_running
 
-    return false unless command_available_else_error? 'docker'
+    return false unless command_available_else_error? config.active['cmd_docker']
 
     log.debug 'Check if the docker daemon is running'
 

data/lib/takelage/info/status/bar.rb

@@ -32,7 +32,7 @@ module InfoStatusBar
     return unless _file_exists? takelage_version_file
 
     _file_read takelage_version_file
-    @bar_list << "takelage: #{@content_file.chomp.green}"
+    @bar_list << "#{config.active['docker_repo']}: #{@content_file.chomp.green}"
   end
 
   # Add tau version info to bar

data/lib/takelage/lib/system.rb

@@ -20,7 +20,7 @@ module SystemModule
 
   # Check if a command is available else log warning message
   # @return [Boolean] is the command available?
-  def command_available_else_warning?(command)
+  def command_available_else_warn?(command)
     unless _command_available? command
       log.warn "The command \"#{command}\" is not available"
       return false

data/lib/takelage/mutagen/check/daemon.rb

@@ -9,7 +9,7 @@ module MutagenCheckDaemon
   def mutagen_check_daemon
     return true if @mutagen_daemon_available
 
-    return false unless command_available_else_warning? 'mutagen'
+    return false unless command_available_else_warn? config.active['cmd_mutagen']
 
     log.debug 'Check mutagen status'
 

data/lib/takelage/version

@@ -1 +1 @@
-0.30.6
+0.31.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.30.6
+  version: 0.31.0
 platform: ruby
 authors:
 - Geospin
@@ -126,16 +126,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement