squared 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aeb7a32f99a22618e2c6c497d6de2f911df5d126232c63ed986324fc5b31aa7
-  data.tar.gz: fb144ac3238fcaf22f1c8bf4218847f547db9d03904a45ef8f040501df1ecc9b
+  metadata.gz: 54118de98db0adf55417ad35cbc3c118bba709c8bbb98b9d74acccaf7a30621e
+  data.tar.gz: 13f6ac344ecdc68f724c10a967f0eba1de6cd0332157abe0c9079db9dba1b9d0
 SHA512:
-  metadata.gz: 6c026101681bf8869138b6882044b60dd3b515d2f61feee9529c4ed70f048c1ceca39538ebe4ac3985c974aeff36b22506d4f5429f9b6eb7ac7d5400a14e737b
-  data.tar.gz: c53bc01a5dbdb5653d67eab02b3bd93229b8cda4fef6d97da16826d70069ab03c085086c49a045281e2da732957a1e920595abd52374bbf76c898f7e63dfe39b
+  metadata.gz: cfbfbd1b2a5fcd376fceafe53fa77789726704d6cdf7f3d919c6381e04f89e2fc3888adfb38e819bbeba7bb51cd7f7f0c08e4fe797d16ee688752dddb9ad6b68
+  data.tar.gz: 4ffd9c7e92c7d357c6e877fa78ca850b202585721001a2c58dbc5851eac292abad59ab67f12fc8eab5ef7706bf3cd1d8db7aaf4ee9b169f0cebf38dfe1016b99

data/CHANGELOG.md

@@ -1,5 +1,76 @@
 # Changelog
 
+## [0.5.3] - 2025-07-27
+
+### Fixed
+
+- See `0.4.16`.
+
+## [0.4.16] - 2025-07-27
+
+### Added
+
+- Git command blame was implemented.
+- Project property only for task filtering was implemented.
+- Node command copy uses NPM pack to refresh development packages.
+- Docker command bake action check was implemented.
+- Ruby uses gem specification for name and version.
+- Ruby constructor parameter gemspec was implemented.
+
+### Changed
+
+- Project boolean property readers were converted into accessors.
+- Workspace hash singleton methods were relocated under Support.
+- Project property version uses setter method for validation.
+- Node command publish will prompt when tag is not semantic.
+- Gem command push without args uses gemspec to locate archive.
+- Prompts will exit process without raising a generic error.
+
+### Fixed
+
+- Gem command exec did not separate command and arguments.
+- Project warning messages were not displayed for errors.
+- Python command outdated did not load virtual env in Windows.
+- Python virtual env original options are not modified.
+- Node could not compare semantic versions above double digits.
+
+## [0.5.2] - 2025-07-16
+
+### Changed
+
+- Common method choice can accept dashed ranges for selection lists.
+
+## [0.4.15] - 2025-07-16
+
+### Added
+
+- Python command outdated option user was implemented.
+- Git command commit action amend and amend-orig are interactive.
+
+### Changed
+
+- Ruby task copy does not guess Gem directory when version is used.
+- Workspace hash-based data uses global method for key creation.
+
+## [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.5.1] - 2025-07-05
 
 ### Changed
@@ -837,8 +908,12 @@
 
 - Changelog was created.
 
+[0.5.3]: https://github.com/anpham6/squared/releases/tag/v0.5.3-ruby
+[0.5.2]: https://github.com/anpham6/squared/releases/tag/v0.5.2-ruby
 [0.5.1]: https://github.com/anpham6/squared/releases/tag/v0.5.1-ruby
 [0.5.0]: https://github.com/anpham6/squared/releases/tag/v0.5.0-ruby
+[0.4.16]: https://github.com/anpham6/squared/releases/tag/v0.4.16-ruby
+[0.4.15]: https://github.com/anpham6/squared/releases/tag/v0.4.15-ruby
 [0.4.14]: https://github.com/anpham6/squared/releases/tag/v0.4.14-ruby
 [0.4.13]: https://github.com/anpham6/squared/releases/tag/v0.4.13-ruby
 [0.4.12]: https://github.com/anpham6/squared/releases/tag/v0.4.12-ruby
@@ -854,6 +929,7 @@
 [0.4.2]: https://github.com/anpham6/squared/releases/tag/v0.4.2-ruby
 [0.4.1]: https://github.com/anpham6/squared/releases/tag/v0.4.1-ruby
 [0.4.0]: https://github.com/anpham6/squared/releases/tag/v0.4.0-ruby
+[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
@@ -867,6 +943,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
@@ -880,6 +957,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/README.ruby.md

@@ -66,6 +66,7 @@ require "squared/app"                                # All workspace related mod
 # log       = /workspaces/logger
 # emc       = /workspaces/e-mc
 # pir       = /workspaces/pi-r
+# pir2      = /workspaces/pi-r2
 # squared   = /workspaces/squared
 # cli       = /workspaces/squared/publish/sqd-cli
 # sqd-serve = /workspaces/squared/publish/sqd-serve
@@ -83,10 +84,11 @@ Workspace::Application
   .add("pathname", run: "rake compile", copy: "rake install", test: "rake test", group: "default", env: { # Ruby (with C extensions)
     "CFLAGS" => "-fPIC -O1"
   })
-  .add("optparse", doc: "rake rdoc", group: "default") # Uses bundler/gem_tasks (without C extensions)
+  .add("optparse", doc: "rake rdoc", gemspec: "optparse.gemspec", group: "default") # Uses bundler/gem_tasks (without C extensions)
   .add("logger", copy: { from: "lib", glob: "**/*.rb", into: "~/.rvm/gems/ruby-3.4.0/gems/logger-1.6.1" }, clean: ["tmp/"]) # autodetect: true | "rvm" | "rbenv" | "asdf" | "bundler"
   .add("e-mc", "emc", copy: { from: "publish", scope: "@e-mc", also: [:pir, "squared-express/"] }, ref: :node) # Node
   .add("pi-r", "pir", copy: { from: "publish", scope: "@pi-r" }, clean: ["publish/**/*.js", "tmp/"]) # Trailing slash required for directories
+  .add("pi-r2", "pir2", copy: { from: :npm, also: %i[squared express], files: ["LICENSE", ["README.md.ruby", "README.md"]] }) # Uses dist files from NPM package spec
   .add("squared", script: ["build:stage1", "build:stage2"], group: "app") do # Copy target (main)
     # Repo (global)
     as(:run, "build:dev", "dev")                                             # npm run build:dev -> npm run dev
@@ -108,7 +110,7 @@ Workspace::Application
     variable_set :depend, false
     variable_set :clean, ["build/sqd/"]
   end
-  .with(:docker, pass: ["unpack"]) do
+  .with(:docker, only: ["build", "compose"]) do
     .add("squared", "docker", file: "Dockerfile", context: ".", tag: "latest", registry: "localhost:5000", username: "squared",
                               args: "--ssh=default",
                               secrets: ["id=github,env=GITHUB_TOKEN"],

data/lib/squared/common/format.rb

@@ -124,7 +124,7 @@ module Squared
       def check_style(args, empty: true)
         ret = []
         colors = __get__(:colors)
-        as_a(args, flat: true, compact: true).each do |val|
+        Array(args).flatten.compact.each do |val|
           if !val.is_a?(::Numeric)
             val = val.to_sym
             ret << val if colors.key?(val) || TEXT_STYLE.include?(val)
@@ -135,7 +135,9 @@ module Squared
             ret << "-0.#{b}".to_f unless b.to_i > 255
           end
         end
-        ret if empty || !ret.empty?
+        return if ret.empty? && !empty
+
+        ret
       end
 
       def apply_style(data, key, args, empty: true)
@@ -222,7 +224,7 @@ module Squared
         n = 0
         max = ->(v) { n = [n, v.max_by(&:size).size].max }
         set = lambda do |v|
-          ret = as_a(v, :to_s)
+          ret = Array(v).map(&:to_s)
           max.call(ret)
           ret
         end
@@ -246,7 +248,7 @@ module Squared
           ret = sub_style(ret, styles: border) if border
           ret
         end
-        sub = as_a sub
+        sub = sub.is_a?(::Hash) ? [sub] : Array(sub)
         pr = lambda do |line|
           s = line.ljust(n)
           sub.each { |h| s = sub_style(s, **h) }

data/lib/squared/common/prompt.rb

@@ -60,27 +60,39 @@ module Squared
                                       end}] "
           end
         end
-        valid = ->(s) { s.match?(/^-?\d+$/) && s.to_i.between?(min, max) }
+        valid = ->(s) { s.match?(/^\d+$/) && s.to_i.between?(min, max) }
         Timeout.timeout(timeout) do
           while (ch = Readline.readline(msg))
             unless (ch = ch.strip).empty?
               if multiple
                 a = ch.split(/\s*,\s*/)
-                b = a.select { |s| valid.call(s) }.map!(&:to_i).sort
-                next unless a.size == b.size
-                return b unless items
-                next if multiple.is_a?(::Numeric) && multiple != b.size
+                b = a.map do |s|
+                  if s =~ /^(\d+)-(\d+)$/
+                    next unless valid.call($1) && valid.call($2)
 
-                return b.map! { |i| items[i - 1] }
+                    c = $1.to_i
+                    d = $2.to_i
+                    next (c..d).to_a if c < d
+                  elsif valid.call(s)
+                    s.to_i
+                  end
+                end
+                unless b.include?(nil)
+                  b.flatten!
+                  b.uniq!
+                  b.sort!
+                  return b unless items
+                  return b.map! { |i| items[i - 1] } unless multiple.is_a?(::Numeric) && multiple != b.size
+                end
               elsif valid.call(ch)
                 return items ? items[ch.to_i - 1] : ch.to_i
               end
             end
             attempts -= 1
             next if attempts > 0
-            break unless force
 
-            exit 1
+            exit 1 if force
+            break
           end
         rescue Interrupt
           puts
@@ -113,7 +125,7 @@ module Squared
                                end
           ret = (prompt.call || '').strip
           multiline.each { |val| break if ret.delete_suffix!(val) } if multiline.is_a?(::Enumerable)
-          raise_error 'user cancelled' if force && ret.empty?
+          exit 1 if force && ret.empty?
           ret
         else
           prompt.call

data/lib/squared/common/shell.rb

@@ -86,8 +86,7 @@ module Squared
       end
 
       def shell_split(val, join: nil, **kwargs)
-        ret = val.shellsplit
-        ret.map! { |opt| shell_escape(opt, double: true, option: true, **kwargs) }
+        ret = val.shellsplit.map! { |opt| shell_escape(opt, double: true, option: true, **kwargs) }
         return ret unless join
 
         ret.join(join.is_a?(::String) ? join : ' ')

data/lib/squared/common/utils.rb

@@ -93,6 +93,15 @@ module Squared
         Time.now.utc.strftime(s).to_i - Time.parse(val).utc.strftime(s).to_i
       end
 
+      def rand_s(size)
+        if RUBY_VERSION >= '3.1'
+          require 'random/formatter'
+          Random.new.alphanumeric(size)
+        else
+          (0...size).map { rand(97..122).chr }.join
+        end
+      end
+
       def env(key, default = nil, suffix: nil, strict: false, equals: nil, ignore: nil)
         ret = env_value(key, suffix: suffix, strict: strict)
         return ret == equals.to_s unless equals.nil?

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -92,7 +92,7 @@ module Squared
         @prefix = prefix
         @series = Application.series_wrap(self)
         @project = {}
-        @kind = {}
+        @kind = Support.hashlist
         @extensions = []
         @envname = env_key(@main).freeze
         @pipe = env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
@@ -106,20 +106,20 @@ module Squared
         else
           @theme = {}
         end
-        @chain = {}
+        @chain = Support.hashlist
         @script = {
-          group: {},
-          ref: {},
+          group: Support.hashobj,
+          ref: Support.hashobj,
           group!: {},
           ref!: {}
         }.freeze
         @events = {
-          group: {},
-          ref: {}
+          group: Support.hashobj,
+          ref: Support.hashobj
         }.freeze
         @pass = {
-          group: {},
-          ref: {},
+          group: Support.hashobj,
+          ref: Support.hashobj,
           global: {},
           pattern: []
         }.freeze
@@ -225,7 +225,7 @@ module Squared
           end
         end
         data = Struct::ChainData.new(action, step, ns.call(with), ns.call(before), ns.call(after), sync)
-        (@chain[task_name(task.to_s)] ||= []) << data
+        @chain[task_name(task.to_s)] << data
         self
       end
 
@@ -267,9 +267,9 @@ module Squared
 
       def pass(name, group: @group, ref: @ref, &blk)
         data = if group
-                 @pass[:group][group] ||= {}
+                 @pass[:group][group]
                elsif ref
-                 @pass[:ref][ref] ||= {}
+                 @pass[:ref][ref]
                else
                  @pass[:global]
                end
@@ -625,12 +625,16 @@ module Squared
         Rake::Win32.windows?
       end
 
+      def mri?
+        RUBY_ENGINE == 'ruby'
+      end
+
       def jruby?
         RUBY_ENGINE == 'jruby'
       end
 
-      def jruby_win?
-        jruby? && windows?
+      def truffleruby?
+        RUBY_ENGINE == 'truffleruby'
       end
 
       def docker?
@@ -821,8 +825,8 @@ module Squared
           items = as_a(ref, :to_sym)
         end
         items.each do |name|
-          (@script[label][name] ||= {})[task] = val
-          (@events[label][name] ||= {})[task] = on if on.is_a?(Hash)
+          @script[label][name][task] = val
+          @events[label][name][task] = on if on.is_a?(Hash)
         end
         self
       end
@@ -839,15 +843,17 @@ module Squared
       end
 
       def data_get(*args, group: nil, ref: nil, target: nil)
-        target[:group][group.to_sym] if group
-        if ref.is_a?(Enumerable)
+        if group && target[:group].key?(key = group.to_sym)
+          target[:group][key]
+        elsif ref.is_a?(Enumerable)
           ref.each do |key|
-            next unless (ret = target[:ref][key])
+            next unless target[:ref].key?(key)
 
+            ret = target[:ref][key]
             return ret if args.empty? || args.any? { |val| ret.key?(val) }
           end
           nil
-        elsif ref
+        elsif ref && target[:ref].key?(ref)
           target[:ref][ref]
         end
       end