squared 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6ba5fce68ca21d291620e1877a4a00733e795d1cc9fa5cccfe9866d422554b6
-  data.tar.gz: 8b22eaea56b0a8ccc5ad9880fd3efc12060246228a09e902d346a054947b31b6
+  metadata.gz: 52de0073b3487c74635741dc496973cfb3c0925e67c61df2a087fb15ced40045
+  data.tar.gz: d8d6cfd52e3575822d667aca3b7432545f1d4ab66a6d5bf02b86cb2d9ee46690
 SHA512:
-  metadata.gz: 8312fe3ccf942363b0bce6b05e24fbb012860b3e1dd3e36956dfc754a0b563db1edac58e054a1409c65d71cdf82f2dd5d4b487e2ee6d1da8c24a650c73132e42
-  data.tar.gz: 6553a12173f0e5e4ee421772fa503c58d9e77f98738cedd25c5d06775ac4f13bf6c1a2b5eab6b0cae07f7ce23e60b60ed95c098b6eb2eaf938bc081c0f1f7e55
+  metadata.gz: 8283a392f7cf4aa3c9f48f152e64d855062f12d7fcc130556e89887f73be82cbc10fe29dea45f274e7568399219a632fd6d6dccf63bccaed39bb2ffa2b8b8ca2
+  data.tar.gz: 2e437617d9ec8a4bb820bd066c8a7d93229dafb65e650a2aaacd533f9bd4b8e858422434fab0d0e31030721547cc372e13a541a46e8cef6a8a34c6e4971a332b

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.3.13] - 2025-07-16
+
+### Fixed
+
+- See `0.2.13`.
+
+## [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.3.12] - 2025-07-05
 
 ### Fixed
@@ -457,6 +476,7 @@
 
 - Changelog was created.
 
+[0.3.13]: https://github.com/anpham6/squared/releases/tag/v0.3.13-ruby
 [0.3.12]: https://github.com/anpham6/squared/releases/tag/v0.3.12-ruby
 [0.3.11]: https://github.com/anpham6/squared/releases/tag/v0.3.11-ruby
 [0.3.10]: https://github.com/anpham6/squared/releases/tag/v0.3.10-ruby
@@ -470,6 +490,7 @@
 [0.3.2]: https://github.com/anpham6/squared/releases/tag/v0.3.2-ruby
 [0.3.1]: https://github.com/anpham6/squared/releases/tag/v0.3.1-ruby
 [0.3.0]: https://github.com/anpham6/squared/releases/tag/v0.3.0-ruby
+[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
@@ -483,6 +504,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.3.12'
+  VERSION = '0.3.13'
 end

data/lib/squared/workspace/application.rb

@@ -664,20 +664,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

@@ -814,7 +814,7 @@ module Squared
           done
         end
 
-        def graph_collect(target, start = [], data: {}, pass: [])
+        def graph_collect(target, start = [], data: {}, pass: [], root: [])
           deps = []
           (start.empty? ? target.instance_variable_get(:@graph) : start)&.each do |val|
             next if pass.include?(val)
@@ -826,18 +826,21 @@ module Squared
             else
               items = workspace.find(group: val, ref: val.to_sym)
             end
-
             items.each do |proj|
-              next if pass.include?(proj.name)
+              next if pass.include?(name = proj.name)
 
-              graph_collect(proj, data: data, pass: pass) if proj.graph? && !data.key?(proj.name)
-              next if (objs = data.fetch(proj.name, [])).include?(target)
+              if proj.graph? && !data.key?(name) && !root.include?(name)
+                graph_collect(proj, data: data, pass: pass, 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.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - An Pham