fly.io-rails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90684da96d9f92f4540828899639869c1edfdba0103f44f68ce5036f87084471
-  data.tar.gz: 90321e28165c4b3e686c1b0920e8fd2a0700edaa9674b2ff0e6a814135b9c712
+  metadata.gz: b0cfcab66d8f161efea6825e771f1bd95f3f57af5e6163dbdec933281a372f78
+  data.tar.gz: 84f1312372f746f150b3dc5dd0d5b35a31d180573c541a42228ae2e8b903c5d7
 SHA512:
-  metadata.gz: 87a139a001b7b333dcc5abc0756ec5bdbf38a39e1a327f0ff9d6c6cffde9a282b6961deba487d9a1c08ad2e26496f616d8a99f094f5a724927c3e9a3017bfc76
-  data.tar.gz: 8d9f3657f904f57109cb37cf8ce3cff8d028e35d50356cafd2f1b7dbe8cfa77ba4f6d2de078fe5fce2f8aa1d98ed59ddf94a27a2398f27b7e30cd71e01184a30
+  metadata.gz: c8dc7129a3b3a06ef98234c590b20e7d14d5d4091744079f353a308e703bcca1bb1aa89ece7c713c7d63723e42c68b90f4a5cfed1bd00cb9f78ebcfdd2411210
+  data.tar.gz: fa3c2b69e0672cc5c7c2115b17a0bcf5e4fd0adc46a0d1f0b6ee5a4cfc909b56dfe8ce4d5115435e59a903285357a4260521716e90b24397415af01f6798c2c0

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,8 @@ module Fly
     include Fly::Scanner
     attr_accessor :options
 
-    def initialize(app = nil, regions = nil)
-      self.app = app if app
+    def initialize(app, regions = nil)
+      self.app = app
 
       @ruby_version = RUBY_VERSION
       @bundler_version = Bundler::VERSION
@@ -50,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)
@@ -58,33 +64,27 @@ 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_key
@@ -195,47 +195,16 @@ module Fly
       exit 1
     end
 
-    def deploy(app, image) 
-
+    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: @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
-          } 
-        ]
-      }
-
       unless secrets.include? 'RAILS_MASTER_KEY'
         generate_key
       end
 
       if @sqlite3
-        volume = create_volume(app, @region, @config.sqlite3.size) 
-
-        config[:mounts] = [
-          { volume: volume, path: '/mnt/volume' }
-        ]
-
-        config[:env] = {
-          "DATABASE_URL" => "sqlite3:///mnt/volume/production.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,
@@ -261,30 +230,80 @@ module Fly
           system cmd
         end
       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
+    def deploy(app, image)
+      launch(app)
 
-      # start proxy, if necessary
-      endpoint = Fly::Machines::fly_api_hostname!
+      # 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
+          } 
+        ]
+      }
 
-      # 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']}"
+      # 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
+        config[:mounts] = [
+          { volume: @volume, path: '/mnt/volume' }
+        ]
+
+        config[:env] = {
+          "DATABASE_URL" => "sqlite3:///mnt/volume/production.sqlite3"
+        }
+      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
       say_status :fly, "start #{app}"
       start = Fly::Machines.create_and_start_machine(app, config: config)

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

@@ -39,7 +39,6 @@ module FlyIoRails
       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.3'
 end

data/lib/generators/fly/app_generator.rb

@@ -15,6 +15,7 @@ class AppGenerator < Rails::Generators::Base
 
     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'
@@ -22,8 +23,8 @@ class AppGenerator < Rails::Generators::Base
     action.generate_patches
     action.generate_ipv4
     action.generate_ipv6
-    action.generate_key
-    
+
+    action.launch(@app)
   end
 end
-end
+end

data/lib/generators/fly/terraform_generator.rb

@@ -15,6 +15,7 @@ class TerraformGenerator < Rails::Generators::Base
 
     action = Fly::Actions.new(@app, options[:region])
     
+    action.generate_toml
     action.generate_dockerfile
     action.generate_dockerignore
     action.generate_terraform

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 = "/"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sam Ruby