cl-magic 1.2.4 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e703c8de1ae89f408ce6e63cc1815522c50cfaa2c8eb378a6c66da8fce474dc5
-  data.tar.gz: 9f059bbe5db125cb443e5e3a460024efde164eaec3aa5b09beb1d353b3eed26e
+  metadata.gz: '097467f37492d3cd640f1dad7b870f7586101f40a2f2e5c3fc5379d0190b2eb0'
+  data.tar.gz: 71767bc1c9bcbcebaccd41b61c106a726aee70864ba34a634827e508083eac9f
 SHA512:
-  metadata.gz: 242e2a6d1c7e455613e056144792ff941528f50592212435b495cc01dc335597d512617223a872a975ad062c9461ae3fb07226bf1079bd636cc7a4935d6ca31d
-  data.tar.gz: 4430e08eaa1b4f312a29a26ac649b789337812b3301899eca78ecbf1c8e063486687947f8ebd84b5d02305ba7865d4e5c68b3f2f9576594f5682b07ac1712215
+  metadata.gz: 12e9003fd1e5693005b879025be7a22d35046cd4cb560f58b18e56e7f422776668514448db8a1be851e170bb745e59e79498c8ba8f5954fcf8c394b92672094e
+  data.tar.gz: 44a1961f5a58faf9bcce44ba818a0b626d6602587d7bb4aa9223e8a017cbb9fd8c42744fc38ec00aa086a50ee863590e69aa9ad4c69b6ae06131a98e4bfca20b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cl-magic (1.2.4)
+    cl-magic (1.2.8)
       activesupport
       baran
       concurrent-ruby

data/lib/cl/magic/cl-dk-make

@@ -102,6 +102,10 @@ def prep_make_command(c, selected_parts)
 end
 
 def interpolate_parts_into_command(cmd, selected_parts)
+  # expand nested dk
+  cmd.gsub!(" dk ", " cl dk ")
+
+  # expand dk
   cmd = "cl #{cmd}" if cmd.start_with?("dk")
 
   # subcommands: don't need interpolated parts

data/lib/cl/magic/dk/yaml_arg_munger.rb

@@ -53,11 +53,18 @@ class YamlArgMunger
     return hash ? hash : {}
   end
 
-  def merge_world_files(compose_hash, show_help=false)
+  def merge_world_files(compose_hash, show_help=false)    
     if @dk_proj_path
       print_dk_help_line("dk-project-path", "#{@dk_proj_path}") if show_help and $stdout.isatty
 
-      Dir.glob("#{@dk_proj_path}/*.yml").sort.each do |filepath|
+      # sorted yaml files
+      sorted_files = Dir.glob("#{@dk_proj_path}/*.{yml,yaml}", File::FNM_DOTMATCH).sort
+
+      # apply .local.yml last
+      sorted_files.push(sorted_files.shift) if sorted_files.first == "#{@dk_proj_path}/.local.yml"
+
+      # merge each file
+      sorted_files.each do |filepath|
         print_dk_help_line("dk-world", "#{filepath}") if show_help and $stdout.isatty
 
         # read file and replace

data/lib/cl/magic/version.rb

@@ -2,6 +2,6 @@
 
 module Cl
   module Magic
-    VERSION = "1.2.4"
+    VERSION = "1.2.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cl-magic
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.8
 platform: ruby
 authors:
 - Don Najd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake