squared 0.2.11 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a71c2dd60f8ae407c47d764959de398fe63e62b62069a858ffa10ef75ca861b4
-  data.tar.gz: afb4976839a8bdb581086c82190fc30a369f2e025561fa95a4e8e1f573094d91
+  metadata.gz: 55acca920e2d36f1ce57ef7cb2f70c4eba31ff643436713bce561822dbb0f266
+  data.tar.gz: 83172faeb6c7638f1528bf401915134ce3a388d47cdd6934dfcd71af77723d38
 SHA512:
-  metadata.gz: 07ea068884c72590aeb5317b64f1a754e8aa74d7f99692dcdb0990c0a21196c45e45b636c291506f591c5aac11f4f0ddc0d6cf7c8e521c8db1abdf1e5c286350
-  data.tar.gz: e289d5c37484e6bfe7045629f0be5cb5a1effeaaf70cd74b943353912a7754c4e87560cd607abfd6fb8dc6cf7149f3d01c68e9704162d1f58d46867ac91a4515
+  metadata.gz: 3d7b1de764a624c7f6424c2e1ceea431b7f1e28362510bb772cc83e43075310949a7644696926991025db0e511c534bb21e01d6c6ecb45f45f93a51d10ba79ab
+  data.tar.gz: 73745e3f8035184b1995cd8d5a2cc26a21bfe93b462e94e6be62795ba34d4c0646b22b70cd3f1017a18f60d1e8dcec4b558932e3423b418461807b4af25d4e3c

data/CHANGELOG.md

@@ -1,5 +1,40 @@
 # 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
+
+- See `0.1.9`.
+
+## [0.1.9] - 2025-07-05
+
+### Added
+
+- Initial support for using JRuby.
+- Config viewer theme color for boolean was implemented.
+
+### Fixed
+
+- Workspace did not add prefix to duplicate project names.
+- Project output divider was not printed when not verbose.
+- Directory context was not threaded using JRuby.
+- Index character was not captured on Windows.
+- Common method is used for Kernel shell commands.
+- Git did not highlight output for single commands.
+
 ## [0.2.11] - 2025-05-15
 
 ### Fixed
@@ -285,6 +320,8 @@
 
 - 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
 [0.2.9]: https://github.com/anpham6/squared/releases/tag/v0.2.9-ruby
@@ -297,6 +334,8 @@
 [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
 [0.1.6]: https://github.com/anpham6/squared/releases/tag/v0.1.6-ruby

data/lib/squared/common/base.rb

@@ -53,6 +53,7 @@ module Squared
           hash: %i[green black!],
           array: %i[blue black!],
           number: [:magenta],
+          boolean: [:magenta],
           undefined: %i[red italic]
         },
         logger: {
@@ -93,13 +94,15 @@ module Squared
       return [] if obj.nil?
 
       unless obj.is_a?(::Array)
-        obj = if obj.respond_to?(:to_a) && !obj.is_a?(::Hash) && (val = obj.to_a).is_a?(::Array)
+        obj = if obj.respond_to?(:to_ary)
+                obj.to_ary
+              elsif obj.respond_to?(:to_a) && !obj.is_a?(::Hash) && (val = obj.to_a).is_a?(::Array)
                 val
               else
                 [obj]
               end
       end
-      obj = obj.flatten(flat.is_a?(::Numeric) ? flat : nil) if flat
+      obj = flat.is_a?(::Numeric) ? obj.flatten(flat) : obj.flatten if flat
       obj = obj.compact if compact
       obj = obj.map(&meth) if meth
       block_given? ? obj.select(&blk) : obj

data/lib/squared/common/system.rb

@@ -1,23 +1,32 @@
 # frozen_string_literal: true
 
 require 'pathname'
-require 'fileutils'
+require 'rake'
 
 module Squared
   module Common
     module System
       module_function
 
-      def shell(*args, **kwargs)
-        if RUBY_VERSION < '2.6'
-          exception = kwargs.delete(:exception)
-          ret = system(*args, **kwargs)
-          return ret if ret || !exception
-
-          raise $?.to_s
+      def shell(*args, name: :system, **kwargs)
+        if RUBY_ENGINE == 'jruby' && Rake::Win32.windows?
+          e = kwargs[:exception]
+          if (dir = kwargs[:chdir]) && ((pwd = Dir.pwd) != dir)
+            Dir.chdir(dir)
+            ret = Kernel.send(name, *args)
+            Dir.chdir(pwd)
+          else
+            ret = Kernel.send(name, *args)
+          end
+        elsif RUBY_VERSION < '2.6'
+          e = kwargs.delete(:exception)
+          ret = Kernel.send(name, *args, **kwargs)
         else
-          system(*args, **kwargs)
+          return Kernel.send(name, *args, **kwargs)
         end
+        return ret if ret || !e
+
+        raise $?.to_s
       end
 
       def copy_dir(src, dest, glob = ['**/*'], create: false, link: nil, force: false, pass: nil, verbose: true)
@@ -29,10 +38,9 @@ module Squared
         dest.mkpath if create
         if pass
           exclude = []
-          pass = [pass] unless pass.is_a?(::Array)
-          pass.each { |val| exclude += Dir.glob(src.join(val)) }
+          Array(pass).each { |val| exclude += Dir.glob(src.join(val)) }
         end
-        (glob.is_a?(::Array) ? glob : [glob]).each do |val|
+        Array(glob).each do |val|
           Dir.glob(src.join(val)) do |path|
             next if exclude&.include?(path) || (path = Pathname.new(path)).directory?
 
@@ -79,8 +87,7 @@ module Squared
       def copy_guard(src, dest, link: nil, force: false, verbose: true)
         unless force
           if (path = Pathname.new(dest)).directory?
-            src = [src] unless src.is_a?(::Array)
-            src = src.reject { |val| path.join(File.basename(val)).exist? }
+            src = Array(src).reject { |val| path.join(File.basename(val)).exist? }
             return if src.empty?
           elsif path.exist?
             return

data/lib/squared/config.rb

@@ -249,6 +249,8 @@ module Squared
                                                 { pat: /\A(.+ : ")(.+)("\s*)\z/m, styles: theme[:string], index: 2 },
                                                 { pat: /\A(.+ : \{)(.+)(\}\s*)\z/m, styles: theme[:hash], index: 2 },
                                                 { pat: /\A(.+ : \[)(.+)(\]\s*)\z/m, styles: theme[:array], index: 2 },
+                                                { pat: /\A(.+ : )(true|false)(\s*)\z/m, styles: theme[:boolean],
+                                                  index: 2 },
                                                 { pat: /\A(.+ : (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
                                                   index: 2 }
                                               ]

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -268,7 +268,7 @@ module Squared
         index = 0
         while @project[name]
           index += 1
-          name = "#{project}-#{index}"
+          name = task_name "#{project}-#{index}"
         end
         proj = ((if !ref.is_a?(Class)
                    Application.find(ref, path: path)
@@ -548,6 +548,14 @@ module Squared
         Rake::Win32.windows?
       end
 
+      def jruby?
+        RUBY_ENGINE == 'jruby'
+      end
+
+      def jruby_win?
+        jruby? && windows?
+      end
+
       def rootpath(*args)
         root.join(*args)
       end
@@ -619,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

@@ -703,7 +703,7 @@ module Squared
 
             t = dedupe.(proj.name)
             j = if out
-                  if i == items.size - 1 || check.(post = items[i + 1..-1]).empty?
+                  if i == items.size - 1 || check.(post = items[(i + 1)..-1]).empty?
                     true
                   elsif !t.empty? && depth > 0
                     post.reject { |pr| t.include?(pr) }.empty?
@@ -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
 
@@ -820,11 +825,11 @@ module Squared
           reg, list = list.partition do |val|
             next unless (n = val.index('='))
 
-            bare << val[0..n - 1] if val.end_with?('?')
+            bare << val[0..(n - 1)] if val.end_with?('?')
             true
           end
           list += bare
-          no = no.map { |val| (n = val.index('=')) ? val[0..n - 1] : val }
+          no = no.map { |val| (n = val.index('=')) ? val[0..(n - 1)] : val }
           found = false
           opts.each do |opt|
             next out << opt if found
@@ -838,7 +843,7 @@ module Squared
               found = true if first && pass.none? { |val| opt.include?(val) }
             end
           end
-          pat = Regexp.new("^(#{reg.map { |val| val[0..val.index('=') - 1] }.join('|')})=(.+)$")
+          pat = Regexp.new("^(#{reg.map { |val| val[0..(val.index('=') - 1)] }.join('|')})=(.+)$")
           [out, pat]
         end
 
@@ -851,7 +856,7 @@ module Squared
         end
 
         def print_item(*val)
-          puts if @@print_order > 0 && verbose && !stdin?
+          puts if @@print_order > 0
           @@print_order += 1
           puts val unless val.empty? || (val.size == 1 && val.first.nil?)
         end
@@ -1077,15 +1082,17 @@ module Squared
         end
 
         def indexitem(val)
-          return unless (data = /\A\^(\d+)(:.+)?\z/.match(val))
-
-          [data[1].to_i, data[2] ? data[2][1..-1] : nil]
+          [$1.to_i, $2 && $2[1..-1]] if val =~ /\A#{Regexp.escape(indexchar)}(\d+)(:.+)?\z/
         end
 
         def indexerror(val, list = nil)
           raise_error("requested index #{val}", hint: list && "of #{list.size}")
         end
 
+        def indexchar
+          workspace.windows? ? '+' : '^'
+        end
+
         def color(val)
           ret = theme[val]
           ret && !ret.empty? ? ret : [val]
@@ -1119,7 +1126,8 @@ module Squared
           pwd = Pathname.pwd
           if block_given?
             begin
-              if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join <= RUBY_VERSION)
+              pass = semscan(pass).join <= RUBY_VERSION if pass.is_a?(String)
+              if (path == pwd || pass == true) && !workspace.jruby_win?
                 ret = instance_eval(&blk)
               else
                 Dir.chdir(path)

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

@@ -460,7 +460,7 @@ module Squared
           source(sync: sync, sub: if verbose
                                     [
                                       { pat: /^(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)$/, styles: :red, index: 4 },
-                                      { pat: /^(.+)(\|\s+\d+\s+)(\++)(-*)(.*)$/, styles: :green, index: 3 }
+                                      { pat: /^(.+)(\|\s+\d+\s+)(\++)(.*)$/, styles: :green, index: 3 }
                                     ]
                                   end, **threadargs)
         end
@@ -732,7 +732,8 @@ module Squared
           origin = nil
           source(git_output('fetch --no-tags --quiet'), io: true, banner: false, stdout: true)
           cmd = git_output("for-each-ref --format=\"#{format}\" refs/heads")
-          source(cmd, io: true, banner: false).first.each do |line|
+          out = source(cmd, io: true, stdout: workspace.windows?, banner: false).first
+          (workspace.windows? ? out.lines : out).each do |line|
             next if (line = line.chomp).empty?
 
             branch, origin, hint = line.split('...')
@@ -746,8 +747,8 @@ module Squared
             break
           end
           i = origin.index('/')
-          branch = "#{branch}:#{origin[i + 1..-1]}" unless origin.end_with?("/#{branch}")
-          origin = origin[0..i - 1]
+          branch = "#{branch}:#{origin[(i + 1)..-1]}" unless origin.end_with?("/#{branch}")
+          origin = origin[0..(i - 1)]
           cmd = git_session('commit', option('dry-run') && '--dry-run', options: false)
           cmd << '--amend' if amend
           if message
@@ -934,9 +935,14 @@ module Squared
                      format_banner((banner.is_a?(String) ? banner : cmd).gsub(File.join(path, ''), ''), banner: true)
                    end
           begin
-            return [stdout ? `#{cmd}` : IO.popen(cmd), banner, from] if io
-
-            if stdin? ? sync : stdout
+            if io
+              ret = if stdout
+                      [`#{cmd}`]
+                    else
+                      [IO.popen(cmd), banner, from]
+                    end
+              return ret
+            elsif stdin? ? sync : stdout
               print_item banner unless multiple
               ret = `#{cmd}`
               if !ret.empty?
@@ -944,7 +950,7 @@ module Squared
               elsif banner && stdout && !stdin?
                 puts 'Success'
               end
-            elsif sync || (!exception && !stderr)
+            elsif !sub && (sync || (!exception && !stderr))
               print_item banner unless multiple
               shell(cmd, exception: exception)
             else
@@ -999,15 +1005,13 @@ module Squared
         end
 
         def list_result(size, type, from: nil, action: 'found', grep: nil)
-          if verbose
-            if size > 0
-              styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
-              styles << :bold if styles.size <= 1
-              puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
-                                sub: { pat: /\A(\d+)(.+)\z/, styles: styles })
-            else
-              puts empty_status("No #{type} were #{action}", 'grep', grep)
-            end
+          if size == 0
+            puts empty_status("No #{type} were #{action}", 'grep', grep)
+          elsif verbose
+            styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
+            styles << :bold if styles.size <= 1
+            puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
+                              sub: { pat: /\A(\d+)(.+)\z/, styles: styles })
           end
           on :last, from if from
         end

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

@@ -72,7 +72,7 @@ module Squared
                 case action
                 when 'add'
                   format_desc action, nil, 'save?=prod|dev|optional|peer,name+'
-                  task action, [:save, :name] do |_, args|
+                  task action, [:save] do |_, args|
                     save = param_guard(action, 'save', args: args, key: :save)
                     if save.start_with?('=')
                       exact = true
@@ -80,7 +80,7 @@ module Squared
                     end
                     case save
                     when 'prod', 'dev', 'optional', 'peer'
-                      name = param_guard(action, 'name', args: args.to_a.drop(1))
+                      name = param_guard(action, 'name', args: args.extras)
                     else
                       save = 'prod'
                       name = param_guard(action, 'name', args: args.to_a)
@@ -90,10 +90,10 @@ module Squared
                 when 'run'
                   next if (list = read_scripts).empty?
 
-                  format_desc action, nil, 'command+|^index|#,pattern*'
+                  format_desc action, nil, "command+|#{indexchar}index|#,pattern*"
                   task action, [:command] do |_, args|
                     if args.command == '#'
-                      format_list(list, 'run[^N]', 'scripts', grep: args.extras, from: dependfile.to_s)
+                      format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile.to_s)
                     else
                       cmd = param_guard(action, 'command', args: args.to_a)
                       cmd.each do |val|
@@ -690,7 +690,7 @@ module Squared
         def read_packagemanager(key = nil, version: nil, update: false)
           if @pm[:_].nil? || update
             doc = JSON.parse(dependfile.read)
-            @pm[:_] = (val = doc['packageManager']) ? val[0..(val.index('+') || 0) - 1] : false
+            @pm[:_] = (val = doc['packageManager']) ? val[0..((val.index('+') || 0) - 1)] : false
             @pm[:name] = doc['name']
             @pm[:scripts] = doc['scripts']
             @pm[:version] = doc['version']
@@ -703,7 +703,7 @@ module Squared
         else
           return @pm[key] if key
 
-          !(ret = @pm[:_]) || (version && ret[ret.index('@') + 1..-1] < version) ? nil : ret
+          !(ret = @pm[:_]) || (version && ret[(ret.index('@') + 1)..-1] < version) ? nil : ret
         end
 
         def read_install

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

@@ -110,11 +110,11 @@ module Squared
                 when 'rake'
                   next unless rakefile
 
-                  format_desc action, nil, 'command*|^index,args*|#,pattern*'
+                  format_desc action, nil, "command*|#{indexchar}index,args*|#,pattern*"
                   task action, [:command] do |_, args|
                     if args.command == '#'
-                      format_list(read_rakefile, 'rake[^N]', 'tasks', grep: args.extras, from: rakefile.to_s,
-                                                                      each: ->(val) { val[0] + val[1].to_s })
+                      format_list(read_rakefile, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile.to_s,
+                                                                                 each: ->(val) { val[0] + val[1].to_s })
                     elsif (data = indexitem(args.command))
                       n, opts = data
                       list = read_rakefile
@@ -470,8 +470,8 @@ module Squared
                     cmd << shell_escape(project)
                     version = name[1..-1]
                   else
-                    cmd << shell_escape(name[0..n - 1])
-                    version = name[n + 1..-1]
+                    cmd << shell_escape(name[0..(n - 1)])
+                    version = name[(n + 1)..-1]
                   end
                   cmd << shell_option('version', version)
                   out.clear

data/lib/squared/workspace/repo.rb

@@ -172,7 +172,7 @@ module Squared
             parse_opts.(args)
             stage = 'init'
             puts if newline
-            system("repo init -u #{manifest_url} -m #{args.manifest || target}.xml", chdir: root)
+            Common::System.shell("repo init -u #{manifest_url} -m #{args.manifest || target}.xml", chdir: root)
             repo['all'].invoke
           end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.13
 platform: ruby
 authors:
 - An Pham
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,7 +106,6 @@ metadata:
   homepage_uri: https://github.com/anpham6/squared
   source_code_uri: https://github.com/anpham6/squared
   documentation_uri: https://squared.readthedocs.io
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []