fly.io-rails 0.1.18-x64-mingw32 → 0.1.19-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de0c354099a707c5df36e1661c21870170a523d2755ea0935891cf4bf14d9783
-  data.tar.gz: c1eb047bea6edfa1de626ecc43c53951e26f44fdef79db0d26d769203a4f0369
+  metadata.gz: 7fa806e7f277dde435a4527d99759cb1ce8c9a56e174a05bf82490bc765cbcc7
+  data.tar.gz: f86bcdb1d12ec8cc4df3340e7ad24c4ee033d7721b191a3054f850221d30fc4b
 SHA512:
-  metadata.gz: e919bec2e6d040b0e66155a433b7068eab2294dc6d34e74549f7e0b12f99cef8f30cc28bb1bcdad0ba44aa00334c98132fe014b76bb89af5087656b14ab630f4
-  data.tar.gz: f44a08b3ce2ae82f0ad3f7d1f98b07489bc7f236e5a1fc1b787a9c4828a0af6e3597dd546e269135f16bec8a48cdd2cff5da9644e032b7f525e26bb35d217107
+  metadata.gz: 5b959b420fad0923f0e53502194fde19f117e13b23118975e83bda6de7cb33052fcc58b339e69d7271c3ab25c1121eb241e77c2ff7cb701ebd7fd8ce2e2cec9f
+  data.tar.gz: d7cc24bc4dd138c16f7a7d19f429cf1cdee5e1b1bb960ef64f57b37c65b6bef0d6ae90b2042bc3f3566f1d3672624d6cfd59130eb78f64be6c1f23c754924c0d

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: x64-mingw32
 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