squared 0.4.27 → 0.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 570209d462189db6296821f539a7b2a3a088c627fa890b25144bbc3c92e1b197
-  data.tar.gz: d92b3f063d0504a2a1962c0a2b096e8ebe8062da8c33e1a16799edf0c806e1a1
+  metadata.gz: eac34fc8ad46d1059142ac793918cfc1382f3ab4a1d9d07feb22c3efed560e36
+  data.tar.gz: eaebe84ed6329e2bdee4930a410aa0986b92e247b11599b3b76a7f0108619ee9
 SHA512:
-  metadata.gz: 6c1f4387eafc98bd80390bc284127fd1018bd191b65dde56666941094609743e44bf82247cc9a3ac39b192ae72f89adf4ef93a9d06ede529fa4201237e74be97
-  data.tar.gz: 1d1117d69bd95cf81964b52b7cf0c7c67d9a693bc3716767da0daeb5b1a1a6d8f9016c0d0e01f74dac392aee66af74b7e85a67528d06f99c99d6e2921384e155
+  metadata.gz: 8ddcc4b63db14643603eef839c605a7e1b463355da2f8a576a16488d947c3f0c6fafd6acacd9341394d9e84e12e9d83a4ed08847f9d7aaff58f14e771459c897
+  data.tar.gz: 368b7ebad234d430b79582560253542b13e15258aa0f490f9aa14acde904685192c3dda5a68726c5ec0798b569635bcd737e3af83ecbd1486407856204966f67

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.4.29] - 2025-11-08
+
+### Fixed
+
+- OptionPartition was created by mistake and is unreliable in every way.
+
+## [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.4.27] - 2025-11-05
 
 ### Changed
@@ -1076,6 +1091,8 @@
 
 - Changelog was created.
 
+[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/class.rb

@@ -38,11 +38,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)
@@ -51,7 +56,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
@@ -72,6 +77,7 @@ module Squared
           end
           ret[i.last] = val
         end
+        ret.concat(extras.map(&:to_s).reject(&:empty?)) unless extras.empty?
         block_given? ? ret.reject(&blk) : ret
       end
 
@@ -91,9 +97,9 @@ 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
@@ -102,9 +108,64 @@ module Squared
         ret
       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

data/lib/squared/common/format.rb

@@ -253,8 +253,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.4.27'
+  VERSION = '0.4.29'
 end

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

@@ -482,31 +482,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).push(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).push(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
@@ -525,12 +525,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)
@@ -1237,7 +1237,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
@@ -1527,11 +1527,12 @@ module Squared
                           **kwargs)
           return if list.empty?
 
+          kwargs[:ignore] = false if no && !kwargs.key?(:ignore)
           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

@@ -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,10 +89,16 @@ module Squared
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               r << matchopts(s, value: value) unless s.empty?
-              Array(target).compact.any? { |val| r.any? { |pat| pat.match?(val.to_s) } }
+              a = target.to_a.compact
+              if (n = a.index('--'))
+                a = a[0..n]
+              end
+              a.any? { |val| r.any? { |pat| pat.match?(val.to_s) } }
             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
 
@@ -115,12 +121,12 @@ module Squared
             end
 
             def shortopt(*group)
-              group.map! { |s| s.sub(/\A-/, '') }
+              group.map! { |s| Regexp.escape(s.sub(/\A-/, '')) }
               "-(?:#{Regexp.escape(group.join('|'))})(?:\\z|[^ =]| +[^ -])"
             end
 
             def longopt(*group, value)
-              group.map! { |s| s.sub(/\A--/, '') }
+              group.map! { |s| Regexp.escape(s.sub(/\A--/, '')) }
               "--(?:#{Regexp.escape(group.join('|'))})(?:#{value ? '=[^ ]| +[^ -]' : '[= ]|\z'})"
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.27
+  version: 0.4.29
 platform: ruby
 authors:
 - An Pham
@@ -125,7 +125,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: []