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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57a76033290a05d6e82ece1a86f2f4c8c816eb2b784353af4ded0a9f2b89a79f
-  data.tar.gz: cb14558e0327e8d22d522927c896b4d1b77be0640cdc91a6ba760999dabd991e
+  metadata.gz: 8fd2964fbab010ec3244d90a6430bc404613ea7607f40f4de64edea4f88744fb
+  data.tar.gz: 7238b56eb85b12f7284a29b61fa3cfe34717cc8ad06ebc32f826c202d1b22e46
 SHA512:
-  metadata.gz: 35400f6f3829a605004785570e150c4a4af1ba3d049ae62ed177f9bced1ad8b37c47efd6fff44ad1faa1746f3e18fd3b81cb0e8aab33816ba1ee2c7b285da662
-  data.tar.gz: ff8b70d770664afc93387314202e3285044489a47bf92bcca4a99d7fb41e553f2a027d96e6ae53c9db1afc9f910395e83961db03195f1a29cad5d2bfb8a0b19e
+  metadata.gz: e403ed878b80fb6b5331713306273234178189b270add51920662e7dd86a990c9a18b9a89422f689dd1398d8968081a9d5719ad220c7a7d58eaa62fc2a629c30
+  data.tar.gz: 1c0b1dce5ec790488c12144f3fda0290376aa311b4d6247736a402c0f61957bdf770eccc0f5711d0e95149b83cf98f2c9614016b70ef91d23bd44e8ef30e7d85

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: x86-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: