fly.io-rails 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306e71554a8f46f7aba10b2c03fe721f401d171e384985dd8b4ab3bbe8aba9bc
-  data.tar.gz: 61b5ba856f16252ab1808361adf3bce4cad5a24cd6308b68960c8547009e4fe3
+  metadata.gz: 76e2a638b08c3d778fbdac62956b4730c9436bd133c3cbaedc758f9fd79f7c08
+  data.tar.gz: d1b6bf847c64e993f4b23d1e35fdfc47c94e91d40d3a50aab723c912efda9475
 SHA512:
-  metadata.gz: 3e180990d4308ec58cf00d61cb8e815d6ae7243a0f4926a46f308ee1eb25d42b7f70b6af522fc4730eee7cc476309746c5e502eacc9a211eeb51137f22b9bfce
-  data.tar.gz: 29708ebbc71852cc4da7c238f44a0c0dc591234fb2e6256a5b3e4555e60c59bc15d700138f01fa9cae86e40b880f07eca5857390e98b18d7728870f2196871e3
+  metadata.gz: 564d0bc23fa62c2d382ef078395e94bb4c2fb3771913265478d3e3492dfbca9f25cb0fce5b38dd5dcb9d973691fcea2cfc7341fcfc25e036e9abec930e54618f
+  data.tar.gz: 5ddd57513b37cdaaa80ce946b67c4af3614541b71c4b3f9b71554b390fb52d7c8de412a69151d7a514d67bb89a33cf86e613c44f946d10cf2249d83e661ffdcf

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

@@ -28,11 +28,8 @@ module Fly
       end
     end
 
-    # determine fly api hostname.  Starts proxy if necessary
-    def self.fly_api_hostname!
-      hostname = fly_api_hostname
-      return hostname if hostname
-
+    # determine application's organization
+    def self.org
       org = 'personal'
 
       if File.exist? 'fly.toml'
@@ -46,6 +43,14 @@ module Fly
 	end
       end
 
+      org
+    end
+
+    # determine fly api hostname.  Starts proxy if necessary
+    def self.fly_api_hostname!
+      hostname = fly_api_hostname
+      return hostname if hostname
+
       pid = fork { exec "flyctl machines api-proxy --org #{org}" }
       at_exit { Process.kill "INT", pid }
 
@@ -62,7 +67,7 @@ module Fly
         end
       end
 
-      @@fy_api_hostname
+      @@fly_api_hostname
     end
 
     # create_fly_application app_name: 'user-functions', org_slug: 'personal'

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.0.18'
+  VERSION = '0.0.20'
 end

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

@@ -17,7 +17,21 @@ namespace :fly do
   #  - full access to secrets, databases
   #  - failures here result in VM being stated, shutdown, and rolled back
   #    to last successful deploy (if any).
-  task :server do
+  task :server => :swapfile do
     sh 'bin/rails server'
   end
+
+  # optional SWAPFILE task:
+  #  - adjust fallocate size as needed
+  #  - 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:
+  #        task :server do
+  task :swapfile do
+    sh 'fallocate -l 512M /swapfile'
+    sh 'chmod 0600 /swapfile'
+    sh 'mkswap /swapfile'
+    sh 'echo 10 > /proc/sys/vm/swappiness'
+    sh 'swapon /swapfile'
+  end
 end

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

@@ -2,11 +2,19 @@ terraform {
   required_providers {
     fly = {
       source = "fly-apps/fly"
-      version = "0.0.10"
+      version = "0.0.18"
     }
   }
 }
 
+/* uncomment if you want an internal tunnel
+provider "fly" {
+  useinternaltunnel    = true
+  internaltunnelorg    = <%= (@org || "personal").inspect %>
+  internaltunnelregion = <%= (@regions.first || 'iad').inspect %>
+}
+*/
+
 # Allocate an IPv4 address
 resource "fly_ip" "<%= @appName %>Ipv4" {
   app        = <%= @app.inspect %>

data/lib/generators/terraform_generator.rb

@@ -1,4 +1,5 @@
 require 'open3'
+require 'fly.io-rails/machines'
 
 class TerraformGenerator < Rails::Generators::Base
   include FlyIoRails::Utils
@@ -35,6 +36,7 @@ class TerraformGenerator < Rails::Generators::Base
     @yarn = File.exist? 'yarn.lock'
     @node_version = @node ? `node --version`.chomp.sub(/^v/, '') : '16.17.0'
     @appName = @app.gsub('-', '_').camelcase(:lower)
+    @org = Fly::Machines.org
 
     template 'Dockerfile.erb', 'Dockerfile'
     template 'dockerignore.erb', '.dockerignore'

data/lib/tasks/fly.rake

@@ -46,6 +46,9 @@ namespace :fly do
     config[:env] ||= {}
     config[:env]['SERVER_COMMAND'] = 'bin/rails fly:release'
 
+    # start proxy, if necessary
+    endpoint = Fly::Machines::fly_api_hostname!
+
     # start release machine
     STDERR.puts "--> #{config[:env]['SERVER_COMMAND']}"
     start = Fly::Machines.create_start_machine(app, config: config)
@@ -75,6 +78,7 @@ namespace :fly do
 
       # 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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-20 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: toml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email: rubys@intertwingly.net
 executables: