modulorails 1.5.0.pre2 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 928b92b50a47d10967876fd9fec84d9f1e0da9b9082d642a48cb2ee0eb49be89
-  data.tar.gz: 599f3d7b1546dfa9b294e8c09d9f1d429ad9d2b2ce69914c62f53e45cf213776
+  metadata.gz: 49cd77852f9aee93c053c1722f8332ad44fa712f2ff00830ddd44ab0e873a722
+  data.tar.gz: 6ce2b6f0314ee71f843bdc4f012ceda11ead2b326e98e954b517e334e1646fde
 SHA512:
-  metadata.gz: 3bcc2bc9acd9c84f41dd80c60036adffdcc85eb4c79c549209852d8dd918806e5d488d40df6b222648512e056b4d09f0f94f894a97215472577d222eea1d996e
-  data.tar.gz: '09cad76576542012ce824cd16891309d6d6e1b380b808e9839799294d099da9b9f6406a71be92a2d7ac8345044fd11c46bf9b8c28580fbb876b12ff06a8d86d3'
+  metadata.gz: 104ac0e4ab98f6194fec633367c0a87b25198fa5c8f0aef3cadac808ff8328c1c96fa1b11bd6881690f414c0400b9eacfc86a083c982a60e87039358c5ad8274
+  data.tar.gz: 3652ed356e878e708d54ae4d17cb18707afd7deabe57846cacdb2fc53caff699ae1c0cb3a932699a0829fd01be80978a406960df7eb534fec1c16daa1b124c36

data/CHANGELOG.md

@@ -4,7 +4,7 @@ This file is used to list changes made in each version of the gem.
 
 # Unreleased
 
-# 1.5.0
+# 1.5.1
 
 - Update templates according to new standards:
   - Optimize layers in Dockerfile.prod.
@@ -28,6 +28,10 @@ This file is used to list changes made in each version of the gem.
 - Deprecate `Modulorails::BaseService#log` and `Modulorails::LogsForMethodService`.
 - Add a common base for all generators.
 
+# 1.5.0
+
+- Released then 
+
 # 1.4.0.1
 
 - Fix auto-update.

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

@@ -67,7 +67,7 @@ class Modulorails::DockerGenerator < Modulorails::Generators::Base
 
   def create_new_file(old_file, new_file, executable: true)
     if File.exist?(old_file)
-      copy_file old_file, new_file
+      copy_original_file old_file, new_file
       remove_file old_file
     else
       template old_file, new_file
@@ -75,4 +75,20 @@ class Modulorails::DockerGenerator < Modulorails::Generators::Base
     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/templates/entrypoints/docker-entrypoint.sh.tt

@@ -21,4 +21,4 @@ if [ "$1" = "./bin/rails" ] && [ "$2" = "server" ]; then
 fi
 
 # Execute the CMD
-exec "$@"
+exec "${@}"

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

@@ -18,7 +18,7 @@ module Modulorails
     private
 
     def create_hook_executor
-      template 'dockeruby.sh', 'bin/dockeruby'
+      template 'dockeruby.rb', 'bin/dockeruby'
       chmod 'bin/dockeruby', 0o755
     end
 

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

@@ -0,0 +1,126 @@
+#!/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 "\$\{?@}?"/
+
+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 --rm #{modulogem_gems_option} #{modulogem_option} -v '#{pwd}:/app/#{working_directory}' #{tty_option} -w '/app/#{working_directory}' ezveus/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 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
+                  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/modulorails/version.rb

@@ -1,6 +1,6 @@
 module Modulorails
 
-  VERSION = '1.5.0.pre2'.freeze
+  VERSION = '1.5.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.0.pre2
+  version: 1.5.1
 platform: ruby
 authors:
 - Matthieu Ciappara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-audit
@@ -183,7 +183,7 @@ files:
 - lib/generators/modulorails/docker/templates/entrypoints/docker-entrypoint.sh.tt
 - lib/generators/modulorails/docker/templates/entrypoints/webpack-entrypoint.sh.tt
 - lib/generators/modulorails/githooks/githooks_generator.rb
-- lib/generators/modulorails/githooks/templates/dockeruby.sh
+- lib/generators/modulorails/githooks/templates/dockeruby.rb
 - 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

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

@@ -1,112 +0,0 @@
-#!/bin/sh
-set -e
-
-# shellcheck disable=SC2016
-VALID_LAST_INSTRUCTION='exec "${@}"'
-
-# Check if the Dockerfile exists
-check_dockerfile() {
-  if [ -f "Dockerfile" ]; then
-    return 0
-  else
-    echo "No Dockerfile"
-    return 1
-  fi
-}
-
-# Get the entrypoint location from the Dockerfile
-entrypoint_location() {
-  entrypoint_line=$(grep '^ENTRYPOINT' Dockerfile || true)
-
-  if [ -z "$entrypoint_line" ]; then
-    echo ""
-  else
-    echo "$entrypoint_line" | sed -n 's/.*\[\(.*\)\].*/\1/p' | tr -d '"'
-  fi
-}
-
-# Check if the entrypoint is valid
-check_entrypoint() {
-  el=$(entrypoint_location)
-  if [ -z "$el" ]; then
-    return 0
-  fi
-
-  if [ ! -f "$el" ]; then
-    echo "Entrypoint not found at location: $el"
-    return 1
-  fi
-
-  last_line=$(tail -n 1 "$el" | xargs)
-
-  if [ "$last_line" != "$VALID_LAST_INSTRUCTION" ]; then
-    echo "Invalid entrypoint: Last instruction should be '$VALID_LAST_INSTRUCTION' instead of '$last_line'"
-    return 1
-  fi
-
-  return 0
-}
-
-# Run docker with the necessary options
-executer_docker_run() {
-  pwd=$(pwd)
-  working_directory=$(basename "$pwd")
-
-  tty_option=""
-  if [ -t 1 ]; then
-    tty_option="-ti"
-  fi
-
-  command="docker run --rm -v '$pwd:/app/$working_directory' -w '/app/$working_directory' $tty_option $git_environment ezveus/ruby:latest $docker_args"
-  echo "$command"
-  exec "$command"
-}
-
-executer_dockerfile_run() {
-  if check_entrypoint; then
-    entrypoint_option=""
-  else
-    entrypoint_option="--entrypoint \"sh -c\""
-  fi
-
-  command="docker compose build && docker compose run --rm $tty_option $git_environment $entrypoint_option app $docker_args"
-  echo "$command"
-  exec "$command"
-}
-
-# Main function
-main() {
-  args="$*"
-  docker_args=""
-  contains_command=false
-  git_name=$(git config --get user.name || whoami)
-  git_email=$(git config --get user.email || echo "$git_name@local")
-  git_environment="-e \"GIT_AUTHOR_EMAIL=$git_email\" -e \"GIT_AUTHOR_NAME=$git_name\" -e \"GIT_COMMITTER_EMAIL=$git_email\" -e \"GIT_COMMITTER_NAME=$git_name\""
-
-  tty_option=""
-  if [ -t 1 ]; then
-    tty_option="-ti"
-  fi
-
-  for arg in "$@"; do
-    # Check if any argument is not an option (doesn't start with '-')
-    if [ "${arg#-}" = "$arg" ]; then
-      contains_command=true
-      break
-    fi
-  done
-
-  if [ "$contains_command" = false ]; then
-    docker_args="ruby $args"
-  else
-    docker_args="$args"
-  fi
-
-  if check_dockerfile; then
-    executer_dockerfile_run
-  else
-    executer_docker_run "$docker_args"
-  fi
-}
-
-main "$@"