fly.io-rails 0.0.1-arm64-darwin → 0.0.2-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c87dc99e3dbb378012098fbd2bfead54f0a519547e64fb230b8a80db2d0ce872
-  data.tar.gz: cba1d904341068c1214a72d63e322b671e3e27c03bc0556a032236e889940fd2
+  metadata.gz: f00ff31f7361f547fe378be5a1444dc196d50f9166a57b55a8a25dd850dbd01e
+  data.tar.gz: 9a8947b41c02c4b7890f80632b518f01fbbc1f135dde53663ff5f98e404ee83e
 SHA512:
-  metadata.gz: 5503434e8b6499041d1a5886ad875fbdf9d6fc364cb27eff267bc4198109247074be559b0598353bae5ec6edec946ac775b3cfce25a484de4a46893ef079bf43
-  data.tar.gz: 369eef59ebad825bc1d79d0cae27e67a14633701c9d667b0775f0d8e6db9685263bf070cfc61fb9ae9963bc99fdff409599776f92d387d58c3f89fe4cd92c422
+  metadata.gz: 10f325efde9eedbe3e363240b507f801747b49c54f2c7961a8a1c3c99ad587b84e33fdcb92c32233b9364a0d7be8dd0876246917b9c1a018493ea12219e6a3ee
+  data.tar.gz: 5988b1583429a523ef8a130200d06cc96164d319da1527bbc6a23c31c47d6b09ab39d80ff0a1e5f0aa7b97f17fbe3f47e642ce6a01a13baed7d0fd05ec8d49f5

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

@@ -0,0 +1,36 @@
+require 'open3'
+
+module FlyIoRails
+  module Utils
+
+    def tee cmd
+      say_status :run, cmd
+      FlyIoRails::Utils.tee cmd
+    end
+    
+    def self.tee cmd
+      data = {:out => [], :err => []}
+
+      Open3.popen3(cmd) do |stdin, stdout, stderr, thread|
+	{ out: stdout, err: stderr }.each do |key, stream|
+	  Thread.new do
+	    until (raw_line = stream.gets).nil? do
+	      data[key].push raw_line
+	      
+	      if key == :out
+		STDOUT.print raw_line
+	      else
+		STDERR.print raw_line
+	      end
+	    end
+	  end
+	end
+
+	thread.join
+      end
+
+      [data[:out].join, data[:err].join]
+    end
+
+  end
+end

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/fly.io-rails.rb

@@ -1,5 +1,6 @@
 require 'rails'
 require 'fly.io-rails/generators'
+require 'fly.io-rails/utils'
 
 class FlyIoRailtie < Rails::Railtie
   rake_tasks do

data/lib/generators/templates/Dockerfile.erb

@@ -0,0 +1,114 @@
+# syntax = docker/dockerfile:experimental
+
+# Dockerfile used to build a deployable image for a Rails application.
+# Adjust as required.
+#
+# Common adjustments you may need to make over time:
+#  * Modify version numbers for Ruby, Bundler, and other products.
+#  * Add library packages needed at build time for your gems, node modules.
+#  * Add deployment packages needed by your application
+#  * Add (often fake) secrets needed to compile your assets
+
+#######################################################################
+
+# Learn more about the chosen Ruby stack, Fullstaq Ruby, here:
+#   https://github.com/evilmartians/fullstaq-ruby-docker.
+#
+# We recommend using the highest patch level for better security and
+# performance.
+
+ARG RUBY_VERSION=<%= @ruby_version %>
+ARG VARIANT=jemalloc-slim
+FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-${VARIANT} as base
+
+ARG BUNDLER_VERSION=<%= @bundler_version %>
+
+ARG RAILS_ENV=production
+ENV RAILS_ENV=${RAILS_ENV}
+
+ENV RAILS_SERVE_STATIC_FILES true
+ENV RAILS_LOG_TO_STDOUT true
+
+ARG BUNDLE_WITHOUT=development:test
+ARG BUNDLE_PATH=vendor/bundle
+ENV BUNDLE_PATH ${BUNDLE_PATH}
+ENV BUNDLE_WITHOUT ${BUNDLE_WITHOUT}
+
+RUN mkdir /app
+WORKDIR /app
+RUN mkdir -p tmp/pids
+
+#######################################################################
+
+# install packages only needed at build time
+
+FROM base as build_deps
+
+ARG BUILD_PACKAGES="git build-essential libpq-dev wget vim curl gzip xz-utils libsqlite3-dev"
+ENV BUILD_PACKAGES ${BUILD_PACKAGES}
+
+RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
+    --mount=type=cache,id=dev-apt-lib,sharing=locked,target=/var/lib/apt \
+    apt-get update -qq && \
+    apt-get install --no-install-recommends -y ${BUILD_PACKAGES} \
+    && rm -rf /var/lib/apt/lists /var/cache/apt/archives
+
+#######################################################################
+
+# install gems
+
+FROM build_deps as gems
+
+RUN gem update --system --no-document && \
+    gem install -N bundler -v ${BUNDLER_VERSION}
+
+COPY Gemfile* ./
+RUN bundle install &&  rm -rf vendor/bundle/ruby/*/cache
+
+#######################################################################
+
+# install deployment packages
+
+FROM base
+
+ARG DEPLOY_PACKAGES="postgresql-client file vim curl gzip libsqlite3-0"
+ENV DEPLOY_PACKAGES=${DEPLOY_PACKAGES}
+
+RUN --mount=type=cache,id=prod-apt-cache,sharing=locked,target=/var/cache/apt \
+    --mount=type=cache,id=prod-apt-lib,sharing=locked,target=/var/lib/apt \
+    apt-get update -qq && \
+    apt-get install --no-install-recommends -y \
+    ${DEPLOY_PACKAGES} \
+    && rm -rf /var/lib/apt/lists /var/cache/apt/archives
+
+# copy installed gems
+COPY --from=gems /app /app
+COPY --from=gems /usr/lib/fullstaq-ruby/versions /usr/lib/fullstaq-ruby/versions
+COPY --from=gems /usr/local/bundle /usr/local/bundle
+
+#######################################################################
+
+# Deploy your application
+COPY . .
+
+# Adjust binstubs to run on Linux and set current working directory
+RUN chmod +x /app/bin/* && \
+    sed -i 's/ruby.exe/ruby/' /app/bin/* && \
+    sed -i '/^#!/aDir.chdir File.expand_path("..", __dir__)' /app/bin/*
+
+# The following enable assets to precompile on the build server.  Adjust
+# as necessary.  If no combination works for you, see:
+# https://fly.io/docs/rails/getting-started/existing/#access-to-environment-variables-at-build-time
+ENV SECRET_KEY_BASE 1
+# ENV AWS_ACCESS_KEY_ID=1
+# ENV AWS_SECRET_ACCESS_KEY=1
+
+# Run build task defined in lib/tasks/fly.rake
+ARG BUILD_COMMAND="bin/rails fly:build"
+RUN ${BUILD_COMMAND}
+
+# Default server start instructions.  Generally Overridden by fly.toml.
+ENV PORT 8080
+ARG SERVER_COMMAND="bin/rails fly:server"
+ENV SERVER_COMMAND ${SERVER_COMMAND}
+CMD ${SERVER_COMMAND}

data/lib/generators/templates/dockerignore.erb

@@ -0,0 +1,16 @@
+.git
+tmp
+!tmp/pids
+log
+public/assets
+public/packs
+.bundle
+
+db/*.sqlite3
+db/*.sqlite3-*
+
+storage
+config/master.key
+config/credentials/*.key
+
+node_modules

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

@@ -0,0 +1,23 @@
+# commands used to deploy a Rails application
+namespace :fly do
+  # BUILD step:
+  #  - changes to the filesystem made here DO get deployed
+  #  - NO access to secrets, volumes, databases
+  #  - Failures here prevent deployment
+  task :build => 'assets:precompile'
+
+  # RELEASE step:
+  #  - changes to the filesystem made here are DISCARDED
+  #  - full access to secrets, databases
+  #  - failures here prevent deployment
+  task :release => 'db:migrate'
+
+  # SERVER step:
+  #  - changes to the filesystem made here are deployed
+  #  - 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
+    sh 'bin/rails server'
+  end
+end

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

@@ -0,0 +1,42 @@
+terraform {
+  required_providers {
+    fly = {
+      source = "fly-apps/fly"
+      version = "0.0.10"
+    }
+  }
+}
+
+resource "fly_ip" "<%= @appName %>Ipv4" {
+  app        = <%= @app.inspect %>
+  type       = "v4"
+}
+
+resource "fly_ip" "<%= @appName %>Ipv6" {
+  app        = <%= @app.inspect %>
+  type       = "v6"
+}
+
+resource "fly_machine" "<%= @appName %>Machine" {
+  for_each = toset(<%= @regions.inspect %>)
+  app    = <%= @app.inspect %>
+  region = each.value
+  name   = "<%= @app %>-${each.value}"
+  image  = "quay.io/evl.ms/fullstaq-ruby:<%= @ruby_version %>-jemalloc-slim"
+  services = [
+    {
+      ports = [
+        {
+          port     = 443
+          handlers = ["tls", "http"]
+        },
+        {
+          port     = 80
+          handlers = ["http"]
+        }
+      ]
+      "protocol" : "tcp",
+      "internal_port" : 8080
+    },
+  ]
+}

data/lib/generators/terraform_generator.rb

@@ -0,0 +1,44 @@
+require 'open3'
+
+class TerraformGenerator < Rails::Generators::Base
+  include FlyIoRails::Utils
+
+  class_option :name, type: :string, required: false
+  class_option :org, type: :string, default: 'personal'
+  class_option :region, type: :array, repeatable: true, default: []
+
+  def terraform
+    cmd = if options[:name]
+      "flyctl apps create #{options[:name].inspect} --org #{options[:org].inspect}"
+    else
+      "flyctl apps create --generate-name --org #{options[:org].inspect}"
+    end
+
+    output, error = tee cmd
+    exit 1 unless output =~ /^New app created: /
+
+    @app = output.split.last
+    create_file 'fly.toml', "app = #{@app.inspect}\n"
+
+    if options[:region].empty?
+      @regions = JSON.parse(`flyctl regions list --json`)['Regions'].
+        map {|region| region['Code']}
+    else
+      @regions = options[:regions].flatten
+    end
+
+    source_paths.push File.expand_path('./templates', __dir__)
+
+    @ruby_version = RUBY_VERSION
+    @bundler_version = Bundler::VERSION
+    @appName = @app.gsub('-', '_').camelcase(:lower)
+    template 'Dockerfile.erb', 'Dockerfile'
+    template 'dockerignore.erb', '.dockerignore'
+    template 'main.tf.erb', 'main.tf'
+    template 'fly.rake.erb', 'lib/tasks/fly.rake'
+
+    ENV['FLY_API_TOKEN'] = `flyctl auth token`
+    tee 'terraform init'
+  end
+end
+

data/lib/tasks/fly.rake

@@ -1,26 +1,20 @@
 namespace :fly do
-  desc 'Launch a new app'
-  task :launch do
-    sh 'flyctl launch'
-
-    # note: Rake task argument syntax isn't particularly user friendy,
-    # but Rake is a Ruby program and we have full access to ARGV,
-    # meaning we can do our own thing with OptionParser or whatever.
-    # The only real caveat if we do so is that we need to exit the
-    # program at the completion of the task lest Rails tries to interpet
-    # the next argument as the name of the next task to execute.
-
-    Rake.rake_output_message 'Customizing Dockerfile...'
-
-    exit
-  end
-
   desc 'Deploy fly application'
   task :deploy do
-    sh 'flyctl deploy'
+    out, err = FlyIoRails::Utils.tee 'fly deploy --build-only --push'
+    image = err[/image:\s+(.*)/, 1]
+
+    if image
+      tf = IO.read('main.tf')
+      tf[/^\s*image\s*=\s*"(.*?)"/, 1] = image
+      IO.write 'main.tf', tf
+
+      ENV['FLY_API_TOKEN'] = `flyctl auth token`
+      FlyIoRails::Utils.tee 'terraform apply -auto-approve'
+    end
   end
 end
 
 # Alias, for convenience
 desc 'Deploy fly application'
-task deploy: 'fly:deploy'
+task deploy: 'fly:deploy'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: arm64-darwin
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -39,7 +39,13 @@ files:
 - lib/fly.io-rails.rb
 - lib/fly.io-rails/generators.rb
 - lib/fly.io-rails/platforms.rb
+- lib/fly.io-rails/utils.rb
 - lib/fly.io-rails/version.rb
+- lib/generators/templates/Dockerfile.erb
+- lib/generators/templates/dockerignore.erb
+- lib/generators/templates/fly.rake.erb
+- lib/generators/templates/main.tf.erb
+- lib/generators/terraform_generator.rb
 - lib/tasks/fly.rake
 homepage: https://github.com/rubys/fly-io.rails
 licenses:
@@ -61,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Rails support for Fly-io