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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65933ec07a633f65ca8b763cf6a4d96e9e630387a0a1ddd35968db6995827f5e
-  data.tar.gz: 1b7d68310e402c7979b62dbd4fcaaf99c5b763edbe13771199cce417df3228c5
+  metadata.gz: f2969a2977d1b9760fc0db62764a4a4c0aae3ce2d0d7eef03c68e0a13a238ea3
+  data.tar.gz: eac7308934153271be184aa2c8476265df6beca863cf6c50781eb1939a4dc90c
 SHA512:
-  metadata.gz: f44d9139aff9c03cc56db439f4d59b6db25caae7460b56bc0f4d2aaacd733272a187a16e93c086a555b091ad486854e8fe1753f48ea8895d05c79297debb87dd
-  data.tar.gz: 91c8e32a07333a35f1211d7a9fc7e27c2326b9a0b8268d446bd50b8aa94237809ad1372b49fd0454100a05daa0a53e9c55a48dbc6255f1394785f9a7027fd022
+  metadata.gz: ce055b8bd24219ca080af782fe0eb5cab99413338b6755039af9c6bf70cf612563fad12749c99a0b5fd30c5f11b06dc4f775a84a4ceed7ce6d13d933fa657927
+  data.tar.gz: 4ae1060171b00617d3240e7da81e0780023d2cc6093c562b05ffb32c37394f73db32e0535357be513ae808437185dd283d387dc44e4124f3d99b8978b33e8715

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

@@ -237,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
@@ -322,9 +322,6 @@ module Fly
 
       # default config
       config = {
-        region: @region,
-        app: app,
-        name: "#{app}-machine",
         image: image,
         guest: {
           cpus: @config.machine.cpus,
@@ -353,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'
@@ -410,19 +407,22 @@ module Fly
 
       # 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 start.inspect
+            STDERR.puts "ERROR: #{start.error}"
             exit 1
           end
 
@@ -499,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.17'
+  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.17
+  version: 0.1.18
 platform: x86_64-darwin
 authors:
 - Sam Ruby