modulorails 1.5.1 → 1.5.2.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49cd77852f9aee93c053c1722f8332ad44fa712f2ff00830ddd44ab0e873a722
-  data.tar.gz: 6ce2b6f0314ee71f843bdc4f012ceda11ead2b326e98e954b517e334e1646fde
+  metadata.gz: 642a5558736412d881a524f70520f9b87a822cae9c214bc466d85275fa7e8da0
+  data.tar.gz: d8a2f4ce6c322adc97bcaa307a9d962fd4f4fba9584d53ca7570bcf84dbce78c
 SHA512:
-  metadata.gz: 104ac0e4ab98f6194fec633367c0a87b25198fa5c8f0aef3cadac808ff8328c1c96fa1b11bd6881690f414c0400b9eacfc86a083c982a60e87039358c5ad8274
-  data.tar.gz: 3652ed356e878e708d54ae4d17cb18707afd7deabe57846cacdb2fc53caff699ae1c0cb3a932699a0829fd01be80978a406960df7eb534fec1c16daa1b124c36
+  metadata.gz: 22d1f0cd41c5735472424928d1730d2a5654c5c18eceaa305222023ba1b4d6dcbfc706ab3869c56ef003a4f6df17ba9c0b48a31e76cda540767f297ac5ae48e4
+  data.tar.gz: 3e534b69d74a1aec16bd9bece3b1e52ca9d6c108ce66e8cacd6d2eb804b4cc941cadb3851beef0e4aba6ed0db11a922d1c7cd3fc332edcf93e5bb6530ec90fd5

data/.rubocop.yml

@@ -38,6 +38,7 @@ AllCops:
     - 'test/**/*'
     - 'node_modules/**/*'
     - 'spec/**/*'
+    - '**/templates/**/*'
 
 # Instructing rubocop about all standard Modulotech environments.
 Rails/UnknownEnv:

data/CHANGELOG.md

@@ -4,6 +4,15 @@ This file is used to list changes made in each version of the gem.
 
 # Unreleased
 
+# 1.5.2
+
+- Fix typo in `database.yml` template for test database.
+- Fix removal of rails' server's pidfile in docker entrypoint.
+- Split DockerGenerator in multiple sub-generators to version each one individually.
+- Merge all keepfiles in one.
+- Wrap health_check initializer in a reloader.to_prepare block.
+- Always use latest ruby in dockeruby.
+
 # 1.5.1
 
 - Update templates according to new standards:
@@ -30,7 +39,7 @@ This file is used to list changes made in each version of the gem.
 
 # 1.5.0
 
-- Released then 
+- Released then yanked for critical bugs.
 
 # 1.4.0.1
 

data/lib/generators/modulorails/bundleraudit/bundleraudit_generator.rb

@@ -4,6 +4,8 @@ require 'modulorails/generators/base'
 
 class Modulorails::BundlerauditGenerator < Modulorails::Generators::Base
 
+  VERSION = 1
+
   desc 'This generator creates a configuration for Bundler-Audit'
 
   protected

data/lib/generators/modulorails/docker/compose/compose_generator.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'modulorails/generators/docker_base'
+
+module Modulorails
+
+  module Docker
+
+    class ComposeGenerator < ::Modulorails::Generators::DockerBase
+
+      VERSION = 1
+
+      desc 'This generator creates Docker Compose configuration'
+
+      protected
+
+      def create_config
+        @data = Modulorails.data
+        @adapter = @data.adapter
+        @webpack_container_needed = @data.webpacker_version.present?
+        @image_name = @data.name.parameterize
+
+        create_new_file('docker-compose.yml', 'compose.yml', executable: false)
+      rescue StandardError => e
+        warn("[Modulorails] Error: cannot generate Docker Compose configuration: #{e.message}")
+      end
+
+    end
+
+  end
+
+end

data/lib/generators/modulorails/docker/config/config_generator.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'modulorails/generators/docker_base'
+
+module Modulorails
+
+  module Docker
+
+    class ConfigGenerator < Modulorails::Generators::DockerBase
+
+      VERSION = 1
+
+      desc 'This generator creates application configuration'
+
+      protected
+
+      def create_config
+        @data = Modulorails.data
+        @adapter = @data.adapter
+
+        template 'config/database.yml'
+        template 'config/cable.yml'
+        template 'config/initializers/0_redis.rb'
+        template 'config/puma.rb'
+      rescue StandardError => e
+        warn("[Modulorails] Error: cannot generate application configuration: #{e.message}")
+      end
+
+    end
+
+  end
+
+end

data/lib/generators/modulorails/docker/{templates → config/templates}/config/database.yml.tt

@@ -8,7 +8,7 @@ development: &default
 
 test:
   <<: *default
-  database: <%%= ENV['DTABASE_TEST_URL'] %>
+  database: <%%= ENV['DATABASE_TEST_URL'] %>
 
 staging:
   <<: *default

data/lib/generators/modulorails/docker/docker_generator.rb

@@ -1,94 +1,33 @@
 # frozen_string_literal: true
 
 require 'modulorails/generators/base'
+require 'generators/modulorails/docker/entrypoint/entrypoint_generator'
+require 'generators/modulorails/docker/dockerfile/dockerfile_generator'
+require 'generators/modulorails/docker/compose/compose_generator'
+require 'generators/modulorails/docker/config/config_generator'
 
-class Modulorails::DockerGenerator < Modulorails::Generators::Base
+module Modulorails
 
-  VERSION = 2
+  class DockerGenerator < Modulorails::Generators::Base
 
-  desc 'This generator creates Docker configuration for an app'
+    VERSION = false
 
-  protected
+    desc 'This generator creates Docker configuration for an app'
 
-  def create_config
-    @data = Modulorails.data
-    @adapter = @data.adapter
-    @webpack_container_needed = @data.webpacker_version.present?
-    @image_name = @data.name.parameterize
-    @environment_name = @data.environment_name
+    protected
 
-    create_dockerfile
-    create_dockerfile_prod
-    create_compose_yml
-    create_docker_entrypoint
-    template 'config/database.yml'
-    template 'config/cable.yml'
-    template 'config/initializers/0_redis.rb'
-    template 'config/puma.rb'
+    def create_config
+      remove_old_keepfile('.modulorails-docker')
 
-    # Useless unless project is using Webpacker
-    return unless @webpack_container_needed
-
-    create_webpack_entrypoint
-  rescue StandardError => e
-    warn("[Modulorails] Error: cannot generate Docker configuration: #{e.message}")
-  end
-
-  private
-
-  def create_dockerfile
-    say('WARNING: The entrypoint was moved. Check that your Dockerfile still works.') if File.exist?('Dockerfile')
-    template 'dockerfiles/modulotech/Dockerfile', 'Dockerfile'
-  end
-
-  def create_webpack_entrypoint
-    create_new_file('entrypoints/webpack-entrypoint.sh', 'bin/webpack-entrypoint')
-  end
-
-  def create_docker_entrypoint
-    create_new_file 'entrypoints/docker-entrypoint.sh', 'bin/docker-entrypoint'
-  end
-
-  def create_compose_yml
-    create_new_file 'docker-compose.yml', 'compose.yml', executable: false
-  end
-
-  def create_dockerfile_prod
-    if File.exist?('Dockerfile.prod')
-      say('WARNING: The entrypoint was moved. Check that your Dockerfile.prod still works.')
-    end
-
-    if Gem::Version.new(@data.rails_version) >= Gem::Version.new('7.2')
-      template 'dockerfiles/rails/Dockerfile.prod', 'Dockerfile.prod'
-    else
-      template 'dockerfiles/modulotech/Dockerfile.prod', 'Dockerfile.prod'
-    end
-  end
-
-  def create_new_file(old_file, new_file, executable: true)
-    if File.exist?(old_file)
-      copy_original_file old_file, new_file
-      remove_file old_file
-    else
-      template old_file, new_file
+      # Running first since the Dockerfile generator checks for existence of entrypoint
+      Modulorails::Docker::EntrypointGenerator.new([], {}, {}).invoke_all
+      Modulorails::Docker::DockerfileGenerator.new([], {}, {}).invoke_all
+      Modulorails::Docker::ComposeGenerator.new([], {}, {}).invoke_all
+      Modulorails::Docker::ConfigGenerator.new([], {}, {}).invoke_all
+    rescue StandardError => e
+      warn("[Modulorails] Error: cannot generate Docker configuration: #{e.message}")
     end
-    chmod new_file, 0o755 if executable
-  end
-
-  def copy_original_file(source, *args, &block)
-    config = args.last.is_a?(Hash) ? args.pop : {}
-    destination = args.first || source
-    source = File.expand_path(source, destination_root)
 
-    create_file destination, nil, config do
-      content = File.binread(source)
-      content = yield(content) if block
-      content
-    end
-    if config[:mode] == :preserve
-      mode = File.stat(source).mode
-      chmod(destination, mode, config)
-    end
   end
 
 end

data/lib/generators/modulorails/docker/dockerfile/dockerfile_generator.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'modulorails/generators/docker_base'
+
+module Modulorails
+
+  module Docker
+
+    class DockerfileGenerator < ::Modulorails::Generators::DockerBase
+
+      VERSION = 1
+
+      desc 'This generator creates Dockerfiles'
+
+      protected
+
+      def create_config
+        @data = Modulorails.data
+        @adapter = @data.adapter
+        @webpack_container_needed = @data.webpacker_version.present?
+
+        EntrypointGenerator.new([], {}, {}).invoke_all unless File.exist?('bin/docker-entrypoint')
+        create_dockerfile
+        create_dockerfile_prod
+      rescue StandardError => e
+        warn("[Modulorails] Error: cannot generate Dockerfiles: #{e.message}")
+      end
+
+      private
+
+      def create_dockerfile
+        template 'dockerfiles/modulotech/Dockerfile', 'Dockerfile'
+      end
+
+      def create_dockerfile_prod
+        if Gem::Version.new(@data.rails_version) >= Gem::Version.new('7.2')
+          template 'dockerfiles/rails/Dockerfile.prod', 'Dockerfile.prod'
+        else
+          template 'dockerfiles/modulotech/Dockerfile.prod', 'Dockerfile.prod'
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/generators/modulorails/docker/{templates → dockerfile/templates}/dockerfiles/rails/Dockerfile.prod.tt

@@ -54,6 +54,11 @@ RUN bundle install && \
     rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git && \
     bundle exec bootsnap precompile --gemfile
 
+<%- if @webpack_container_needed -%>
+COPY package.json yarn.lock ./
+RUN yarn install
+<%- end-%>
+
 # Copy application code
 COPY . .
 

data/lib/generators/modulorails/docker/entrypoint/entrypoint_generator.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'modulorails/generators/docker_base'
+require 'generators/modulorails/sidekiq/sidekiq_generator'
+
+module Modulorails
+
+  module Docker
+
+    class EntrypointGenerator < Modulorails::Generators::DockerBase
+
+      VERSION = 1
+
+      desc 'This generator creates Docker entrypoints'
+
+      protected
+
+      def create_config
+        create_docker_entrypoint
+        create_webpack_entrypoint if Modulorails.data.webpacker_version.present?
+
+        if File.exist?('entrypoints/sidekiq-entrypoint.sh') || File.exist?('bin/sidekiq-entrypoint')
+          SidekiqGenerator.new([], {}, {}).invoke('add_entrypoint')
+        end
+      rescue StandardError => e
+        warn("[Modulorails] Error: cannot generate Docker entrypoints: #{e.message}")
+      end
+
+      private
+
+      def create_webpack_entrypoint
+        create_new_file('entrypoints/webpack-entrypoint.sh', 'bin/webpack-entrypoint')
+      end
+
+      def create_docker_entrypoint
+        create_new_file 'entrypoints/docker-entrypoint.sh', 'bin/docker-entrypoint'
+      end
+
+    end
+
+  end
+
+end

data/lib/generators/modulorails/docker/{templates → entrypoint/templates}/entrypoints/docker-entrypoint.sh.tt

@@ -15,6 +15,12 @@ then
   yarn install
 fi
 
+# Remove pidfile if it exists else the server will not launch
+if [ -f tmp/pids/server.pid ]
+then
+  rm tmp/pids/server.pid
+fi
+
 # If running the rails server then create or migrate existing database
 if [ "$1" = "./bin/rails" ] && [ "$2" = "server" ]; then
   ./bin/rails db:prepare

data/lib/generators/modulorails/githooks/githooks_generator.rb

@@ -6,9 +6,12 @@ module Modulorails
 
   class GithooksGenerator < Modulorails::Generators::Base
 
+    VERSION = 1
+
     protected
 
     def create_config
+      remove_old_keepfile('.modulorails-githooks')
       create_hook_executor
       create_refresh_generations_script
       create_git_hooks

data/lib/generators/modulorails/githooks/templates/dockeruby.rb

@@ -35,7 +35,7 @@ def entrypoint_location
   md[1]
 end
 
-VALID_LAST_INSTRUCTION = /exec "\$\{?@}?"/
+VALID_LAST_INSTRUCTION = /exec "\$\{?@}?"/.freeze
 
 def check_entrypoint(verbose: false)
   el = entrypoint_location
@@ -70,7 +70,7 @@ def executer_docker_run(docker_args, verbose: false)
 
   # Build the command string
   # rubocop:disable Layout/LineLength
-  command = %(docker run --rm #{modulogem_gems_option} #{modulogem_option} -v '#{pwd}:/app/#{working_directory}' #{tty_option} -w '/app/#{working_directory}' ezveus/ruby:latest #{docker_args})
+  command = %(docker run --pull=always --rm #{modulogem_gems_option} #{modulogem_option} -v '#{pwd}:/app/#{working_directory}' #{tty_option} -w '/app/#{working_directory}' ruby:latest #{docker_args})
   # rubocop:enable Layout/LineLength
 
   puts(command) if verbose
@@ -97,20 +97,18 @@ def executer_compose_run(docker_args, verbose: false)
   exec(command)
 end
 
+def contains_command(escaped_args)
+  escaped_args.each_with_index.any? do |arg, index|
+    !arg.start_with?('-') && (index.zero? || !escaped_args[index - 1].start_with?('-'))
+  end
+end
+
 def main(args, verbose: false)
   # Escape each argument individually
   escaped_args = args.map { |arg| Shellwords.escape(arg) }
 
-  # Check if the arguments contain a Ruby command or only options
-  contains_command = false
-  escaped_args.each_with_index do |arg, index|
-    if !arg.start_with?('-') && (index.zero? || !escaped_args[index - 1].start_with?('-'))
-      contains_command = true
-      break
-    end
-  end
-
-  docker_args = if contains_command
+  # Prefix the arguments with a `ruby` command if there is not already one
+  docker_args = if contains_command(escaped_args)
                   escaped_args.join(' ')
                 else
                   "ruby #{escaped_args.join(' ')}"

data/lib/generators/modulorails/gitlabci/gitlabci_generator.rb

@@ -4,11 +4,16 @@ require 'modulorails/generators/base'
 
 class Modulorails::GitlabciGenerator < Modulorails::Generators::Base
 
+  VERSION = 1
+
   desc 'This generator creates a template for a .gitlab-ci.yml file at root'
 
   protected
 
   def create_config
+    remove_old_keepfile('.modulorails-gitlab-ci')
+    remove_old_keepfile('.modulorails-gitlabci')
+
     @data = Modulorails.data
     @image_name = @data.name.parameterize
     @environment_name = @data.environment_name

data/lib/generators/modulorails/health_check/health_check_generator.rb

@@ -11,6 +11,8 @@ class Modulorails::HealthCheckGenerator < Modulorails::Generators::Base
   protected
 
   def create_config
+    remove_old_keepfile('.modulorails-health_check')
+
     # Update the template
     template 'config/initializers/health_check.rb'
 
@@ -22,8 +24,4 @@ class Modulorails::HealthCheckGenerator < Modulorails::Generators::Base
     warn("[Modulorails] Error: cannot generate health_check configuration: #{e.message}")
   end
 
-  def keep_file_name
-    '.modulorails-health_check'
-  end
-
 end

data/lib/generators/modulorails/health_check/templates/config/initializers/health_check.rb.tt

@@ -1,100 +1,102 @@
-HealthCheck.setup do |config|
+Rails.application.reloader.to_prepare do
+    HealthCheck.setup do |config|
 
-  # uri prefix (no leading slash)
-  config.uri = 'health'
+      # uri prefix (no leading slash)
+      config.uri = 'health'
 
-  # Text output upon success
-  config.success = 'success'
+      # Text output upon success
+      config.success = 'success'
 
-  # Text output upon failure
-  config.failure = 'health_check failed'
+      # Text output upon failure
+      config.failure = 'health_check failed'
 
-  # Disable the error message to prevent /health_check from leaking
-  # sensitive information
-  config.include_error_in_response_body = false
+      # Disable the error message to prevent /health_check from leaking
+      # sensitive information
+      config.include_error_in_response_body = false
 
-  # Log level (success or failure message with error details is sent to rails log unless this is set to nil)
-  config.log_level = 'info'
+      # Log level (success or failure message with error details is sent to rails log unless this is set to nil)
+      config.log_level = 'info'
 
-  # Timeout in seconds used when checking smtp server
-  config.smtp_timeout = 30.0
+      # Timeout in seconds used when checking smtp server
+      config.smtp_timeout = 30.0
 
-  # http status code used when plain text error message is output
-  # Set to 200 if you want your want to distinguish between partial (text does not include success) and
-  # total failure of rails application (http status of 500 etc)
+      # http status code used when plain text error message is output
+      # Set to 200 if you want your want to distinguish between partial (text does not include success) and
+      # total failure of rails application (http status of 500 etc)
 
-  config.http_status_for_error_text = 500
+      config.http_status_for_error_text = 500
 
-  # http status code used when an error object is output (json or xml)
-  # Set to 200 if you want to distinguish between partial (healthy property == false) and
-  # total failure of rails application (http status of 500 etc)
+      # http status code used when an error object is output (json or xml)
+      # Set to 200 if you want to distinguish between partial (healthy property == false) and
+      # total failure of rails application (http status of 500 etc)
 
-  config.http_status_for_error_object = 500
+      config.http_status_for_error_object = 500
 
-  # bucket names to test connectivity - required only if s3 check used, access permissions can be mixed
-  # config.buckets = { 'bucket_name' => %i[R W D] }
+      # bucket names to test connectivity - required only if s3 check used, access permissions can be mixed
+      # config.buckets = { 'bucket_name' => %i[R W D] }
 
-  # You can customize which checks happen on a standard health check, eg to set an explicit list use:
-  config.standard_checks = %w[database migrations]
+      # You can customize which checks happen on a standard health check, eg to set an explicit list use:
+      config.standard_checks = %w[database migrations]
 
-  # Or to exclude one check:
-  config.standard_checks -= %w[emailconf]
+      # Or to exclude one check:
+      config.standard_checks -= %w[emailconf]
 
-  # You can set what tests are run with the 'full' or 'all' parameter
-  config.full_checks = %w[database migrations custom email cache redis]
-  # config.full_checks = %w[database migrations custom email cache redis sidekiq-redis s3]
+      # You can set what tests are run with the 'full' or 'all' parameter
+      config.full_checks = %w[database migrations custom email cache redis]
+      # config.full_checks = %w[database migrations custom email cache redis sidekiq-redis s3]
 
-  # Add one or more custom checks that return a blank string if ok, or an error message if there is an error
-  # config.add_custom_check do
-  #   CustomHealthCheck.perform_check # any code that returns blank on success and non blank string upon failure
-  # end
+      # Add one or more custom checks that return a blank string if ok, or an error message if there is an error
+      # config.add_custom_check do
+      #   CustomHealthCheck.perform_check # any code that returns blank on success and non blank string upon failure
+      # end
 
-  # Add another custom check with a name, so you can call just specific custom checks. This can also be run using
-  # the standard 'custom' check.
-  # You can define multiple tests under the same name - they will be run one after the other.
-  # config.add_custom_check('sometest') do
-  #   CustomHealthCheck.perform_another_check # any code that returns blank on success and non blank string upon failure
-  # end
+      # Add another custom check with a name, so you can call just specific custom checks. This can also be run using
+      # the standard 'custom' check.
+      # You can define multiple tests under the same name - they will be run one after the other.
+      # config.add_custom_check('sometest') do
+      #   CustomHealthCheck.perform_another_check # any code that returns blank on success and non blank string upon failure
+      # end
 
-  # max-age of response in seconds
-  # cache-control is public when max_age > 1 and basic_auth_username is not set
-  # You can force private without authentication for longer max_age by
-  # setting basic_auth_username but not basic_auth_password
-  config.max_age = 1
+      # max-age of response in seconds
+      # cache-control is public when max_age > 1 and basic_auth_username is not set
+      # You can force private without authentication for longer max_age by
+      # setting basic_auth_username but not basic_auth_password
+      config.max_age = 1
 
-  # Protect health endpoints with basic auth
-  # These default to nil and the endpoint is not protected
-  # config.basic_auth_username = 'my_username'
-  # config.basic_auth_password = 'my_password'
+      # Protect health endpoints with basic auth
+      # These default to nil and the endpoint is not protected
+      # config.basic_auth_username = 'my_username'
+      # config.basic_auth_password = 'my_password'
 
-  # Whitelist requesting IPs by a list of IP and/or CIDR ranges, either IPv4 or IPv6 (uses IPAddr.include? method to check)
-  # Defaults to blank which allows any IP
-  # config.origin_ip_whitelist = %w(123.123.123.123 10.11.12.0/24 2400:cb00::/32)
+      # Whitelist requesting IPs by a list of IP and/or CIDR ranges, either IPv4 or IPv6 (uses IPAddr.include? method to check)
+      # Defaults to blank which allows any IP
+      # config.origin_ip_whitelist = %w(123.123.123.123 10.11.12.0/24 2400:cb00::/32)
 
-  # Use ActionDispatch::Request's remote_ip method when behind a proxy to pick up the real remote IP for origin_ip_whitelist check
-  # Otherwise uses Rack::Request's ip method (the default, and always used by Middleware), which is more susceptible to spoofing
-  # See https://stackoverflow.com/questions/10997005/whats-the-difference-between-request-remote-ip-and-request-ip-in-rails
-  config.accept_proxied_requests = false
+      # Use ActionDispatch::Request's remote_ip method when behind a proxy to pick up the real remote IP for origin_ip_whitelist check
+      # Otherwise uses Rack::Request's ip method (the default, and always used by Middleware), which is more susceptible to spoofing
+      # See https://stackoverflow.com/questions/10997005/whats-the-difference-between-request-remote-ip-and-request-ip-in-rails
+      config.accept_proxied_requests = false
 
-  # http status code used when the ip is not allowed for the request
-  config.http_status_for_ip_whitelist_error = 403
+      # http status code used when the ip is not allowed for the request
+      config.http_status_for_ip_whitelist_error = 403
 
-  # rabbitmq
-  # config.rabbitmq_config = {}
+      # rabbitmq
+      # config.rabbitmq_config = {}
 
-  # When redis url/password is non-standard
-  config.redis_url = ENV.fetch('REDIS_URL', 'redis://redis:6379')
-  # Only included if set, as url can optionally include passwords as well
-  # config.redis_password = 'redis_password' # default ENV['REDIS_PASSWORD']
+      # When redis url/password is non-standard
+      config.redis_url = ENV.fetch('REDIS_URL', 'redis://redis:6379')
+      # Only included if set, as url can optionally include passwords as well
+      # config.redis_password = 'redis_password' # default ENV['REDIS_PASSWORD']
 
-  # Failure Hooks to do something more ...
-  # checks lists the checks requested
-  config.on_failure do |checks, msg|
-    # log msg somewhere
-  end
+      # Failure Hooks to do something more ...
+      # checks lists the checks requested
+      config.on_failure do |checks, msg|
+        # log msg somewhere
+      end
 
-  config.on_success do |checks|
-    # flag that everything is well
-  end
+      config.on_success do |checks|
+        # flag that everything is well
+      end
 
+    end
 end

data/lib/generators/modulorails/moduloproject/moduloproject_generator.rb

@@ -4,9 +4,12 @@ require 'rails/generators'
 
 class Modulorails::ModuloprojectGenerator < Modulorails::Generators::Base
 
+  VERSION = 1
+
   desc 'This generator creates templates for Moduloproject'
 
   def create_config
+    remove_old_keepfile(".modulorails-#{generator_name}")
     template 'config/environments/production.rb'
     copy_file('config/environments/production.rb', 'config/environments/staging.rb')
     update_application_rb

data/lib/modulorails/generators/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rails/generators'
+require 'yaml'
 
 module Modulorails
 
@@ -31,38 +32,47 @@ module Modulorails
       def version
         self.class.const_get('VERSION')
       rescue NameError
-        1
+        false
       end
 
       def generator_name
-        self.class.name.split('::').last.gsub('Generator', '').parameterize
+        @generator_name ||= self.class.generator_name
       end
 
       def keep_file_name
-        ".modulorails-#{generator_name}"
+        '.modulorails.yml'
       end
 
-      def keep_file_present?
+      def keep_file_version
+        return @keep_file_version if @keep_file_version
+
         pathname = Rails.root.join(keep_file_name)
+        keep_file_exist = pathname.exist?
+        @keep_file_version = if keep_file_exist
+                               YAML.load_file(pathname).dig(generator_name, 'version').to_i
+                             else
+                               0
+                             end
+      end
 
-        res = pathname.exist?
-        return res if version < 2
+      def keep_file_present?
+        v = version
+        return false unless v
 
-        res && pathname.readlines(keep_file_name).first
-                       .match(/version: (\d+)/i)&.send(:[], 1).to_i >= version
+        Rails.root.join(keep_file_name).exist? && keep_file_version >= v
       end
 
       def create_keep_file
-        file = keep_file_name
+        v = version
+        return unless v
 
-        remove_file(file)
-
-        content = <<~TEXT
-          Version: #{version}
+        file = keep_file_name
+        config = File.exist?(file) ? YAML.load_file(file) : {}
+        config[generator_name] = {
+          'version' => v
+        }
 
-          If you want to reset your configuration, you can run `rails g modulorails:#{generator_name} --force`.
-        TEXT
-        create_file(file, content)
+        create_file(file, config.to_yaml)
 
         say "Add #{file} to git"
         git add: file
@@ -72,6 +82,36 @@ module Modulorails
         raise NotImplementedError
       end
 
+      def create_new_file(old_file, new_file, executable: true)
+        if File.exist?(old_file)
+          copy_original_file old_file, new_file
+          remove_file old_file
+        else
+          template old_file, new_file
+        end
+        chmod new_file, 0o755 if executable
+      end
+
+      def copy_original_file(source, *args, &block)
+        config = args.last.is_a?(Hash) ? args.pop : {}
+        destination = args.first || source
+        source = File.expand_path(source, destination_root)
+
+        create_file destination, nil, config do
+          content = File.binread(source)
+          content = yield(content) if block
+          content
+        end
+        return unless config[:mode] == :preserve
+
+        mode = File.stat(source).mode
+        chmod(destination, mode, config)
+      end
+
+      def remove_old_keepfile(filename)
+        FileUtils.rm_f(filename)
+      end
+
     end
 
   end

data/lib/modulorails/generators/docker_base.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'modulorails/generators/base'
+
+module Modulorails
+
+  module Generators
+
+    class DockerBase < Modulorails::Generators::Base
+
+      def self.default_generator_root
+        File.expand_path("modulorails/docker/#{generator_name}", base_root)
+      end
+
+    end
+
+  end
+
+end

data/lib/modulorails/version.rb

@@ -1,6 +1,6 @@
 module Modulorails
 
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.5.2.pre.1'.freeze
 
   # Useful to compare the current Ruby version
   COMPARABLE_RUBY_VERSION = Gem::Version.new(RUBY_VERSION)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulorails
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2.pre.1
 platform: ruby
 authors:
 - Matthieu Ciappara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-audit
@@ -171,17 +171,21 @@ files:
 - gemfiles/rails_61.gemfile
 - gemfiles/rails_70.gemfile
 - lib/generators/modulorails/bundleraudit/bundleraudit_generator.rb
+- lib/generators/modulorails/docker/compose/compose_generator.rb
+- lib/generators/modulorails/docker/compose/templates/docker-compose.yml.tt
+- lib/generators/modulorails/docker/config/config_generator.rb
+- lib/generators/modulorails/docker/config/templates/config/cable.yml.tt
+- lib/generators/modulorails/docker/config/templates/config/database.yml.tt
+- lib/generators/modulorails/docker/config/templates/config/initializers/0_redis.rb
+- lib/generators/modulorails/docker/config/templates/config/puma.rb
 - lib/generators/modulorails/docker/docker_generator.rb
-- lib/generators/modulorails/docker/templates/config/cable.yml.tt
-- lib/generators/modulorails/docker/templates/config/database.yml.tt
-- lib/generators/modulorails/docker/templates/config/initializers/0_redis.rb
-- lib/generators/modulorails/docker/templates/config/puma.rb
-- lib/generators/modulorails/docker/templates/docker-compose.yml.tt
-- lib/generators/modulorails/docker/templates/dockerfiles/modulotech/Dockerfile.prod.tt
-- lib/generators/modulorails/docker/templates/dockerfiles/modulotech/Dockerfile.tt
-- lib/generators/modulorails/docker/templates/dockerfiles/rails/Dockerfile.prod.tt
-- lib/generators/modulorails/docker/templates/entrypoints/docker-entrypoint.sh.tt
-- lib/generators/modulorails/docker/templates/entrypoints/webpack-entrypoint.sh.tt
+- lib/generators/modulorails/docker/dockerfile/dockerfile_generator.rb
+- lib/generators/modulorails/docker/dockerfile/templates/dockerfiles/modulotech/Dockerfile.prod.tt
+- lib/generators/modulorails/docker/dockerfile/templates/dockerfiles/modulotech/Dockerfile.tt
+- lib/generators/modulorails/docker/dockerfile/templates/dockerfiles/rails/Dockerfile.prod.tt
+- lib/generators/modulorails/docker/entrypoint/entrypoint_generator.rb
+- lib/generators/modulorails/docker/entrypoint/templates/entrypoints/docker-entrypoint.sh.tt
+- lib/generators/modulorails/docker/entrypoint/templates/entrypoints/webpack-entrypoint.sh.tt
 - lib/generators/modulorails/githooks/githooks_generator.rb
 - lib/generators/modulorails/githooks/templates/dockeruby.rb
 - lib/generators/modulorails/githooks/templates/post-rewrite.sh
@@ -216,6 +220,7 @@ files:
 - lib/modulorails/errors/invalid_format_error.rb
 - lib/modulorails/errors/invalid_value_error.rb
 - lib/modulorails/generators/base.rb
+- lib/modulorails/generators/docker_base.rb
 - lib/modulorails/railtie.rb
 - lib/modulorails/services/base_service.rb
 - lib/modulorails/services/logs_for_method_service.rb