squared 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4f586dc4eb61a4952f9093d90f52b07bd95b920ddeb2f3f10df67c5d32a936
-  data.tar.gz: d2c688164ad5033e3d662fda16b63809cc2c6f1020b963d7ef15b3f61571f457
+  metadata.gz: 55acca920e2d36f1ce57ef7cb2f70c4eba31ff643436713bce561822dbb0f266
+  data.tar.gz: 83172faeb6c7638f1528bf401915134ce3a388d47cdd6934dfcd71af77723d38
 SHA512:
-  metadata.gz: 8cebf94bb4963e7b8c2515df1c2a02e3c7a919a702eea06f66840c73cfd87cdaf3069c8dece4487385ecc421bb858934a87f320ecfeedec89964971147a3810d
-  data.tar.gz: d0917560fbe4c49c70269b1f4cfbe1f63b1c460eb9d1658046b9c23b1764182007533556d2fceb174b452424d835928a67815ba22927a435f872aeb5c8611772
+  metadata.gz: 3d7b1de764a624c7f6424c2e1ceea431b7f1e28362510bb772cc83e43075310949a7644696926991025db0e511c534bb21e01d6c6ecb45f45f93a51d10ba79ab
+  data.tar.gz: 73745e3f8035184b1995cd8d5a2cc26a21bfe93b462e94e6be62795ba34d4c0646b22b70cd3f1017a18f60d1e8dcec4b558932e3423b418461807b4af25d4e3c

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.2.13] - 2025-07-16
+
+### Fixed
+
+- Project graph did not ignore circular references.
+
+## [0.1.10] - 2025-07-16
+
+### Fixed
+
+- Module namespaces were not combined in the right order.
+- Workspace group tasks were not registered.
+
 ## [0.2.12] - 2025-07-05
 
 ### Fixed
@@ -307,6 +320,7 @@
 
 - Changelog was created.
 
+[0.2.13]: https://github.com/anpham6/squared/releases/tag/v0.2.13-ruby
 [0.2.12]: https://github.com/anpham6/squared/releases/tag/v0.2.12-ruby
 [0.2.11]: https://github.com/anpham6/squared/releases/tag/v0.2.11-ruby
 [0.2.10]: https://github.com/anpham6/squared/releases/tag/v0.2.10-ruby
@@ -320,6 +334,7 @@
 [0.2.2]: https://github.com/anpham6/squared/releases/tag/v0.2.2-ruby
 [0.2.1]: https://github.com/anpham6/squared/releases/tag/v0.2.1-ruby
 [0.2.0]: https://github.com/anpham6/squared/releases/tag/v0.2.0-ruby
+[0.1.10]: https://github.com/anpham6/squared/releases/tag/v0.1.10-ruby
 [0.1.9]: https://github.com/anpham6/squared/releases/tag/v0.1.9-ruby
 [0.1.8]: https://github.com/anpham6/squared/releases/tag/v0.1.8-ruby
 [0.1.7]: https://github.com/anpham6/squared/releases/tag/v0.1.7-ruby

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -627,20 +627,19 @@ module Squared
       end
 
       def data_get(*args, group: nil, ref: nil, target: nil)
-        if group
-          target[:group][group.to_sym]
-        elsif ref.is_a?(Array)
-          ref = ref.each
-        end
-        if ref.instance_of?(Enumerator)
-          ref.each do |key|
-            next unless (ret = target[:ref][key])
+        if group && (ret = target[:group][group.to_sym])
+          ret
+        elsif ref
+          if ref.is_a?(Enumerable)
+            ref.each do |key|
+              next unless (ret = target[:ref][key])
 
-            return ret if args.empty? || args.any? { |val| ret.key?(val) }
+              return ret if args.empty? || args.any? { |val| ret.key?(val) }
+            end
+            nil
+          else
+            target[:ref][ref]
           end
-          nil
-        elsif ref
-          target[:ref][ref]
         end
       end
 

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

@@ -745,7 +745,7 @@ module Squared
           done
         end
 
-        def graph_collect(target, start = [], data: {})
+        def graph_collect(target, start = [], data: {}, root: [])
           deps = []
           (start.empty? ? target.instance_variable_get(:@graph) : start)&.each do |val|
             if (obj = workspace.find(name: val))
@@ -756,14 +756,19 @@ module Squared
               items = workspace.find(group: val, ref: val.to_sym)
             end
             items.each do |proj|
-              graph_collect(proj, data: data) if proj.graph? && !data.key?(proj.name)
-              next if (objs = data.fetch(proj.name, [])).include?(target)
+              name = proj.name
+              if proj.graph? && !data.key?(name) && !root.include?(name)
+                graph_collect(proj, data: data, root: root + [name, target.name])
+              end
+              next if (objs = data.fetch(name, [])).include?(target)
 
               deps << proj
-              deps += objs
+              deps.concat(objs)
             end
           end
-          data[target.name] = deps.uniq.reject { |proj| proj == target }
+          deps.uniq!
+          deps.delete(target)
+          data[target.name] = deps
           data
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - An Pham