fly.io-rails 0.1.1-aarch64-linux → 0.1.3-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be97db44551be250958be80dff8851b26c170cc0a5389925ec02796edd94a2aa
-  data.tar.gz: 3c82e8bd082d95bb02a06d8af4c045f5ab9312f6d95d179f12f6b3c26489849c
+  metadata.gz: 8f41938cae3b641c62ba20f5f9d96f71c8412d37ea5375486a74e391134e359f
+  data.tar.gz: 36475f27a01dd21b781c7c2ca0e7075147f21e9139916c889f430ed51fdff066
 SHA512:
-  metadata.gz: fe46074f8ba95b94f7e49fd7365247b2d47ee5ec07627105cedcfecb81c7721b8eb8dedf92ed0a091541aa6d1d8df02d1fb76905ea1d74c493da52d19ac9fda9
-  data.tar.gz: 8bc0687d21dfb258b1d37aa0b7cb94ffaefbdc0ad2b90104f4948068ca37a893e020d35b84e4246e2db0580df47fb2673cce07f7405895dcf573cced2120422b
+  metadata.gz: d0944e97fce0219230fcdd51c43c70917e37695a362bedb508b1b7a3296892931ddde0c659e6366616fc1451398452aaf0d3e4faacafa8ec73a0c6fc044d6acb
+  data.tar.gz: 934e65fdf6387696783331f41f6eceaf6073f1ba1c4683e5c61b0371682a904e410916f750626ba9e44efaaec5f7e9a16ead1d53a2dd909c2b966d1ef62f5779

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

@@ -1,18 +1,23 @@
+require 'open3'
 require 'thor'
+require 'toml'
 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)
-      self.app = app if app
+    def initialize(app, regions = nil)
+      self.app = app
 
       @ruby_version = RUBY_VERSION
       @bundler_version = Bundler::VERSION
@@ -20,10 +25,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
@@ -31,6 +51,11 @@ module Fly
       self.app = TOML.load_file('fly.toml')['app']
     end
 
+    def app_template template_file, destination
+      app
+      template template_file, destination
+    end
+
     def app=(app)
       @app = app
       @appName = @app.gsub('-', '_').camelcase(:lower)
@@ -39,35 +64,51 @@ module Fly
     source_paths.push File::expand_path('../generators/templates', __dir__)
 
     def generate_toml
-      app
-      template 'fly.toml.erb', 'fly.toml'
+      app_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'
+      app_template 'Dockerfile.erb', 'Dockerfile'
     end
 
     def generate_dockerignore
-      app
-      template 'dockerignore.erb', '.dockerignore'
+      app_template 'dockerignore.erb', '.dockerignore'
     end
 
     def generate_terraform
-      app
-      template 'main.tf.erb', 'main.tf'
+      app_template 'main.tf.erb', 'main.tf'
     end
 
     def generate_raketask
-      app
-      template 'fly.rake.erb', 'lib/tasks/fly.rake'
+      app_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
@@ -114,7 +155,7 @@ module Fly
       end
 
       # create a new redis
-      cmd = "flyctl redis create --org #{org} --name #{app}-redis --region #{region} --no-replicas #{eviction} --plan Free"
+      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+}]
@@ -125,9 +166,9 @@ module Fly
       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,
@@ -144,63 +185,31 @@ module Fly
       # 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'
+        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
 
-    def deploy(app, image) 
-      regions = JSON.parse(`flyctl regions list --json`)['Regions'].
-        map {|region| region['Code']} rescue []
-      region = regions.first || 'iad'
-
+    def launch(app)
       secrets = JSON.parse(`flyctl secrets list --json`).
         map {|secret| secret["Name"]}
 
-      config = {
-        region: region,
-        app: app,
-        name: "#{app}-machine",
-        image: image,
-        guest: {
-          cpus: 1,
-          cpu_kind: "shared",
-          memory_mb: 256,
-        },
-        services: [
-	  {
-	    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
-
-      if database == 'sqlite3'
-        volume = create_volume(app, region, 3) 
+      unless secrets.include? 'RAILS_MASTER_KEY'
+        generate_key
+      end
 
-        config[:mounts] = [
-          { volume: volume, path: '/mnt/volume' }
-        ]
-
-        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)
+      if @sqlite3
+        @volume = create_volume(app, @region, @config.sqlite3.size) 
+      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}"
@@ -209,20 +218,11 @@ module Fly
         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 @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'
 
-      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)
+        secret = create_redis(app, @org, @region, eviction)
 
         if secret
           cmd = "flyctl secrets set --stage REDIS_URL=#{secret}"
@@ -230,25 +230,78 @@ module Fly
           system cmd
         end
       end
+    end
+
+    def deploy(app, image)
+      launch(app)
+
+      # default config
+      config = {
+        region: @region,
+        app: app,
+        name: "#{app}-machine",
+        image: image,
+        guest: {
+          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
+          } 
+        ]
+      }
 
-      # build config for release machine, overriding server command
-      release_config = config.dup
-      release_config.delete :services
-      release_config.delete :mounts
-      release_config[:env] = { 'SERVER_COMMAND' => 'bin/rails fly:release' }
+      # only run release step if there is a non-empty release task in fly.rake
+      if (IO.read('lib/tasks/fly.rake') rescue '') =~ /^\s*task[ \t]*+:?release"?[ \t]*\S/
+        # build config for release machine, overriding server command
+        release_config = config.dup
+        release_config.delete :services
+        release_config.delete :mounts
+        release_config[:env] = { 'SERVER_COMMAND' => 'bin/rails fly:release' }
+
+        # perform release
+        say_status :fly, release_config[:env]['SERVER_COMMAND']
+        machine = release(app, release_config)
+        Fly::Machines.delete_machine app, machine if machine
+
+        # 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
+      end
 
-      # perform release
-      say_status :fly, release_config[:env]['SERVER_COMMAND']
-      machine = release(app, release_config)
-      Fly::Machines.delete_machine app, machine if machine
+      # configure sqlite3 (can be overridden by fly.toml)
+      if @sqlite3
+        config[:mounts] = [
+          { volume: @volume, path: '/mnt/volume' }
+        ]
 
-      # start proxy, if necessary
-      endpoint = Fly::Machines::fly_api_hostname!
+        config[:env] = {
+          "DATABASE_URL" => "sqlite3:///mnt/volume/production.sqlite3"
+        }
+      end
 
-      # stop previous instances
-      JSON.parse(`fly machines list --json`).each do |list|
-        next if list['id'] == machine
-        system "fly machines remove --force #{list['id']}"
+      # process toml overrides
+      toml = (TOML.load_file('fly.toml') rescue {})
+      config[:env] = toml['env'] if toml['env']
+      config[:services] = toml['services'] if toml['services']
+      if toml['mounts']
+        mounts = toml['mounts']
+        config[:mounts] = [ { volume: mounts['source'], path: mounts['destination'] } ]
       end
 
       # start app
@@ -257,15 +310,15 @@ module Fly
       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'
@@ -279,22 +332,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
@@ -314,36 +367,36 @@ module Fly
       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/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,39 @@ 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
+  
+      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.1'
+  VERSION = '0.1.3'
 end

data/lib/generators/fly/app_generator.rb

@@ -0,0 +1,30 @@
+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_toml
+    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.launch(@app)
+  end
+end
+end

data/lib/generators/fly/terraform_generator.rb

@@ -0,0 +1,30 @@
+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_toml
+    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/fly.toml.erb

@@ -1,4 +1,56 @@
 app = "<%= @app %>"
+kill_signal = "SIGINT"
+kill_timeout = 5
+processes = []
+
+[build]
+  [build.args]
+    BUILD_COMMAND = "bin/rails fly:build"
+    SERVER_COMMAND = "bin/rails fly:server"
 
 [deploy]
-  release_command = "bundle exec rails fly:release"
+  release_command = "bin/rails fly:release"
+
+[env]
+  PORT = "8080"
+<% if @sqlite3 -%>
+  DATABASE_URL = "sqlite3:///mnt/volume/production.sqlite3"
+
+[mounts]
+source = <%= "#{app.gsub('-', '_')}_volume".inspect %>
+destination = "/mnt/volume"
+<% end -%>
+
+[experimental]
+  allowed_public_ports = []
+  auto_rollback = true
+
+[[services]]
+  http_checks = []
+  internal_port = 8080
+  processes = ["app"]
+  protocol = "tcp"
+  script_checks = []
+  [services.concurrency]
+    hard_limit = 25
+    soft_limit = 20
+    type = "connections"
+
+  [[services.ports]]
+    force_https = true
+    handlers = ["http"]
+    port = 80
+
+  [[services.ports]]
+    handlers = ["tls", "http"]
+    port = 443
+
+  [[services.tcp_checks]]
+    grace_period = "1s"
+    interval = "15s"
+    restart_limit = 0
+    timeout = "2s"
+
+[[statics]]
+  guest_path = "/app/public"
+  url_prefix = "/"

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.1
+  version: 0.1.3
 platform: aarch64-linux
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-24 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -52,18 +52,23 @@ files:
 - exe/flyctl
 - 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