fly.io-rails 0.1.18-aarch64-linux → 0.1.19-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e5ae6928d84dfd6e9fbce5617ecdccb86c96f08b66efb388ced7acd6d4300e
-  data.tar.gz: a960753eba8fc03563e34656331411d060ce2270b697ce90582d77e95d0dec17
+  metadata.gz: '09a7c3cb47fa7a3dacfdef6ecd9d8ff964b58a1fe0a0ab72751442657d84e3ae'
+  data.tar.gz: 40235704945d00d19fac4878626d93b4dc6c821103bb6f92aa5b596430d4c251
 SHA512:
-  metadata.gz: 89fbef2f0e6f4849b179d46875ea4396bb5502ffdbaadcfd5bd4bf7d18d4b4cff5bb3f0858c59ef49f539a8352d9bacf3ba62d962136a9b534d9933004596fb2
-  data.tar.gz: 1d7533be67de6e5cc72ec96cacaf5cc13a4bb4ae6f64c7da3974cf4e77473729e80f76a1738cf5da1eed27353ba8158cb285523e114d9b145ba2d922b9631b35
+  metadata.gz: 585c9169d3ab547c72832049d4632c9e38b727853ef4b1db69827471473f918e0d6a06f4fc1bff7c9ddde148d79c0dd9091095b3197aaaf7fc3d84179f1661ec
+  data.tar.gz: 8a3fcda9bbf40c5200dafd807abb61724085c49d6268aafece6bfd62c787fcd121b9a3afe535839ed6626ef0f0bdd3091cd20f8164e713eaa034acbd793ac9d3

data/lib/fly.io-rails/actions.rb

@@ -365,13 +365,15 @@ module Fly
 
       # stop previous instances - list will fail on first run
       stdout, stderr, status = Open3.capture3('fly machines list --json')
+      existing_machines = []
       unless stdout.empty?
-	JSON.parse(stdout).each do |list|
-	  next if list['id'] == machine or list['state'] == 'destroyed'
-	  cmd = "fly machines remove --force #{list['id']}"
-	  say_status :run, cmd
-	  system cmd
-	end
+        JSON.parse(stdout).each do |list|
+          existing_machines << list['name']
+          next if list['id'] == machine or list['state'] == 'destroyed'
+          cmd = "fly machines remove --force #{list['id']}"
+          say_status :run, cmd
+          system cmd
+        end
       end
 
       # configure sqlite3 (can be overridden by fly.toml)
@@ -410,7 +412,10 @@ module Fly
       options = {region: @region, config: config}
       say_status :fly, "start #{app}"
       if not toml['processes'] or toml['processes'].empty?
-        options[:name] = "#{app}-machine",
+        options[:name] = "#{app}-machine"
+        taken = existing_machines.find {|name| name.start_with? options[:name]}
+        options[:name] = taken == options[:name] ? "#{taken}-2" : taken.next if taken
+
         start = Fly::Machines.create_and_start_machine(app, options)
         machines['app'] = start[:id] 
       else
@@ -418,11 +423,14 @@ module Fly
         config[:env]['NATS_SERVER'] = 'localhost'
         toml['processes'].each do |name, entrypoint|
           options[:name] = "#{app}-machine-#{name}"
+          taken = existing_machines.find {|name| name.start_with? options[:name]}
+          options[:name] = taken == options[:name] ? "#{taken}-2" : taken.next if taken
+
           config[:env]['SERVER_COMMAND'] = entrypoint
           start = Fly::Machines.create_and_start_machine(app, options)
 
           if start['error']
-            STDERR.puts "ERROR: #{start.error}"
+            STDERR.puts "ERROR: #{start['error']}"
             exit 1
           end
 

data/lib/fly.io-rails/version.rb

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.18'
+  VERSION = '0.1.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: aarch64-linux
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby