easy_manager 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11feb80943534098ca933a620ea7face972816314e4292336b34ea432ff0f5b4
-  data.tar.gz: de1c828f3d43fc9581c9e99045a11741bb77567c1f341b89ac268cfda7544888
+  metadata.gz: bfb1e50bc8e3aa5d0b6387b1464774ceab853e72e476bbfdde0235da92cb5fa5
+  data.tar.gz: 559ec2811c9aed00b58e32e020635e8d0eb65e9843fd44168c5ecb16e66cc7b2
 SHA512:
-  metadata.gz: 00cd84e57894fee52e4ea070f27db99f3ca3c9f1c8c9df46adf50e5e4c1ccd0f8384b87686d3968cb76d739483559b2528c937cdd542c8e5e1cd6d5c7d7cf909
-  data.tar.gz: b06fc5f300eccce23a5a3fbbddf25dfc0bfc23b3c76307cd04d6ea4d07afd8c842097d2fb79e3920e4b123aae7b4ad1ba15dcd189f215b6742d5a1b8ac66c934
+  metadata.gz: ddded25e7989bf1e70dd6d13571f3e7d2ff7cbb998683d62c11c90102b8d781e3803b977f8c6b7b86342923602d10514bc8896b227506fa36820e59e054155c0
+  data.tar.gz: bd1a66cfc21f9f3e6b541345114204fa00a335d46942d7b715df2c20101ed0e2654b0f94ba77739ac6e59a776611a13538112a2925d28fc6b6f997e0a3c1aee7

data/lib/easymanager/scaleway/main.rb

@@ -35,9 +35,16 @@ class EasyManager
     end
 
     def delete_by_id(id)
+      response = nil
       servers = list
 
-      servers.each { |server| delete(server) if server['id'] == id }
+      servers.each do |server|
+        next unless server['id'] == id
+
+        response = delete(server)
+      end
+
+      response
     end
 
     def status(srv)
@@ -48,7 +55,7 @@ class EasyManager
       Servers.ready?(self, srv, ssh, srv_ready_cmds)
     end
 
-    def wait_until_ready!(srv, ssh, timeout = 300)
+    def wait_until_ready!(srv, ssh, timeout = 360)
       ready = false
       start = Time.now
       loop do
@@ -67,7 +74,7 @@ class EasyManager
       check_cloud_init_cmd = "test -f '/var/log/cloud-init.log' && echo true"
       cloud_init_ready_cmd = 'tail -1 /var/log/cloud-init-output.log'
 
-      [check_cloud_init_cmd, cloud_init_ready_cmd, 'hostname']
+      [check_cloud_init_cmd, cloud_init_ready_cmd]
     end
   end
 end

data/lib/easymanager/scaleway/servers.rb

@@ -29,11 +29,11 @@ class EasyManager
         return unless srv_up?(scw, srv)
 
         cmd_values = SSH.cmd_exec(ssh, srv, cmds)
-        if cmd_values[cmds[0]].empty?
-          cmd_values['hostname'] == srv['hostname']
-        else
-          cmd_values[cmds[1]].include?('The system is finally up')
-        end
+        return unless cmd_values
+        return if cmd_values[cmds[0]].empty?
+
+        cmd_values[cmds[1]].include?('The system is finally up') ||
+          cmd_values[cmds[1]].match?(/Cloud-init v.*finished\sat.*Up.*seconds/)
       end
 
       def self.status(scw, srv_id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_manager
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Joshua MARTINELLE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf