modulorails 1.5.2.pre.1 → 1.6.0

data/lib/modulorails/data.rb

@@ -13,7 +13,7 @@ module Modulorails
     ATTRIBUTE_KEYS = %i[
       name main_developer project_manager repository type rails_name ruby_version rails_version
       bundler_version modulorails_version adapter db_version adapter_version webpacker_version
-      importmap_version jsbundling_version
+      importmap_version js_engine
       production_url staging_url review_base_url
       environment_name
     ].freeze
@@ -48,6 +48,10 @@ module Modulorails
       }
     end
 
+    def authentication_type
+      @authentication_type ||= authentication_data
+    end
+
     private
 
     def initialize_from_constants
@@ -104,20 +108,16 @@ module Modulorails
 
     def initialize_from_database
       # Get the database connection to identify the database used by the application
-      # or return nil if the database does not exist
-      db_connection = begin
-        ActiveRecord::Base.connection
-      rescue ActiveRecord::NoDatabaseError, ActiveRecord::ConnectionNotEstablished => e
-        warn("[Modulorails] Error: #{e.message}")
-        nil
-      end
+      db_connection = ActiveRecord::Base.connection || return
 
       # The name of the ActiveRecord adapter; it gives the name of the database system too
-      @adapter = db_connection&.adapter_name&.downcase
+      @adapter = db_connection.adapter_name.downcase
 
       # The version of the database engine; this request works only on MySQL and PostgreSQL
       # It should not be a problem since those are the sole database engines used at Modulotech
-      @db_version = db_connection&.select_value('SELECT version()')
+      @db_version = db_connection.select_value('SELECT version()')
+    rescue ActiveRecord::NoDatabaseError, ActiveRecord::ConnectionNotEstablished => e
+      warn("[Modulorails] Error: #{e.message}")
     end
 
     def initialize_from_gem_specs
@@ -134,14 +134,28 @@ module Modulorails
       # The version of the ActiveRecord adapter
       @adapter_version = gem_version(loaded_specs[@adapter])
 
+      initialize_from_js_specs(loaded_specs)
+    end
+
+    def initialize_from_js_specs(loaded_specs)
       # The version of the webpacker gem - might be nil
       @webpacker_version = gem_version(loaded_specs['webpacker'])
 
       # The version of the importmap-rails gem - might be nil
       @importmap_version = gem_version(loaded_specs['importmap-rails'])
 
-      # The version of the jsbundling-rails gem - might be nil
-      @jsbundling_version = gem_version(loaded_specs['jsbundling-rails'])
+      @js_engine =
+        if @webpacker_version
+          :webpacker
+        elsif @importmap_version
+          :importmap
+        else
+          find_js_engine
+        end
+    end
+
+    def find_js_engine
+      File.exist?(Rails.root.join('bun.config.js')) ? :bun : :unknown
     end
 
     def gem_version(spec)
@@ -182,6 +196,19 @@ module Modulorails
       }
     end
 
+    def authentication_data
+      loaded_specs = Gem.loaded_specs
+
+      # The version of the devise gem - might be nil
+      devise_version = gem_version(loaded_specs['devise'])
+
+      if devise_version
+        :devise
+      elsif File.exist?(Rails.root.join('app/controllers/concerns/authentication.rb'))
+        :rails
+      end
+    end
+
   end
 
 end

data/lib/modulorails/generators/base.rb

@@ -72,7 +72,7 @@ module Modulorails
           'version' => v
         }
 
-        create_file(file, config.to_yaml)
+        create_file(file, config.to_yaml, force: true)
 
         say "Add #{file} to git"
         git add: file

data/lib/modulorails/railtie.rb

@@ -31,6 +31,10 @@ module Modulorails
       end
     end
 
+    initializer "modulorails.deprecator" do |app|
+      app.deprecators[:modulorails] = Modulorails.deprecator if app.respond_to?(:deprecators)
+    end
+
     # Sending data after the initialization ensures we can access
     # all gems, constants and configurations we might need.
     config.after_initialize do
@@ -58,6 +62,9 @@ module Modulorails
       # Add/update Bundler-audit config
       Modulorails.generate_bundleraudit_template
 
+      # Add/update Claude Code config
+      Modulorails.configure_claude_code
+
       # Gem's self-update if a new version was released
       Modulorails.self_update
     end

data/lib/modulorails/services/base_service.rb

@@ -45,7 +45,7 @@ class Modulorails::BaseService
   # @param method [#to_s] The method calling `#log`
   # @param message [Hash,#to_s] The message to log; Hash will be logged after a #to_json call
   def log(method, message)
-    ActiveSupport::Deprecation.warn(<<~MESSAGE)
+    Modulorails.deprecator.warn(<<~MESSAGE)
       Modulorails::BaseService#log is deprecated and will be removed with version 2.0.
       Use Rails.logger.debug directly with objects instead.
     MESSAGE

data/lib/modulorails/services/logs_for_method_service.rb

@@ -14,7 +14,7 @@ class Modulorails::LogsForMethodService < Modulorails::BaseService
 
   # Write a formatted debug log using given initialization parameters
   def call
-    ActiveSupport::Deprecation.warn(<<~MESSAGE)
+    Modulorails.deprecator.warn(<<~MESSAGE)
       Modulorails::LogsForMethodService is deprecated and will be removed with version 2.0.
       Use Rails.logger.debug directly with objects instead.
     MESSAGE

data/lib/modulorails/version.rb

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

data/lib/modulorails.rb

@@ -9,6 +9,7 @@ require 'generators/modulorails/self_update/self_update_generator'
 require 'generators/modulorails/rubocop/rubocop_generator'
 require 'generators/modulorails/bundleraudit/bundleraudit_generator'
 require 'generators/modulorails/githooks/githooks_generator'
+require 'generators/modulorails/claude_code/claude_code_generator'
 require 'httparty'
 require 'modulorails/error_data'
 require 'modulorails/success_data'
@@ -166,6 +167,18 @@ module Modulorails
       Modulorails::GithooksGenerator.new([], {}, {}).invoke_all
     end
 
+    # @author Matthieu 'ciappa_m' Ciappara
+    #
+    # Configure devcontainer for Claude code unless it was already done.
+    # The check is done using a 'keepfile'.
+    def configure_claude_code
+      Modulorails::ClaudeCodeGenerator.new([], {}, {}).invoke_all
+    end
+
+    def deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new('2.0', 'Modulorails')
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: modulorails
 version: !ruby/object:Gem::Version
-  version: 1.5.2.pre.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Matthieu Ciappara
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-audit
@@ -171,29 +170,36 @@ files:
 - gemfiles/rails_61.gemfile
 - gemfiles/rails_70.gemfile
 - lib/generators/modulorails/bundleraudit/bundleraudit_generator.rb
+- lib/generators/modulorails/claude_code/claude_code_generator.rb
+- lib/generators/modulorails/claude_code/templates/.gitlab-ci.yml.tt
+- lib/generators/modulorails/claude_code/templates/.modulorails-gitlab-ci
+- lib/generators/modulorails/claude_code/templates/bin/init-firewall.sh.tt
 - 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/devcontainer/devcontainer_generator.rb
+- lib/generators/modulorails/docker/devcontainer/templates/devcontainer/Dockerfile.tt
+- lib/generators/modulorails/docker/devcontainer/templates/devcontainer/compose.yml.tt
+- lib/generators/modulorails/docker/devcontainer/templates/devcontainer/devcontainer.json.tt
 - lib/generators/modulorails/docker/docker_generator.rb
 - 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/dockerfile/templates/dockerfiles/Dockerfile.prod.tt
+- lib/generators/modulorails/docker/dockerfile/templates/dockerfiles/dockerignore.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/dc.sh
+- lib/generators/modulorails/githooks/templates/dcr.sh
 - lib/generators/modulorails/githooks/templates/post-rewrite.sh
 - lib/generators/modulorails/githooks/templates/pre-merge-commit.sh
 - lib/generators/modulorails/githooks/templates/refresh_generations.sh
 - lib/generators/modulorails/gitlabci/gitlabci_generator.rb
 - lib/generators/modulorails/gitlabci/templates/.gitlab-ci.yml.tt
 - lib/generators/modulorails/gitlabci/templates/.modulorails-gitlab-ci
+- lib/generators/modulorails/gitlabci/templates/bin/test.sh.tt
 - lib/generators/modulorails/gitlabci/templates/config/deploy/production.yaml.tt
 - lib/generators/modulorails/gitlabci/templates/config/deploy/review.yaml.tt
 - lib/generators/modulorails/gitlabci/templates/config/deploy/staging.yaml.tt
@@ -210,7 +216,6 @@ files:
 - lib/generators/modulorails/service/templates/service.rb.tt
 - lib/generators/modulorails/sidekiq/sidekiq_generator.rb
 - lib/generators/modulorails/sidekiq/templates/config/initializers/sidekiq.rb.tt
-- lib/generators/modulorails/sidekiq/templates/entrypoints/sidekiq-entrypoint.sh.tt
 - lib/modulorails.rb
 - lib/modulorails/configuration.rb
 - lib/modulorails/data.rb
@@ -236,7 +241,6 @@ metadata:
   source_code_uri: https://github.com/moduloTech/modulorails
   changelog_uri: https://github.com/moduloTech/modulorails/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -251,8 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Common base for Ruby on Rails projects at Modulotech
 test_files: []

data/lib/generators/modulorails/docker/compose/templates/docker-compose.yml.tt

@@ -1,81 +0,0 @@
-services:
-  app:
-    image: modulotechgroup/<%= @image_name %>:dev
-    build:
-      context: .
-      dockerfile: Dockerfile
-    depends_on:
-      - database
-      - redis
-    ports:
-      - '3000:3000'
-    volumes:
-      - .:/app
-    environment:
-      RAILS_ENV: development
-      URL: http://localhost:3000
-      <%- if @adapter =~ /mysql/ -%>
-      DATABASE_URL: mysql2://root@database/<%= @image_name %>
-      DATABASE_TEST_URL: mysql2://root@database/<%= @image_name %>-test
-      <%- else -%>
-      DATABASE_URL: postgresql://postgres:postgres@database/<%= @image_name %>
-      DATABASE_TEST_URL: postgresql://postgres:postgres@database/<%= @image_name %>-test
-      <%- end -%>
-      REDIS_URL: redis://redis:6379/1
-    stdin_open: true
-    tty: true
-
-  <%- if @adapter =~ /mysql/ -%>
-  database:
-    image: mysql/mysql-server:8.0
-    volumes:
-      - db_data:/var/lib/mysql
-    ports:
-      - '3306:3306'
-    environment:
-      MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
-      MYSQL_DATABASE: <%= @image_name %>
-      MYSQL_ROOT_HOST: '%'
-  <%- else -%>
-  database:
-    image: postgres:16-alpine
-    volumes:
-      - db_data:/var/lib/postgresql/data
-    ports:
-      - '5432:5432'
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: <%= @image_name %>
-      LC_COLLATE: 'en_US.UTF-8'
-      LC_CTYPE: 'en_US.UTF-8'
-  <%- end -%>
-
-  redis:
-    image: redis:7-alpine
-
-  mailcatcher:
-    image: dockage/mailcatcher
-    ports:
-      - '1080:1080'
-      - '1025:1025'
-
-  <%- if @webpack_container_needed -%>
-  webpack:
-   image: modulotechgroup/<%= @image_name %>:dev
-   build:
-     context: .
-     dockerfile: Dockerfile
-   entrypoint: ./bin/webpack-entrypoint
-   volumes:
-     - .:/app
-   ports:
-     - '3035:3035'
-   environment:
-     NODE_ENV: development
-     RAILS_ENV: development
-     WEBPACKER_DEV_SERVER_HOST: 0.0.0.0
-  <%- end -%>
-
-volumes:
-  db_data:

data/lib/generators/modulorails/docker/dockerfile/templates/dockerfiles/modulotech/Dockerfile.prod.tt

@@ -1,66 +0,0 @@
-# BUILD IMAGE
-FROM ruby:<%= @data.ruby_version %>-alpine as builder
-
-ENV RAILS_ENV=production \
-    SECRET_KEY_BASE=1
-WORKDIR /app
-
-RUN apk add --update --no-cache \
-    alpine-sdk \
-    nodejs \
-    tzdata \
-    yarn \
-    shared-mime-info \
-    gcompat \
-    <%- if @adapter =~ /mysql/ -%>
-    mysql-dev
-    <%- else -%>
-    postgresql-dev
-    <%- end -%>
-RUN gem install bundler -v <%= @data.bundler_version %>
-
-COPY Gemfile Gemfile.lock ./
-RUN bundle config set --local deployment 'true' \
-    && bundle check || bundle install --jobs=2 \
-    && rm -rf vendor/bundle/ruby/*/cache/*
-
-<%- if @webpack_container_needed -%>
-COPY package.json yarn.lock ./
-RUN yarn install
-<%- end-%>
-
-COPY . .
-RUN bundle exec rake assets:precompile
-
-# FINAL IMAGE
-FROM ruby:<%= @data.ruby_version %>-alpine
-
-ENV RAILS_ENV=development \
-    EDITOR=vim
-WORKDIR /app
-RUN adduser -D user
-
-RUN apk add --update --no-cache \
-    git \
-    nodejs \
-    tzdata \
-    shared-mime-info \
-    vim \
-    <%- if @adapter =~ /mysql/ -%>
-    mysql-dev \
-    <%- else -%>
-    postgresql-dev \
-    <%- end -%>
-    && rm -rf .git/
-RUN gem install bundler -v <%= @data.bundler_version %>
-
-COPY --chown=user:user --from=builder /app .
-
-RUN bundle config --local path vendor/bundle \
-    && bundle config --local without development:test:assets
-
-EXPOSE 3000
-
-ENTRYPOINT ["./bin/docker-entrypoint"]
-
-CMD ["./bin/rails", "server"]

data/lib/generators/modulorails/docker/dockerfile/templates/dockerfiles/modulotech/Dockerfile.tt

@@ -1,30 +0,0 @@
-FROM ruby:<%= @data.ruby_version %>-alpine
-
-ENV RAILS_ENV=development
-ENV EDITOR=vim
-WORKDIR /app
-
-RUN apk add --update --no-cache \
-    alpine-sdk \
-    nodejs \
-    yarn \
-    tzdata \
-    gcompat \
-    vim \
-    <%- if @adapter =~ /mysql/ -%>
-    mysql-dev
-    <%- else -%>
-    postgresql-dev
-    <%- end -%>
-RUN gem install bundler -v <%= @data.bundler_version %>
-
-COPY Gemfile Gemfile.lock ./
-RUN bundle install --jobs=2
-
-COPY . .
-
-EXPOSE 3000
-
-ENTRYPOINT ["./bin/docker-entrypoint"]
-
-CMD ["./bin/rails", "server"]

data/lib/generators/modulorails/docker/entrypoint/templates/entrypoints/webpack-entrypoint.sh.tt

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Exit immediately if a command exits with a non-zero status
-set -e
-
-# Launch webpack
-exec ./bin/webpack-dev-server

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

@@ -1,124 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: true
-
-def require_or_install(gem_name, version=nil)
-  gem(gem_name, "~> #{version}") unless version.nil?
-  require gem_name
-rescue LoadError
-  warn "Installing gem #{gem_name}"
-  if version.nil?
-    Gem.install(gem_name)
-  else
-    Gem.install(gem_name, "~> #{version}")
-    gem(gem_name, "~> #{version}")
-  end
-  require gem_name
-end
-
-require_or_install('shellwords')
-
-def check_dockerfile(verbose: false)
-  return true if File.exist?('Dockerfile')
-
-  puts('No Dockerfile') if verbose
-  false
-end
-
-def entrypoint_location
-  entrypoint_line = File.readlines('Dockerfile').find { |line| line.start_with?('ENTRYPOINT') }
-
-  return nil if entrypoint_line.nil?
-
-  md = /\[["'](.+)["']\]/.match(entrypoint_line)
-  return nil if md.nil? || md[1].nil?
-
-  md[1]
-end
-
-VALID_LAST_INSTRUCTION = /exec "\$\{?@}?"/.freeze
-
-def check_entrypoint(verbose: false)
-  el = entrypoint_location
-  return true if el.nil?
-
-  unless File.exist?(el)
-    warn("Entrypoint not found at location: #{el}") if verbose
-    return false
-  end
-
-  last_line = File.readlines(el).last&.strip
-  return true if VALID_LAST_INSTRUCTION.match?(last_line)
-
-  warn("Invalid entrypoint: Last instruction should be 'exec \"${@}\"' instead of '#{last_line}'") if verbose
-
-  false
-end
-
-def executer_docker_run(docker_args, verbose: false)
-  pwd = Dir.pwd
-  working_directory = File.basename(pwd)
-
-  volumes = `docker volume ls -q -f name=modulogem`
-  volumes = volumes.split("\n").map(&:strip)
-  modulogem_gems = volumes.find { |volume| volume.include?('modulogem_gems') }
-  modulogem = volumes.find { |volume| volume.include?('modulogem') }
-  modulogem_gems_option = modulogem_gems.nil? ? '' : "-v #{modulogem_gems}:/usr/local/bundle"
-  modulogem_option = modulogem.nil? ? '' : "-v #{modulogem}:/root"
-
-  # Check if the shell is a TTY
-  tty_option = $stdout.isatty ? '-ti' : ''
-
-  # Build the command string
-  # rubocop:disable Layout/LineLength
-  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
-  exec(command)
-end
-
-def executer_compose_run(docker_args, verbose: false)
-  entrypoint_option = check_entrypoint(verbose: verbose) ? '' : '--entrypoint "sh -c"'
-  git_email = `git config --get user.email`.strip
-  git_name = `git config --get user.name`.strip
-
-  # Check if the shell is a TTY
-  tty_option = $stdout.isatty ? '-ti' : ''
-
-  # rubocop:disable Layout/LineLength
-  command = %(docker compose build && docker compose run --rm #{tty_option} -e "GIT_AUTHOR_EMAIL=#{git_email}" -e "GIT_AUTHOR_NAME=#{git_name}" -e "GIT_COMMITTER_EMAIL=#{git_email}" -e "GIT_COMMITTER_NAME=#{git_name}" #{entrypoint_option} app)
-  command = if entrypoint_option == ''
-              "#{command} #{docker_args}"
-            else
-              "#{command} '#{docker_args}'"
-            end
-  # rubocop:enable Layout/LineLength
-  puts(command) if verbose
-  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) }
-
-  # 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(' ')}"
-                end
-
-  if check_dockerfile(verbose: verbose)
-    executer_compose_run(docker_args, verbose: verbose)
-  else
-    executer_docker_run(docker_args, verbose: verbose)
-  end
-end
-
-main(ARGV, verbose: true)

data/lib/generators/modulorails/sidekiq/templates/entrypoints/sidekiq-entrypoint.sh.tt

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Exit immediately if a command exits with a non-zero status
-set -e
-
-# Launch Sidekiq
-exec ./bin/bundle exec sidekiq