fly.io-rails 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3e2cb915aae5b7e8d4d2cd96fc2461e814817793b67933ac50997f4f98fdfd0
-  data.tar.gz: b8671505b05fa89a22b0340054d7c691a0a836cc4206b416b69f77cbc76a241e
+  metadata.gz: bf047fddfe38280f888b4c2f8e2215172d89bdaaeb3c9e0d082c00014047e110
+  data.tar.gz: 5428fb05b28780d0640baf068ba1c3d326fef353771c1cbf8fcd0ccba32b100c
 SHA512:
-  metadata.gz: debc5c5ec2c92168e7a0ab10ea3a2dd5a574ddce0687cf505dcd393dbed3a014462d001ed35e05c8664c3eab3f61d3b4f0110f75a89aa817d5830ce93bd5886e
-  data.tar.gz: c3ef5f38213186776cfe5aa67f3fe0d1c32f7254de36794277efddfe5bc03a4d52817bb5ed9c424e40095581ab0864548d002adcbb734ebfdd52e0450ff62565
+  metadata.gz: efbdb4918b945916191ba8bb0452788d73c5066411fef2318eb45b1e6d6d2a6f0218b353bbc835856ab6d405dc3e9b5d8b77fdb3b575d7bd2bc00ebc71bf7c93
+  data.tar.gz: 034d4cf87622aa1988c33e33b3b48f5872b5863c7f12f36f3364dcca58ae16f2b347df25cf6f18e1ea19f1e13b1618606e386ec69ed10d4429f5957a147ae1fa

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

@@ -14,7 +14,7 @@ module Fly
     include Thor::Base
     include Thor::Shell
     include Fly::Scanner
-    attr_accessor :options
+    attr_accessor :options, :dockerfile, :ignorefile
 
     def initialize(app=nil, options={})
       # placate thor
@@ -30,6 +30,7 @@ module Fly
       @nomad = options[:nomad]
       @passenger = options[:passenger]
       @serverless = options[:serverless]
+      @eject = options[:eject]
 
       # prepare template variables
       @ruby_version = RUBY_VERSION
@@ -95,7 +96,7 @@ module Fly
       @procs = {web: 'bin/rails server'}
       @procs[:web] = "nginx -g 'daemon off;'" if @passenger
       @procs[:worker] = 'bundle exec sidekiq' if @sidekiq
-      @procs[:redis] = 'redis-server /etc/redis/redis.conf' if @redis
+      @procs[:redis] = 'redis-server /etc/redis/redis.conf' if @redis == :internal
       @procs.merge! 'anycable-rpc': 'bundle exec anycable --rpc-host=0.0.0.0:50051',
         'anycable-go': 'env ANYCABLE_RPC_HOST=$ANYCABLE_GO_RPC_HOST /usr/local/bin/anycable-go --port=8082 --host 0.0.0.0' if @anycable
     end
@@ -126,11 +127,35 @@ module Fly
     end
 
     def generate_dockerfile
-      app_template 'Dockerfile.erb', 'Dockerfile'
+      if @eject or File.exist? 'Dockerfile'
+        @dockerfile = 'Dockerfile'
+      else
+        tmpfile = Tempfile.new('Dockerfile')
+        @dockerfile = tmpfile.path
+        tmpfile.unlink
+        at_exit { File.unlink @dockerfile }
+      end
+
+      if @eject or not File.exist? @dockerfile
+        app_template 'Dockerfile.erb', @dockerfile
+      end
     end
 
     def generate_dockerignore
-      app_template 'dockerignore.erb', '.dockerignore'
+      if @eject or File.exist? '.dockerignore'
+        @ignorefile = '.dockerignore'
+      elsif File.exist? '.gitignore'
+        @ignorefile = '.gitignore'
+      else
+        tmpfile = Tempfile.new('Dockerignore')
+        @ignoreile = tmpfile.path
+        tmpfile.unlink
+        at_exit { Filee.unlink @ignorefile }
+      end
+
+      if @eject or not File.exist? @ignorefile
+        app_template 'dockerignore.erb', @ignorefile
+      end
     end
 
     def generate_nginx_conf
@@ -148,6 +173,7 @@ module Fly
     end
 
     def generate_raketask
+      return unless @nomad
       app_template 'fly.rake.erb', 'lib/tasks/fly.rake'
     end
 

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

@@ -18,7 +18,8 @@ def check_git
 
     system `git clone --depth 1 #{spec.git} /srv/fly.io-rails`
     exit 1 unless Dir.exist? '/srv/fly.io-rails/lib'
-    exec "ruby -r /srv/fly.io-rails/deploy -e #{caller_locations(1,1)[0].label}"
+    ENV['RUBYLIB'] = '/srv/fly.io-rails/lib'
+    exec "ruby -r fly.io-rails/deploy -e #{caller_locations(1,1)[0].label}"
   end
 end
 

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

@@ -1,6 +1,10 @@
+require 'rake'
+
 module Fly
   module DSL
     class Base
+      include Rake::DSL
+
       @@blocks = {}
 
       def initialize

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

@@ -3,6 +3,9 @@ module Fly
     # scan for major features - things that if present will likely affect
     # more than one artifact that is generated.
     def scan_rails_app
+
+      ### database ###
+
       database = YAML.load_file('config/database.yml').
         dig('production', 'adapter') rescue nil
 
@@ -14,16 +17,37 @@ module Fly
         @mysql = true
       end
 
-      gemfile = IO.read('Gemfile') rescue ''
-      @sidekiq = gemfile.include? 'sidekiq'
-      @anycable = gemfile.include? 'anycable'
-      @rmagick = gemfile.include? 'rmagick'
-      @image_processing = gemfile.include? 'image_processing'
-      @bootstrap = gemfile.include? 'bootstrap'
-      @puppeteer = gemfile.include? 'puppeteer'
+      ### ruby gems ###
+
+      @gemfile = []
+
+      if File.exist? 'Gemfile.lock'
+        parser = Bundler::LockfileParser.new(Bundler.read_file('Gemfile.lock'))
+        @gemfile += parser.specs.map { |spec, version| spec.name }
+      end
+      
+      if File.exist? 'Gemfile'
+        @gemfile += Bundler::Definition.build('Gemfile', nil, []).dependencies.map(&:name)
+      end
+
+      @sidekiq = @gemfile.include? 'sidekiq'
+      @anycable = @gemfile.include? 'anycable'
+      @rmagick = @gemfile.include? 'rmagick'
+      @image_processing = @gemfile.include? 'image_processing'
+      @bootstrap = @gemfile.include? 'bootstrap'
+      @puppeteer = @gemfile.include? 'puppeteer'
+
+      ### node modules ###
+
+      @package_json = []
+
+      if File.exist? 'package.json'
+        @package_json += JSON.load_file('package.json')['dependencies'].keys rescue []
+      end
+
+      @puppeteer ||= @package_json.include? 'puppeteer'
 
-      package_json = IO.read('package.json') rescue ''
-      @puppeteer ||= package_json.include? 'puppeteer'
+      ### cable/redis ###
 
       @cable = ! Dir['app/channels/*.rb'].empty?
 

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/lib/generators/fly/app_generator.rb

@@ -20,19 +20,28 @@ class AppGenerator < Rails::Generators::Base
   def generate_app
     source_paths.push File.expand_path('../templates', __dir__)
 
+    # the plan is to make eject an option, default to false, but until
+    # that is ready, have generate fly:app always eject
+    options = options.to_h.dup
+    options[:eject] = options[:nomad]
+
     create_app(**options.symbolize_keys)
 
     action = Fly::Actions.new(@app, options)
 
     action.generate_toml
     action.generate_fly_config unless File.exist? 'config/fly.rb'
-    action.generate_dockerfile unless File.exist? 'Dockerfile'
-    action.generate_dockerignore unless File.exist? '.dockerignore'
-    action.generate_nginx_conf unless File.exist? 'config/nginx.conf'
-    action.generate_raketask unless File.exist? 'lib/tasks/fly.rake'
-    action.generate_procfile unless File.exist? 'Procfile.rake'
-    action.generate_litefs if options[:litefs] and not File.exist? 'config/litefs'
-    action.generate_patches
+
+    if options[:eject]
+      action.generate_dockerfile unless File.exist? 'Dockerfile'
+      action.generate_dockerignore unless File.exist? '.dockerignore'
+      action.generate_nginx_conf unless File.exist? 'config/nginx.conf'
+      action.generate_raketask unless File.exist? 'lib/tasks/fly.rake'
+      action.generate_procfile unless File.exist? 'Procfile.rake'
+      action.generate_litefs if options[:litefs] and not File.exist? 'config/litefs'
+      action.generate_patches
+    end
+
     action.generate_ipv4
     action.generate_ipv6
 

data/lib/generators/templates/Dockerfile.erb

@@ -1,36 +1,9 @@
-# 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
+# syntax = docker/dockerfile:1
 
+FROM quay.io/evl.ms/fullstaq-ruby:<%= @ruby_version %>-jemalloc-slim as base
 LABEL fly_launch_runtime="rails"
 
-<% if @node -%>
-ARG NODE_VERSION=<%= @node_version %>
-ARG YARN_VERSION=<%= @yarn_version %>
-<% end -%>
-ARG BUNDLER_VERSION=<%= @bundler_version %>
-
-ARG RAILS_ENV=production
-ENV RAILS_ENV=${RAILS_ENV}
+ENV RAILS_ENV=production
 <% if @anycable or not @passenger -%>
 ENV RAILS_LOG_TO_STDOUT true
 <% end -%>
@@ -45,19 +18,18 @@ ENV BUNDLE_WITHOUT ${BUNDLE_WITHOUT}
 
 RUN mkdir /app
 WORKDIR /app
-RUN mkdir -p tmp/pids
 
 <% if @node -%>
 RUN curl https://get.volta.sh | bash
 ENV VOLTA_HOME /root/.volta
 ENV PATH $VOLTA_HOME/bin:/usr/local/bin:$PATH
-RUN volta install node@${NODE_VERSION} yarn@${YARN_VERSION} && \
+RUN volta install node@<%= @node_version %> yarn@<%= @yarn_version %> && \
     gem update --system --no-document && \
-    gem install -N bundler -v ${BUNDLER_VERSION}
+    gem install --no-document bundler --version <%= @bundler_version %>
 
 <% else -%>
 RUN gem update --system --no-document && \
-    gem install -N bundler -v ${BUNDLER_VERSION}
+    gem install --no-document bundler --version <%= @bundler_version %>
 
 <% end -%>
 #######################################################################
@@ -89,7 +61,16 @@ RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
 FROM build_deps as gems
 
 COPY Gemfile* ./
-RUN bundle install &&  rm -rf vendor/bundle/ruby/*/cache
+RUN bundle install && \
+<% if @redis and not @gemfile.include? 'redis' -%>
+<% @bundle_add = true -%>
+    bundle add redis && \
+<% end -%>
+<% if @postgresql and not @gemfile.include? 'pg' -%>
+<% @bundle_add = true -%>
+    bundle add pg && \
+<% end -%>
+    rm -rf vendor/bundle/ruby/*/cache
 
 <% if @node -%>
 #######################################################################
@@ -246,6 +227,9 @@ COPY config/hook_detached_process /etc/nginx/
 
 # Deploy your application
 COPY . .
+<% if @bundle_add -%>
+COPY --from=gems /app/Gemfile* ./
+<% end -%>
 
 # Adjust binstubs to run on Linux and set current working directory
 RUN chmod +x /app/bin/* && \

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

@@ -45,7 +45,7 @@ namespace :fly do
     deps << 'db:migrate' if @sqlite3
     deps = deps.first if deps.length == 1
 
-    if @procs.length > 1 ? ':server, [:formation]' : ':server'
+    if @procs.length > 1
       "task :server, [:formation] => #{deps.inspect} do |task, args|"
     else
       "task :server => #{deps.inspect} do"

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

@@ -22,4 +22,12 @@ end
 redis do
   plan "Free"
 end
+<% end -%>
+
+<% unless @nomad -%>
+<%=
+  rakefile = File.expand_path('fly.rake.erb', __dir__)
+  template = ERB.new(IO.read(File.expand_path('fly.rake.erb', __dir__)), trim_mode: '-')
+  template.result(binding)
+%>
 <% end -%>

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

@@ -1,4 +1,5 @@
 app = "<%= @app %>"
+<% if @nomad -%>
 kill_signal = "SIGINT"
 kill_timeout = 5
 <% unless @avahi or @nats -%>
@@ -77,3 +78,4 @@ processes = []
 [[statics]]
   guest_path = "/app/public"
   url_prefix = "/"
+<% end -%>

data/lib/tasks/fly.rake

@@ -4,6 +4,12 @@ require 'fly.io-rails/actions'
 require 'toml'
 require 'json'
 
+config = File.expand_path('config/fly.rb', Rails.application.root)
+if File.exist? config
+  @config = Fly::DSL::Config.new
+  @config.instance_eval IO.read(config), config
+end
+
 namespace :fly do
   desc 'Deploy fly application'
   task :deploy do
@@ -20,13 +26,13 @@ namespace :fly do
     action = Fly::Actions.new(app)
     action.generate_toml if @app
     action.generate_fly_config unless File.exist? 'config/fly.rb'
-    action.generate_dockerfile unless File.exist? 'Dockerfile'
-    action.generate_dockerignore unless File.exist? '.dockerignore'
+    action.generate_dockerfile
+    action.generate_dockerignore
     action.generate_raketask unless File.exist? 'lib/tasks/fly.rake'
     action.generate_procfile unless File.exist? 'Procfile.fly'
 
     # build and push an image
-    out = FlyIoRails::Utils.tee 'fly deploy --build-only --push'
+    out = FlyIoRails::Utils.tee "flyctl deploy --build-only --push --dockerfile #{action.dockerfile} --ignorefile #{action.ignorefile}"
     image = out[/image:\s+(.*)/, 1]&.strip
 
     exit 1 unless image

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby