fly.io-rails 0.1.0-x64-mingw32 → 0.1.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31dbb298f72984f01bd39eb4859577e3442b4f4021b0e099bf0be2e3d7c16134
-  data.tar.gz: 374cee9b246abb711a1f6954d9a77f04aeada9f47fb6a6441cebd3105a627ced
+  metadata.gz: cec3ca4f27cbb576d74009dcdea78a60113a091c85b833efb1f83388bfd37475
+  data.tar.gz: 702966a87970bca9d3192dbc8cd76cb94bb5fdf0cfa25f331ea290a02f08f097
 SHA512:
-  metadata.gz: 9d6a32e791648274508e64ca20bb3234a42189bff8a9c6031549dcb12b6391b47685c7606c708a97327bb71a058238c76029788d753d263e294ef204a4167b18
-  data.tar.gz: 68481956ca5448163257265683cc72363f19a83f5eee2fe4e51c3a00baf6b38988336ac439cc87ecd7b4f6773021193248f0850c64b8652bb559edcd9181e649
+  metadata.gz: 17a5d4feb8fdfe76af46edb6b6f416c5387aab1d01a6a2e8dcf10d9c37925eafd0a17043f67b5faf3a6d056f58bacb147494964142957e3848199caf0bcec792
+  data.tar.gz: bf8f63c0bb7d6d890a3dbb1f1b8f5b4fb2190277ef606e6b2bca2016c58c649c1c474ba0c6c48be0dc99e2bbda4a6fbfc9e3cd35248a49617aff0d4f4a00d628

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

@@ -1,17 +1,21 @@
+require 'open3'
 require 'thor'
 require 'active_support'
 require 'active_support/core_ext/string/inflections'
 require 'fly.io-rails/machines'
 require 'fly.io-rails/utils'
+require 'fly.io-rails/dsl'
+require 'fly.io-rails/scanner'
 
 module Fly
   class Actions < Thor::Group
     include Thor::Actions
     include Thor::Base
     include Thor::Shell
+    include Fly::Scanner
     attr_accessor :options
 
-    def initialize(app = nil)
+    def initialize(app = nil, regions = nil)
       self.app = app if app
 
       @ruby_version = RUBY_VERSION
@@ -20,10 +24,25 @@ module Fly
       @yarn = File.exist? 'yarn.lock'
       @node_version = @node ? `node --version`.chomp.sub(/^v/, '') : '16.17.0'
       @org = Fly::Machines.org
-      @regions = []
 
       @options = {}
       @destination_stack = [Dir.pwd]
+
+      if !regions or regions.empty?
+        @regions = JSON.parse(`flyctl regions list --json --app #{app}`)['Regions'].
+          map {|region| region['Code']} rescue []
+      else
+        @regions = regions
+      end
+
+      @region = @regions.first || 'iad'
+
+      @config = Fly::DSL::Config.new
+      if File.exist? 'config/fly.rb'
+        @config.instance_eval IO.read('config/fly.rb')
+      end
+
+      scan_rails_app
     end
 
     def app
@@ -43,6 +62,11 @@ module Fly
       template 'fly.toml.erb', 'fly.toml'
     end
 
+    def generate_fly_config
+      app
+      template 'fly.rb.erb', 'config/fly.rb'
+    end
+
     def generate_dockerfile
       app
       template 'Dockerfile.erb', 'Dockerfile'
@@ -63,11 +87,28 @@ module Fly
       template 'fly.rake.erb', 'lib/tasks/fly.rake'
     end
 
-    def generate_all
-      generate_dockerfile
-      generate_dockerignore
-      generate_terraform
-      generate_raketask
+    def generate_key
+      credentials = nil
+      if File.exist? 'config/credentials/production.key'
+        credentials = 'config/credentials/production.key'
+      elsif File.exist? 'config/master.key'
+        credentials = 'config/master.key'
+      end
+  
+      if credentials
+        say_status :run, "flyctl secrets set --stage RAILS_MASTER_KEY from #{credentials}"
+        system "flyctl secrets set --stage RAILS_MASTER_KEY=#{IO.read(credentials).chomp}"
+        puts
+      end
+  
+      ENV['FLY_API_TOKEN'] = `flyctl auth token`
+    end
+
+    def generate_patches
+      if @redis_cable and not File.exist? 'config/initializers/action_cable.rb'
+        app
+        template 'patches/action_cable.rb', 'config/initializers/action_cable.rb'
+      end
     end
 
     def generate_ipv4
@@ -85,7 +126,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,71 +138,96 @@ 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 #{@config.redis.plan}"
+      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
-	STDERR.puts 'Error starting release machine'
-	PP.pp start, STDERR
-	exit 1
+        STDERR.puts 'Error starting release machine'
+        PP.pp start, STDERR
+        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
+
+      # 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 status.to_json
+      STDERR.puts event.to_json
       exit 1
     end
 
     def deploy(app, image) 
-      regions = JSON.parse(`flyctl regions list --json`)['Regions'].
-        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 = {
-        region: region,
+        region: @region,
         app: app,
         name: "#{app}-machine",
         image: image,
         guest: {
-          cpus: 1,
-          cpu_kind: "shared",
-          memory_mb: 256,
+          cpus: @config.machine.cpus,
+          cpu_kind: @config.machine.cpu_kind,
+          memory_mb: @config.machine.memory_mb
         },
         services: [
-	  {
-	    ports: [
-	      {port: 443, handlers: ["tls", "http"]},
-	      {port: 80, handlers: ["http"]}
-	    ],
-	    protocol: "tcp",
-	    internal_port: 8080
-	  } 
+          {
+            ports: [
+              {port: 443, handlers: ["tls", "http"]},
+              {port: 80, handlers: ["http"]}
+            ],
+            protocol: "tcp",
+            internal_port: 8080
+          } 
         ]
       }
 
-      database = YAML.load_file('config/database.yml').
-        dig('production', 'adapter') rescue nil
-      cable = YAML.load_file('config/cable.yml').
-        dig('production', 'adapter') rescue nil
+      unless secrets.include? 'RAILS_MASTER_KEY'
+        generate_key
+      end
 
-      if database == 'sqlite3'
-        volume = create_volume(app, region, 3) 
+      if @sqlite3
+        volume = create_volume(app, @region, @config.sqlite3.size) 
 
         config[:mounts] = [
           { volume: volume, path: '/mnt/volume' }
@@ -170,12 +236,30 @@ module Fly
         config[:env] = {
           "DATABASE_URL" => "sqlite3:///mnt/volume/production.sqlite3"
         }
-      elsif database == 'postgresql' and not secrets.include? 'DATABASE_URL'
-        secret = create_postgres(app, @org, region, 'shared-cpu-1x', 1, 1)
+      elsif @postgresql and not secrets.include? 'DATABASE_URL'
+        secret = create_postgres(app, @org, @region,
+          @config.postgres.vm_size,
+          @config.postgres.volume_size,
+          @config.postgres.initial_cluster_size)
+
+        if secret
+          cmd = "flyctl secrets set --stage DATABASE_URL=#{secret}"
+          say_status :run, cmd
+          system cmd
+        end
+      end
 
-        cmd = "fly secrets set DATABASE_URL=#{secret}"
-        say_status :run, cmd
-        system cmd
+      if @redis and not secrets.include? 'REDIS_URL'
+        # Set eviction policy to true if a cache provider, else false.
+        eviction = @redis_cache ? '--enable-eviction' : '--disable-eviction'
+
+        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,21 +276,30 @@ module Fly
       # start proxy, if necessary
       endpoint = Fly::Machines::fly_api_hostname!
 
+      # stop previous instances - list will fail on first run
+      stdout, stderr, status = Open3.capture3('fly machines list --json')
+      unless stdout.empty?
+        JSON.parse(stdout).each do |list|
+          next if list['id'] == machine
+          system "fly machines remove --force #{list['id']}"
+        end
+      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
-	STDERR.puts 'Error starting application'
-	PP.pp start, STDERR
-	exit 1
+        STDERR.puts 'Error starting application'
+        PP.pp start, STDERR
+        exit 1
       end
 
       5.times do
-	status = Fly::Machines.wait_for_machine app, machine,
+        status = Fly::Machines.wait_for_machine app, machine,
           timeout: 60, status: 'started'
-	return if status[:ok]
+        return if status[:ok]
       end
 
       STDERR.puts 'Timeout waiting for application to start'
@@ -220,22 +313,22 @@ module Fly
 
       # find first machine in terraform config file
       machines = Fly::HCL.parse(IO.read('main.tf')).find {|block|
-	block.keys.first == :resource and
-	block.values.first.keys.first == 'fly_machine'}
+        block.keys.first == :resource and
+        block.values.first.keys.first == 'fly_machine'}
 
       # extract HCL configuration for the machine
       config = machines.values.first.values.first.values.first
 
       # delete HCL specific configuration items
       %i(services for_each region app name depends_on).each do |key|
-	 config.delete key
+         config.delete key
       end
 
       # move machine configuration into guest object
       config[:guest] = {
-	cpus: config.delete(:cpus),
-	memory_mb: config.delete(:memorymb),
-	cpu_kind: config.delete(:cputype)
+        cpus: config.delete(:cpus),
+        memory_mb: config.delete(:memorymb),
+        cpu_kind: config.delete(:cputype)
       }
 
       # release machines should have no services or mounts
@@ -251,40 +344,40 @@ 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
-	STDERR.puts 'Error starting release machine'
-	PP.pp start, STDERR
-	exit 1
+        STDERR.puts 'Error starting release machine'
+        PP.pp start, STDERR
+        exit 1
       end
 
       # wait for release to copmlete
       event = nil
       90.times do
-	sleep 1
-	status = Fly::Machines.get_a_machine app, machine
-	event = status[:events]&.first
-	break if event && event[:type] == 'exit'
+        sleep 1
+        status = Fly::Machines.get_a_machine app, machine
+        event = status[:events]&.first
+        break if event && event[:type] == 'exit'
       end
 
       # extract exit code
       exit_code = event.dig(:request, :exit_event, :exit_code)
-	       
+               
       if exit_code == 0
-	# delete release machine
-	Fly::Machines.delete_machine app, machine
+        # delete release machine
+        Fly::Machines.delete_machine app, machine
 
-	# use terraform apply to deploy
-	ENV['FLY_API_TOKEN'] = `flyctl auth token`.chomp
-	ENV['FLY_HTTP_ENDPOINT'] = endpoint if endpoint
-	system 'terraform apply -auto-approve'
+        # use terraform apply to deploy
+        ENV['FLY_API_TOKEN'] = `flyctl auth token`.chomp
+        ENV['FLY_HTTP_ENDPOINT'] = endpoint if endpoint
+        system 'terraform apply -auto-approve'
       else
-	STDERR.puts 'Error performing release'
-	STDERR.puts (exit_code ? {exit_code: exit_code} : event).inspect
-	STDERR.puts "run 'flyctl logs --instance #{machine}' for more information"
-	exit 1
+        STDERR.puts 'Error performing release'
+        STDERR.puts (exit_code ? {exit_code: exit_code} : event).inspect
+        STDERR.puts "run 'flyctl logs --instance #{machine}' for more information"
+        exit 1
       end
     end
   end

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

@@ -0,0 +1,79 @@
+module Fly
+  module DSL
+    class Base
+      def initialize
+	@value = {}
+      end
+
+      def self.option name, default=nil
+	@options ||= {}
+	@options[name] = default
+
+	define_method name do |*args|
+	  if args.length == 1
+	    @value[name] =  args.first
+	  elsif args.length > 1
+	    raise ArgumentError.new("wrong number of arguments (given #{args.length}, expected 0..1)")
+	  end
+
+	  @value.include?(name) ? @value[name] : default
+	end
+      end
+
+      def self.options
+	@options ||= {}
+      end
+    end
+
+    #############################################################
+
+    class Machine < Base
+      option :cpus, 1
+      option :cpu_kind, 'shared'
+      option :memory_mb, 256
+    end
+
+    class Postgres < Base
+      option :vm_size, 'shared-cpu-1x'
+      option :volume_size, 1
+      option :initial_cluster_size, 1
+    end
+
+    class Redis < Base
+      option :plan, "Free"
+    end
+
+    class Sqlite3 < Base
+      option :size, 3
+    end
+
+    #############################################################
+
+    class Config
+      @@blocks = {}
+
+      def initialize
+	@config = {}
+      end
+
+      def self.block name, kind
+	@@blocks[name] = kind
+
+	define_method name do |&block| 
+	  @config[name] ||= kind.new
+	  @config[name].instance_eval(&block) if block
+	  @config[name]
+	end
+      end
+
+      def self.blocks
+	@@blocks
+      end
+
+      block :machine, Machine
+      block :postgres, Postgres
+      block :redis, Redis
+      block :sqlite3, Sqlite3
+    end
+  end
+end

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/scanner.rb

@@ -0,0 +1,26 @@
+module Fly
+  module Scanner
+    # scan for major features - things that if present will likely affect
+    # more than one artifact that is generated.
+    def scan_rails_app
+      database = YAML.load_file('config/database.yml').
+        dig('production', 'adapter') rescue nil
+
+      if database == 'sqlite3'
+        @sqlite3 = true
+      elsif database == 'postgresql'
+        @postgresql = true
+      end
+
+      if (YAML.load_file('config/cable.yml').dig('production', 'adapter') rescue false)
+        @redis_cable = true
+      end
+
+      if (IO.read('config/environments/production.rb') =~ /redis/i rescue false)
+        @redis_cache = true
+      end
+
+      @redis = @redis_cable || @redis_cache
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module FlyIoRails
   module Utils
 
     def tee cmd
-      say_status :run, cmd
+      say_status :run, cmd if defined? say_status
       FlyIoRails::Utils.tee cmd
     end
     
@@ -12,21 +12,40 @@ module FlyIoRails
       data = []
 
       begin
-	PTY.spawn( cmd ) do |stdin, stdout, pid|
-	  begin
-	    # Do stuff with the output here. Just printing to show it works
-	    stdin.each do |line| 
+        PTY.spawn( cmd ) do |stdin, stdout, pid|
+          begin
+            # Do stuff with the output here. Just printing to show it works
+            stdin.each do |line| 
               print line
               data << line
             end
-	  rescue Errno::EIO
-	  end
-	end
+          rescue Errno::EIO
+          end
+        end
       rescue PTY::ChildExited
       end
 
       data.join
     end
 
+    def create_app(name=nil, org='personal', regions=[])
+      cmd = if name
+        "flyctl apps create #{name.inspect} --org #{org.inspect} --machines"
+      else
+        "flyctl apps create --generate-name --org #{org.inspect} --machines"
+      end
+  
+      output = tee cmd
+      exit 1 unless output =~ /^New app created: /
+  
+      @app = output.split.last
+      template 'fly.toml.erb', 'fly.toml' if defined? template # rake tasks are on their own
+  
+      unless regions.empty?
+        @regions = regions.flatten
+      end
+
+      @app
+    end
   end
 end

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

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

data/lib/generators/fly/app_generator.rb

@@ -0,0 +1,29 @@
+require 'fly.io-rails/actions'
+
+module Fly::Generators
+class AppGenerator < Rails::Generators::Base
+  include FlyIoRails::Utils
+
+  class_option :name, type: :string, required: false
+  class_option :org, type: :string, default: 'personal'
+  class_option :region, type: :array, repeatable: true, default: []
+
+  def generate_app
+    source_paths.push File.expand_path('../templates', __dir__)
+
+    create_app(options[:name], options[:org], options)
+
+    action = Fly::Actions.new(@app, options[:region])
+
+    action.generate_fly_config unless File.exist? 'config/fly.rb'
+    action.generate_dockerfile unless File.exist? 'Dockerfile'
+    action.generate_dockerignore unless File.exist? '.dockerignore'
+    action.generate_raketask unless File.exist? 'lib/tasks/fly.rake'
+    action.generate_patches
+    action.generate_ipv4
+    action.generate_ipv6
+    action.generate_key
+    
+  end
+end
+end

data/lib/generators/fly/terraform_generator.rb

@@ -0,0 +1,29 @@
+require 'fly.io-rails/actions'
+
+module Fly::Generators
+class TerraformGenerator < Rails::Generators::Base
+  include FlyIoRails::Utils
+
+  class_option :name, type: :string, required: false
+  class_option :org, type: :string, default: 'personal'
+  class_option :region, type: :array, repeatable: true, default: []
+
+  def terraform
+    source_paths.push File.expand_path('../templates', __dir__)
+
+    create_app(options[:name], options[:org], options[:region])
+
+    action = Fly::Actions.new(@app, options[:region])
+    
+    action.generate_dockerfile
+    action.generate_dockerignore
+    action.generate_terraform
+    action.generate_raketask
+    action.generate_patches
+
+    action.generate_key
+
+    tee 'terraform init'
+  end
+end
+end

data/lib/generators/templates/fly.rake.erb

@@ -10,14 +10,22 @@ namespace :fly do
   #  - changes to the filesystem made here are DISCARDED
   #  - full access to secrets, databases
   #  - failures here prevent deployment
+  <%- if @sqlite3 -%>
+  task :release
+  <%- else -%>
   task :release => 'db:migrate'
+  <%- end -%>
 
   # SERVER step:
   #  - changes to the filesystem made here are deployed
   #  - full access to secrets, databases
   #  - failures here result in VM being stated, shutdown, and rolled back
   #    to last successful deploy (if any).
+  <%- if @sqlite3 -%>
+  task :server => [:swapfile, 'db:migrate'] do
+  <%- else -%>
   task :server => :swapfile do
+  <%- end -%>
     sh 'bin/rails server'
   end
 
@@ -26,7 +34,11 @@ namespace :fly do
   #  - performance critical applications should scale memory to the
   #    point where swap is rarely used.  'fly scale help' for details.
   #  - disable by removing dependency on the :server task, thus:
+  <%- if @sqlite3 -%>
+  #        task :server => 'db:migrate' do
+  <%- else -%>
   #        task :server do
+  <%- end -%>
   task :swapfile do
     sh 'fallocate -l 512M /swapfile'
     sh 'chmod 0600 /swapfile'

data/lib/generators/templates/fly.rb.erb

@@ -0,0 +1,25 @@
+machine do
+  cpus 1
+  cpu_kind 'shared'
+  memory_mb 256
+end
+<% if @sqlite3 -%>
+
+sqlite3 do
+  size 3
+end
+<% end -%>
+<% if @postgresql -%>
+
+postgres do
+  vm_size 'shared-cpu-1x'
+  volume_size 1
+  initial_cluster_size 1
+end
+<% end -%>
+<% if @redis -%>
+
+redis do
+  plan "Free"
+end
+<% end -%>

data/lib/generators/templates/main.tf.erb

@@ -27,7 +27,9 @@ resource "fly_ip" "<%= @appName %>Ipv6" {
   type       = "v6"
 }
 
+<% unless @sqlite3 -%>
 /* Uncomment this if you want a volume
+<% end -%>
 resource "fly_volume" "<%= @appName %>Volume" {
   for_each = toset(<%= @regions.inspect %>)
   region = each.value
@@ -36,7 +38,9 @@ resource "fly_volume" "<%= @appName %>Volume" {
   app        = <%= @app.inspect %>
   size       = 3
 }
+<% unless @sqlite3 -%>
 */
+<% end -%>
 
 # Start a fly machine
 resource "fly_machine" "<%= @appName %>Machine" {
@@ -71,7 +75,7 @@ resource "fly_machine" "<%= @appName %>Machine" {
     }
   ]
 
-  /* Uncomment this if you want sqlite3 on a volume
+  <%- if @sqlite3 -%>
   env = {
     DATABASE_URL = "sqlite3:///mnt/db/production.sqlite3"
   }
@@ -83,6 +87,10 @@ resource "fly_machine" "<%= @appName %>Machine" {
     }
   ]
 
+  depends_on = [fly_volume.<%= @appName %>Volume]
+  <%- else -%>
+  /* Uncomment this if you want a volume
   depends_on = [fly_volume.<%= @appName %>Volume]
   */
+  <%- end -%>
 }

data/lib/generators/templates/patches/action_cable.rb

@@ -0,0 +1,20 @@
+# Restart Action Cable server on Redis connection failures.
+# See: https://github.com/rails/rails/pull/45478
+require 'action_cable/subscription_adapter/redis'
+
+module ActionCableRedisListenerPatch
+  private
+
+  def ensure_listener_running
+    @thread ||= Thread.new do
+      Thread.current.abort_on_exception = true
+      conn = @adapter.redis_connection_for_subscriptions
+      listen conn
+    rescue ::Redis::BaseConnectionError
+      @thread = @raw_client = nil
+      ::ActionCable.server.restart
+    end
+  end
+end
+
+ActionCable::SubscriptionAdapter::Redis::Listener.prepend(ActionCableRedisListenerPatch)

data/lib/tasks/fly.rake

@@ -12,25 +12,20 @@ namespace :fly do
     if File.exist? 'fly.toml'
       app = TOML.load_file('fly.toml')['app']
     else
-      output = FlyIoRails::Utils.tee(
-        "flyctl apps create --generate-name --org personal --machines"
-      )
-
-      exit 1 unless output =~ /^New app created: /
-
-      @app = app = output.split.last
+      app = create_app
     end
 
     # ensure fly.toml and Dockerfile are present
     action = Fly::Actions.new(app)
     action.generate_toml if @app
+    action.generate_fly_config unless File.exist? 'config/fly.rb'
     action.generate_dockerfile unless File.exist? 'Dockerfile'
     action.generate_dockerignore unless File.exist? '.dockerignore'
     action.generate_raketask unless File.exist? 'lib/tasks/fly.rake'
 
     # build and push an image
     out = FlyIoRails::Utils.tee 'fly deploy --build-only --push'
-    image = out[/image:\s+(.*)/, 1].strip
+    image = out[/image:\s+(.*)/, 1]&.strip
 
     exit 1 unless image
 

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.2
 platform: x64-mingw32
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -53,18 +53,23 @@ files:
 - exe/x64-mingw32/wintun.dll
 - lib/fly.io-rails.rb
 - lib/fly.io-rails/actions.rb
+- lib/fly.io-rails/dsl.rb
 - lib/fly.io-rails/generators.rb
 - lib/fly.io-rails/hcl.rb
 - lib/fly.io-rails/machines.rb
 - lib/fly.io-rails/platforms.rb
+- lib/fly.io-rails/scanner.rb
 - lib/fly.io-rails/utils.rb
 - lib/fly.io-rails/version.rb
+- lib/generators/fly/app_generator.rb
+- lib/generators/fly/terraform_generator.rb
 - lib/generators/templates/Dockerfile.erb
 - lib/generators/templates/dockerignore.erb
 - lib/generators/templates/fly.rake.erb
+- lib/generators/templates/fly.rb.erb
 - lib/generators/templates/fly.toml.erb
 - lib/generators/templates/main.tf.erb
-- lib/generators/terraform_generator.rb
+- lib/generators/templates/patches/action_cable.rb
 - lib/tasks/fly.rake
 homepage: https://github.com/rubys/fly-io.rails
 licenses:

data/lib/generators/terraform_generator.rb

@@ -1,52 +0,0 @@
-require 'open3'
-require 'fly.io-rails/actions'
-
-class Fly::Generators::TerraformGenerator < Rails::Generators::Base
-  include FlyIoRails::Utils
-
-  class_option :name, type: :string, required: false
-  class_option :org, type: :string, default: 'personal'
-  class_option :region, type: :array, repeatable: true, default: []
-
-  def terraform
-    source_paths.push File.expand_path('./templates', __dir__)
-
-    cmd = if options[:name]
-      "flyctl apps create #{options[:name].inspect} --org #{options[:org].inspect}"
-    else
-      "flyctl apps create --generate-name --org #{options[:org].inspect}"
-    end
-
-    output = tee cmd
-    exit 1 unless output =~ /^New app created: /
-
-    @app = output.split.last
-    template 'fly.toml.erb', 'fly.toml'
-
-    if options[:region].empty?
-      @regions = JSON.parse(`flyctl regions list --json`)['Regions'].
-        map {|region| region['Code']}
-    else
-      @regions = options[:regions].flatten
-    end
-
-    action = Fly::Actions.new(@app)
-    action.generate_all
-
-    credentials = nil
-    if File.exist? 'config/credentials/production.key'
-      credentials = 'config/credentials/production.key'
-    elsif File.exist? 'config/master.key'
-      credentials = 'config/master.key'
-    end
-
-    if credentials
-      say_status :run, "flyctl secrets set RAILS_MASTER_KEY from #{credentials}"
-      system "flyctl secrets set RAILS_MASTER_KEY=#{IO.read(credentials).chomp}"
-      puts
-    end
-
-    ENV['FLY_API_TOKEN'] = `flyctl auth token`
-    tee 'terraform init'
-  end
-end