securial 2.1.1 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9c7a709db9d2a74edcd0d7d4046d280049a2d83fe63fbb8aa5d15b209ac39aa
-  data.tar.gz: 520a658e2797e57cdcb7ef1d365324b84ba2c57e2e1197974c7d76f516d7977e
+  metadata.gz: 380f3eb7c41909962f49e0d860ac4ebfb8948b4477557ca0d4fc3a3b599b78c6
+  data.tar.gz: fe9c3e04c95f70836d453e36f4bbaf67b428a397c05a7516ca42d152a8368f9d
 SHA512:
-  metadata.gz: bf133510e6d9923775356f1ce0d8674289dafc8cc52e0f87faf10a156b9c24285d62d07fa5db4c32363f82bd40c714266c70c8694016d6cbf46bedcc58aab1af
-  data.tar.gz: f150c5a04805ea5a8d92b0833dd1e926265d8fb574534e3f146b7865c9c49b38514b8edf8069be7ee5e3f92b752eff52e05191d123abb30ac69f5db4cd359c7b
+  metadata.gz: 2a144e1b69790b12456fb2db21218f3ae77cf72c148a92af38d7934ab21740af566b4bd2155738d90d490da4004f12531a447296c674565b54774f667c33719b
+  data.tar.gz: 50404735621bed58aa44b3a98a5387a85093ea9d0a68050daa39e21fcad42fab30efbcf953b63c118b5d77dec4c640c47bc0e84a1c1382225030670f9aa18612

data/lib/securial/cli.rb

@@ -197,22 +197,55 @@ module Securial
     # @param app_name [String] name of the Rails application
     # @return [void]
     #
-    def update_database_yml_host(app_name)
+    def update_database_yml_host(app_name) # rubocop:disable Metrics/MethodLength
       db_config_path = File.join(app_name, "config", "database.yml")
+
+      # Step 1: Parse to check adapter
       raw = File.read(db_config_path)
       rendered = ERB.new(raw).result
       config = YAML.safe_load(rendered, aliases: true) || {}
 
-      config["default"] ||= {}
-      return if config["default"]["adapter"].blank?
-      return unless ["mysql2", "postgresql"].include?(config["default"]["adapter"])
-      config["default"]["host"] = "<%= ENV.fetch(\"DB_HOST\", \"localhost\") %>"
-      config["default"]["username"] = "<%= ENV.fetch(\"DB_USERNAME\") { \"postgres\" } %>"
-      config["default"]["password"] = "<%= ENV.fetch(\"DB_PASSWORD\") { \"postgres\" } %>"
+      adapter = config.dig("default", "adapter")
+      return unless adapter.is_a?(String) && %w[postgresql mysql2].include?(adapter)
+
+      # Step 2: Modify the raw file line-by-line to preserve anchors and formatting
+      lines = File.readlines(db_config_path)
+      inside_default = false
+      updated_lines = []
+
+      lines.each_with_index do |line, index|
+        if line =~ /^default:/
+          inside_default = true
+          updated_lines << line
+          next
+        end
+
+        if inside_default
+          # Break out of default block when another top-level key appears
+          if line =~ /^\S/ && line !~ /^\s/
+            inside_default = false
+          end
+
+          # Skip existing host/username/password lines
+          next if line =~ /^\s*(host|username|password):/
+        end
+
+        updated_lines << line
+      end
+
+      # Find index of `default:` line to insert after
+      insert_index = updated_lines.find_index { |l| l =~ /^default:/ }
+      return unless insert_index
+
+      injection = [
+        "  host: <%= ENV.fetch(\"DB_HOST\", \"localhost\") %>",
+        "  username: <%= ENV.fetch(\"DB_USERNAME\") { \"postgres\" } %>",
+        "  password: <%= ENV.fetch(\"DB_PASSWORD\") { \"postgres\" } %>",
+      ]
+
+      updated_lines.insert(insert_index + 1, *injection)
 
-      # Dump YAML manually to preserve formatting
-      yaml = config.to_yaml.gsub(/['"](<%= .*? %>)['"]/, '\1') # Unquote the ERB
-      File.write(db_config_path, yaml)
+      File.write(db_config_path, updated_lines.join)
     end
 
     # Adds the Securial gem to the application's Gemfile.

data/lib/securial/version.rb

@@ -6,5 +6,5 @@ module Securial
   #
   # @see https://semver.org/ Semantic Versioning 2.0.0
   # @return [String] the current version in the format "major.minor.patch"
-  VERSION = "2.1.1".freeze
+  VERSION = "2.1.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: securial
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.5
 platform: ruby
 authors:
 - Aly Badawy