modulorails 1.5.2.pre.2 → 1.7.0

data/lib/generators/modulorails/claude_code/templates/.modulorails-gitlab-ci

@@ -0,0 +1,6 @@
+This file ensures the modulorails gem will not try to override your current .gitlab-ci.yml
+file on Rails start.
+
+If you want to reset your CI configuration, you can either:
+- remove this file,
+- or run `rails g modulorails:gitlabci`.

data/lib/generators/modulorails/claude_code/templates/bin/init-firewall.sh.tt

@@ -0,0 +1,118 @@
+#!/bin/bash
+set -euo pipefail  # Exit on error, undefined vars, and pipeline failures
+IFS=$'\n\t'       # Stricter word splitting
+
+# Flush existing rules and delete existing ipsets
+iptables -F
+iptables -X
+iptables -t nat -F
+iptables -t nat -X
+iptables -t mangle -F
+iptables -t mangle -X
+ipset destroy allowed-domains 2>/dev/null || true
+
+# First allow DNS and localhost before any restrictions
+# Allow outbound DNS
+iptables -A OUTPUT -p udp --dport 53 -j ACCEPT
+# Allow inbound DNS responses
+iptables -A INPUT -p udp --sport 53 -j ACCEPT
+# Allow outbound SSH
+iptables -A OUTPUT -p tcp --dport 22 -j ACCEPT
+# Allow inbound SSH responses
+iptables -A INPUT -p tcp --sport 22 -m state --state ESTABLISHED -j ACCEPT
+# Allow localhost
+iptables -A INPUT -i lo -j ACCEPT
+iptables -A OUTPUT -o lo -j ACCEPT
+
+# Create ipset with CIDR support
+ipset create allowed-domains hash:net
+
+# Fetch GitHub meta information and aggregate + add their IP ranges
+echo "Fetching GitHub IP ranges..."
+gh_ranges=$(curl -s https://api.github.com/meta)
+if [ -z "$gh_ranges" ]; then
+    echo "ERROR: Failed to fetch GitHub IP ranges"
+    exit 1
+fi
+
+if ! echo "$gh_ranges" | jq -e '.web and .api and .git' >/dev/null; then
+    echo "ERROR: GitHub API response missing required fields"
+    exit 1
+fi
+
+echo "Processing GitHub IPs..."
+while read -r cidr; do
+    if [[ ! "$cidr" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/[0-9]{1,2}$ ]]; then
+        echo "ERROR: Invalid CIDR range from GitHub meta: $cidr"
+        exit 1
+    fi
+    echo "Adding GitHub range $cidr"
+    ipset add allowed-domains "$cidr"
+done < <(echo "$gh_ranges" | jq -r '(.web + .api + .git)[]' | aggregate -q)
+
+# Resolve and add other allowed domains
+for domain in \
+    "registry.npmjs.org" \
+    "api.anthropic.com" \
+    "sentry.io" \
+    "statsig.anthropic.com" \
+    "statsig.com"; do
+    echo "Resolving $domain..."
+    ips=$(dig +short A "$domain")
+    if [ -z "$ips" ]; then
+        echo "ERROR: Failed to resolve $domain"
+        exit 1
+    fi
+
+    while read -r ip; do
+        if [[ ! "$ip" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            echo "ERROR: Invalid IP from DNS for $domain: $ip"
+            exit 1
+        fi
+        echo "Adding $ip for $domain"
+        ipset add allowed-domains "$ip"
+    done < <(echo "$ips")
+done
+
+# Get host IP from default route
+HOST_IP=$(ip route | grep default | cut -d" " -f3)
+if [ -z "$HOST_IP" ]; then
+    echo "ERROR: Failed to detect host IP"
+    exit 1
+fi
+
+HOST_NETWORK=$(echo "$HOST_IP" | sed "s/\.[0-9]*$/.0\/24/")
+echo "Host network detected as: $HOST_NETWORK"
+
+# Set up remaining iptables rules
+iptables -A INPUT -s "$HOST_NETWORK" -j ACCEPT
+iptables -A OUTPUT -d "$HOST_NETWORK" -j ACCEPT
+
+# Set default policies to DROP first
+iptables -P INPUT DROP
+iptables -P FORWARD DROP
+iptables -P OUTPUT DROP
+
+# First allow established connections for already approved traffic
+iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
+iptables -A OUTPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
+
+# Then allow only specific outbound traffic to allowed domains
+iptables -A OUTPUT -m set --match-set allowed-domains dst -j ACCEPT
+
+echo "Firewall configuration complete"
+echo "Verifying firewall rules..."
+if curl --connect-timeout 5 https://example.com >/dev/null 2>&1; then
+    echo "ERROR: Firewall verification failed - was able to reach https://example.com"
+    exit 1
+else
+    echo "Firewall verification passed - unable to reach https://example.com as expected"
+fi
+
+# Verify GitHub API access
+if ! curl --connect-timeout 5 https://api.github.com/zen >/dev/null 2>&1; then
+    echo "ERROR: Firewall verification failed - unable to reach https://api.github.com"
+    exit 1
+else
+    echo "Firewall verification passed - able to reach https://api.github.com as expected"
+fi

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

@@ -8,19 +8,20 @@ module Modulorails
 
     class ComposeGenerator < ::Modulorails::Generators::DockerBase
 
-      VERSION = 1
+      VERSION = 2
 
       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
+        Modulorails.deprecator.warn(<<~MESSAGE)
+          Modulorails::Docker::ComposeGenerator is deprecated and will be removed in version 2.0.
+          Use Moduloproject 3.0 (available later) to initialize new projects with Docker configuration.
+        MESSAGE
 
-        create_new_file('docker-compose.yml', 'compose.yml', executable: false)
+        remove_file('docker-compose.yml')
+        remove_file('compose.yml')
       rescue StandardError => e
         warn("[Modulorails] Error: cannot generate Docker Compose configuration: #{e.message}")
       end

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

@@ -8,20 +8,26 @@ module Modulorails
 
     class ConfigGenerator < Modulorails::Generators::DockerBase
 
-      VERSION = 1
+      VERSION = 2
 
       desc 'This generator creates application configuration'
 
       protected
 
       def create_config
+        Modulorails.deprecator.warn(<<~MESSAGE)
+          Modulorails::Docker::ConfigGenerator is deprecated and will be removed in version 2.0.
+          Use Moduloproject 3.0 (available later) to initialize new projects with Docker configuration.
+        MESSAGE
+
         @data = Modulorails.data
         @adapter = @data.adapter
+        @image_name = @data.name.parameterize
 
-        template 'config/database.yml'
-        template 'config/cable.yml'
-        template 'config/initializers/0_redis.rb'
-        template 'config/puma.rb'
+        template 'config/database.yml', force: true
+        template 'config/cable.yml', force: true
+        template 'config/initializers/0_redis.rb', force: true
+        template 'config/puma.rb', force: true
       rescue StandardError => e
         warn("[Modulorails] Error: cannot generate application configuration: #{e.message}")
       end

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

@@ -1,14 +1,19 @@
 development: &default
 <%- if @adapter =~ /mysql/ -%>
   adapter: mysql2
+  url: <%%= ENV.fetch('DATABASE_URL', 'mysql2://root@database/<%= @image_name %>') %>
 <%- else -%>
   adapter: postgresql
+  url: <%%= ENV.fetch('DATABASE_URL', 'postgresql://postgres:postgres@database/<%= @image_name %>') %>
 <%- end -%>
-  url: <%%= ENV['DATABASE_URL'] %>
 
 test:
   <<: *default
-  database: <%%= ENV['DATABASE_TEST_URL'] %>
+<%- if @adapter =~ /mysql/ -%>
+  url: <%%= ENV.fetch('DATABASE_TEST_URL', 'mysql2://root@database/<%= @image_name %>-test') %>
+<%- else -%>
+  url: <%%= ENV.fetch('DATABASE_TEST_URL', 'postgresql://postgres:postgres@database/<%= @image_name %>-test') %>
+<%- end -%>
 
 staging:
   <<: *default

data/lib/generators/modulorails/docker/devcontainer/devcontainer_generator.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'modulorails/generators/docker_base'
+require 'generators/modulorails/sidekiq/sidekiq_generator'
+
+module Modulorails
+
+  module Docker
+
+    class DevcontainerGenerator < Modulorails::Generators::DockerBase
+
+      VERSION = 1
+
+      desc 'This generator creates devcontainer configuration'
+
+      protected
+
+      def create_config
+        Modulorails.deprecator.warn(<<~MESSAGE)
+          Modulorails::Docker::DevcontainerGenerator is deprecated and will be removed in version 2.0.
+          Use Moduloproject 3.0 (available later) to initialize new projects with Docker configuration.
+        MESSAGE
+
+        remove_old_dockerfiles
+        create_template_files
+      rescue StandardError => e
+        warn("[Modulorails] Error: cannot generate devcontainer configuration: #{e.message}")
+      end
+
+      private
+
+      def remove_old_dockerfiles
+        remove_file 'compose.yml'
+        remove_file 'docker-compose.yml'
+      end
+
+      def create_template_files
+        @data = Modulorails.data
+        @adapter = @data.adapter
+        @image_name = @data.name.parameterize
+        @js_engine = @data.js_engine
+
+        template 'devcontainer/devcontainer.json', '.devcontainer/devcontainer.json'
+        template 'devcontainer/compose.yml', '.devcontainer/compose.yml'
+        template 'devcontainer/Dockerfile', '.devcontainer/Dockerfile'
+      end
+
+    end
+
+  end
+
+end

data/lib/generators/modulorails/docker/devcontainer/templates/devcontainer/Dockerfile.tt

@@ -0,0 +1,53 @@
+FROM ruby:<%= @data.ruby_version %>-alpine
+
+ENV RAILS_ENV=development
+ENV EDITOR=vim
+WORKDIR /rails
+
+RUN apk add --update --no-cache \
+    alpine-sdk \
+    nodejs \
+    tzdata \
+    gcompat \
+    vim \
+    bash \
+    openssh \
+    yaml-dev \
+    curl \
+<%- if @adapter =~ /mysql/ -%>
+    mysql-dev
+<%- else -%>
+    postgresql-dev
+<%- end -%>
+RUN gem install bundler -v <%= @data.bundler_version %>
+
+<%- case @js_engine -%>
+<%- when :webpacker -%>
+RUN apk add yarn
+
+# Install node modules
+COPY package.json yarn.lock ./
+RUN yarn install
+<%- when :bun -%>
+# Install bun
+ENV BUN_INSTALL=/usr/local/bun
+ENV PATH="$BUN_INSTALL/bin:$PATH"
+RUN curl -fsSL https://bun.sh/install | bash
+
+# Install node modules
+COPY package.json bun.lock ./
+RUN bun install
+<%- end -%>
+
+COPY Gemfile Gemfile.lock ./
+RUN bundle install --jobs=2
+
+COPY . .
+
+RUN sed -i 's:/bin/ash:/bin/bash:g' /etc/passwd
+
+EXPOSE 3000
+
+ENTRYPOINT ["./bin/docker-entrypoint"]
+
+CMD ["sleep", "infinity"]

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

@@ -0,0 +1,97 @@
+services:
+  app:
+    image: modulotechgroup/<%= @image_name %>:dev
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+    depends_on:
+      - database
+      - redis
+    volumes:
+      - ..:/rails
+    environment:
+      RAILS_ENV: development
+      URL: http://localhost:3000
+    env_file:
+      - path: .env
+        required: false
+    stdin_open: true
+    tty: true
+
+<%- if @adapter =~ /mysql/ -%>
+  database:
+    image: mysql/mysql-server:8.0
+    volumes:
+      - db_data:/var/lib/mysql
+    expose:
+      - '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
+    expose:
+      - '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
+    volumes:
+      - redis_data:/data
+
+  mailcatcher:
+    image: dockage/mailcatcher
+    expose:
+      - '1080'
+      - '1025'
+
+<%- case @js_engine -%>
+<%- when :webpacker -%>
+  webpack:
+    image: modulotechgroup/<%= @image_name %>:dev
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+    command: ./bin/webpack-dev-server
+    volumes:
+      - ..:/rails
+    environment:
+      NODE_ENV: development
+      RAILS_ENV: development
+<%- when :bun -%>
+  js:
+    image: modulotechgroup/<%= @image_name %>:dev
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+    command: bun run build --watch
+    volumes:
+      - ..:/rails
+    environment:
+      NODE_ENV: development
+
+  css:
+    image: modulotechgroup/<%= @image_name %>:dev
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+    command: bun run watch:css
+    volumes:
+      - ..:/rails
+    environment:
+      NODE_ENV: development
+<%- end -%>
+
+volumes:
+  db_data:
+  redis_data:

data/lib/generators/modulorails/docker/devcontainer/templates/devcontainer/devcontainer.json.tt

@@ -0,0 +1,80 @@
+// For format details, see https://containers.dev/implementors/json_reference/.
+// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/ruby
+{
+	"name": "<%= @image_name %>",
+	"dockerComposeFile": "./compose.yml",
+	"service": "app",
+	"workspaceFolder": "/rails",
+	"shutdownAction": "stopCompose",
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	"features": {
+		"ghcr.io/cirolosapio/devcontainers-features/alpine-docker-outside-of-docker:0": {}
+	},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+<%- if @adapter =~ /mysql/ -%>
+	"forwardPorts": [3000, "database:3306", "mailcatcher:1080"],
+<%- else -%>
+	"forwardPorts": [3000, "database:5432", "mailcatcher:1080"],
+<%- end -%>
+
+	// Configure tool-specific properties.
+	"customizations": {
+		"vscode": {
+			"yard.spacers.beforeDescription": false,
+			"yard.spacers.afterDescription": false,
+			"yard.spacers.beforeTags": false,
+			"yard.spacers.separateTags": false,
+			"yard.spacers.afterTags": false,
+			"yard.spacers.beforeSingleTag": false,
+			"yard.spacers.afterSingleTag": false,
+			"yard.tags.paramNameBeforeType": true,
+			"extensions": [
+				"ecmel.vscode-html-css",
+				"Shopify.ruby-lsp",
+				"ms-vscode-remote.remote-containers",
+				"KoichiSasada.vscode-rdbg",
+				"pavlitsky.yard",
+				"eamodio.gitlens",
+				"GrapeCity.gc-excelviewer",
+				"smoore.yaml-path"
+			],
+			"settings": {
+				"terminal.integrated.profiles.linux": {
+					"JavaScript Debug Terminal": null,
+					"Rails console": {
+						"path": "rails",
+						"env": {
+							"DEV_LOG_LEVEL": "error",
+							"USE_CACHE": "YES"
+						},
+						"args": [
+							"c"
+						],
+						"icon": "ruby",
+						"color": "terminal.ansiRed"
+					},
+					"Rails server": {
+						"path": "rails",
+						"env": {
+							"DEV_LOG_LEVEL": "error",
+							"USE_CACHE": "YES"
+						},
+						"args": [
+							"s"
+						],
+						"icon": "ruby",
+						"color": "terminal.ansiRed"
+					}
+				}
+			}
+		}
+	},
+
+	// Uncomment to connect as root instead. More info: https://containers.dev/implementors/json_reference/#remoteUser.
+	// "remoteUser": "root",
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "bin/setup --skip-server"
+}

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

@@ -5,6 +5,7 @@ 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'
+require 'generators/modulorails/docker/devcontainer/devcontainer_generator'
 
 module Modulorails
 
@@ -17,6 +18,11 @@ module Modulorails
     protected
 
     def create_config
+      Modulorails.deprecator.warn(<<~MESSAGE)
+        Modulorails::DockerGenerator is deprecated and will be removed in version 2.0.
+        Use Moduloproject 3.0 (available later) to initialize new projects with Docker configuration.
+      MESSAGE
+
       remove_old_keepfile('.modulorails-docker')
 
       # Running first since the Dockerfile generator checks for existence of entrypoint
@@ -24,6 +30,7 @@ module Modulorails
       Modulorails::Docker::DockerfileGenerator.new([], {}, {}).invoke_all
       Modulorails::Docker::ComposeGenerator.new([], {}, {}).invoke_all
       Modulorails::Docker::ConfigGenerator.new([], {}, {}).invoke_all
+      Modulorails::Docker::DevcontainerGenerator.new([], {}, {}).invoke_all
     rescue StandardError => e
       warn("[Modulorails] Error: cannot generate Docker configuration: #{e.message}")
     end

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

@@ -8,36 +8,40 @@ module Modulorails
 
     class DockerfileGenerator < ::Modulorails::Generators::DockerBase
 
-      VERSION = 1
+      VERSION = 2
 
       desc 'This generator creates Dockerfiles'
 
       protected
 
       def create_config
+        Modulorails.deprecator.warn(<<~MESSAGE)
+          Modulorails::Docker::DockerfileGenerator is deprecated and will be removed in version 2.0.
+          Use Moduloproject 3.0 (available later) to initialize new projects with Docker configuration.
+        MESSAGE
+
         @data = Modulorails.data
         @adapter = @data.adapter
-        @webpack_container_needed = @data.webpacker_version.present?
+        @js_engine = @data.js_engine
 
         EntrypointGenerator.new([], {}, {}).invoke_all unless File.exist?('bin/docker-entrypoint')
-        create_dockerfile
         create_dockerfile_prod
+        create_dockerignore
       rescue StandardError => e
         warn("[Modulorails] Error: cannot generate Dockerfiles: #{e.message}")
       end
 
       private
 
-      def create_dockerfile
-        template 'dockerfiles/modulotech/Dockerfile', 'Dockerfile'
+      def create_dockerfile_prod
+        @rails_72_and_more = Gem::Version.new(@data.rails_version) >= Gem::Version.new('7.2')
+
+        remove_file 'Dockerfile.prod'
+        template 'dockerfiles/Dockerfile.prod', 'Dockerfile', force: true
       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
+      def create_dockerignore
+        template 'dockerfiles/dockerignore', '.dockerignore'
       end
 
     end

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

@@ -17,11 +17,11 @@ RUN apk add --update --no-cache \
     vim \
     jemalloc \
     vips \
-    <%- if @adapter =~ /mysql/ -%>
+  <%- if @adapter =~ /mysql/ -%>
     mysql-client
-    <%- else -%>
+  <%- else -%>
     postgresql-client
-    <%- end -%>
+  <%- end -%>
 
 # Set production environment
 ENV RAILS_ENV="production" \
@@ -37,27 +37,45 @@ RUN apk add --update --no-cache \
     alpine-sdk \
     nodejs \
     tzdata \
-    yarn \
     shared-mime-info \
     gcompat \
-    <%- if @adapter =~ /mysql/ -%>
+    yaml-dev \
+    curl \
+    bash \
+  <%- if @adapter =~ /mysql/ -%>
     mysql-dev
-    <%- else -%>
+  <%- else -%>
     postgresql-dev
-    <%- end -%>
+  <%- end -%>
 
 # Install application gems
 RUN gem install bundler -v <%= @data.bundler_version %>
 
+<%- case @js_engine -%>
+<%- when :webpacker -%>
+RUN apk add yarn
+<%- when :bun -%>
+# Install bun
+ENV BUN_INSTALL=/usr/local/bun
+ENV PATH="$BUN_INSTALL/bin:$PATH"
+RUN curl -fsSL https://bun.sh/install | bash
+<%- end -%>
+
 COPY Gemfile Gemfile.lock ./
 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 -%>
+<%- case @js_engine -%>
+<%- when :webpacker -%>
+# Install node modules
 COPY package.json yarn.lock ./
 RUN yarn install
-<%- end-%>
+<%- when :bun -%>
+# Install node modules
+COPY package.json bun.lock ./
+RUN bun install --frozen-lockfile
+<%- end -%>
 
 # Copy application code
 COPY . .
@@ -66,10 +84,11 @@ COPY . .
 RUN bundle exec bootsnap precompile app/ lib/
 
 # Precompiling assets for production without requiring secret RAILS_MASTER_KEY
+<%- if @rails_72_and_more -%>
 RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
-
-
-
+<%- else -%>
+RUN SECRET_KEY_BASE=1 ./bin/rails assets:precompile
+<%- end -%>
 
 # Final stage for app image
 FROM base