fly.io-rails 0.1.18-x86_64-darwin → 0.1.19-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2969a2977d1b9760fc0db62764a4a4c0aae3ce2d0d7eef03c68e0a13a238ea3
-  data.tar.gz: eac7308934153271be184aa2c8476265df6beca863cf6c50781eb1939a4dc90c
+  metadata.gz: 64e4378a88765ff053d5971a67090b7be6d73748e6392e9ad046ffd40763de3e
+  data.tar.gz: 3c5c03dd9063381849995990c8f626c653744c29b2318d9e0f21be1a5e28ed50
 SHA512:
-  metadata.gz: ce055b8bd24219ca080af782fe0eb5cab99413338b6755039af9c6bf70cf612563fad12749c99a0b5fd30c5f11b06dc4f775a84a4ceed7ce6d13d933fa657927
-  data.tar.gz: 4ae1060171b00617d3240e7da81e0780023d2cc6093c562b05ffb32c37394f73db32e0535357be513ae808437185dd283d387dc44e4124f3d99b8978b33e8715
+  metadata.gz: f4acf517f636845df6a3d41663eac4ee2f5e3051b91a64be4206ac3e694d62afa8ea5a73d572da60d3aab08f75af4b8805e3bda0f39df7049661b0d62e795ab6
+  data.tar.gz: 32f3aff5af96d2fd9c9d91ff58102b1ceac0800c422ab517d748a13e7139d1d684bb6a9e1b1e10512accf2269ee7f2521edf34cb26b761e42af5927a5d2da82d

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: x86_64-darwin
 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