fly.io-rails 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f96dcb36171d5224f7773b14c56bc9340df0a0dc4adb31cac61bdeecf2d1f9f0
-  data.tar.gz: 4a0cdf24d5760dfe5a88eadffede2b5aa0a74aa781d27ee0a1efecb3225b0a60
+  metadata.gz: 62e1e45b67b1e59c9d6bf778c523af71a59a04ebdf7946d009ea8593424f931f
+  data.tar.gz: 1635153348c6abd68625f3617880a528bd9a4e7b5856efe5b861a1f9231d83d4
 SHA512:
-  metadata.gz: '069d3d1c55f65d24f22cc515710946fe03659bf8d53362dc5726609cbbed0e47109110176cb5dc60767232da475c712776942fa52b2ab0a2378bf8ae422af845'
-  data.tar.gz: 85982160164a4e63cd5fc23ab869c3bc8d7ab43fc78fb5cd2950dd848a63b6aef4f07a83c7603b9e72da36e1fbbff3682b85fb5569ee67c3c6c9e3b7ea4cc461
+  metadata.gz: 2c910a4ae830a27db4041023be42c5c80a0cb1dc05a5e25411c6578a62ad199a0e7d139fe145695f197f2f68c80e19eac131e837e5fc398a2a64f7126afa93b4
+  data.tar.gz: 94cb87aa38e1a73a6cb9eecd0e9b009e10de12800e3667695881eac524d89408ef173c2065825b5ceb31e14c38b8b556a0b6b93cd53cb508cabfb52c1e7ac16c

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)
@@ -235,8 +237,8 @@ module Fly
       output[%r{redis://\S+}]
     end
 
-    def release(app, config)
-      start = Fly::Machines.create_and_start_machine(app, config: config)
+    def release(app, options)
+      start = Fly::Machines.create_and_start_machine(app, options)
       machine = start[:id]
 
       if not machine
@@ -320,9 +322,6 @@ module Fly
 
       # default config
       config = {
-        region: @region,
-        app: app,
-        name: "#{app}-machine",
         image: image,
         guest: {
           cpus: @config.machine.cpus,
@@ -351,7 +350,7 @@ module Fly
 
         # perform release
         say_status :fly, release_config[:env]['SERVER_COMMAND']
-        event, exit_code, machine = release(app, release_config)
+        event, exit_code, machine = release(app, region: @region, config: release_config)
 
         if exit_code != 0
           STDERR.puts 'Error performing release'
@@ -396,21 +395,37 @@ 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
       machines = {}
+      options = {region: @region, config: config}
       say_status :fly, "start #{app}"
       if not toml['processes'] or toml['processes'].empty?
-        start = Fly::Machines.create_and_start_machine(app, config: config)
+        options[:name] = "#{app}-machine",
+        start = Fly::Machines.create_and_start_machine(app, options)
         machines['app'] = start[:id] 
       else
         config[:env] ||= {}
         config[:env]['NATS_SERVER'] = 'localhost'
         toml['processes'].each do |name, entrypoint|
+          options[:name] = "#{app}-machine-#{name}"
           config[:env]['SERVER_COMMAND'] = entrypoint
-          start = Fly::Machines.create_and_start_machine(app, config: config)
+          start = Fly::Machines.create_and_start_machine(app, options)
+
+          if start['error']
+            STDERR.puts "ERROR: #{start.error}"
+            exit 1
+          end
+
           machines[name] = start[:id] 
 
           config.delete :mounts
@@ -484,7 +499,7 @@ module Fly
       # perform release, if necessary
       if (IO.read('lib/tasks/fly.rake') rescue '') =~ /^\s*task[ \t]*+:?release"?[ \t]*\S/
         say_status :fly, config[:env]['SERVER_COMMAND']
-        event, exit_code, machine = release(app, config)
+        event, exit_code, machine = release(app, region: @region, config: config)
       else
         exit_code = 0
       end

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.16'
+  VERSION = '0.1.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors:
 - Sam Ruby