securial 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 380f3eb7c41909962f49e0d860ac4ebfb8948b4477557ca0d4fc3a3b599b78c6
-  data.tar.gz: fe9c3e04c95f70836d453e36f4bbaf67b428a397c05a7516ca42d152a8368f9d
+  metadata.gz: 914b5c4ac539dfc8c6994f001eeec7237a0fbda2030c828898864b9371ac2ac4
+  data.tar.gz: 3b23660aa0a8e439d0bfa46f8bfab87949634dd84a45eaedb91088058a1576d3
 SHA512:
-  metadata.gz: 2a144e1b69790b12456fb2db21218f3ae77cf72c148a92af38d7934ab21740af566b4bd2155738d90d490da4004f12531a447296c674565b54774f667c33719b
-  data.tar.gz: 50404735621bed58aa44b3a98a5387a85093ea9d0a68050daa39e21fcad42fab30efbcf953b63c118b5d77dec4c640c47bc0e84a1c1382225030670f9aa18612
+  metadata.gz: 5f50a95757c49396f0c45ce9970e9f4333603e8499f8ae532def4f3d96252ec8dc91be4533f8f2cb190e2d905fd6cfcb4bccec4aad978ead7ed99bcedc40e183
+  data.tar.gz: a7e219a841c30569a68dec40b3ff2abbca4f446a60c6e0de7214a470bb188eb1bdcded2bea1c86a79ba5b31752f2b746bebde25c8b58ddce1dd4e6031d89fffb

data/lib/securial/cli.rb

@@ -208,43 +208,33 @@ module Securial
       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
+      # Step 2: Modify the raw YAML file line-by-line
       lines = File.readlines(db_config_path)
-      inside_default = false
       updated_lines = []
+      inside_default = false
+      inserted = false
+
+      lines.each do |line|
+        updated_lines << line
 
-      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):/
+        if inside_default && line.strip.start_with?("adapter:")
+          # Insert immediately after the adapter line
+          updated_lines += [
+            "  host: <%= ENV.fetch(\"DB_HOST\", \"localhost\") %>\n",
+            "  username: <%= ENV.fetch(\"DB_USERNAME\") { \"postgres\" } %>\n",
+            "  password: <%= ENV.fetch(\"DB_PASSWORD\") { \"postgres\" } %>\n",
+          ]
+          inserted = true
         end
 
-        updated_lines << line
+        # Exit `default:` block when another top-level key appears
+        inside_default = false if inside_default && line =~ /^\S/ && line !~ /^\s/
       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)
-
       File.write(db_config_path, updated_lines.join)
     end
 

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.5".freeze
+  VERSION = "2.1.6".freeze
 end

metadata

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