fly.io-rails 0.0.19-x64-mingw32 → 0.0.20-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df725e0b66cefb97d360e2ee89d194847a676a84c07901c7d5eca297876a23e9
-  data.tar.gz: 69c8b38529e3621b31d27553563bf4607fc0a27c7c9165af6ca7ef4769cda382
+  metadata.gz: 5d2254f8649b6ad620d95bc5fbbba580ba02f66d2c53ddf2dbd20a9b41f8040c
+  data.tar.gz: 0bb35198a3f546371d9300f5aa56471fdec2f5b56cc0923928744944ec62e4b2
 SHA512:
-  metadata.gz: 20dbb61eb9a481f1198568caced62a22a038153251ed9d6f650d700b6414884e683db716630386e7b9560e9003e762a498c7637f2d47b81e950856cd0f6fc5be
-  data.tar.gz: dccbf9c5ca50b32d3c171ac9f0ac3dd1aca92016774a151ea07da65b5417b6405a8f661358c0ea05a2d50a1a33999a287acec834098e68d6b8ab732da4ea7e92
+  metadata.gz: 24a399c2ab66e3ffe008c03df9714423fe2fa1c8342ba6add8c3707129217d6f59cfacc2fb73d4d40303af644f2b94f70343f9266863b63030caa0a091fea450
+  data.tar.gz: 75e5669e4fd1f116bccb8774e892ba14e2882d8e1f27d653665177037e059d92d3dedd86df3592f5c40646d716f5e5f7fa94abb4e3ecf1617ba6a7065e40303c

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: x64-mingw32
 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: