fly.io-rails 0.1.2-arm64-darwin → 0.1.4-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 356701f60f98b167049abc2f37e2c85b184d07e84c47f7d6f031253dedbaa684
-  data.tar.gz: 6b830ae58c1c165b73b662caf5c27cf995147a9bd5c26a2f7a3a1e8a93a91666
+  metadata.gz: c5b51eb7f2d1610fb30b0a6fd3d57231537c2ebfbe0aeb2b11a4bb1262e30fec
+  data.tar.gz: 517fde9bf686c0ab23905995ddef33efa7c62e157a872146922557af385a555a
 SHA512:
-  metadata.gz: c58ce796bd1f9a9aa91f19cae3c6f1086642d025496ad1611b877cd75a2222a6c62c128857c3b75aecc7630eaa1bb78b64a9ef5a666344d1e68dfdcfc2b2bf32
-  data.tar.gz: '0627194c02f430f155f4b88ca4bd62fa3405462411eaa2211e4373d068444d4d00e41733d04d25b5e0e99e9d21449d902d5a7c3fdf85209b865817d103ecb5e3'
+  metadata.gz: bb24d9eb76f794c454c2f9145a99bf65e56bdd3d14a54c8464b60e9c75f61c9ac74ff737c40b674082fff12ae82962ff51e0569502a6f20776b0675ec45e3383
+  data.tar.gz: 52a0bfc9f46dfe2a45558d93b5c4f80ce659e7a0b270a5b8b848ed106d7468a01b38b9b11a3123aac8afb9774a9f2117e17610c0c83e17edfe97cd65673c5235

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

@@ -1,5 +1,6 @@
 require 'open3'
 require 'thor'
+require 'toml'
 require 'active_support'
 require 'active_support/core_ext/string/inflections'
 require 'fly.io-rails/machines'
@@ -15,8 +16,11 @@ module Fly
     include Fly::Scanner
     attr_accessor :options
 
-    def initialize(app = nil, regions = nil)
-      self.app = app if app
+    def initialize(app, options={})
+      self.app = app
+      regions = options[:region].flatten || []
+      @litefs = options[:litefs]
+      @set_stage = options[:nomad] ? 'set' : 'set --stage'
 
       @ruby_version = RUBY_VERSION
       @bundler_version = Bundler::VERSION
@@ -36,6 +40,7 @@ module Fly
       end
 
       @region = @regions.first || 'iad'
+      @regions = [@region] if @regions.empty?
 
       @config = Fly::DSL::Config.new
       if File.exist? 'config/fly.rb'
@@ -50,6 +55,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)
@@ -58,33 +68,31 @@ 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'
+      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_litefs
+      app_template 'litefs.yml.erb', 'config/litefs.yml'
     end
 
     def generate_key
@@ -96,8 +104,8 @@ module Fly
       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}"
+        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
   
@@ -126,9 +134,9 @@ 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'], volume['Region']]}
 
-      unless volumes.include? volume
+      unless volumes.include? [volume, region]
         cmd = "flyctl volumes create #{volume} --app #{app} --region #{region} --size #{size}"
         say_status :run, cmd
         system cmd
@@ -195,11 +203,53 @@ module Fly
       exit 1
     end
 
-    def deploy(app, image) 
-
+    def launch(app)
       secrets = JSON.parse(`flyctl secrets list --json`).
         map {|secret| secret["Name"]}
 
+      unless secrets.include? 'RAILS_MASTER_KEY'
+        generate_key
+      end
+
+      if @sqlite3
+        if @litefs
+          @regions.each do |region|
+            @volume = create_volume(app, region, @config.sqlite3.size) 
+          end
+        else
+          @volume = create_volume(app, @region, @config.sqlite3.size) 
+        end
+      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
+
+      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
+    end
+
+    def deploy(app, image)
+      launch(app)
+
+      # default config
       config = {
         region: @region,
         app: app,
@@ -222,67 +272,54 @@ module Fly
         ]
       }
 
-      unless secrets.include? 'RAILS_MASTER_KEY'
-        generate_key
+      # 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
 
+      # configure sqlite3 (can be overridden by fly.toml)
       if @sqlite3
-        volume = create_volume(app, @region, @config.sqlite3.size) 
-
         config[:mounts] = [
-          { volume: volume, path: '/mnt/volume' }
+          { volume: @volume, path: '/mnt/volume' }
         ]
 
         config[:env] = {
           "DATABASE_URL" => "sqlite3:///mnt/volume/production.sqlite3"
         }
-      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
+        if @litefs
+          config[:env]['DATABASE_URL'] = "sqlite3:///data/production.sqlite3"
         end
       end
 
-      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
-      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
+      # 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

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

@@ -28,18 +28,19 @@ module FlyIoRails
       data.join
     end
 
-    def create_app(name=nil, org='personal', regions=[])
+    def create_app(name: nil, org: 'personal', regions: [], nomad: false, **rest)
       cmd = if name
         "flyctl apps create #{name.inspect} --org #{org.inspect} --machines"
       else
         "flyctl apps create --generate-name --org #{org.inspect} --machines"
       end
+
+      cmd.sub! ' --machines', '' if nomad
   
       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

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

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

data/lib/generators/fly/app_generator.rb

@@ -7,23 +7,28 @@ class AppGenerator < Rails::Generators::Base
   class_option :name, type: :string, required: false
   class_option :org, type: :string, default: 'personal'
   class_option :region, type: :array, repeatable: true, default: []
+  class_option :nomad, type: :boolean, default: false
+
+  class_option :litefs, type: :boolean, default: false
 
   def generate_app
     source_paths.push File.expand_path('../templates', __dir__)
 
-    create_app(options[:name], options[:org], options)
+    create_app(**options.symbolize_keys)
 
-    action = Fly::Actions.new(@app, options[:region])
+    action = Fly::Actions.new(@app, options)
 
+    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_litefs if options[:litefs] and not File.exist? 'config/litefs'
     action.generate_patches
     action.generate_ipv4
     action.generate_ipv6
-    action.generate_key
-    
+
+    action.launch(@app)
   end
 end
 end

data/lib/generators/fly/terraform_generator.rb

@@ -8,13 +8,16 @@ class TerraformGenerator < Rails::Generators::Base
   class_option :org, type: :string, default: 'personal'
   class_option :region, type: :array, repeatable: true, default: []
 
+  class_option :litefs, type: :boolean, default: false
+
   def terraform
     source_paths.push File.expand_path('../templates', __dir__)
 
-    create_app(options[:name], options[:org], options[:region])
+    create_app(**options.symbolize_keys)
 
-    action = Fly::Actions.new(@app, options[:region])
+    action = Fly::Actions.new(@app, options)
     
+    action.generate_toml
     action.generate_dockerfile
     action.generate_dockerignore
     action.generate_terraform
@@ -26,4 +29,4 @@ class TerraformGenerator < Rails::Generators::Base
     tee 'terraform init'
   end
 end
-end
+end

data/lib/generators/templates/Dockerfile.erb

@@ -21,6 +21,8 @@ ARG RUBY_VERSION=<%= @ruby_version %>
 ARG VARIANT=jemalloc-slim
 FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-${VARIANT} as base
 
+LABEL fly_launch_runtime="rails"
+
 <% if @node -%>
 ARG NODE_VERSION=<%= @node_version %>
 <% end -%>
@@ -54,7 +56,12 @@ RUN volta install node@${NODE_VERSION} yarn
 
 FROM base as build_deps
 
-ARG BUILD_PACKAGES="git build-essential libpq-dev wget vim curl gzip xz-utils libsqlite3-dev"
+<% 
+  @build_packages = %w(git build-essential wget vim curl gzip xz-utils)
+  @build_packages << 'libpq-dev' if @postgresql
+  @build_packages << 'libsqlite3-dev' if @sqlite3
+-%>
+ARG BUILD_PACKAGES=<%= @build_packages.join(' ').inspect %>
 ENV BUILD_PACKAGES ${BUILD_PACKAGES}
 
 RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
@@ -92,12 +99,24 @@ RUN npm install
 
 <% end -%>
 #######################################################################
+<% if @litefs -%>
+
+# Fetch the LiteFS binary
+FROM flyio/litefs:pr-109 AS litefs
 
+#######################################################################
+<% end %>
 # install deployment packages
 
 FROM base
 
-ARG DEPLOY_PACKAGES="postgresql-client file vim curl gzip libsqlite3-0"
+<%
+  @deploy_packages = %w(file vim curl gzip)
+  @deploy_packages << 'postgresql-client' if @postgresql
+  @deploy_packages << 'libsqlite3-0' if @sqlite3
+  @deploy_packages << 'fuse' if @litefs
+-%>
+ARG DEPLOY_PACKAGES=<%= @deploy_packages.join(' ').inspect %>
 ENV DEPLOY_PACKAGES=${DEPLOY_PACKAGES}
 
 RUN --mount=type=cache,id=prod-apt-cache,sharing=locked,target=/var/cache/apt \
@@ -116,6 +135,16 @@ COPY --from=gems /usr/local/bundle /usr/local/bundle
 # copy installed node modules
 COPY --from=node_modules /app/node_modules /app/node_modules
 
+<% end -%>
+<% if @litefs -%>
+# copy litefs binary
+COPY --from=litefs /usr/local/bin/litefs /usr/local/bin/litefs
+
+# Copy our LiteFS configuration.
+ADD config/litefs.yml /etc/litefs.yml
+
+# Create mount point
+RUN mkdir /data
 <% end -%>
 #######################################################################
 
@@ -140,6 +169,10 @@ RUN ${BUILD_COMMAND}
 
 # Default server start instructions.  Generally Overridden by fly.toml.
 ENV PORT 8080
+<% if @litefs -%>
+ARG SERVER_COMMAND="litefs"
+<% else -%>
 ARG SERVER_COMMAND="bin/rails fly:server"
+<% end -%>
 ENV SERVER_COMMAND ${SERVER_COMMAND}
 CMD ${SERVER_COMMAND}

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

@@ -6,6 +6,7 @@ namespace :fly do
   #  - Failures here prevent deployment
   task :build => 'assets:precompile'
 
+<% unless @litefs -%>
   # RELEASE step:
   #  - changes to the filesystem made here are DISCARDED
   #  - full access to secrets, databases
@@ -16,6 +17,7 @@ namespace :fly do
   task :release => 'db:migrate'
   <%- end -%>
 
+<% end -%>
   # SERVER step:
   #  - changes to the filesystem made here are deployed
   #  - full access to secrets, databases

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

@@ -1,4 +1,67 @@
 app = "<%= @app %>"
+kill_signal = "SIGINT"
+kill_timeout = 5
+processes = []
+
+[build]
+  [build.args]
+    BUILD_COMMAND = "bin/rails fly:build"
+<% if @litefs -%>
+    SERVER_COMMAND = "litefs"
+<% else -%>
+    SERVER_COMMAND = "bin/rails fly:server"
 
 [deploy]
-  release_command = "bundle exec rails fly:release"
+  release_command = "bin/rails fly:release"
+<% end -%>
+
+[env]
+  PORT = "8080"
+<% if @sqlite3 -%>
+<% if @litefs -%>
+  DATABASE_URL = "sqlite3:///data/production.sqlite3"
+<% else -%>
+  DATABASE_URL = "sqlite3:///mnt/volume/production.sqlite3"
+<% end -%>
+
+[mounts]
+source = <%= "#{app.gsub('-', '_')}_volume".inspect %>
+destination = "/mnt/volume"
+<% end -%>
+
+[experimental]
+  allowed_public_ports = []
+  auto_rollback = true
+<% if @litefs -%>
+  enable_consul = true
+<% end  -%>
+
+[[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/litefs.yml.erb

@@ -0,0 +1,14 @@
+# The path to where the SQLite database will be accessed.
+mount-dir: "/data"
+
+# The path to where the underlying volume mount is.
+data-dir: "/mnt/volume"
+
+# Execute this subprocess once LiteFS connects to the cluster. 
+exec: "bin/rails fly:server"
+
+# These environment variables will be available in your Fly.io application.
+# You must specify "experiement.enable_consul" for FLY_CONSUL_URL to be available.
+consul:
+  url: "${FLY_CONSUL_URL}"
+  advertise-url: "http://${HOSTNAME}.vm.${FLY_APP_NAME}.internal:20202"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: arm64-darwin
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-25 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -67,6 +67,7 @@ files:
 - lib/generators/templates/fly.rake.erb
 - lib/generators/templates/fly.rb.erb
 - lib/generators/templates/fly.toml.erb
+- lib/generators/templates/litefs.yml.erb
 - lib/generators/templates/main.tf.erb
 - lib/generators/templates/patches/action_cable.rb
 - lib/tasks/fly.rake