fly.io-rails 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62e1e45b67b1e59c9d6bf778c523af71a59a04ebdf7946d009ea8593424f931f
-  data.tar.gz: 1635153348c6abd68625f3617880a528bd9a4e7b5856efe5b861a1f9231d83d4
+  metadata.gz: 4cc23fa369a363a787843d3550716ee786faabbbc0f04d44d6d648fc8199242b
+  data.tar.gz: c0def1765381df4dd6940049913c0cff4b27fda258efab192848b9a5ad229f59
 SHA512:
-  metadata.gz: 2c910a4ae830a27db4041023be42c5c80a0cb1dc05a5e25411c6578a62ad199a0e7d139fe145695f197f2f68c80e19eac131e837e5fc398a2a64f7126afa93b4
-  data.tar.gz: 94cb87aa38e1a73a6cb9eecd0e9b009e10de12800e3667695881eac524d89408ef173c2065825b5ceb31e14c38b8b556a0b6b93cd53cb508cabfb52c1e7ac16c
+  metadata.gz: c482ea6f86f0b9184a97def4f78f2ea694192261aae93f0105eda54a859578e1d696a47c4ad6fb9d6fbbaf956c58a3a8431492654639f4aab5f8f7db263629bc
+  data.tar.gz: 9c2b5c82abbc06cea0f12e505184d6389de4a40f675d2cd8dca65d5957c3c70b5239de7b9cca4459f885818d5becc973aa9621c4945434407181aaecf9261ba6

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