fly.io-rails 0.1.15-aarch64-linux → 0.1.17-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b19f550bafa3218fc5fe4243b2a76281c025e5bef1f73eea02b62aa2c6db0a20
-  data.tar.gz: fae01dcfbfe687e1bd644a2083be66ef90f18952e70ebeb5c5dec7c5b51e99b4
+  metadata.gz: 9b811abd0796f98b64ce088f8e9b2b4cd31308e739a1f11066c78ee4ef203c7c
+  data.tar.gz: efc0ff0a0ce55759bf6ba1a0d2da3438e7fd85a5ca8216d82a69ff9e18c35833
 SHA512:
-  metadata.gz: 6b4c15dcb0ba438ec5bbdfe0d28da7043d6096e5c0a6f39d822a5a02be22cae434fed20d60b863898a38ad5de1accc1333cfaea48a0dd438cd51ef9cba1a3a4a
-  data.tar.gz: 24282449189a51b4b921756ba6ebd7dffee19199f7a8f22d2358c05e7dd9781c59ca647e6da309fe89c8288ee8ea6f669b179ba7b365c1f6a4bde698a57fad57
+  metadata.gz: 1b2dcdab7c02f669cdb5f0583d41c0110129ce319121baab165621908f88d2c8436fff613469b5e0ca44281730e47945e5aef7bfabddd13f3e4aae0227e4841b
+  data.tar.gz: 95876661bc40e5ae17233cd425bebf458e83f12de769bfd2233c4e3e44da629bfbd55752c8017710897a1e8c2f2dffc4e21031aa8f55212d05434f11fb67556f

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/machines.rb

@@ -174,6 +174,7 @@ module Fly
       host ||= "http://#{fly_api_hostname}"
       uri = URI.join(host, path)
       http = Net::HTTP.new(uri.host, uri.port)
+      http.set_debug_output $stderr if ENV['TRACE'] 
       http.use_ssl = true if uri.instance_of? URI::HTTPS
 
       request = make_request.call(uri.request_uri)

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.15'
+  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.15
+  version: 0.1.17
 platform: aarch64-linux
 authors:
 - Sam Ruby