squared 0.5.13 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3ed5681f473df27b02a4787101d56a1081c2c1bd6db77b2e9f39368b8b131dc
-  data.tar.gz: c968c299822d98c675f032f024d904305c5aaa045dccced2f8d02228b714bdc9
+  metadata.gz: bb26d6cf2dfdece4362de8ae2e5748eb11cc05e4158d4d81a43c1c63320764b4
+  data.tar.gz: 2d01a9695d8953acd20d568be48089424bc1afc23039f372d1125a77562792bd
 SHA512:
-  metadata.gz: 670b650344b8a956b15d90d3d24c0a60ee03a13c36875dddb2db51bc8a93919ff7f10c2270b01062418b3e36f285aa824d7ac87465a2499f1830b257d757fb08
-  data.tar.gz: dd50aee39f1bdd0def09334ea6383e835c56ca103cee67c0937c1bd0a963356d909196fc284f1ce2247078c4a230690b620b313b0a0bbf8a4613367f477f0fb7
+  metadata.gz: c3f191d7014c93cb20c6ace155e9b3e56561e8d88ad48f67793da484d73b50e7d7fa183ba7f52dfdfc7d434c1acedd1a748d4e95b8726763235fd5e45df893d7
+  data.tar.gz: f7ce5072078a05a56c850420f17b3923444b8581e7bd06a71d61a13197ac91b05d883edad0774b890c28edd79bd8da597e0accac53559f8bd1da152890d708f9

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## [0.5.15] - 2025-11-08
+
+### Fixed
+
+- See `0.4.29`.
+
+## [0.4.29] - 2025-11-08
+
+### Fixed
+
+- OptionPartition was created by mistake and is unreliable in every way.
+
+## [0.5.14] - 2025-11-08
+
+### Fixed
+
+- See `0.4.28`.
+
+## [0.4.28] - 2025-11-08
+
+### Fixed
+
+- Project base method build as arrays parsed unrelated arguments.
+- OptionPartition method arg? does not check after "--" delimiter.
+- OptionPartition did not support duplicate values after "--" delimiter.
+- OptionPartition method opt? did not type check for String.
+
 ## [0.5.13] - 2025-11-05
 
 ### Fixed
@@ -1202,6 +1229,8 @@
 
 - Changelog was created.
 
+[0.5.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.15
+[0.5.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.14
 [0.5.13]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.13
 [0.5.12]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.12
 [0.5.11]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.11
@@ -1216,6 +1245,8 @@
 [0.5.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.2-ruby
 [0.5.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.1-ruby
 [0.5.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.0-ruby
+[0.4.29]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.29
+[0.4.28]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.28
 [0.4.27]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.27
 [0.4.26]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.26
 [0.4.25]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.25

data/lib/squared/common/format.rb

@@ -255,8 +255,8 @@ module Squared
           sub.each { |h| s = sub_style(s, **h) }
           s = "#{b0} #{s} #{b0}"
           if border
-            s = sub_style(s, pat: /\A(#{Regexp.escape(b0)})(.+)\z/m, styles: border)
-            s = sub_style(s, pat: /\A(.+)(#{Regexp.escape(b0)})\z/m, styles: border, index: 2)
+            s = sub_style(s, pat: /\A(#{Regexp.escape(b0)})(.+)\z/om, styles: border)
+            s = sub_style(s, pat: /\A(.+)(#{Regexp.escape(b0)})\z/om, styles: border, index: 2)
           end
           s
         end

data/lib/squared/version.rb

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

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

@@ -525,31 +525,31 @@ module Squared
             cmd = cmd.join(' && ')
           else
             cmd, opts, var, flags, extra = args
-          end
-          if cmd
-            return run_b(cmd, sync: sync, from: from) if cmd.is_a?(Proc) || cmd.is_a?(Method)
+            if cmd
+              return run_b(cmd, sync: sync, from: from) if cmd.is_a?(Proc) || cmd.is_a?(Method)
 
-            cmd = as_get(cmd, from)
-            opts = compose(opts, script: false) if opts && respond_to?(:compose)
-            flags = append_hash(flags, target: []).join(' ') if flags.is_a?(Hash)
-            case opts
-            when Hash
-              cmd = Array(cmd).append(flags)
-                              .concat(append_hash(opts, target: [], build: true))
-                              .compact
-                              .join(' ')
-            when Enumerable
-              cmd = Array(cmd).concat(opts.to_a)
-              cmd.map! { |val| "#{val} #{flags}" } if flags
-              cmd = cmd.join(' && ')
+              cmd = as_get(cmd, from)
+              opts = compose(opts, script: false) if opts && respond_to?(:compose)
+              flags = append_hash(flags, target: []).join(' ') if flags.is_a?(Hash)
+              case opts
+              when Hash
+                cmd = Array(cmd).append(flags)
+                                .concat(append_hash(opts, target: [], build: true))
+                                .compact
+                                .join(' ')
+              when Enumerable
+                cmd = Array(cmd).concat(opts.to_a)
+                cmd.map! { |val| "#{val} #{flags}" } if flags
+                cmd = cmd.join(' && ')
+              else
+                cmd = [cmd, flags, opts].compact.join(' ') if opts || flags
+              end
             else
-              cmd = [cmd, flags, opts].compact.join(' ') if opts || flags
-            end
-          else
-            return unless (opts || extra) && respond_to?(:compose)
+              return unless (opts || extra) && respond_to?(:compose)
 
-            cmd = compose(as_get(opts, from), flags, script: true, args: extra, from: from)
-            from = :script if from == :run && script?
+              cmd = compose(as_get(opts, from), flags, script: true, args: extra, from: from)
+              from = :script if from == :run && script?
+            end
           end
           run(cmd, var, sync: sync, from: from, banner: banner)
         end
@@ -568,12 +568,12 @@ module Squared
                 if proj.respond_to?(meth.to_sym)
                   begin
                     proj.__send__(meth, sync: sync)
-                    next
                   rescue StandardError => e
                     on_error(e, :prereqs, exception: true)
                   end
+                else
+                  print_error(name, "method: #{meth}", subject: 'prereqs', hint: 'undefined')
                 end
-                print_error(name, 'method not found', subject: 'prereqs', hint: meth)
               end
             elsif proj.build?
               proj.build(sync: sync)
@@ -1307,7 +1307,7 @@ module Squared
           end
           ret = JoinSet.new(cmd.flatten(1))
           if options && (val = env("#{prefix.upcase}_OPTIONS"))
-            split_escape(val).each { |opt| ret.last(fill_option(opt), /\A(--?[^ =]+)[ =].+\z/m) }
+            split_escape(val).each { |opt| ret.last(fill_option(opt), /\A(--?[^\[\]=\s-][^\[\]=\s]*)[=\s].+\z/m) }
           end
           main ? @session = ret : ret
         end
@@ -1593,11 +1593,12 @@ module Squared
                           **kwargs)
           return if list.empty?
 
+          kwargs[:ignore] = false if no && !kwargs.key?(:ignore)
           [].tap do |ret|
             list.flatten.each do |flag|
               next unless (val = option(flag, target: target, **kwargs))
 
-              if val == '0' && no
+              if no && val == '0'
                 flag = "no-#{flag}"
                 val = nil
               end

data/lib/squared/workspace/project/support/class.rb

@@ -11,7 +11,7 @@ module Squared
           extend Forwardable
 
           OPT_NAME = /\A(?:(--)|-)((?(1)[^\[\]=\s-][^\[\]=\s]*|[^\[\]=\s-]))\z/
-          OPT_VALUE = /\A-{0,2}([^\[\]=\s-][^\[\]=\s]*)(?:\s*=\s*|\s+)(.+)\z/
+          OPT_VALUE = /\A-{0,2}([^\[\]=\s-][^\[\]=\s]*)(?:=|\s+)(\S.*)\z/
           OPT_SINGLE = /\A-([^\[\]=\s-])(.+)\z/
           private_constant :OPT_NAME, :OPT_VALUE, :OPT_SINGLE
 
@@ -27,7 +27,7 @@ module Squared
               target << '--' if delim && !target.include?('--')
               if strip
                 pat, s = Array(strip)
-                ret.map! { |val| val.gsub(pat, s || '') }
+                ret.map! { |val| val.is_a?(String) ? val.gsub(pat, s || '') : val }
               end
               if escape || quote
                 ret.map! do |val|
@@ -89,11 +89,16 @@ module Squared
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               r << matchopts(s, value) unless s.empty?
-              s = target.to_a.compact
-              r.any? { |pat| s.any?(pat) }
+              a = target.to_a
+              if (n = a.index('--'))
+                a = a[0..n]
+              end
+              r.any? { |pat| a.any?(pat) }
             end
 
             def opt?(val)
+              return false unless val.is_a?(String)
+
               val.start_with?('-') && (OPT_NAME.match?(val) || OPT_VALUE.match?(val) || OPT_SINGLE.match?(val))
             end
 
@@ -116,13 +121,13 @@ module Squared
             end
 
             def shortopt(*group)
-              group.map! { |s| s.delete_prefix('-') }
-              "-(?:#{Regexp.escape(group.join('|'))})(?:\\z|[^ =]| +[^ -])"
+              group.map! { |s| Regexp.escape(s.delete_prefix('-')) }
+              "-(?:#{group.join('|')})(?:\\z|[^ =]| +[^ -])"
             end
 
             def longopt(*group, value)
-              group.map! { |s| s.delete_prefix('--') }
-              "--(?:#{Regexp.escape(group.join('|'))})(?:#{value ? '=[^ ]| +[^ -]' : '[= ]|\z'})"
+              group.map! { |s| Regexp.escape(s.delete_prefix('--')) }
+              "--(?:#{group.join('|')})(?:#{value ? '=[^ ]| +[^ -]' : '[= ]|\z'})"
             end
           end
 
@@ -530,11 +535,16 @@ module Squared
             super[/[^:]+\z/, 0]
           end
 
-          attr_reader :delim
+          alias to_ary to_a
 
-          def initialize(data = [], delim: ' ')
-            super(data.compact)
+          attr_reader :delim, :extras
+
+          def initialize(data = [], delim: ' ', partition: '--', uniq: /\A--?[^\[\]=\s-][^\[\]=\s]*(?:=|\s+)\S/)
             @delim = delim
+            @partition = partition
+            @uniq = uniq
+            @extras = []
+            super(data.compact)
           end
 
           def last(val, pat)
@@ -543,7 +553,7 @@ module Squared
           end
 
           def pass(&blk)
-            ret = to_a.map!(&:to_s).reject(&:empty?)
+            ret = to_ary.map!(&:to_s).reject(&:empty?)
             @last&.each do |val, pat, key|
               i = []
               j = nil
@@ -564,6 +574,7 @@ module Squared
               end
               ret[i.last] = val
             end
+            ret.concat(extras.map(&:to_s).reject(&:empty?)) unless extras.empty?
             return ret unless block_given?
 
             ret.reject(&blk)
@@ -585,18 +596,73 @@ module Squared
 
           def temp(*args, &blk)
             args.compact!
-            ret = pass(&blk)
-            ret = Set.new(ret.concat(args)).to_a unless args.empty?
-            ret.join(@delim)
+            pass(&blk)
+              .concat(args)
+              .join(@delim)
           end
 
           def done
             to_s.tap { clear }
           end
 
+          def merge(enum)
+            if !extras.empty?
+              extras.concat(enum.to_a)
+              self
+            elsif (n = enum.find_index { |val| extras?(val) })
+              data = enum.to_a
+              @extras = if n == 0
+                          data
+                        else
+                          super(data[0...n])
+                          data[n..-1]
+                        end
+              self
+            else
+              super
+            end
+          end
+
+          def <<(obj)
+            extras!(obj) || super
+          end
+
+          def add?(obj)
+            extras!(obj) || super
+          end
+
+          def to_a
+            pass
+          end
+
           def to_s
             pass.join(@delim)
           end
+
+          def to_enum(*args)
+            pass.to_enum(*args)
+          end
+
+          def to_json(*args)
+            pass.to_json(*args)
+          end
+
+          def to_yaml(*args)
+            pass.to_yaml(*args)
+          end
+
+          private
+
+          def extras!(obj)
+            return if extras.empty? && !extras?(obj)
+
+            extras << obj unless !extras.include?(@partition) && include?(obj) && @uniq.match?(obj.to_s)
+            self
+          end
+
+          def extras?(obj)
+            obj == @partition || (include?(obj) && !@uniq.match?(obj.to_s))
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.15
 platform: ruby
 authors:
 - An Pham
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []