fly.io-rails 0.1.16-arm64-darwin → 0.1.17-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2162b9025e71b499daf82354e54a32b51cfaae392582854335e6dc046ed80bad
-  data.tar.gz: 14bd4d55a770a961755a159b33ffc732d23d8bdf6c663430d5ac594c90dc9a71
+  metadata.gz: 462e418cd9cd1f0232f94c3f861358fc9a4498f7df287dd65af89a2688ffaeb8
+  data.tar.gz: 210ed9f107a7a7e29093391920aaa02d6cb9077c774ea0f1a7dfc747329d8f17
 SHA512:
-  metadata.gz: c8a84dd1cc423c8f9846eb0340d20421fb5338776f70ae0fb567d92bcc997f45dfc54729cae0447b9fe1b1259bbb77b56f78b52eada153000374b9fbf5cee649
-  data.tar.gz: d9d76448d89b5f75956c5b1856c9f3c0d263db872b1cee87f8b356b34c46f09e0ebea72e0fe4e32d81e21e71b028f07052315c05d9c053a8dc2d7811a232f019
+  metadata.gz: 10e957aa0ac8bb64c39cfbe71693c52e597c001a2a73751fe5bcd38bafb9543d2a7ed4a6f86ac4075d9ef4e97e22a156bdc2427e3b838d51e053b445c01ac65a
+  data.tar.gz: d1b30c5d80923681386b95e896d1b23aa4a7fd52236e8d21db8ff6b6ee8d3a1c2bce7a3db1b7ac159793faebc4edc63d8a1ecd16461ce9390554f75ecf80e0c3

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

@@ -197,17 +197,19 @@ module Fly
     end
 
     def create_volume(app, region, size)
-      volume = "#{app.gsub('-', '_')}_volume"
-      volumes = JSON.parse(`flyctl volumes list --json`).
-        map {|volume| [volume['Name'], volume['Region']]}
+      name = "#{app.gsub('-', '_')}_volume"
+      volumes = JSON.parse(`flyctl volumes list --json`)
 
-      unless volumes.include? [volume, region]
-        cmd = "flyctl volumes create #{volume} --app #{app} --region #{region} --size #{size}"
+      volume = volumes.find {|volume| volume['Name'] == name and volume['Region'] == region}
+      unless volume
+        cmd = "flyctl volumes create #{name} --app #{app} --region #{region} --size #{size}"
         say_status :run, cmd
         system cmd
+        volumes = JSON.parse(`flyctl volumes list --json`)
+        volume = volumes.find {|volume| volume['Name'] == name and volume['Region'] == region}
       end
 
-      volume
+      volume && volume['id']
     end
 
     def create_postgres(app, org, region, vm_size, volume_size, cluster_size)
@@ -396,7 +398,14 @@ module Fly
       config[:services] = toml['services'] if toml['services']
       if toml['mounts']
         mounts = toml['mounts']
-        config[:mounts] = [ { volume: mounts['source'], path: mounts['destination'] } ]
+        volume = JSON.parse(`flyctl volumes list --json`).
+          find {|volume| volume['Name'] == mounts['source'] and volume['Region'] == @region}
+        if volume
+          config[:mounts] = [ { volume: volume['id'], path: mounts['destination'] } ]
+        else
+          STDERR.puts "volume #{mounts['source']} not found in region #{@region}"
+          exit 1
+        end
       end
 
       # start app
@@ -411,6 +420,12 @@ module Fly
         toml['processes'].each do |name, entrypoint|
           config[:env]['SERVER_COMMAND'] = entrypoint
           start = Fly::Machines.create_and_start_machine(app, config: config)
+
+          if start['error']
+            STDERR.puts start.inspect
+            exit 1
+          end
+
           machines[name] = start[:id] 
 
           config.delete :mounts

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.16'
+  VERSION = '0.1.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: arm64-darwin
 authors:
 - Sam Ruby