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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65933ec07a633f65ca8b763cf6a4d96e9e630387a0a1ddd35968db6995827f5e
-  data.tar.gz: 1b7d68310e402c7979b62dbd4fcaaf99c5b763edbe13771199cce417df3228c5
+  metadata.gz: 64e4378a88765ff053d5971a67090b7be6d73748e6392e9ad046ffd40763de3e
+  data.tar.gz: 3c5c03dd9063381849995990c8f626c653744c29b2318d9e0f21be1a5e28ed50
 SHA512:
-  metadata.gz: f44d9139aff9c03cc56db439f4d59b6db25caae7460b56bc0f4d2aaacd733272a187a16e93c086a555b091ad486854e8fe1753f48ea8895d05c79297debb87dd
-  data.tar.gz: 91c8e32a07333a35f1211d7a9fc7e27c2326b9a0b8268d446bd50b8aa94237809ad1372b49fd0454100a05daa0a53e9c55a48dbc6255f1394785f9a7027fd022
+  metadata.gz: f4acf517f636845df6a3d41663eac4ee2f5e3051b91a64be4206ac3e694d62afa8ea5a73d572da60d3aab08f75af4b8805e3bda0f39df7049661b0d62e795ab6
+  data.tar.gz: 32f3aff5af96d2fd9c9d91ff58102b1ceac0800c422ab517d748a13e7139d1d684bb6a9e1b1e10512accf2269ee7f2521edf34cb26b761e42af5927a5d2da82d

data/lib/fly.io-rails/actions.rb

@@ -237,8 +237,8 @@ module Fly
       output[%r{redis://\S+}]
     end
 
-    def release(app, config)
-      start = Fly::Machines.create_and_start_machine(app, config: config)
+    def release(app, options)
+      start = Fly::Machines.create_and_start_machine(app, options)
       machine = start[:id]
 
       if not machine
@@ -322,9 +322,6 @@ module Fly
 
       # default config
       config = {
-        region: @region,
-        app: app,
-        name: "#{app}-machine",
         image: image,
         guest: {
           cpus: @config.machine.cpus,
@@ -353,7 +350,7 @@ module Fly
 
         # perform release
         say_status :fly, release_config[:env]['SERVER_COMMAND']
-        event, exit_code, machine = release(app, release_config)
+        event, exit_code, machine = release(app, region: @region, config: release_config)
 
         if exit_code != 0
           STDERR.puts 'Error performing release'
@@ -368,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,19 +409,28 @@ module Fly
 
       # start app
       machines = {}
+      options = {region: @region, config: config}
       say_status :fly, "start #{app}"
       if not toml['processes'] or toml['processes'].empty?
-        start = Fly::Machines.create_and_start_machine(app, config: config)
+        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
         config[:env] ||= {}
         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, config: config)
+          start = Fly::Machines.create_and_start_machine(app, options)
 
           if start['error']
-            STDERR.puts start.inspect
+            STDERR.puts "ERROR: #{start['error']}"
             exit 1
           end
 
@@ -499,7 +507,7 @@ module Fly
       # perform release, if necessary
       if (IO.read('lib/tasks/fly.rake') rescue '') =~ /^\s*task[ \t]*+:?release"?[ \t]*\S/
         say_status :fly, config[:env]['SERVER_COMMAND']
-        event, exit_code, machine = release(app, config)
+        event, exit_code, machine = release(app, region: @region, config: config)
       else
         exit_code = 0
       end

data/lib/fly.io-rails/version.rb

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.17'
+  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.17
+  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