squared 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2fd23c5964fe7c987966b8d237b569883b2dae5b70d9c120a924e2cc0227873
-  data.tar.gz: 8ef09d80e13c53fda678aa6a7194e33abf04728fb9d1c17739a5dc6c814e3b03
+  metadata.gz: 11c047668befa13733be4f81fbac270909c72be73754f70b464e804c11f8204e
+  data.tar.gz: fac920aa92d55210e48c2f780ea366b58f0c9ed870d524b5bf19eeeeb2628ab1
 SHA512:
-  metadata.gz: c41b98512dfc370a056716c3af2a599321b6113fa4883ab1f9c6b1418332f6b973560ce2cb1550c3813521eaa326150371ef3e60906cb694d6a6fd41ac1e0f05
-  data.tar.gz: cedbdcb188a6fb4a8407fc36836ffbeb4b93893217cec168d291845ce9a4f3f4dede9936022b8c950efa48ec21e2f93d013dc7e6fa929397ac80df7d6e3b099a
+  metadata.gz: 78b3346cbf690fa4ce9a36431eaad0ffb24d464a46700810c19f6938b5e020c94c1ede8709f61e448f75443f3b8c9df8a00877e380e81beb7ce37732dc244289
+  data.tar.gz: ee6b18f73590b38fa91a2f73852cbc6ccc467255bed2c5c540731d565dc43e15b1b6c103866003979518ef416fcb450beb5c58f5f1ad1c20119437d5f795aa84

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [0.1.3] - 2024-01-02
+
+### Fixed
+
+- Output lines from IO were missing theme styling.
+- Node did not apply build options when stored as Array.
+- Git commit push did not send origin and branch.
+
+## [0.1.2] - 2024-12-23
+
+### Added
+
+- Git command tag was implemented.
+
+### Deprecated
+
+- Repo static method empty? was relocated into Application.
+
+### Fixed
+
+- Namespace prefix was sometimes missing or duplicated.
+- Silent operation used undefined variable.
+- Unnecessary shell option escapes were removed.
+- Ruby command outdated did not display in order when threaded.
+- Regexp uses \A|\z format and not ^|$ for standard matches.
+- Rake being called by a project did not escape options.
+- Workspace did not check base project for Windows filename.
+- Regexp for SemVer did not recognize package names.
+
 ## [0.1.1] - 2024-12-14
 
 ### Added
@@ -50,6 +79,8 @@
 
 - Changelog was created.
 
+[0.1.3]: https://github.com/anpham6/squared/releases/tag/v0.1.3-ruby
+[0.1.2]: https://github.com/anpham6/squared/releases/tag/v0.1.2-ruby
 [0.1.1]: https://github.com/anpham6/squared/releases/tag/v0.1.1-ruby
 [0.1.0]: https://github.com/anpham6/squared/releases/tag/v0.1.0-ruby
 [0.0.12]: https://github.com/anpham6/squared/releases/tag/v0.0.12-ruby

data/README.ruby.md

@@ -37,17 +37,23 @@ Projects from any accessible folder can be added relative to the parent director
 require "squared"
 
 require "squared/workspace"
-require "squared/workspace/repo"           # Optional
-require "squared/workspace/project/node"   #
-require "squared/workspace/project/python" #
-require "squared/workspace/project/ruby"   #
+require "squared/workspace/repo"                     # Optional
+require "squared/workspace/project/node"             #
+require "squared/workspace/project/python"           #
+require "squared/workspace/project/ruby"             #
 # OR
-require "squared/app"                      # All workspace related modules
+require "squared/app"                                # All workspace related modules
 
 # NODE_ENV  = production
-# REPO_ROOT = /workspaces
-# REPO_HOME = /workspaces/squared
-# rake      = /workspaces/squared/Rakefile
+
+# REPO_ROOT = /workspaces                            #
+# REPO_HOME = /workspaces/squared                    # Dir.pwd
+# rake      = /workspaces/squared/Rakefile           # main?
+# OR
+# REPO_ROOT = /workspaces                            # Dir.pwd
+# rake      = /workspaces/Rakefile                   #
+# REPO_HOME = /workspaces/squared                    # main: "squared"
+
 # pathname  = /workspaces/pathname
 # optparse  = /workspaces/optparse
 # log       = /workspaces/logger

data/lib/squared/common/class.rb

@@ -9,7 +9,7 @@ module Squared
       extend Forwardable
 
       def self.to_s
-        super.match(/[^:]+$/)[0]
+        super.match(/[^:]+\z/)[0]
       end
 
       def_delegators :@data, :+, :each, :each_with_index, :entries, :to_a, :include?
@@ -31,7 +31,7 @@ module Squared
 
     class JoinSet < Set
       def self.to_s
-        super.match(/[^:]+$/)[0]
+        super.match(/[^:]+\z/)[0]
       end
 
       def initialize(data = [], delim: ' ')

data/lib/squared/common/format.rb

@@ -46,7 +46,7 @@ module Squared
         if pat && index != 0
           return val unless (data = pat.match(val))
 
-          ret = index == -1 ? data.to_a[1..-1] : data[index]
+          ret = index == -1 ? data.to_a.drop(1) : data[index]
         else
           ret = val
           index = 0
@@ -235,8 +235,8 @@ module Squared
           sub.each { |h| s = sub_style(s, **h) }
           s = "| #{s} |"
           if border
-            s = sub_style(s, pat: /^(\|)(.+)$/m, styles: border)
-            s = sub_style(s, pat: /^(.+)(\|)$/m, styles: border, index: 2)
+            s = sub_style(s, pat: /\A(\|)(.+)\z/m, styles: border)
+            s = sub_style(s, pat: /\A(.+)(\|)\z/m, styles: border, index: 2)
           end
           s
         end

data/lib/squared/common/prompt.rb

@@ -8,8 +8,8 @@ module Squared
       def confirm(msg, default = nil, agree: 'Y', cancel: 'N', attempts: 5, timeout: 15)
         require 'readline'
         require 'timeout'
-        agree = /^#{agree}$/i if agree.is_a?(::String)
-        cancel = /^#{cancel}$/i if cancel.is_a?(::String)
+        agree = /\A#{agree}\z/i if agree.is_a?(::String)
+        cancel = /\A#{cancel}\z/i if cancel.is_a?(::String)
         Timeout.timeout(timeout) do
           begin
             while (ch = Readline.readline(msg, true))

data/lib/squared/common/shell.rb

@@ -8,38 +8,51 @@ module Squared
     module Shell
       module_function
 
-      def shell_escape(val, quote: false)
-        val = val.to_s
-        return ::Shellwords.escape(val) unless ::Rake::Win32.windows?
+      def shell_escape(val, quote: false, force: false)
+        if (data = /\A(--?[^= ]+)((=|\s+)(["'])?(.+?)(["'])?)?\z/m.match(val = val.to_s))
+          return val unless data[2]
 
-        quote ? shell_quote(val, force: false) : val
+          join = ->(opt) { data[1] + data[3] + shell_quote(opt) }
+          if data[4] == data[6]
+            data[4] ? val : join.(data[5])
+          else
+            join.("#{data[4]}#{data[5]}#{data[6]}")
+          end
+        elsif Rake::Win32.windows?
+          quote ? shell_quote(val, force: force) : val
+        else
+          Shellwords.escape(val)
+        end
       end
 
       def shell_quote(val, force: true)
-        ret = val.to_s.strip
-        return ret if (!force && !ret.include?(' ')) || ret =~ /(?:^|\S=|[^=]\s+)(["']).+\1$/m
+        val = val.to_s
+        return val if (!force && !val.include?(' ')) || val =~ /(?:^|\S=|[^=]\s+)(["']).+\1\z/m
 
-        ::Rake::Win32.windows? ? "\"#{double_quote(ret)}\"" : "'#{single_quote(ret)}'"
+        Rake::Win32.windows? ? "\"#{double_quote(val)}\"" : "'#{single_quote(val)}'"
       end
 
-      def shell_split(val, quote: false, join: false)
-        ret = ::Shellwords.split(val).map do |opt|
-          if (data = /^(--?[^= ]+)(=|\s+)?(["'])?(.+?)\3?$/m.match(opt))
-            next opt unless data[2] && !data[3]
+      def shell_split(val, quote: false, join: nil)
+        val = Shellwords.split(val).map { |opt| shell_escape(opt, quote: quote) }
+        return val unless join
 
-            data[1] + data[2] + shell_quote(data[4], force: !::Rake::Win32.windows?)
-          else
-            shell_escape(opt, quote: quote)
-          end
-        end
-        join ? ret.join(' ') : ret
+        val.join(join.is_a?(::String) ? join : ' ')
+      end
+
+      def shell_option(flag, val = nil, quote: false, escape: true)
+        "--#{flag}#{if val
+                      "=#{if escape
+                            shell_escape(val, quote: quote)
+                          else
+                            quote ? shell_quote(val) : val
+                          end}"
+                    end}"
       end
 
       def fill_option(val)
-        return "-#{val}" if val.size == 1 || val =~ /^[a-z]\d+$/i
+        return "-#{val}" if val =~ /\A[a-z](?:\d*)\z/i
 
-        val = "--#{val}" unless val.start_with?('-')
-        shell_escape(val).sub('\\=', '=')
+        shell_escape(val.start_with?('-') ? val : "--#{val}")
       end
 
       def single_quote(val)

data/lib/squared/common/system.rb

@@ -9,7 +9,7 @@ module Squared
       module_function
 
       def shell(*args, **kwargs)
-        if RUBY_VERSION =~ /^2\.[0-5]\./
+        if RUBY_VERSION < '2.6'
           exception = kwargs.delete(:exception)
           ret = system(*args, **kwargs)
           return ret if ret || !exception

data/lib/squared/config.rb

@@ -12,7 +12,7 @@ module Squared
       include Rake::DSL
 
       def self.to_s
-        super.match(/[^:]+$/)[0]
+        super.match(/[^:]+\z/)[0]
       end
 
       attr_reader :main, :name, :project, :theme
@@ -199,17 +199,18 @@ module Squared
         title = Pathname.new(file)
                         .realpath
                         .to_s
-                        .sub(Regexp.new("^#{Regexp.escape(File.join(Dir.pwd, ''))}"), '')
+                        .sub(Regexp.new("\\A#{Regexp.escape(File.join(Dir.pwd, ''))}"), '')
         emphasize(lines, title: title, sub: unless stdin?
                                               [
-                                                { pat: /^((?:[^:]|(?<! ):(?! ))+)$/, styles: theme[:banner] },
-                                                { pat: /^(.*?)(<[^>]+>)(.+)$/m, styles: theme[:undefined], index: 2 },
-                                                { pat: /^(.+)( : (?!undefined).+)$/m, styles: theme[:key] },
-                                                { pat: /^(.+ : )(-?[\d.]+)(\s*)$/m, styles: theme[:number], index: 2 },
-                                                { pat: /^(.+ : ")(.+)("\s*)$/m, styles: theme[:string], index: 2 },
-                                                { pat: /^(.+ : \{)(.+)(\}\s*)$/m, styles: theme[:hash], index: 2 },
-                                                { pat: /^(.+ : \[)(.+)(\]\s*)$/m, styles: theme[:array], index: 2 },
-                                                { pat: /^(.+ : (?!undefined))([^"\[{].*)$/m, styles: theme[:value],
+                                                { 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],
+                                                  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(.+ : (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
                                                   index: 2 }
                                               ]
                                             end)
@@ -261,6 +262,8 @@ module Squared
       end
 
       def format_desc(command, *ext, exist: exist?)
+        return unless Rake::TaskManager.record_task_metadata
+
         val = "#{ext.first}[#{exist ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
         message(@prefix, *name.split(':'), command, val, empty: true)
       end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -56,7 +56,7 @@ module Squared
         end
 
         def to_s
-          super.match(/[^:]+$/)[0]
+          super.match(/[^:]+\z/)[0]
         end
 
         attr_reader :kind_project
@@ -70,8 +70,14 @@ module Squared
       def initialize(home = Dir.pwd, *, main: nil, prefix: nil,
                      verbose: ARG[:VERBOSE], common: ARG[:COMMON], pipe: ARG[:PIPE], exception: ARG[:FAIL], **)
         @home = Pathname.new(home).realdirpath
+        basename = @home.basename.to_s
+        if main
+          @main = main.to_s.freeze
+          @home = @home.join(@main) unless @main == basename || (windows? && @main.downcase == basename.downcase)
+        else
+          @main = basename.freeze
+        end
         @root = @home.parent
-        @main = (main || @home.basename).to_s.freeze
         @prefix = prefix
         @series = Application.impl_series.new(self)
         @project = {}
@@ -322,7 +328,7 @@ module Squared
 
       def task_name(val, desc: false)
         ret = @prefix ? task_join(@prefix, val) : val.to_s
-        desc ? ret.split(':').join(ARG[:SPACE]) : ret
+        desc ? message(*ret.split(':')) : ret
       end
 
       def task_namespace(val, first: false)
@@ -383,7 +389,7 @@ module Squared
 
           return ret
         end
-        @script[:ref!][:_] || SCRIPT_OBJ
+        @script[:ref!][:''] || SCRIPT_OBJ
       end
 
       def script_get(*args, group: nil, ref: nil)
@@ -409,7 +415,7 @@ module Squared
         return ret if group && (ret = @banner[:group][group.to_sym])
 
         ref.reverse_each { |val| return ret if (ret = @banner[:ref][val]) }
-        @banner[:ref][:_]
+        @banner[:ref][:'']
       end
 
       def enabled?
@@ -444,6 +450,10 @@ module Squared
         !(proj = find(home)).nil? && proj.enabled?
       end
 
+      def windows?
+        Rake::Win32.windows?
+      end
+
       def rootpath(*args)
         root.join(*args)
       end
@@ -505,7 +515,21 @@ module Squared
         elsif ref
           as_a(ref).each { |val| @script[:ref!][val.to_sym] = data }
         else
-          @script[:ref!][:_] = data
+          @script[:ref!][:''] = data
+        end
+      end
+
+      def root?(path, pass: [])
+        return false unless path.directory?
+
+        case path.children.size
+        when 0
+          true
+        when 1
+          target = path.children.first
+          target.to_s == __FILE__ || pass.any? { |val| val == target.basename.to_s }
+        else
+          false
         end
       end
 

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

@@ -15,7 +15,7 @@ module Squared
         include Rake::DSL
 
         VAR_SET = %i[parent global envname dependfile theme run script env].freeze
-        SEM_VER = /(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?/.freeze
+        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?\b/.freeze
         private_constant :VAR_SET, :SEM_VER
 
         class << self
@@ -46,7 +46,7 @@ module Squared
           end
 
           def to_s
-            super.match(/[^:]+$/)[0]
+            super.match(/[^:]+\z/)[0]
           end
         end
 
@@ -264,9 +264,9 @@ module Squared
                           val
                         end
                         emphasize(out, title: path, right: true, border: borderstyle, sub: [
-                          { pat: /^(#{Regexp.escape(path.to_s)})(.*)$/, styles: theme[:header] },
-                          { pat: /^(#{Regexp.escape(name)})(.*)$/, styles: theme[:active] },
-                          { pat: /^(.+ )(\()(\d+)(\))(.*)$/, styles: theme[:inline], index: 3 }
+                          { pat: /\A(#{Regexp.escape(path.to_s)})(.*)\z/, styles: theme[:header] },
+                          { pat: /\A(#{Regexp.escape(name)})(.*)\z/, styles: theme[:active] },
+                          { pat: /\A(.+ )(\()(\d+)(\))(.*)\z/, styles: theme[:inline], index: 3 }
                         ])
                       end
                     end
@@ -550,7 +550,7 @@ module Squared
           cmd = session_done(cmd)
           log.info cmd
           begin
-            if cmd =~ /^[^:]+:[^:]/ && workspace.task_defined?(cmd)
+            if cmd =~ /\A[^:]+:[^:]/ && workspace.task_defined?(cmd)
               log.warn "ENV was discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
@@ -749,6 +749,8 @@ module Squared
         end
 
         def format_desc(action, flag, opts = nil, req: nil, arg: 'opts*')
+          return unless Rake::TaskManager.record_task_metadata
+
           opts = "#{arg}=#{opts.join(',')}" if opts.is_a?(Array)
           out = [@desc]
           if flag
@@ -771,7 +773,7 @@ module Squared
           end
           if verbose
             out = []
-            out << cmd.sub(/^\S+/, &:upcase) if data[:command]
+            out << cmd.sub(/\A\S+/, &:upcase) if data[:command]
             data[:order].each do |val|
               if val.is_a?(Array)
                 s = ' '
@@ -793,7 +795,7 @@ module Squared
               out << val.to_s
             end
             print_banner(*out, styles: data[:styles], border: data[:border], client: client)
-          elsif multiple && workspace.series.multiple?
+          elsif workspace.series.multiple?
             "## #{__send__(data[:order].first || :path)} ##"
           end
         end
@@ -818,10 +820,10 @@ module Squared
             end
             if from
               out << from
-              pat = /^(#{Regexp.escape(out.last)})(.*)$/
+              pat = /\A(#{Regexp.escape(out.last)})(.*)\z/m
             end
           else
-            pat = /^(\s*\d+\.)(.+)$/
+            pat = /\A(\s*\d+\.)(.+)\z/m
           end
           sub = [headerstyle]
           sub << { pat: pat, styles: theme[:active] } if pat
@@ -833,16 +835,32 @@ module Squared
         end
 
         def append_repeat(flag, opts)
-          opts.each { |val| @session << "--#{flag}=#{shell_escape(val, quote: true)}" }
+          opts.each { |val| @session << shell_option(flag, val, quote: true) }
         end
 
-        def append_value(opts, delim: false)
+        def append_value(opts, delim: false, escape: true)
           @session << '--' if delim && !opts.empty?
-          opts.each { |val| @session << shell_escape(val) }
+          opts.each { |val| @session << (escape ? shell_escape(val) : shell_quote(val)) }
         end
 
-        def append_option(list, **kwargs)
-          list.each { |val| @session << "--#{val}" if option(val, **kwargs) }
+        def append_first(list, flag: true, equals: false, quote: false, **kwargs)
+          list.each do |opt|
+            next unless (val = option(opt, **kwargs))
+
+            return @session << (if flag
+                                  shell_option(opt, equals ? val : nil, quote: quote)
+                                else
+                                  shell_quote(val)
+                                end)
+          end
+        end
+
+        def append_option(list, equals: false, quote: false, **kwargs)
+          list.each do |flag|
+            next unless (val = option(flag, **kwargs))
+
+            @session << shell_option(flag, equals ? val : nil, quote: quote)
+          end
         end
 
         def append_nocolor(flag = nil)