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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08da2b642dec92633b4746a9bfd15960c5f7f08bf8ff7f357e8817e0e9363d39'
-  data.tar.gz: 2387302a9e1e0282204be060de1de5fb777ebf89b88dbdf1ad1bcec19318cd30
+  metadata.gz: d56497d97c6640bc7cdbc410ebd1ec3173a1e0a76d748eae927d2967b90a4756
+  data.tar.gz: 19588353e1daab1113e57b87fd1316bd90f7346bd76a65eff952f4a5e3881265
 SHA512:
-  metadata.gz: 9ea9aac26971910bc8d8d3ade160a3ca8d324248dcb4e6c961322e79ce8981828d5b5cb710e37dd5907a26a859a7b17f04bd3616e657124e8ba31ad9022736b0
-  data.tar.gz: 884bb6749dc51dc068f51647abbb20b4bd3aa5214cca3fd0a86aa61066a0e350191f03bae89c0036c1e84d391aef2dd1dff6ee90007342562c5082bc77a34d39
+  metadata.gz: bed48756018de9020b89d8328d851d2083aaa39675afe1be1f5739fc176befbda7e4060c1006fa93206d3cad4894b9d1d14c46d80f94ac0449fa3f7179f4c0c8
+  data.tar.gz: e8e01cb750655558081d133d400fc74fe463d632d9b40eb0b57d22ff5c17cca0ce7db44a00500093b11e3062ed3defaadf18da0ac6f9a124f0fbfbe9fd379ad5

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-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