takeltau 0.45.16 → 0.45.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9e11c018e6993f4bbb2699c699f52f73512d200ac177c2b2ca6b4e56e0108ef5
4
- data.tar.gz: f32c777e36e4997749d9a2aa10913dd7496b5e5d1b56c5abb2c84898bdb88a0b
3
+ metadata.gz: 83e83d1198f3013bc8dccd2cf87482a1c4a4fbead2db74c243ce1a12465c2fb2
4
+ data.tar.gz: c439865666c24e03d1f3a8349cb1e8c82c31137c09365d1987cbb545506c6ad5
5
5
  SHA512:
6
- metadata.gz: 5fb8aa14337a2dceffe46b0c77042d5bb55cdaf614cb4b3b84f10a30bfc4a28c2eab0ecc66695221d7688d53f93a10aa843d51c08f875fcc9a5853821b9d6235
7
- data.tar.gz: b26feddd04a79042f36287cf4f61c434989b0175da221b5ee92e61e32ce7a89b99eb29566c9fae0962e7f6d394a754d1f44116a2d46cd753b78fc67364e39c71
6
+ metadata.gz: 7e38db0e1a20a6613d08d721d8e7ae6e1b88b59deedb2cc451ccb29bbf5e182319a79d7dca49f86f3adca3a4db33fbbe18c9da65ec69c33ea5d30bfe2f157831
7
+ data.tar.gz: b213d047e992ade91debbf52a743eaac0d5c196f36babc13d4878f739d7dcb1fd27931a720d95f85a762731f8afc61d3c41675608bede6e6fd3fc4e790056a01
@@ -62,6 +62,7 @@ cmd_ship_container_login: 'bash'
62
62
  cmd_ship_container_logs: '%{ship_docker} logs %{ship_hostname} %{args}'
63
63
  cmd_ship_docker: 'docker'
64
64
  cmd_ship_docker_check: 'docker --version'
65
+ cmd_ship_docker_wait: '%{ship_docker} wait %{ship_hostname}'
65
66
  cmd_ship_docker_stop: '%{ship_docker} kill %{ship_hostname}'
66
67
  cmd_ship_project_start_docker_run_nonprivileged: '%{ship_docker} run --rm --interactive %{ship_run_args_nonprivileged} %{image} %{command}'
67
68
  cmd_ship_project_start_docker_run_privileged: '%{ship_docker} run --privileged --rm --detach --name %{ship_hostname} --hostname %{ship_hostname} %{ship_env} %{ports} --volume %{project_root_dir}/%{ship_data_dir}:/home/podman/takelship %{ship_run_args_privileged} %{image} %{command}'
@@ -15,6 +15,7 @@ module Takeltau
15
15
  include ShipPortsLib
16
16
  include ShipProjectCreate
17
17
  include ShipProjectList
18
+ include ShipProjectRestart
18
19
  include ShipProjectStart
19
20
 
20
21
  #
@@ -51,8 +52,7 @@ module Takeltau
51
52
  LONGDESC
52
53
  # ship restart: {Takeltau::ShipProject#restart}
53
54
  def restart(project = 'default')
54
- Takeltau::ShipProject.new.stop
55
- Takeltau::ShipProject.new.start project
55
+ exit ship_project_restart project
56
56
  end
57
57
 
58
58
  #
@@ -17,7 +17,7 @@ module ShipProjectCreate
17
17
  ship_hostname_suffix: 'dump',
18
18
  publish_ports: false
19
19
  )
20
- return false unless _ship_container_lib_started? ship_status
20
+ return false unless _ship_container_lib_started?(ship_status, false)
21
21
 
22
22
  say "#{verb} takelship project \"#{project}\"."
23
23
  true
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ # tau ship project restart
4
+ module ShipProjectRestart
5
+ # Restart a takelship
6
+ def ship_project_restart(project)
7
+ say ship_container_stop
8
+ sleep 1 until ship_project_start project, mute: true
9
+ true
10
+ end
11
+ end
@@ -3,7 +3,7 @@
3
3
  # tau ship project start
4
4
  module ShipProjectStart
5
5
  # Start a takelship
6
- def ship_project_start(project)
6
+ def ship_project_start(project, mute: false)
7
7
  return false unless _ship_project_start_matrjoschka?
8
8
 
9
9
  takelship = _ship_info_lib_get_takelshipinfo
@@ -23,7 +23,7 @@ module ShipProjectStart
23
23
 
24
24
  log.debug "Starting takelship project \"#{project}\""
25
25
  ship_status = _ship_container_lib_docker_privileged ports, project
26
- return false unless _ship_container_lib_started? ship_status
26
+ return false unless _ship_container_lib_started?(ship_status, mute)
27
27
 
28
28
  _ship_project_start_print_banner project
29
29
  say
@@ -62,11 +62,11 @@ module ShipProjectStart
62
62
  end
63
63
 
64
64
  # check if the ship started successfully
65
- def _ship_container_lib_started?(ship_status)
65
+ def _ship_container_lib_started?(ship_status, mute)
66
66
  return true if ship_status[2].zero?
67
67
 
68
- say 'Unable to start the takelship. The error message was:'
69
- say ship_status[1].to_s.strip.delete_prefix('"').delete_suffix('"')
68
+ say 'Unable to start the takelship. The error message was:' unless mute
69
+ say ship_status[1].to_s.strip.delete_prefix('"').delete_suffix('"') unless mute
70
70
  false
71
71
  end
72
72
 
data/lib/takeltau/version CHANGED
@@ -1 +1 @@
1
- 0.45.16
1
+ 0.45.19
data/lib/takeltau.rb CHANGED
@@ -104,6 +104,7 @@ require_relative 'takeltau/ship/ports/list'
104
104
  require_relative 'takeltau/ship/ports/cli'
105
105
  require_relative 'takeltau/ship/project/create'
106
106
  require_relative 'takeltau/ship/project/list'
107
+ require_relative 'takeltau/ship/project/restart'
107
108
  require_relative 'takeltau/ship/project/start'
108
109
  require_relative 'takeltau/ship/project/cli'
109
110
  require_relative 'takeltau/ship/cli'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: takeltau
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.45.16
4
+ version: 0.45.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - Takelwerk
@@ -307,6 +307,7 @@ files:
307
307
  - lib/takeltau/ship/project/cli.rb
308
308
  - lib/takeltau/ship/project/create.rb
309
309
  - lib/takeltau/ship/project/list.rb
310
+ - lib/takeltau/ship/project/restart.rb
310
311
  - lib/takeltau/ship/project/start.rb
311
312
  - lib/takeltau/version
312
313
  homepage: https://github.com/takelwerk/takelage-cli