fly.io-rails 0.0.20 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76e2a638b08c3d778fbdac62956b4730c9436bd133c3cbaedc758f9fd79f7c08
-  data.tar.gz: d1b6bf847c64e993f4b23d1e35fdfc47c94e91d40d3a50aab723c912efda9475
+  metadata.gz: 135b867385fc6527e5879d853de374af267a79a5517c78092253211121df544a
+  data.tar.gz: ed9c255fd3753e3f566a11eb3f8a79d455e41adb079174adffdb133944064e36
 SHA512:
-  metadata.gz: 564d0bc23fa62c2d382ef078395e94bb4c2fb3771913265478d3e3492dfbca9f25cb0fce5b38dd5dcb9d973691fcea2cfc7341fcfc25e036e9abec930e54618f
-  data.tar.gz: 5ddd57513b37cdaaa80ce946b67c4af3614541b71c4b3f9b71554b390fb52d7c8de412a69151d7a514d67bb89a33cf86e613c44f946d10cf2249d83e661ffdcf
+  metadata.gz: fcf3225e3bc2d499d3cb5ece10b7c074de6b0d65e1a1368fe83e3de16d8e4e42f0f08ae50b73f42409361a465ffdf3adf246b13aacefbbc476f41561384645fc
+  data.tar.gz: 1a71284951420ea1b311f85b6f84c65be623211e94827c153f86386bc62b71527e9c355baed1d23c00e27be7d3afe2220aa74725f82989f78afacfb186d0bfe4

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

@@ -0,0 +1,291 @@
+require 'thor'
+require 'active_support'
+require 'active_support/core_ext/string/inflections'
+require 'fly.io-rails/machines'
+require 'fly.io-rails/utils'
+
+module Fly
+  class Actions < Thor::Group
+    include Thor::Actions
+    include Thor::Base
+    include Thor::Shell
+    attr_accessor :options
+
+    def initialize(app = nil)
+      self.app = app if app
+
+      @ruby_version = RUBY_VERSION
+      @bundler_version = Bundler::VERSION
+      @node = File.exist? 'node_modules'
+      @yarn = File.exist? 'yarn.lock'
+      @node_version = @node ? `node --version`.chomp.sub(/^v/, '') : '16.17.0'
+      @org = Fly::Machines.org
+      @regions = []
+
+      @options = {}
+      @destination_stack = [Dir.pwd]
+    end
+
+    def app
+      return @app if @app
+      self.app = TOML.load_file('fly.toml')['app']
+    end
+
+    def app=(app)
+      @app = app
+      @appName = @app.gsub('-', '_').camelcase(:lower)
+    end
+
+    source_paths.push File::expand_path('../generators/templates', __dir__)
+
+    def generate_toml
+      app
+      template 'fly.toml.erb', 'fly.toml'
+    end
+
+    def generate_dockerfile
+      app
+      template 'Dockerfile.erb', 'Dockerfile'
+    end
+
+    def generate_dockerignore
+      app
+      template 'dockerignore.erb', '.dockerignore'
+    end
+
+    def generate_terraform
+      app
+      template 'main.tf.erb', 'main.tf'
+    end
+
+    def generate_raketask
+      app
+      template 'fly.rake.erb', 'lib/tasks/fly.rake'
+    end
+
+    def generate_all
+      generate_dockerfile
+      generate_dockerignore
+      generate_terraform
+      generate_raketask
+    end
+
+    def generate_ipv4
+      cmd = 'flyctl ips allocate-v4'
+      say_status :run, cmd
+      system cmd
+    end
+
+    def generate_ipv6
+      cmd = 'flyctl ips allocate-v6'
+      say_status :run, cmd
+      system cmd
+    end
+
+    def create_volume(app, region, size)
+      volume = "#{app.gsub('-', '_')}_volume"
+      volumes = JSON.parse(`flyctl volumes list --json`).
+        map {|volume| volume[' Name']}
+
+      unless volumes.include? volume
+        cmd = "flyctl volumes create #{volume} --app #{app} --region #{region} --size #{size}"
+        say_status :run, cmd
+        system cmd
+      end
+
+      volume
+    end
+
+    def create_postgres(app, org, region, vm_size, volume_size, cluster_size)
+      cmd = "fly postgres create --name #{app}-db --org #{org} --region #{region} --vm-size #{vm_size} --volume-size #{volume_size} --initial-cluster-size #{cluster_size}"
+      say_status :run, cmd
+      output = FlyIoRails::Utils.tee(cmd)
+      output[%r{postgres://\S+}]
+   end
+
+    def release(app, config)
+      start = Fly::Machines.create_start_machine(app, config: config)
+      machine = start[:id]
+
+      if !machine
+	STDERR.puts 'Error starting release machine'
+	PP.pp start, STDERR
+	exit 1
+      end
+
+      # wait for release to copmlete
+      status = nil
+      5.times do
+	status = Fly::Machines.wait_for_machine app, machine,
+          timeout: 60, status: 'stopped'
+	return machine if status[:ok]
+      end
+
+      STDERR.puts status.to_json
+      exit 1
+    end
+
+    def deploy(app, image) 
+      regions = JSON.parse(`flyctl regions list --json`)['Regions'].
+        map {|region| region['Code']} rescue []
+      region = regions.first || 'iad'
+
+      secrets = JSON.parse(`fly secrets list --json`).
+        map {|secret| secret["Name"]}
+
+      config = {
+        region: region,
+        app: app,
+        name: "#{app}-machine",
+        image: image,
+        guest: {
+          cpus: 1,
+          cpu_kind: "shared",
+          memory_mb: 256,
+        },
+        services: [
+	  {
+	    ports: [
+	      {port: 443, handlers: ["tls", "http"]},
+	      {port: 80, handlers: ["http"]}
+	    ],
+	    protocol: "tcp",
+	    internal_port: 8080
+	  } 
+        ]
+      }
+
+      database = YAML.load_file('config/database.yml').
+        dig('production', 'adapter') rescue nil
+      cable = YAML.load_file('config/cable.yml').
+        dig('production', 'adapter') rescue nil
+
+      if database == 'sqlite3'
+        volume = create_volume(app, region, 3) 
+
+        config[:mounts] = [
+          { volume: volume, path: '/mnt/volume' }
+        ]
+
+        config[:env] = {
+          "DATABASE_URL" => "sqlite3:///mnt/volume/production.sqlite3"
+        }
+      elsif database == 'postgresql' and not secrets.include? 'DATABASE_URL'
+        secret = create_postgres(app, @org, region, 'shared-cpu-1x', 1, 1)
+
+        cmd = "fly secrets set DATABASE_URL=#{secret}"
+        say_status :run, cmd
+        system cmd
+      end
+
+      # build config for release machine, overriding server command
+      release_config = config.dup
+      release_config.delete :services
+      release_config.delete :mounts
+      release_config[:env] = { 'SERVER_COMMAND' => 'bin/rails fly:release' }
+
+      # perform release
+      say_status :fly, release_config[:env]['SERVER_COMMAND']
+      machine = release(app, release_config)
+      Fly::Machines.delete_machine app, machine if machine
+
+      # start proxy, if necessary
+      endpoint = Fly::Machines::fly_api_hostname!
+
+      # start app
+      say_status :fly, "start #{app}"
+      start = Fly::Machines.create_start_machine(app, config: config)
+      machine = start[:id]
+
+      if !machine
+	STDERR.puts 'Error starting application'
+	PP.pp start, STDERR
+	exit 1
+      end
+
+      5.times do
+	status = Fly::Machines.wait_for_machine app, machine,
+          timeout: 60, status: 'started'
+	return if status[:ok]
+      end
+
+      STDERR.puts 'Timeout waiting for application to start'
+    end
+
+    def terraform(app, image) 
+      # update main.tf with the image name
+      tf = IO.read('main.tf')
+      tf[/^\s*image\s*=\s*"(.*?)"/, 1] = image.strip
+      IO.write 'main.tf', tf
+
+      # find first machine in terraform config file
+      machines = Fly::HCL.parse(IO.read('main.tf')).find {|block|
+	block.keys.first == :resource and
+	block.values.first.keys.first == 'fly_machine'}
+
+      # extract HCL configuration for the machine
+      config = machines.values.first.values.first.values.first
+
+      # delete HCL specific configuration items
+      %i(services for_each region app name depends_on).each do |key|
+	 config.delete key
+      end
+
+      # move machine configuration into guest object
+      config[:guest] = {
+	cpus: config.delete(:cpus),
+	memory_mb: config.delete(:memorymb),
+	cpu_kind: config.delete(:cputype)
+      }
+
+      # release machines should have no services or mounts
+      config.delete :services
+      config.delete :mounts
+
+      # override start command
+      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)
+      machine = start[:id]
+
+      if !machine
+	STDERR.puts 'Error starting release machine'
+	PP.pp start, STDERR
+	exit 1
+      end
+
+      # wait for release to copmlete
+      event = nil
+      90.times do
+	sleep 1
+	status = Fly::Machines.get_a_machine app, machine
+	event = status[:events]&.first
+	break if event && event[:type] == 'exit'
+      end
+
+      # extract exit code
+      exit_code = event.dig(:request, :exit_event, :exit_code)
+	       
+      if exit_code == 0
+	# delete release machine
+	Fly::Machines.delete_machine app, machine
+
+	# 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'
+	STDERR.puts (exit_code ? {exit_code: exit_code} : event).inspect
+	STDERR.puts "run 'flyctl logs --instance #{machine}' for more information"
+	exit 1
+      end
+    end
+  end
+end

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

@@ -98,9 +98,9 @@ module Fly
       post "/v1/apps/#{app}/machines", options
     end
 
-    # wait_for_machine_to_start 'user-functions', '73d8d46dbee589'
-    def self.wait_for_machine_to_start app, machine, timeout=60
-      get "/v1/apps/#{app}/machines/#{machine}/wait?timeout=#{timeout}"
+    # wait_for_machine 'user-functions', '73d8d46dbee589'
+    def self.wait_for_machine app, machine, options = {timeout:60, status: 'started'}
+      get "/v1/apps/#{app}/machines/#{machine}/wait?#{options.to_query}"
     end
 
     # get_a_machine machine 'user-functions', '73d8d46dbee589'

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.0.20'
+  VERSION = '0.1.0'
 end

data/lib/generators/terraform_generator.rb

@@ -1,7 +1,7 @@
 require 'open3'
-require 'fly.io-rails/machines'
+require 'fly.io-rails/actions'
 
-class TerraformGenerator < Rails::Generators::Base
+class Fly::Generators::TerraformGenerator < Rails::Generators::Base
   include FlyIoRails::Utils
 
   class_option :name, type: :string, required: false
@@ -30,18 +30,8 @@ class TerraformGenerator < Rails::Generators::Base
       @regions = options[:regions].flatten
     end
 
-    @ruby_version = RUBY_VERSION
-    @bundler_version = Bundler::VERSION
-    @node = File.exist? 'node_modules'
-    @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'
-    template 'main.tf.erb', 'main.tf'
-    template 'fly.rake.erb', 'lib/tasks/fly.rake'
+    action = Fly::Actions.new(@app)
+    action.generate_all
 
     credentials = nil
     if File.exist? 'config/credentials/production.key'
@@ -60,4 +50,3 @@ class TerraformGenerator < Rails::Generators::Base
     tee 'terraform init'
   end
 end
-

data/lib/tasks/fly.rake

@@ -1,90 +1,45 @@
 require 'fly.io-rails/machines'
 require 'fly.io-rails/hcl'
+require 'fly.io-rails/actions'
+require 'toml'
 
 namespace :fly do
   desc 'Deploy fly application'
   task :deploy do
-    # build and push an image
-    out = FlyIoRails::Utils.tee 'fly deploy --build-only --push'
-    image = out[/image:\s+(.*)/, 1]
-
-    exit 1 unless image
-
-    # update main.tf with the image name
-    tf = IO.read('main.tf')
-    tf[/^\s*image\s*=\s*"(.*?)"/, 1] = image.strip
-    IO.write 'main.tf', tf
+    include FlyIoRails::Utils
 
-    # find first machine in terraform config file
-    machines = Fly::HCL.parse(IO.read('main.tf')).find {|block|
-      block.keys.first == :resource and
-      block.values.first.keys.first == 'fly_machine'}
-
-    # extract HCL configuration for the machine
-    config = machines.values.first.values.first.values.first
+    # Get app name, creating one if necessary
+    if File.exist? 'fly.toml'
+      app = TOML.load_file('fly.toml')['app']
+    else
+      output = FlyIoRails::Utils.tee(
+        "flyctl apps create --generate-name --org personal --machines"
+      )
 
-    # extract fly application name
-    app = config[:app]
+      exit 1 unless output =~ /^New app created: /
 
-    # delete HCL specific configuration items
-    %i(services for_each region app name depends_on).each do |key|
-       config.delete key
+      @app = app = output.split.last
     end
 
-    # move machine configuration into guest object
-    config[:guest] = {
-      cpus: config.delete(:cpus),
-      memory_mb: config.delete(:memorymb),
-      cpu_kind: config.delete(:cputype)
-    }
-
-    # release machines should have no services or mounts
-    config.delete :services
-    config.delete :mounts
-
-    # override start command
-    config[:env] ||= {}
-    config[:env]['SERVER_COMMAND'] = 'bin/rails fly:release'
+    # ensure fly.toml and Dockerfile are present
+    action = Fly::Actions.new(app)
+    action.generate_toml if @app
+    action.generate_dockerfile unless File.exist? 'Dockerfile'
+    action.generate_dockerignore unless File.exist? '.dockerignore'
+    action.generate_raketask unless File.exist? 'lib/tasks/fly.rake'
 
-    # 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)
-    machine = start[:id]
-
-    if !machine
-      STDERR.puts 'Error starting release machine'
-      PP.pp start, STDERR
-      exit 1
-    end
-
-    # wait for release to copmlete
-    event = nil
-    90.times do
-      sleep 1
-      status = Fly::Machines.get_a_machine app, machine
-      event = status[:events]&.first
-      break if event && event[:type] == 'exit'
-    end
+    # build and push an image
+    out = FlyIoRails::Utils.tee 'fly deploy --build-only --push'
+    image = out[/image:\s+(.*)/, 1].strip
 
-    # extract exit code
-    exit_code = event.dig(:request, :exit_event, :exit_code)
-	     
-    if exit_code == 0
-      # delete release machine
-      Fly::Machines.delete_machine app, machine
+    exit 1 unless image
 
-      # 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'
+    if File.exist? 'main.tf'
+      action.terraform(app, image)
     else
-      STDERR.puts 'Error performing release'
-      STDERR.puts (exit_code ? {exit_code: exit_code} : event).inspect
-      STDERR.puts "run 'flyctl logs --instance #{machine}' for more information"
-      exit 1
+      action.generate_ipv4 if @app
+      action.generate_ipv6 if @app
+      action.deploy(app, image)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.1.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -50,6 +50,7 @@ files:
 - Rakefile
 - exe/flyctl
 - lib/fly.io-rails.rb
+- lib/fly.io-rails/actions.rb
 - lib/fly.io-rails/generators.rb
 - lib/fly.io-rails/hcl.rb
 - lib/fly.io-rails/machines.rb