squared 0.4.14 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fafee0b2a60973f9363c71173b9de4ed4779090e2ef3c2331d3ecd9f3a2a9398
-  data.tar.gz: 8eb5bfef9ec19b7985866ffd1f0b55a849ff7d27a895b76d29a1cd85553e717a
+  metadata.gz: 3aeb7a32f99a22618e2c6c497d6de2f911df5d126232c63ed986324fc5b31aa7
+  data.tar.gz: fb144ac3238fcaf22f1c8bf4218847f547db9d03904a45ef8f040501df1ecc9b
 SHA512:
-  metadata.gz: 464952bd65f6c404a89ef8624549e04a7a4ec0cc2c0b211e73d0464cf1bcd8094f760449ab7e0e944fd390cf01029f14ef2b6a082ae67d1ad071d243821ee527
-  data.tar.gz: d36b6c580ccabb5bde29585cdb4642c7a81dadfff59b5766fa76efece506983ed0335551fdd31a41eced8c6631967573a6ad4a19f22b912e61a93f6f10e334ec
+  metadata.gz: 6c026101681bf8869138b6882044b60dd3b515d2f61feee9529c4ed70f048c1ceca39538ebe4ac3985c974aeff36b22506d4f5429f9b6eb7ac7d5400a14e737b
+  data.tar.gz: c53bc01a5dbdb5653d67eab02b3bd93229b8cda4fef6d97da16826d70069ab03c085086c49a045281e2da732957a1e920595abd52374bbf76c898f7e63dfe39b

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.5.1] - 2025-07-05
+
+### Changed
+
+- Common method confirm will automatically append hint with defaults.
+
+### Fixed
+
+- Gem command push did not prompt for gem to publish.
+
 ## [0.4.14] - 2025-07-05
 
 ### Added
@@ -62,6 +72,31 @@
 - Common method is used for Kernel shell commands.
 - Git did not highlight output for single commands.
 
+## [0.5.0] - 2025-06-16
+
+### Added
+
+- Node command exec through NVM was implemented.
+- Git command options were updated to version 2.49.
+
+### Changed
+
+- Gem specification required Ruby version set to 2.5.
+- Docker build options from ENV do not require dashes.
+- Unused task descriptions are not generated.
+- Class object shapes were declared in initialize.
+- Project outdated interactive uses a more compact prompt.
+- Workspace banner configuration uses a struct.
+
+### Removed
+
+- Git commit hash identifier uses only a colon for a prefix.
+- Common module for classes was delegated to support namespaces.
+
+### Fixed
+
+- Project private variables external modification was revised.
+
 ## [0.4.13] - 2025-06-16
 
 ### Added
@@ -802,6 +837,8 @@
 
 - Changelog was created.
 
+[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.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

data/README.md

@@ -140,13 +140,13 @@ rake clone               # node + docs
 # PIPE_FAIL={0,1}
 # PORT=3000
 docker build -t squared --build-arg MANIFEST=prod --build-arg NODE_ENV=production .
-docker build -t node --build-arg NODE_TAG=22 --build-arg NODE_INSTALL=pnpm -f slim.Dockerfile .
+docker build -t node --build-arg NODE_TAG=22 --build-arg NODE_INSTALL=pnpm -f Dockerfile.slim .
 NODE=22 docker buildx bake node
 # OR
-docker build -t ruby --build-arg RUBY_TAG=3.4.0 --build-arg NODE_VERSION=22 --build-arg PIPE_FAIL=0 -f ruby.Dockerfile .
+docker build -t ruby --build-arg RUBY_TAG=3.4.0 --build-arg NODE_VERSION=22 --build-arg PIPE_FAIL=0 -f Dockerfile.ruby .
 RUBY=3.4.0 docker buildx bake ruby
 # OR
-docker build -t nginx --build-arg NGINX_VERSION=1.27 --build-arg PORT=3000 --build-arg NODE_VERSION=20 -f nginx.Dockerfile .
+docker build -t nginx --build-arg NGINX_VERSION=1.27 --build-arg PORT=3000 --build-arg NODE_VERSION=20 -f Dockerfile.nginx .
 NGINX=1.27 docker buildx bake nginx
 
 # Express
@@ -1359,4 +1359,4 @@ NOTE: Defining an element "**id**" will prevent it from being removed during the
 
 ## LICENSE
 
-BSD 3-Clause
+BSD 3-Clause

data/README.ruby.md

@@ -1,16 +1,17 @@
-# squared 0.4
+# squared 0.5
 
 * [source](https://github.com/anpham6/squared)
 * [docs](https://squared.readthedocs.io)
 
 ## Version Compatibility
 
-| Date       | squared |    Min |    Max |    Git |
-| :--------: | ------: | -----: | -----: | -----: |
-| 2024-12-07 |   0.1.0 |  2.4.0 |  3.3.6 |   2.39 |
-| 2025-01-07 |   0.2.0 |  2.4.0 |  3.4.0 |   2.39 |
-| 2025-02-07 |   0.3.0 |  2.4.0 |  3.4.1 |   2.39 |
-| 2025-03-06 |   0.4.0 |  2.4.0 |  3.4.2 |   2.39 |
+| Date       | squared |    Min |    Max |
+| :--------: | ------: | -----: | -----: |
+| 2024-12-07 |   0.1.0 |  2.4.0 |  3.3.6 |
+| 2025-01-07 |   0.2.0 |        |  3.4.0 |
+| 2025-02-07 |   0.3.0 |        |  3.4.1 |
+| 2025-03-06 |   0.4.0 |        |  3.4.2 |
+| 2025-06-16 |   0.5.0 |  2.5.0 |  3.4.3 |
 
 The range chart indicates the latest Ruby tested against at the time of release.
 
@@ -263,7 +264,7 @@ Workspace::Application
     add("squared") do
       revbuild(include: %w[src/ framework/ types/])                        # Git revision build command (optional)
       chain "all", "revbuild", after: "express:build"                      # step: 4
-      chain "publish", "bump:patch", "publish:latest", step: 0, sync: true # rake publish -> squared:bump:patch -> squared:publish:latest
+      chain "publish", "bump:patch", "publish:latest", step: 0, sync: true # rake publish
     end
   end
   .with(:python) do
@@ -275,12 +276,12 @@ Workspace::Application
       chain "all", "doc", with: "squared", before: "squared:revbuild"      # Same
     end
   end
-  .chain "all", "status", with: "squared", after: "android-docs"           # Global tasks (e.g. without ":")
+  .chain("all", "status", with: "squared", after: "android-docs")          # Global tasks (e.g. without ":")
   .build
 ```
 
 ```sh
-rake all                                                                   # all[1-3-4]
+rake all                # all[1-3-4]
 rake all:print
 ```
 
@@ -537,7 +538,6 @@ Commands which use commit hashes are parsed using a ":" prefix as to not be conf
 
 ```sh
 rake squared:log:view[:af012345]                   # git log af012345
-rake squared:log:view[#{af012345}]                 # deprecated
 rake squared:log:view[H1,HEAD^5,all,lib,./H12345]  # git log --all @~1 @^5 -- 'lib' 'H12345'
 ```
 
@@ -683,6 +683,9 @@ DOCKER_TAG=latest                        # all
 DOCKER_TAG_${NAME}=v0.1.0                # project only (override)
 DOCKER_ALL=1                             # list every image/container
 DOCKER_Y=1                               # confirm all
+
+BUILD_SQUARED_OPTS="NODE_TAG=24 RUBY_VERSION=3.4.0" DOCKER_SQUARED_OPTS="--no-cache --label=v1" rake squared:build
+docker build --no-cache --label=v1 --build-arg='NODE_TAG=24' --build-arg='RUBY_VERSION=3.4.0' .
 ```
 
 | Command    | Flag              |  ENV                                            |

data/lib/squared/common/base.rb

@@ -100,7 +100,7 @@ module Squared
 
     module_function
 
-    def as_a(obj, meth = nil, flat: nil, compact: false, &blk)
+    def as_a(obj, *meth, flat: nil, compact: false, &blk)
       return [] if obj.nil?
 
       unless obj.is_a?(::Array)
@@ -114,8 +114,10 @@ module Squared
       end
       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
+      obj = obj.map(&meth.shift) until meth.empty?
+      return obj unless block_given?
+
+      obj.select(&blk)
     end
   end
 end

data/lib/squared/common/format.rb

@@ -41,7 +41,7 @@ module Squared
 
       def enable_aixterm
         unless (colors = __get__(:colors)).frozen?
-          colors.merge!(AIX_TERM)
+          colors.update(AIX_TERM)
         end
         self
       end

data/lib/squared/common/prompt.rb

@@ -8,27 +8,33 @@ module Squared
       def confirm(msg, default = nil, agree: 'Y', cancel: 'N', attempts: 5, timeout: 30)
         require 'readline'
         require 'timeout'
+        if agree == 'Y' && cancel == 'N' && !msg.match?(%r{\[(?:Yn|nY|Y/n|y/N)\]})
+          case default
+          when 'Y'
+            msg = "#{msg} [Y/n] "
+          when 'N'
+            msg = "#{msg} [y/N] "
+          end
+        end
         agree = /^#{Regexp.escape(agree)}$/i if agree.is_a?(::String)
         cancel = /^#{Regexp.escape(cancel)}$/i if cancel.is_a?(::String)
         Timeout.timeout(timeout) do
-          begin
-            while (ch = Readline.readline(msg))
-              ch = ch.chomp
-              case (ch.empty? ? default : ch)
-              when agree
-                return true
-              when cancel
-                return false
-              end
-              attempts -= 1
-              exit 1 unless attempts > 0
+          while (ch = Readline.readline(msg))
+            ch = ch.chomp
+            case (ch.empty? ? default : ch)
+            when agree
+              return true
+            when cancel
+              return false
             end
-          rescue Interrupt
-            puts
-            exit 0
-          else
-            false
+            attempts -= 1
+            exit 1 unless attempts > 0
           end
+        rescue Interrupt
+          puts
+          exit 0
+        else
+          false
         end
       end
 
@@ -43,7 +49,7 @@ module Squared
             next if grep&.none? { |pat| pat.match?(line) }
 
             items << val.chomp
-            puts "#{items.size.to_s.rjust(2)}. #{val}"
+            puts '%2d. %s' % [items.size, val]
           end
           max = items.size
           raise_error 'empty selection list' if max == 0
@@ -56,33 +62,31 @@ module Squared
         end
         valid = ->(s) { s.match?(/^-?\d+$/) && s.to_i.between?(min, max) }
         Timeout.timeout(timeout) do
-          begin
-            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
+          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
 
-                  return b.map! { |i| items[i - 1] }
-                elsif valid.call(ch)
-                  return items ? items[ch.to_i - 1] : ch.to_i
-                end
+                return b.map! { |i| items[i - 1] }
+              elsif valid.call(ch)
+                return items ? items[ch.to_i - 1] : ch.to_i
               end
-              attempts -= 1
-              next if attempts > 0
-              break unless force
-
-              exit 1
             end
-          rescue Interrupt
-            puts
-            exit 0
-          else
-            multiple ? [] : nil
+            attempts -= 1
+            next if attempts > 0
+            break unless force
+
+            exit 1
           end
+        rescue Interrupt
+          puts
+          exit 0
+        else
+          multiple ? [] : nil
         end
       end
 

data/lib/squared/common/shell.rb

@@ -85,26 +85,31 @@ module Squared
                       end}"
       end
 
-      def shell_split(val, quote: false, force: false, join: nil)
+      def shell_split(val, join: nil, **kwargs)
         ret = val.shellsplit
-        ret.map! { |opt| shell_escape(opt, quote: quote, force: force, double: true, option: true) }
+        ret.map! { |opt| shell_escape(opt, double: true, option: true, **kwargs) }
         return ret unless join
 
         ret.join(join.is_a?(::String) ? join : ' ')
       end
 
-      def fill_option(val, double: false)
+      def line_width(lines)
+        ret = [lines.max_by(&:size).size, 80].max
+        [ret, Rake.application.terminal_width].min
+      end
+
+      def fill_option(val, **kwargs)
         return "-#{val}" if val.match?(/\A(?:[a-z]\d*|\d)\z/i)
 
-        shell_escape(val.start_with?('-') ? val : "--#{val}", double: double)
+        shell_escape(val.start_with?('-') ? val : "--#{val}", **kwargs)
       end
 
-      def quote_option(flag, val, option: true, double: false, merge: false)
-        shell_option(flag, val, escape: false, option: option, double: double, merge: merge)
+      def quote_option(flag, val, **kwargs)
+        shell_option(flag, val, escape: false, **kwargs)
       end
 
-      def basic_option(flag, val, merge: false)
-        shell_option(flag, val, escape: false, force: false, merge: merge)
+      def basic_option(flag, val, **kwargs)
+        shell_option(flag, val, escape: false, force: false, **kwargs)
       end
     end
   end

data/lib/squared/common/system.rb

@@ -29,27 +29,29 @@ module Squared
         raise $?.to_s
       end
 
-      def copy_dir(src, dest, glob = ['**/*'], create: false, link: nil, force: false, pass: nil, verbose: true)
-        src = Pathname.new(src)
-        dest = Pathname.new(dest)
-        raise "#{dest.cleanpath} (not found)" if !create && !dest.parent.exist?
+      def copy_dir(src, dest, glob = ['**/*'], create: false, link: nil, force: false, pass: nil, hidden: false,
+                   verbose: true)
+        base = Pathname.new(src)
+        target = Pathname.new(dest)
+        raise "#{target.cleanpath} (not found)" if !create && !target.parent.exist?
 
         subdir = {}
-        dest.mkpath if create
+        target.mkpath if create
+        flags = hidden ? [File::FNM_DOTMATCH] : []
         if pass
           exclude = []
-          Array(pass).each { |val| exclude.concat(Dir.glob(src + val)) }
+          Array(pass).each { |val| exclude.concat(Dir.glob(val, *flags, base: base)) }
         end
         Array(glob).each do |val|
-          Dir.glob(src + val) do |path|
-            next if exclude&.include?(path) || (path = Pathname.new(path)).directory?
+          Dir.glob(val, *flags, base: base) do |file|
+            next if exclude&.include?(file) || (entry = base + file).directory?
 
-            dir = dest.join(path.relative_path_from(src)).dirname
+            dir = target.join(file).dirname
             if (data = subdir[dir.to_s])
-              data << path
+              data << entry
             else
               dir.mkpath
-              subdir[dir.to_s] = [path]
+              subdir[dir.to_s] = [entry]
             end
           end
         end
@@ -57,23 +59,24 @@ module Squared
         soft = 0
         subdir.each do |dir, files|
           if link
-            items = files.dup
-            files.clear
-            items.each do |file|
-              if file.exist?
-                if file.symlink?
-                  next unless force
+            files.dup.yield_self do |items|
+              files.clear
+              items.each do |file|
+                if file.exist?
+                  if file.symlink?
+                    next unless force
+                  else
+                    files << file
+                    next
+                  end
+                end
+                if link == 'hard'
+                  FileUtils.ln(file, dir, force: force, verbose: false)
                 else
-                  files << file
-                  next
+                  FileUtils.ln_s(file, dir, force: force, verbose: false)
                 end
+                soft += 1
               end
-              if link == 'hard'
-                FileUtils.ln(file, dir, force: force, verbose: false)
-              else
-                FileUtils.ln_s(file, dir, force: force, verbose: false)
-              end
-              soft += 1
             end
           end
           next if files.empty?
@@ -81,15 +84,16 @@ module Squared
           out = FileUtils.cp(files, dir, verbose: false)
           count += out.size
         end
-        puts [dest.realpath, subdir.size, soft > 0 ? "#{count}+#{soft}" : count].join(' => ') if verbose
+        puts [target.realpath, subdir.size, soft > 0 ? "#{count}+#{soft}" : count].join(' => ') if verbose
       end
 
       def copy_guard(src, dest, link: nil, force: false, verbose: true)
         unless force
-          if (path = Pathname.new(dest)).directory?
-            src = Array(src).reject { |val| path.join(File.basename(val)).exist? }
+          target = Pathname.new(dest)
+          if target.directory?
+            src = Array(src).reject { |val| target.join(File.basename(val)).exist? }
             return if src.empty?
-          elsif path.exist?
+          elsif target.exist?
             return
           end
         end

data/lib/squared/common/utils.rb

@@ -88,18 +88,6 @@ module Squared
         end
       end
 
-      def time_offset(val = nil)
-        val = DateTime.parse(val) if val.is_a?(::String)
-        cur = DateTime.now
-        ret = 0
-        if (r = /^([+-])(\d+):(\d+):(\d+)$/.match((val || cur).strftime('%::z')))
-          ret += (r[1] == '+' ? -1 : 1) * ((r[2].to_i * 60 * 60) + (r[3].to_i * 60) + r[4].to_i) * 1000
-        end
-        return ret unless val
-
-        (cur.strftime('%Q').to_i + time_offset) - (val.strftime('%Q').to_i + ret)
-      end
-
       def time_since(val, ms: true)
         s = ms ? '%s%L' : '%s'
         Time.now.utc.strftime(s).to_i - Time.parse(val).utc.strftime(s).to_i

data/lib/squared/common.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
+require 'set'
+
 require_relative 'common/base'
-require_relative 'common/class'
 require_relative 'common/format'
 require_relative 'common/prompt'
 require_relative 'common/shell'

data/lib/squared/config.rb

@@ -26,7 +26,7 @@ module Squared
         def link(project, main = project.dependfile.basename, name = nil, **kwargs, &blk)
           return unless project.enabled?
 
-          ret = Viewer.new(main, name, project: project, **kwargs)
+          ret = new(main, name, project: project, **kwargs)
           ret.instance_eval(&blk) if block_given?
           ret
         end
@@ -169,7 +169,7 @@ module Squared
       end
 
       def style(name, *args)
-        apply_style(theme, name, args)
+        apply_style theme, name, args
         self
       end
 
@@ -212,7 +212,7 @@ module Squared
             file = nil
             ext[0] = mime
           elsif file
-            keys.unshift(file)
+            keys.prepend(file)
             alt = basepath("#{main}.{#{ext.join(',')}}")
             file = Dir[alt].first
           else
@@ -242,15 +242,16 @@ module Squared
                                               [
                                                 { pat: /\A((?:[^:]|(?<! ):(?! ))+)\z/, styles: theme[:banner] },
                                                 { pat: /\A(.*?)(<[^>]+>)(.+)\z/m, styles: theme[:undefined], index: 2 },
-                                                { pat: /\A(.+)( : (?!undefined).+)\z/m, styles: theme[:key] },
-                                                { pat: /\A(.+ : )(-?[\d.]+)(\s*)\z/m, styles: theme[:number],
+                                                { pat: /\A((?~ : ))( : (?!undefined).+)\z/m, styles: theme[:key] },
+                                                { pat: /\A((?~: ): )(-?[\d.]+)(\s*)\z/m, styles: theme[:number],
                                                   index: 2 },
-                                                { 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],
+                                                { 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(.+ : (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
+                                                { pat: /\A((?~: ): )(true|false)(\s*)\z/m, styles: theme[:boolean],
+                                                  index: 2 },
+                                                { pat: /\A((?~: ): (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
                                                   index: 2 }
                                               ]
                                             end, border: theme[:border])
@@ -293,7 +294,7 @@ module Squared
         if stdin?
           puts out.map!(&:last).join("\n")
         else
-          out.map! { |item| "#{item[0].ljust(pad)} : #{item[1]}" }
+          out.map! { |item| '%-*s : %s' % [pad, item[0], item[1]] }
         end
       end
 
@@ -309,7 +310,7 @@ module Squared
         return unless Rake::TaskManager.record_task_metadata
 
         val = "#{ext.first}[#{target ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
-        args = *name.split(':').push(command, val)
+        args = *name.split(':').append(command, val)
         if project
           project.workspace.task_desc(*args)
         else
@@ -347,7 +348,7 @@ module Squared
       end
 
       def basepath(file)
-        project ? project.basepath(file) : Pathname.new(file).realdirpath
+        project ? project.basepath(file) : Pathname.pwd + file
       end
     end
   end

data/lib/squared/version.rb

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