dockerfile-rails 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4478af556f6059702ab4b1fce65ab4735a024299796bdebce3014730f3d86220
-  data.tar.gz: 941e1e7a2fd88238d3ee9dd7fe16ffb2e290e10568fd1ca2ed3e0001d5aceed8
+  metadata.gz: 1aca228134c031de432e9c059c2451da36827f11334c25498506e1dc1a5f7819
+  data.tar.gz: b661bfc9e1d9a3aafa0a10181a33927616e06162bb4ea24f960d33ff5598337c
 SHA512:
-  metadata.gz: ed8adae939c867d565049530df18915c49f0cbd775cc9b909733960ea8b3075b9185132eaf1454e501f7ea211a3f903dca44ce394f20fe356168154d8c2165dd
-  data.tar.gz: a289a97a457eedd708e9449172b5191685d5f120de3b04df18d6e35950131f681972bf009953967120e32d949b4aede461ac0fb675e14fff8858ccf38de7d522
+  metadata.gz: b432aedcdafad7b3aea076ad4501252aa2dc51f3cd980be1e6d4761d43b57773ec76ebc862d4f9cdd8526f1d5e3cf77c5f24b48d615fe558e0055b54aabd0803
+  data.tar.gz: c20b0900280252cef4eab686b3f0b2718e99e46779504174fd4898d86ec68868607acc1cc5179d5c815334c2d911e0bd587169dfe6ca023af40e2caa743f66fc

data/lib/dockerfile-rails/scanner.rb

@@ -44,7 +44,7 @@ module DockerfileRails
         @sqlite3 = true
       elsif database == "postgresql"
         @postgresql = true
-      elsif (database == "mysql") || (database == "mysql2")
+      elsif (database == "mysql") || (database == "mysql2") || (database == "trilogy")
         @mysql = true
       elsif database == "sqlserver"
         @sqlserver = true
@@ -52,7 +52,7 @@ module DockerfileRails
 
       @sqlite3 = true if @gemfile.include? "sqlite3"
       @postgresql = true if @gemfile.include? "pg"
-      @mysql = true if @gemfile.include? "mysql2"
+      @mysql = true if @gemfile.include?("mysql2") || using_trilogy?
 
       ### node modules ###
 
@@ -81,5 +81,9 @@ module DockerfileRails
 
       @redis = @redis_cable || @redis_cache
     end
+
+    def using_trilogy?
+      @gemfile.include?("trilogy") || @gemfile.include?("activerecord-trilogy-adapter")
+    end
   end
 end

data/lib/generators/dockerfile_generator.rb

@@ -38,7 +38,7 @@ class DockerfileGenerator < Rails::Generators::Base
     "variant" => "slim",
     "windows" => false,
     "yjit" => false,
-  }.then { |hash| Struct.new(*hash.keys.map(&:to_sym)).new(*hash.values) }
+  }.yield_self { |hash| Struct.new(*hash.keys.map(&:to_sym)).new(*hash.values) }
 
   OPTION_DEFAULTS = BASE_DEFAULTS.dup
 
@@ -282,14 +282,12 @@ class DockerfileGenerator < Rails::Generators::Base
       fly_attach_consul
     end
 
-    if fly_processes # therefore File.exist?('fly.toml')
+    if File.exist?("fly.toml") && (fly_processes || !options.prepare)
       if File.stat("fly.toml").size > 0
         template "fly.toml.erb", "fly.toml"
       else
-        toml = fly_make_processes(fly_processes)
-        if toml != IO.read("fly.toml")
-          File.write "fly.toml", toml
-        end
+        toml = fly_make_toml
+        File.write "fly.toml", toml if toml != ""
       end
     end
 
@@ -321,7 +319,7 @@ private
     scope = (Class.new do
       def initialize(obj, locals)
         @_obj = obj
-        @_locals = locals.then do |hash|
+        @_locals = locals.yield_self do |hash|
           return nil if hash.empty?
           Struct.new(*hash.keys.map(&:to_sym)).new(*hash.values)
         end
@@ -400,6 +398,14 @@ private
     using_node? && options.parallel
   end
 
+  def has_mysql_gem?
+    @gemfile.include? "mysql2" or using_trilogy?
+  end
+
+  def using_trilogy?
+    @gemfile.include?("trilogy") || @gemfile.include?("activerecord-trilogy-adapter")
+  end
+
   def keeps?
     return @keeps if @keeps != nil
     @keeps = !!Dir["**/.keep"]
@@ -419,7 +425,7 @@ private
     end
 
     if options.mysql? || @mysql
-      system "bundle add mysql2 --skip-install" unless @gemfile.include? "mysql2"
+      system "bundle add mysql2 --skip-install" unless has_mysql_gem?
     end
 
     if options.redis? || using_redis?
@@ -511,7 +517,10 @@ private
     # add databases: sqlite3, postgres, mysql
     packages << "pkg-config" if options.sqlite3? || @sqlite3
     packages << "libpq-dev" if options.postgresql? || @postgresql
-    packages << "default-libmysqlclient-dev" if options.mysql? || @mysql
+
+    if (options.mysql? || @mysql) && !using_trilogy?
+      packages << "default-libmysqlclient-dev"
+    end
 
     # add git if needed to install gems
     packages << "git" if @git
@@ -857,7 +866,7 @@ private
     # use presence of "pg" or "mysql2" in the bundle as evidence of intent.
     if options.postgresql? || @postgresql || @gemfile.include?("pg")
       "postgresql"
-    elsif options.mysql? || @mysql || @gemfile.include?("mysql2")
+    elsif options.mysql? || @mysql || has_mysql_gem?
       "mysql"
     else
       "sqlite3"
@@ -1042,19 +1051,31 @@ private
     system "#{flyctl} consul attach"
   end
 
-  def fly_make_processes(list)
+  def fly_make_toml
     toml = File.read("fly.toml")
 
-    if toml.include? "[processes]"
-      toml.sub!(/\[processes\].*?(\n\n|\n?\z)/m, "[processes]\n" +
-        list.map { |name, cmd| "  #{name} = #{cmd.inspect}" }.join("\n") + '\1')
-    else
-      toml += "\n[processes]\n" +
-        list.map { |name, cmd| "  #{name} = #{cmd.inspect}\n" }.join
+    list = fly_processes
+    if list
+      if toml.include? "[processes]"
+        toml.sub!(/\[processes\].*?(\n\n|\n?\z)/m, "[processes]\n" +
+          list.map { |name, cmd| "  #{name} = #{cmd.inspect}" }.join("\n") + '\1')
+      else
+        toml += "\n[processes]\n" +
+          list.map { |name, cmd| "  #{name} = #{cmd.inspect}\n" }.join
 
-      app = list.has_key?("app") ? "app" : list.keys.first
+        app = list.has_key?("app") ? "app" : list.keys.first
 
-      toml.sub! "[http_service]\n", "\\0  processes = [#{app.inspect}]\n"
+        toml.sub! "[http_service]\n", "\\0  processes = [#{app.inspect}]\n"
+      end
+    end
+
+    if options.prepare == false
+      deploy = "[deploy]\n  release_command = #{dbprep_command.inspect}\n\n"
+      if toml.include? "[deploy]"
+        toml.sub!(/\[deploy\].*?(\n\n|\n?\z)/m, deploy)
+      else
+        toml += deploy
+      end
     end
 
     toml

data/lib/generators/templates/_install_node.erb

@@ -20,7 +20,7 @@ RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz
 <% if yarn_version < '2' -%>
 <% if node_version -%>   <% else %>RUN<% end %> npm install -g yarn@$YARN_VERSION<% if node_version -%> && \<% end %>
 <% else -%>
-<% if (node_version.split('.').map(&:to_i) <=> [16,10,0]) < 0 -%>
+<% if node_version && (node_version.split('.').map(&:to_i) <=> [16,10,0]) < 0 -%>
     npm i -g corepack && \
 <% else -%>
     corepack enable && \

data/lib/generators/templates/docker-compose.yml.erb

@@ -21,8 +21,12 @@ services:
 <% if deploy_database == 'postgresql' -%>
       - DATABASE_URL=postgres://root:password@postgres-db/
 <% elsif deploy_database == 'mysql' -%>
+<% if using_trilogy? -%>
+      - DATABASE_URL=trilogy://root:password@mysql-db/
+<% else -%>
       - DATABASE_URL=mysql2://root:password@mysql-db/
 <% end -%>
+<% end -%>
 <% if deploy_database == 'sqlite3' -%>
     volumes:
       - ./db:/rails/db
@@ -89,7 +93,11 @@ services:
 <% if deploy_database == 'postgresql' -%>
       - DATABASE_URL=postgres://root:password@postgres-db/
 <% elsif deploy_database == 'mysql' -%>
+<% if using_trilogy? -%>
+      - DATABASE_URL=trilogy://root:password@mysql-db/
+<% else -%>
       - DATABASE_URL=mysql2://root:password@mysql-db/
+<% end -%>
 <% end -%>
     depends_on:
       redis-db:

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

@@ -1 +1 @@
-<%= fly_make_processes(fly_processes) -%>
+<%= fly_make_toml -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerfile-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -65,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="