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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fd48bbd6d60636588b2be4029aa7e3fb8681439aea0138a8cc5996a3d85c4de
-  data.tar.gz: 705039823dcc01af1473fd9cc2cbd5696a8d6372a1cddb6c53c0efc473d88020
+  metadata.gz: 690a6d50aca782e3c8d9a070abdc0c985424285251d624e0b9061e58499acac4
+  data.tar.gz: 205e6925ba94d799a1b9cff5ac3a4d3816a741279c7ad46b76e96b401a494709
 SHA512:
-  metadata.gz: b5d6672031e5a57f54a107d980a43a34025416cc306cbccc96b28d64ea264b09b2295d21a5838be89f6d008d821d89e3e39044ce67187d17b19584acc24c8427
-  data.tar.gz: 91c9a197ae0d71c605cbed54d5defa19c4373e9ded1a9834a3c9570b7ab080904a33ea91f94d68e474795ed2f22e52164522631159fea7461079460ff2de6510
+  metadata.gz: 47dfe7f59f3b2b4842233e20676d930f34af919cd53dbcada9cf5a0fcc133d803ed72640284ce85652481c95b3f2fa308e1d213e12b95ac5af6d2682cbc555a1
+  data.tar.gz: 5defc631cd018276994ac69ceaccc5cd37c6d0c099ae011e10e71f307d0c40925d597ea42c790ac4ff08afbf13937be29d0e4e15699199476bbce8926c6282f5

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