squared 0.4.24 → 0.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c07babae909a985bae708b8a2bec453b223d9889af828da70d990609e9966142
-  data.tar.gz: 5375a660bbcc0f49b5a3eaad5ab2740b103beeb3823a0d7b027b9005bf39faa9
+  metadata.gz: 11a03c7d13bf0170f8b60953148792df626cf1c1edb02f7a1da9c46a4668fc1d
+  data.tar.gz: ee42ffc6ac7b056604d9bb8ad81041dcd7787cb6d883b253f5390e7e94addc99
 SHA512:
-  metadata.gz: 23cd1e57c7d0039fed851d6d426eec51022dba2c26bbce9faafddd20ded4aad3d00d6db023c3a99e2aa485aace597567df4f603130746daa5dc5e2d661c658dd
-  data.tar.gz: cb9556662d393d458413df3669f9859b4b3df9d9ca3e659b9098fac0d550349eaf8b414e6cb85b0828f522f3b78f1627c282350eb6b9b62218f76413ebcaabb8
+  metadata.gz: 23cf6af69c98270efe9894f77e646c6006e34652aae843cc621fd6248324efece67b90bd60ea107f28c7a38b522885984f8f0e5e962dc5dd67c6d52ae522ac05
+  data.tar.gz: 3cd04987351a9a9f98c878ab93307270ea7fa84d93207d361455ec008dc757ad98b258b2c098280ae1ae22aee78b90b179df9b654d9f01594b2c1198d02f4b0b

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.4.25] - 2025-10-18
+
+### Fixed
+
+- Project groups did not have their own copy of base events.
+
 ## [0.4.24] - 2025-10-17
 
 ### Added
@@ -1037,6 +1043,7 @@
 
 - Changelog was created.
 
+[0.4.25]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.25
 [0.4.24]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.24
 [0.4.23]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.23
 [0.4.22]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.22

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.4.24'
+  VERSION = '0.4.25'
 end

data/lib/squared/workspace/application.rb

@@ -322,21 +322,9 @@ module Squared
       end
 
       def add(path, project = nil, **kwargs, &blk)
-        if @withargs
-          data = @withargs.dup
-          data.merge!(kwargs)
-          kwargs = data
-        end
-        ref = if kwargs.key?(:ref)
-                kwargs = kwargs.dup unless @withargs
-                kwargs.delete(:ref)
-              elsif @ref.is_a?(Symbol)
-                @ref
-              end
-        if @group.is_a?(String) && !kwargs.key?(:group)
-          kwargs = kwargs.dup unless @withargs
-          kwargs[:group] = @group
-        end
+        kwargs = Support.hashdup(@withargs).update(kwargs) if @withargs
+        ref = kwargs.key?(:ref) ? kwargs.delete(:ref) : @ref
+        kwargs[:group] = @group if @group && !kwargs.key?(:group)
         path = root + path
         project = (project || path.basename).to_s
         name = task_name project

data/lib/squared/workspace/project/base.rb

@@ -396,18 +396,9 @@ module Squared
             return self
           elsif !projectpath?(path = basepath(path)) || !checkdir?(path)
             return self
-          else
-            name = case name
-                   when String, Symbol
-                     name.to_s
-                   end
-          end
-          if @withargs
-            data = @withargs.dup
-            data.merge!(kwargs)
-            kwargs = data
           end
-          kwargs[:group] = group unless kwargs.key?(:group)
+          kwargs = hashdup(@withargs).update(kwargs) if @withargs
+          kwargs[:group] = group if group && !kwargs.key?(:group)
           kwargs[:ref] = ref unless kwargs.key?(:ref)
           parent = self
           proj = nil
@@ -2139,6 +2130,10 @@ module Squared
           Workspace::Support.hashlist
         end
 
+        def hashdup
+          Workspace::Support.hashdup
+        end
+
         def borderstyle
           ((data = workspace.banner_get(*@ref, group: group)) && data[:border]) || theme[:border]
         end

data/lib/squared/workspace/project/support/class.rb

@@ -247,9 +247,9 @@ module Squared
                     add quote_option(key, val, double: qq.include?(key), merge: merge)
                   elsif p.include?(key)
                     if val.match?(/\A(["']).+\1\z/)
-                      add shell_option(key, val, escape: false, merge: merge, sep: sep)
+                      add shell_option(key, val, escape: false, merge: merge)
                     elsif path
-                      add quote_option(key, path + val, merge: merge, sep: sep)
+                      add quote_option(key, path + val, merge: merge)
                     else
                       push opt
                     end

data/lib/squared/workspace/support/base.rb

@@ -11,6 +11,26 @@ module Squared
         def hashlist
           Hash.new { |data, key| data[key] = [] }
         end
+
+        def hashdup(data, pass: [])
+          ret = {}
+          data.each do |key, val|
+            ret[key] = case val
+                       when Hash
+                         if pass.include?(val)
+                           val
+                         else
+                           pass << val
+                           hashdup(val, pass: pass)
+                         end
+                       when Proc, Method
+                         val
+                       else
+                         val.dup
+                       end
+          end
+          ret
+        end
       end
     end
   end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.24
+  version: 0.4.25
 platform: ruby
 authors:
 - An Pham
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,6 +112,7 @@ metadata:
   homepage_uri: https://github.com/anpham6/squared-ruby
   source_code_uri: https://github.com/anpham6/squared-ruby
   documentation_uri: https://squared.readthedocs.io
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,7 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []