fly.io-rails 0.1.0-x86-linux → 0.1.1-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9890e28fc749cbc987a613926614f76ca68de5eb0d54553ca53042ac170db250
-  data.tar.gz: f144955be9c68497037bc38e88c7ce18485b8b235344006480abed035bfb7033
+  metadata.gz: 2ae2eb431bc02977e776f060fca9f15373c64a5dc212ba584bfb318b9c1b54e3
+  data.tar.gz: 1ff8e6992b955e86146536dfaf926387c82bf06b465122e11a3ad59e8f69ffcd
 SHA512:
-  metadata.gz: 0e68bbfa7e68e01b2d25b5e26a70d375aeaa2787957108fec78bad687d7408d65b125d648720520760fffc77f5e9c430bb9bd7eda9b90d2afb0ec1d1007657d9
-  data.tar.gz: abc38c1b1feb87e319704c200964c75567feb0a80c5b32c2a20345a864f5c91c294606ea5b6bd78213b1d2e0a06aa9d8c342e501ccb716de2eda7e60e2421d79
+  metadata.gz: 3e9dca7ab20bc360de7eabaf6a63449e1bd9a607431d23ed9ad7889269bacc5bc856bc6c0ace0b653f4e111dcfe2f883e6c5aaa31552de1f05255759ee27bc90
+  data.tar.gz: 40e8697df6f63334ea54ddff94506cc85240c19da33dae98f2d9322d83ffebb53e7f223f84d859f7934132cbf6cf61da5392b127bff51d941199646404bd5c56

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

@@ -85,7 +85,7 @@ module Fly
     def create_volume(app, region, size)
       volume = "#{app.gsub('-', '_')}_volume"
       volumes = JSON.parse(`flyctl volumes list --json`).
-        map {|volume| volume[' Name']}
+        map {|volume| volume['Name']}
 
       unless volumes.include? volume
         cmd = "flyctl volumes create #{volume} --app #{app} --region #{region} --size #{size}"
@@ -97,14 +97,31 @@ module Fly
     end
 
     def create_postgres(app, org, region, vm_size, volume_size, cluster_size)
-      cmd = "fly postgres create --name #{app}-db --org #{org} --region #{region} --vm-size #{vm_size} --volume-size #{volume_size} --initial-cluster-size #{cluster_size}"
+      cmd = "flyctl postgres create --name #{app}-db --org #{org} --region #{region} --vm-size #{vm_size} --volume-size #{volume_size} --initial-cluster-size #{cluster_size}"
       say_status :run, cmd
       output = FlyIoRails::Utils.tee(cmd)
       output[%r{postgres://\S+}]
    end
 
+    def create_redis(app, org, region, eviction)
+      # see if redis is already defined
+      name = `flyctl redis list`.lines[1..-2].map(&:split).
+        find {|tokens| tokens[1] == org}&.first
+
+      if name
+        secret = `flyctl redis status #{name}`[%r{redis://\S+}]
+        return secret if secret
+      end
+
+      # create a new redis
+      cmd = "flyctl redis create --org #{org} --name #{app}-redis --region #{region} --no-replicas #{eviction} --plan Free"
+      say_status :run, cmd
+      output = FlyIoRails::Utils.tee(cmd)
+      output[%r{redis://\S+}]
+    end
+
     def release(app, config)
-      start = Fly::Machines.create_start_machine(app, config: config)
+      start = Fly::Machines.create_and_start_machine(app, config: config)
       machine = start[:id]
 
       if !machine
@@ -113,15 +130,27 @@ module Fly
 	exit 1
       end
 
+      status = Fly::Machines.wait_for_machine app, machine,
+        timeout: 60, state: 'started'
+
       # wait for release to copmlete
       status = nil
       5.times do
-	status = Fly::Machines.wait_for_machine app, machine,
-          timeout: 60, status: 'stopped'
-	return machine if status[:ok]
+        status = Fly::Machines.wait_for_machine app, machine,
+          timeout: 60, state: 'stopped'
+        return machine if status[:ok]
       end
 
-      STDERR.puts status.to_json
+      # wait for release to copmlete
+      event = nil
+      90.times do
+	sleep 1
+	status = Fly::Machines.get_a_machine app, machine
+	event = status[:events]&.first
+	return machine if event && event[:type] == 'exit'
+      end
+
+      STDERR.puts event.to_json
       exit 1
     end
 
@@ -130,7 +159,7 @@ module Fly
         map {|region| region['Code']} rescue []
       region = regions.first || 'iad'
 
-      secrets = JSON.parse(`fly secrets list --json`).
+      secrets = JSON.parse(`flyctl secrets list --json`).
         map {|secret| secret["Name"]}
 
       config = {
@@ -173,9 +202,33 @@ module Fly
       elsif database == 'postgresql' and not secrets.include? 'DATABASE_URL'
         secret = create_postgres(app, @org, region, 'shared-cpu-1x', 1, 1)
 
-        cmd = "fly secrets set DATABASE_URL=#{secret}"
-        say_status :run, cmd
-        system cmd
+        if secret
+          cmd = "flyctl secrets set --stage DATABASE_URL=#{secret}"
+          say_status :run, cmd
+          system cmd
+        end
+      end
+
+      # Enable redis if mentioned as a cache provider or a cable provider.
+      # Set eviction policy to true if a cache provider, else false.
+      eviction = nil
+
+      if (YAML.load_file('config/cable.yml').dig('production', 'adapter') rescue false)
+        eviction = '--disable-eviction'
+      end
+
+      if (IO.read('config/environments/production.rb') =~ /redis/i rescue false)
+        eviction = '--enable-eviction'
+      end
+
+      if eviction and not secrets.include? 'REDIS_URL'
+        secret = create_redis(app, @org, region, eviction)
+
+        if secret
+          cmd = "flyctl secrets set --stage REDIS_URL=#{secret}"
+          say_status :run, cmd
+          system cmd
+        end
       end
 
       # build config for release machine, overriding server command
@@ -192,9 +245,15 @@ module Fly
       # start proxy, if necessary
       endpoint = Fly::Machines::fly_api_hostname!
 
+      # stop previous instances
+      JSON.parse(`fly machines list --json`).each do |list|
+        next if list['id'] == machine
+        system "fly machines remove --force #{list['id']}"
+      end
+
       # start app
       say_status :fly, "start #{app}"
-      start = Fly::Machines.create_start_machine(app, config: config)
+      start = Fly::Machines.create_and_start_machine(app, config: config)
       machine = start[:id]
 
       if !machine
@@ -251,7 +310,7 @@ module Fly
 
       # start release machine
       STDERR.puts "--> #{config[:env]['SERVER_COMMAND']}"
-      start = Fly::Machines.create_start_machine(app, config: config)
+      start = Fly::Machines.create_and_start_machine(app, config: config)
       machine = start[:id]
 
       if !machine

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

@@ -80,7 +80,7 @@ module Fly
       get "/v1/apps/#{app}"
     end
 
-    # create_start_machine 'user-functions', name: 'quirky_machine', config: {
+    # create_and_start_machine 'user-functions', name: 'quirky_machine', config: {
     #   image: 'flyio/fastify-functions',
     #   env: {'APP_ENV' => 'production'},
     #   services: [
@@ -94,7 +94,7 @@ module Fly
     #     }
     #   ]
     # }
-    def self.create_start_machine app, options
+    def self.create_and_start_machine app, options
       post "/v1/apps/#{app}/machines", options
     end
 

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: x86-linux
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby