fly.io-rails 0.0.19-aarch64-linux → 0.0.20-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da7910fca025f08a8e53eae01fb805eb8cd4b6a0c26704cea88662e2c4ee222
-  data.tar.gz: 4356bce2f9ed7eb62396110ae19e5d863f04c0178af82d0a8d760ac0bfd0d32c
+  metadata.gz: f9c7a71664199f9823f1f9ba0e073ba7b3683a78282a6f2f0ac9990e793002c7
+  data.tar.gz: c49bd4810fa0c086b224957e4e1f7fc686ef3b756004a49bd037671c78fb4898
 SHA512:
-  metadata.gz: 257dcd27d9b58ca45f93126f563ccfa45c061c196689d79c189617d1e24a1d05219d2b4690e6d5a8f268c228109ab7c792dca31c19c8107642e9068d5d7b1ca5
-  data.tar.gz: 3657150a29d84cfe18d50ab6581ad66a45bb7fd606e4147388cd03fa211155a7b988d0a373744c42a94e5176897435d26b7628ad859806b477361dc867942297
+  metadata.gz: 418e4daab1549d7949a5c8f6eb79fd61de031f26123de144e1591f4f34c954244804937d01e6aba31c12f2043da7f7c063e81b475fa80a4854dbd8a255aa15be
+  data.tar.gz: 26718913be9b24b61859d837bc518a7dfbe235b910517aa133f3b13cc73e6d916ff53f73fc765e1d1b666c7dd3d96def461f505a37774bff82c5b5d37ea5b80f

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.19'
+  VERSION = '0.0.20'
 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.19
+  version: 0.0.20
 platform: aarch64-linux
 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: