fly.io-rails 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1033cc1f3a2be38373fe2370d73811fcabbd468cd2633d37d2c9f2ef00146b
-  data.tar.gz: 194efa47eb17e2cc94a415d1dc83986979bf2c59c9f2d850f4177db29514c1b3
+  metadata.gz: 6cd9eeec82563db7cad109945cd690f9da1b0d064a9505b196df8e3735120484
+  data.tar.gz: ed54c0bc5884f9793913ac7430e865a84c85175aca383d02c8999acb0c0ba5b2
 SHA512:
-  metadata.gz: 4f08a76c5d80ea01670343fa52c9ccdf411bbc7a150ddc5a1d007e2e1b82edb04562350cef800fadc1f954c331786ddbf0cb713c8e0ec57666b264255e6bf8e4
-  data.tar.gz: 1421a30a28d44caf0321be7c1365482fb167476e701884778a414adea7d076ed72bc9b149c5a13f0f53bbcbc7966e0774ab0cbff829c86a54cfe9839e98db85d
+  metadata.gz: da01a522eab3c5c28febc36e304919de75108947052bd12fdbc697bc5684b0b2fe29eb3c0332332da7959b8c3ade087190f4e090ca4cb659d263bb5c1532e3f8
+  data.tar.gz: d74d360f004f7dd42ed54b025d245fba96c37faddaf48eeb0edb4fd27bb8b23f2a2af3ea896a5d01a6f518043e992c766b353248de966c86b5eec434432fa3d6

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: ruby
 authors:
 - Sam Ruby