fly.io-rails 0.0.19-x86_64-darwin → 0.0.20-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f929098e295f918fa46a37d36caa7080d4c7350f09e98a59921b7f262cfaa2
-  data.tar.gz: 5f786e41cc4413764b9ead3f9a4711026c29f35034a4dd3c2c610f645665a2ed
+  metadata.gz: 3a7dcc8e3cb676412613e409cab2e30faea300a076d94e2111d072055ecf68c8
+  data.tar.gz: 341bddcd7a49739441f9d8c84f07417740c913f9870b4ad3b01f93ac8547f7d5
 SHA512:
-  metadata.gz: 9ee1766b0181a00c3753c67ceee5409f745c40fb895e9f4e4e20437e088a0bae92f15ad4586409b6db66fd3cd2bfea682b66c9d7878e9d6ab4e988a301072274
-  data.tar.gz: '0219238590873c56f094ddb223debb58ad4f87f6b901aa5ae509fb8710c6caefa2a2e51050c73afdc75917751e77dea53e87355612863763b92ac8bdb0d60ee0'
+  metadata.gz: 1248898f8d43835025988a9c6f78dfa8ef64d744e60c75e68d120490e68f1af8673296807b1afd59d976f857a09a878347568bf22b7e443d01dce4113d57e504
+  data.tar.gz: fae2ff3b054f8ad1fdff4a9223fbfb3107bbc0489f35f036d6bd2947c6ffa2e869f00986726e4cfbd195f03f93d70be070a793510bdfcc7fc2fc907d68ad0c29

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_64-darwin
 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: