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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3152f6adda2cdbbd7a2bef5deac278a658e64868c323e6b0ac84de777a52a14a
-  data.tar.gz: 94fdf2dab412dfc2e6d3b6a87089c413c5c64255d92e4024124695493f1805eb
+  metadata.gz: 65933ec07a633f65ca8b763cf6a4d96e9e630387a0a1ddd35968db6995827f5e
+  data.tar.gz: 1b7d68310e402c7979b62dbd4fcaaf99c5b763edbe13771199cce417df3228c5
 SHA512:
-  metadata.gz: 02b75994809d227acf64ba1386383cba933fa58d761445fe0da8bf28f022b182d630ba86e71fe0655b3cf711c9b96ef7624bad774c3cb34581b795db835c75f2
-  data.tar.gz: 939d20b2b48b34041124694c8a83bb022f1ee6f34e77c1370963a8bc0a627e2b99b284dde57e1c4373cd68ef772a147e9628dc4a8c751790a68ef825e2179e7b
+  metadata.gz: f44d9139aff9c03cc56db439f4d59b6db25caae7460b56bc0f4d2aaacd733272a187a16e93c086a555b091ad486854e8fe1753f48ea8895d05c79297debb87dd
+  data.tar.gz: 91c8e32a07333a35f1211d7a9fc7e27c2326b9a0b8268d446bd50b8aa94237809ad1372b49fd0454100a05daa0a53e9c55a48dbc6255f1394785f9a7027fd022

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