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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7389af7bf88265119e2d06aa049355559bc4028f0d3dece0d0e8953343e4f862
-  data.tar.gz: c152a91850b5b485a20587c6dc00c07bd5dbfd0598bc732a55195e1e9660b01b
+  metadata.gz: 3c377a9ad2cc1b010d8ce03e8ab13102188a78577c3a3f6324cabb7a7f26d7ad
+  data.tar.gz: 8433d90ec57bf0ce16c039f8319daf15c7bdc4aacf719f7d07acc63635a1a6eb
 SHA512:
-  metadata.gz: 4f0cd311b53e3eeac2b85249759f66d6a978187df0597a83458bc4d99522d9657ffc06a150ff6ab8580ffb246ce57ddd6851c13722b1585dd26e8b8fb6479101
-  data.tar.gz: 75c9ca90be85fa0a003fc4ba47924f0414a0ee5f794c3412fc072bd78c7f714ce0e3d7220866df6fbad935484bace0e43e00b5d236f41a9945bbda9d84be70bc
+  metadata.gz: ac7e4a4a9364564bdd466297a6aadca1b0279c9f9f8cca4a71d26ccd66456ef2f4c0645cdb9dfa46dfc80e62a7d6d9e509fb4ce99df3bec9af6dde9df43864c0
+  data.tar.gz: 2a3a4538ea643f7cf5cf5dc5e818767f2e5c4952eb76f155c24eceb5cfde30f5582e307534409c30b56f4506846c874a96762b79101360f0d7576835707376bc

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