squared 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de07baaee5e8dab48b40441f8ec83a471e1b54c464fe8d06bb360eeef06c6d0
-  data.tar.gz: 3f2fab32edfcbec1cd13a0f320ce540f174d8da54b89e70c29eff9033c3b8244
+  metadata.gz: 1283f1d3569c68e4f0c547dcdd6e84ebffef516cd7cfbf01914b4ff0615a61f9
+  data.tar.gz: 7c637c6bf63303b7b2e41406b384356a541c5321c3f9f94b1990c5003965cb56
 SHA512:
-  metadata.gz: e9199678633fe880e68d0adc7d9a2bb61cef4b9d7298b395e4d34621669f8db4b74f38321bc644f5113783d4b722a0547228e21d53c36ea22d5f25f34778aff1
-  data.tar.gz: 6c4905fd7a1d74e68951644633c40f78e3acc6dde48ac8ba397c853759101439ef7d43ef5a2e446cc1c99eb73ef237ebd3caf22764b9593331c44b87b764b034
+  metadata.gz: 0aae27adafb209e0f7b15ffd43dda5d13766acb9b7f506352481c740fee584b469574b8772fafa6fd3d55d785f28b8389bac21bfd6fbd6038856b710c1125479
+  data.tar.gz: 0a55a9deb920a0ea929fcbadb4fbac4513b6d784fef3d844ea1de4e0c2e7a33faf9b8d9610692c707d9b8364a91ec436de18ca35defb21ccb10efac57bab40c1

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [0.1.10] - 2025-07-16
+
+### Fixed
+
+- Module namespaces were not combined in the right order.
+- Workspace group tasks were not registered.
+
+## [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.1.8] - 2025-05-15
 
 ### Fixed
@@ -127,6 +150,8 @@
 
 - Changelog was created.
 
+[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

@@ -49,6 +49,7 @@ module Squared
           hash: %i[green black!],
           array: %i[blue black!],
           number: %i[magenta],
+          boolean: %i[magenta],
           undefined: %i[red italic]
         },
         logger: {
@@ -88,13 +89,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
       meth ? obj.map(&meth) : obj
     end

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_d(src, dest, glob: ['**/*'], pass: nil, create: false, verbose: true)
@@ -30,9 +39,9 @@ module Squared
         dest.mkpath if create
         if pass
           exclude = []
-          (pass.is_a?(::Array) ? pass : [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?
 
@@ -52,7 +61,7 @@ module Squared
       def copy_f(src, dest, overwrite: true, verbose: false)
         unless overwrite
           if (path = ::Pathname.new(dest)).directory?
-            src = (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? }
           elsif path.exist?
             return
           end

data/lib/squared/config.rb

@@ -210,6 +210,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.1.8'
+  VERSION = '0.1.10'
 end

data/lib/squared/workspace/application.rb

@@ -259,7 +259,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)
@@ -393,20 +393,19 @@ module Squared
       end
 
       def script_get(*args, group: nil, ref: nil)
-        if group
-          @script[: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 = @script[:ref][key])
+        if group && (ret = @script[:group][group.to_sym])
+          ret
+        elsif ref
+          if ref.is_a?(Enumerable)
+            ref.each do |key|
+              next unless (ret = @script[: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
+            @script[:ref][ref]
           end
-          nil
-        elsif ref
-          @script[:ref][ref]
         end
       end
 
@@ -454,6 +453,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

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

@@ -608,7 +608,7 @@ module Squared
             s = proj.name
             t = dedupe.(s)
             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?
@@ -705,7 +705,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
@@ -905,15 +905,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]
@@ -922,7 +924,8 @@ module Squared
         def pwd_set(done = nil, pass: false, &blk)
           pwd = Pathname.pwd
           if block_given?
-            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

@@ -112,9 +112,9 @@ module Squared
                       end
                     when :merged
                       desc format_desc(action, flag, 'commit,pattern*')
-                      task flag, [:commit, :pattern] do |_, args|
+                      task flag, [:commit] do |_, args|
                         commit = guard_params(action, flag, args: args, key: :commit)
-                        tag(flag, args.to_a.drop(1), commit: commit)
+                        tag(flag, args.extras, commit: commit)
                       end
                     when :delete
                       desc format_desc(action, flag, 'name+')
@@ -168,7 +168,7 @@ module Squared
                       desc format_desc(action, flag, 'name,pathspec*')
                       task flag, [:name] do |_, args|
                         branch = guard_params(action, flag, args: args, key: :name)
-                        diff(flag, args.to_a.drop(1), branch: branch)
+                        diff(flag, args.extras, branch: branch)
                       end
                     when :files
                       desc format_desc(action, flag, 'path1,path2')
@@ -217,8 +217,8 @@ module Squared
                   when :reset
                     if flag == :head
                       desc format_desc(action, flag, 'ref,pathspec+')
-                      task flag, [:ref, :pathspec] do |_, args|
-                        files = guard_params(action, flag, args: args.to_a.drop(1))
+                      task flag, [:ref] do |_, args|
+                        files = guard_params(action, flag, args: args.extras)
                         reset(flag, files, ref: args.ref)
                       end
                     else
@@ -235,8 +235,8 @@ module Squared
                       end
                     else
                       desc format_desc(action, flag, 'format,object*')
-                      task flag, [:format, :object] do |_, args|
-                        show(args.to_a.drop(1), "#{flag}": args.format)
+                      task flag, [:format] do |_, args|
+                        show(args.extras, "#{flag}": args.format)
                       end
                     end
                   end
@@ -262,7 +262,7 @@ module Squared
           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
           source(sync: sync, sub: sub, **threadargs)
@@ -470,7 +470,9 @@ module Squared
           branch = nil
           origin = nil
           source('git fetch --no-tags --quiet', io: true, banner: false, stdout: true)
-          source("git for-each-ref --format=\"#{format}\" refs/heads", io: true, banner: false).first.each do |line|
+          out = source("git for-each-ref --format=\"#{format}\" refs/heads",
+                       io: true, banner: false, stdout: workspace.windows?).first
+          (workspace.windows? ? out.lines : out).each do |line|
             next if (line = line.chomp).empty?
 
             branch, origin, hint = line.split('...')
@@ -484,8 +486,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'
           cmd << '--dry-run' if option('dry-run')
           cmd << '--amend' if amend
@@ -541,9 +543,9 @@ module Squared
           banner = format_banner(cmd.gsub(File.join(path, ''), ''), banner: banner)
           cmd = cmd.sub(/\Agit\b/, "git --work-tree=#{shell_quote(path)} --git-dir=#{shell_quote(gitpath)}")
           begin
-            if io
-              [stdout ? `#{cmd}` : IO.popen(cmd), banner]
-            elsif stdin? ? sync : stdout
+            return [stdout ? `#{cmd}` : IO.popen(cmd), banner] if io
+
+            if stdin? ? sync : stdout
               print_item banner
               ret = `#{cmd}`
               if !ret.empty?
@@ -551,7 +553,7 @@ module Squared
               elsif banner && stdout && !stdin?
                 puts 'Success'
               end
-            elsif sync || (!exception && !stderr)
+            elsif !sub && (sync || (!exception && !stderr))
               print_item banner
               shell(cmd, exception: exception)
             else
@@ -603,15 +605,13 @@ module Squared
         end
 
         def list_result(size, type, action: 'found', grep: nil)
-          return unless verbose
-
-          if size > 0
+          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(/s\z/, '') : type}",
                               sub: { pat: /\A(\d+)(.+)\z/, styles: styles })
-          else
-            puts empty_status("No #{type} were #{action}", 'grep', grep)
           end
         end
 

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

@@ -68,10 +68,11 @@ module Squared
               if flags.nil?
                 case action
                 when :run
-                  desc format_desc(action, nil, 'command+|^index|#,pattern*')
+                  desc format_desc(action, nil, "command+|#{indexchar}index|#,pattern*")
                   task action, [:command] do |_, args|
                     if args.command == '#'
-                      format_list(read_scripts, 'run[^N]', 'scripts', grep: args.extras, from: dependfile.to_s)
+                      format_list(read_scripts, "run[#{indexchar}N]", 'scripts', grep: args.extras,
+                                                                                 from: dependfile.to_s)
                     else
                       cmd = guard_params(action, 'command', args: args.to_a)
                       cmd.each do |val|
@@ -618,7 +619,7 @@ module Squared
         def read_packagemanager(version: nil)
           if @pm[:_].nil?
             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']
@@ -629,7 +630,7 @@ module Squared
           @pm[:_] = false
           nil
         else
-          !(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/python.rb

@@ -78,9 +78,9 @@ module Squared
                     list += OPT_GENERAL
                     desc format_desc(action, flag, list, req: req)
                     if flag == :target
-                      task flag, [:dir, :opts] do |_, args|
+                      task flag, [:dir] do |_, args|
                         dir = guard_params(action, flag, args: args, key: :dir)
-                        depend(flag, dir: dir, opts: args.to_a.drop(1))
+                        depend(flag, dir: dir, opts: args.extras)
                       end
                     else
                       task flag do |_, args|

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

@@ -90,11 +90,11 @@ module Squared
                 when :rake
                   next unless rakefile
 
-                  desc format_desc(action, nil, 'command*|^index,args*|#,pattern*')
+                  desc 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

data/lib/squared/workspace/repo.rb

@@ -183,7 +183,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.1.8
+  version: 0.1.10
 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: []