fly.io-rails 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd9eeec82563db7cad109945cd690f9da1b0d064a9505b196df8e3735120484
-  data.tar.gz: ed54c0bc5884f9793913ac7430e865a84c85175aca383d02c8999acb0c0ba5b2
+  metadata.gz: 62e1e45b67b1e59c9d6bf778c523af71a59a04ebdf7946d009ea8593424f931f
+  data.tar.gz: 1635153348c6abd68625f3617880a528bd9a4e7b5856efe5b861a1f9231d83d4
 SHA512:
-  metadata.gz: da01a522eab3c5c28febc36e304919de75108947052bd12fdbc697bc5684b0b2fe29eb3c0332332da7959b8c3ade087190f4e090ca4cb659d263bb5c1532e3f8
-  data.tar.gz: d74d360f004f7dd42ed54b025d245fba96c37faddaf48eeb0edb4fd27bb8b23f2a2af3ea896a5d01a6f518043e992c766b353248de966c86b5eec434432fa3d6
+  metadata.gz: 2c910a4ae830a27db4041023be42c5c80a0cb1dc05a5e25411c6578a62ad199a0e7d139fe145695f197f2f68c80e19eac131e837e5fc398a2a64f7126afa93b4
+  data.tar.gz: 94cb87aa38e1a73a6cb9eecd0e9b009e10de12800e3667695881eac524d89408ef173c2065825b5ceb31e14c38b8b556a0b6b93cd53cb508cabfb52c1e7ac16c

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