kdep 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f971ace54be5f10abde07364654600377be07f9f77c1b7afb5bb9f73e5b3ddfe
-  data.tar.gz: f2040905cec594653386a4a5f9049e6217628a29925d5f7fcc8aa0724eb873dc
+  metadata.gz: d962875f073779d83a18069ff777a107db39ff7ac8cdd922d14492972c24288b
+  data.tar.gz: 1dc2947fe2e82b34b40dcc0355394f4983d2ca0095cc49eb8030eef2cb5229fc
 SHA512:
-  metadata.gz: 0cb2245173f84ca39286e957c7fce8a83491f403adc8c591c40da30cbe0f3ee26bf48ce432fa7c5deac669a43fdaa328212d3e1e00ec8266248164d76779957e
-  data.tar.gz: b4cbb931a8a08250b1489ad22e9020a4642650330b1efbf79329294f777f2f1cfeb85b9b02c97bd1a0901318efa0b6f2deaa3ee5791b05eaf7a4cf02339a4a69
+  metadata.gz: 1debfdafa912d40db9e37dffa7a8ddd9ae088f1d5c0246bb67b284a93df29a09ac29702b3ed113b2d60a9429e0acd6ba3d8ddfa68a8b7efbf8a4f8646b3eee44
+  data.tar.gz: 45202494e9302714222da3f55e3400005773e9301e42577c00ffddd4449afd53b489a4d90dea6eed8a83283e48fca8f61e87c80e6eb64f9e646addb768a055db

data/lib/kdep/config.rb

@@ -37,14 +37,15 @@ module Kdep
 
     def load_yaml(path)
       content = File.read(path)
-      if RUBY_VERSION >= "3.1"
-        YAML.safe_load(content, permitted_classes: [], permitted_symbols: [], aliases: false, filename: path) || {}
-      else
-        YAML.safe_load(content, [], [], false, path) || {}
-      end
+      Kdep::YAMLCompat.safe_load(content, filename: path) || {}
     end
 
     def apply_defaults(config)
+      # Backward compatibility: rename "env" to "configmap"
+      if config.key?("env") && !config.key?("configmap")
+        config["configmap"] = config.delete("env")
+      end
+
       preset_name = config.fetch("preset", "custom")
       defaults = Kdep::Defaults.for_preset(preset_name)
       result = deep_merge(defaults, config)

data/lib/kdep/old_format.rb

@@ -34,11 +34,7 @@ module Kdep
       config_file = File.join(@path, "app.yml")
       return {} unless File.exist?(config_file)
       content = File.read(config_file)
-      if RUBY_VERSION >= "3.1"
-        YAML.safe_load(content, permitted_classes: [], permitted_symbols: [], aliases: false) || {}
-      else
-        YAML.safe_load(content, [], [], false) || {}
-      end
+      Kdep::YAMLCompat.safe_load(content) || {}
     end
 
     def materialized_files
@@ -75,7 +71,7 @@ module Kdep
 
       # Start with what's in the old app.yml
       %w[preset namespace name image registry context port replicas
-         command args env env_from resources probe domains
+         command args env_from resources probe domains
          image_pull_secrets image_pull_policy schedule service_port
          ingress_name ingress_annotations ingress_class_field
          tls_secret_name tls_hosts ssl_redirect
@@ -90,6 +86,9 @@ module Kdep
         result[key] = old[key] if old.key?(key)
       end
 
+      # Migrate old "env" key to "configmap"
+      result["configmap"] = old["env"] if old.key?("env")
+
       # Old format uses "target" as the preset name
       result["preset"] ||= old["target"]
 
@@ -122,7 +121,7 @@ module Kdep
       # Merge env from ConfigMap into config (for rendering)
       manifest_env = extract_env
       unless manifest_env.empty?
-        result["env"] = (result["env"] || {}).merge(manifest_env)
+        result["configmap"] = (result["configmap"] || {}).merge(manifest_env)
       end
 
       # Ensure name: prefer deploy metadata name > image > app_name
@@ -724,11 +723,7 @@ module Kdep
         # Handle multi-document YAML
         content.split(/^---\s*$/).each do |part|
           next if part.strip.empty?
-          doc = if RUBY_VERSION >= "3.1"
-                  YAML.safe_load(part, permitted_classes: [], permitted_symbols: [], aliases: false)
-                else
-                  YAML.safe_load(part, [], [], false)
-                end
+          doc = Kdep::YAMLCompat.safe_load(part)
           yield doc if doc.is_a?(Hash)
         end
       end

data/lib/kdep/version.rb

@@ -1,3 +1,3 @@
 module Kdep
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/lib/kdep/yaml_compat.rb

@@ -0,0 +1,24 @@
+require "yaml"
+
+module Kdep
+  # Compatibility shim for YAML.safe_load across Psych versions.
+  #
+  # Psych 3.0 (Ruby 2.5):      positional args only.
+  # Psych 3.1+ (Ruby 2.6+):    kwargs added, positional still accepted.
+  # Psych 4.0+ (Ruby 3.1+):    positional removed — kwargs only.
+  #
+  # We discriminate on Psych::VERSION (NOT RUBY_VERSION) because Psych is a
+  # default gem and can be updated independently of the Ruby runtime — e.g.
+  # Ruby 3.0 with an upgraded Psych 4+ would break a RUBY_VERSION-based check.
+  module YAMLCompat
+    module_function
+
+    def safe_load(content, filename: nil)
+      if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+        YAML.safe_load(content, permitted_classes: [], permitted_symbols: [], aliases: false, filename: filename)
+      else
+        YAML.safe_load(content, [], [], false, filename)
+      end
+    end
+  end
+end

data/lib/kdep.rb

@@ -1,5 +1,6 @@
 require "kdep/version"
 require "kdep/ui"
+require "kdep/yaml_compat"
 require "kdep/defaults"
 require "kdep/config"
 require "kdep/preset"

data/templates/init/app.yml.erb

@@ -42,6 +42,10 @@ registry: <%= registry %>
 #     path: /api
 #     path_type: Prefix
 #
+# configmap:                             # ConfigMap data (key-value pairs)
+#   RAILS_ENV: production
+#   LOG_LEVEL: info
+#
 # env_from:                              # environment variable sources
 #   - configmap/my-config                # from ConfigMap
 #   - secret/my-secret                   # from Secret

data/templates/resources/configmap.yml.erb

@@ -3,9 +3,9 @@ kind: ConfigMap
 metadata:
   name: <%= @config["configmap_name"] || "config-#{name}" %>
   namespace: <%= namespace %>
-<% if @config["env"] && !@config["env"].empty? -%>
+<% if @config["configmap"] && !@config["configmap"].empty? -%>
 data:
-<% @config["env"].sort.each do |key, value| -%>
+<% @config["configmap"].sort.each do |key, value| -%>
   <%= key %>: "<%= value %>"
 <% end -%>
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kdep
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Leadfy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-22 00:00:00.000000000 Z
+date: 2026-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,6 +107,7 @@ files:
 - lib/kdep/version.rb
 - lib/kdep/version_tagger.rb
 - lib/kdep/writer.rb
+- lib/kdep/yaml_compat.rb
 - templates/init/app.yml.erb
 - templates/init/gitignore
 - templates/init/secrets.yml
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Kubernetes deployment CLI