fly.io-rails 0.1.15-x64-mingw32 → 0.1.17-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e485bf42c46a2875d4cd9e86abe7bdb11be4b95d90a30c2394c08d658b397ec
-  data.tar.gz: 279fe3cf5f500abdcac1a31acb83c0678b0304ed6264572564d932d08514067e
+  metadata.gz: db56dc0375073cb48b4255df0b41f4e77967d0e6ca30040756e1f12d121eef31
+  data.tar.gz: 656579b8ad9eb78bf19e46953ac8edbd389ca46f358dad011460cf488a65b681
 SHA512:
-  metadata.gz: cf09a9145a046d93451e3059139a36bd3b1ac52a4f34f52e40eb032eb3f113ffead913a8521141d01d76b282660249b9cfa81d284eec8fe55b65676474840e29
-  data.tar.gz: 5e7a4e58fa7c0e800e90ffdf21e1ae9c93537ee8d0dadaaef9c80f111e20126da8d932df56b454d6ea8317d9b436d354ef8254047bd2a8648bfab9c6a6860bbd
+  metadata.gz: b2bce63de2d640a1371ca80c524ae31fcb5d376a22b7d2961e42ad12c4897afc0ef71b96492c6c97e29b555527a5d3acb987c7ed10534c3a11e476ce42fc417e
+  data.tar.gz: 8d989eb0092f908a2666efcd2d668e33dda2f9a53d4a36f169d46234acd801208adc5a1652c61a7ac8d5564497af6a56677ba1bb11db25661df2aaf8988eace5

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