squared 0.4.7 → 0.4.9

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

@@ -16,10 +16,10 @@ module Squared
             include Prompt
 
             def append(target, *args, delim: false, escape: false, quote: true)
-              return if args.empty?
+              return if (ret = args.flatten).empty?
 
               target << '--' if delim && !target.include?('--')
-              ret = args.flatten.map { |val| escape ? shell_escape(val, quote: quote) : shell_quote(val) }
+              ret.map! { |val| escape ? shell_escape(val, quote: quote) : shell_quote(val) } if escape || quote
               if target.is_a?(Set)
                 target.merge(ret)
               else
@@ -35,18 +35,25 @@ module Squared
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
               warn log_message(Logger::WARN, opts.join(', '), pass: true, **kwargs)
-              return if pass || confirm("Run? [#{sub_style(target, styles: styles)}] [y/N] ", 'N', timeout: 30)
+              return if pass || confirm("Run? [#{sub_style(target, styles: styles)}] [y/N] ", 'N')
 
               raise_error 'user cancelled'
             end
 
+            def strip(val)
+              return [] unless val
+
+              val = shell_split(val) if val.is_a?(String)
+              val.map { |s| s.sub(/\A-([a-z\d])(.+)\z/mi, '\1=\2').sub(/\A--?/, '') }.reject(&:empty?)
+            end
+
             def arg?(target, *args, value: false)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               unless s.empty?
                 s.map! { |val| Regexp.escape(shell_option(val)) }
                 r << /\A(?:#{s.join('|')})#{value ? '[ =].' : '(?: |=|\z)'}/
               end
-              target.any? { |opt| r.any? { |val| opt.match?(val) } }
+              target.any? { |opt| r.any? { |val| opt&.match?(val) } }
             end
           end
 
@@ -66,7 +73,7 @@ module Squared
             parse(list, opts, **kwargs, &blk)
           end
 
-          def parse(list, opts = extras, no: nil, single: nil, args: false, first: false, pass: ['='], &blk)
+          def parse(list, opts = extras, no: nil, single: nil, args: false, first: nil, &blk)
             @extras = []
             @values = []
             bare = []
@@ -79,8 +86,8 @@ module Squared
             i = []
             f = []
             si = []
-            list.map do |val|
-              x, y = val.split('|')
+            list.flat_map do |val|
+              x, y = val.split('|', 2)
               if y
                 if (n = val.index('='))
                   x += val[n..-1]
@@ -90,7 +97,6 @@ module Squared
                 x
               end
             end
-            .flatten
             .each do |val|
               if (n = val.index('='))
                 flag = val[0, n]
@@ -117,6 +123,7 @@ module Squared
                 else
                   next
                 end
+                m << flag if val[n + 2] == 'm'
                 bare << flag if val.end_with?('?')
               else
                 bare << val
@@ -124,6 +131,12 @@ module Squared
             end
             no = (no || []).map { |val| (n = val.index('=')) ? val[0, n] : val }
             bare.concat(no)
+            numtype = [
+              [i, /\A\d+\z/],
+              [f, /\A\d*(?:\.\d+)?\z/],
+              [si, /\A-?\d+\z/]
+            ].freeze
+            numcheck = ->(k, v) { numtype.any? { |flag, pat| flag.include?(k) && pat.match?(v) } }
             skip = false
             opts.each do |opt|
               next @extras << opt if skip
@@ -138,17 +151,17 @@ module Squared
                 if opt =~ /\A([^=]+)=(.+)\z/
                   key = $1
                   val = $2
-                  match = ->(flag, pat) { flag.include?(key) && pat.match?(val) }
+                  merge = m.include?(key)
                   if e.include?(key)
-                    target << shell_option(key, val)
+                    target << shell_option(key, val, merge: merge)
                   elsif q.include?(key)
-                    target << quote_option(key, val, double: qq.include?(key))
+                    target << quote_option(key, val, double: qq.include?(key), merge: merge)
                   elsif p.include?(key) && path
-                    target << quote_option(key, path.join(val))
-                  elsif m.include?(key)
+                    target << quote_option(key, path + val, merge: merge)
+                  elsif b.include?(key) || numcheck.call(key, val)
+                    target << basic_option(key, val, merge: merge)
+                  elsif merge
                     target << basic_option(key, val, merge: true)
-                  elsif b.include?(key) || match.(i, /^\d+$/) || match.(f, /^\d*(?:\.\d+)?$/) || match.(si, /^-?\d+$/)
-                    target << basic_option(key, val)
                   else
                     @extras << opt
                   end
@@ -157,10 +170,10 @@ module Squared
                   @extras << opt
                   skip = true if args
                 end
-                skip = true if first && pass.none? { |s| opt.include?(s) }
+                skip = true if first&.any? { |s| s.is_a?(Regexp) ? opt.match?(s) : !opt.include?(s) }
               end
             end
-            @values = @values.empty? ? /\A\s+\z/ : /\A(#{@values.join('|')})=(.+)\z/
+            @values = @values.empty? ? /\A\s+\z/ : /\A(#{@values.join('|')})=(.+)\z/m
             @extras.each_with_index(&blk) if block_given?
             self
           end
@@ -179,9 +192,14 @@ module Squared
             self
           end
 
-          def clear(opts = nil, **kwargs)
-            opts ||= (kwargs[:errors] ? errors : extras)
+          def clear(opts = nil, errors: false, **kwargs)
             styles = project.theme[:inline] if project
+            if !opts
+              opts = errors ? @errors : @extras
+            elsif errors
+              OptionPartition.clear(target, @errors, styles: styles, **kwargs)
+              @errors.clear
+            end
             OptionPartition.clear(target, opts.reject { |val| found.include?(val) }, styles: styles, **kwargs)
             opts.clear
             self

data/lib/squared/workspace/repo.rb

@@ -3,12 +3,10 @@
 module Squared
   module Workspace
     module Repo
-      include Common::Format
-
       class << self
         def read_manifest(path)
           require 'rexml/document'
-          return unless (file = path.join('.repo/manifest.xml')).exist?
+          return unless (file = path + '.repo/manifest.xml').exist?
 
           doc = REXML::Document.new(file.read)
           doc.elements['manifest/include'].attributes['name']&.sub('.xml', '')
@@ -41,12 +39,12 @@ module Squared
                     raise_error("path does not exist: #{val}", hint: 'REPO_ROOT') unless repo_confirm
                   end
                   @root.join(main).realdirpath
-                elsif repo_install?(parent: true) && (!@home.exist? || @root.join(main) == @home)
+                elsif repo_install?(parent: true) && (!@home.exist? || @root + main == @home)
                   @home
                 elsif repo_install?(@home)
-                  @home.join(main)
+                  @home + main
                 else
-                  (path = pwd) == @home || !repo_install?(path) ? @home : path.join(main)
+                  (path = pwd) == @home || !repo_install?(path) ? @home : path + main
                 end
         @root = @home.parent
         @manifest_url = url
@@ -149,9 +147,9 @@ module Squared
             end
           end
 
-          desc.('all[{0}]')
+          desc.call('all[{0}]')
           task 'all', [:opts] do |_, args|
-            parse_opts.(args)
+            parse_opts.call(args)
             stage ||= 'all'
             repo['sync'].invoke
             next if env('REPO_DRYRUN', equals: '2')
@@ -174,21 +172,21 @@ module Squared
             end
           end
 
-          desc.("init[manifest?=#{target},{0}]", target)
+          desc.call("init[manifest?=#{target},{0}]", target)
           task 'init', [:manifest, :opts] do |_, args|
-            parse_opts.(args)
+            parse_opts.call(args)
             stage = 'init'
             puts if newline
             system("repo init -u #{env('REPO_URL') || manifest_url} -m #{args.manifest || target}.xml", chdir: root)
             repo['all'].invoke
           end
 
-          desc.('sync[{0}]')
+          desc.call('sync[{0}]')
           task 'sync', [:opts] do |_, args|
             unless branch || stage == 'init'
               raise_error('repo not initialized', hint: task_name('repo:init'), kind: LoadError)
             end
-            parse_opts.(args)
+            parse_opts.call(args)
             cmd << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}"
             cmd << '--fail-fast' if failfast
             puts if newline && stage != 'init'

data/lib/squared/workspace/series.rb

@@ -71,11 +71,12 @@ module Squared
       def_delegators :@data, :[], :each, :each_key, :keys, :fetch, :to_a, :to_s, :inspect, :merge!, :key?
       def_delegators :@workspace, :task_desc, :task_name, :task_namespace, :task_join, :format_desc
 
-      def initialize(workspace)
+      def initialize(workspace, exclude: [])
         @workspace = workspace
         @sync = []
         @multiple = []
         @parallel = []
+        @exclude = exclude.freeze
         @session = {
           group: {},
           parent: {},
@@ -89,7 +90,7 @@ module Squared
         group, parent, id = @session.values
         ws = proj.workspace
         @data.each do |key, items|
-          next if (tasks = ws.task_resolve(proj, key)).empty?
+          next if exclude?(key) || (tasks = ws.task_resolve(proj, key)).empty?
 
           if (g = proj.group)
             id << g
@@ -113,13 +114,13 @@ module Squared
         @data.merge!(@session[:parent]) if @session[:id].uniq.size > 1
         @data.merge!(@session[:group])
         @data.each do |key, items|
-          next if items.empty? || @workspace.task_exclude?(t = name_get(key))
+          next if exclude?(key, true) || @workspace.task_exclude?(t = name_get(key))
 
-          key = task_name(t)
+          key = task_name t
           val = format_desc(key, out: true)
           if items.size > 1
             @multiple << key
-            if parallel.include?(t) || pattern.any? { |pat| t.match?(pat) } || subcheck.(t)
+            if parallel.include?(t) || pattern.any? { |pat| t.match?(pat) } || subcheck.call(t)
               task_desc("#{val} (thread)", name: key)
               multitask key => items
               @parallel << key
@@ -167,14 +168,13 @@ module Squared
         return false unless (items = TASK_EXTEND[key]) && !(items = items.select { |kind| obj.is_a?(kind) }).empty?
 
         meth = :"#{key}?"
-        allref = obj.allref.to_a
         ret = false
         items.each do |kind|
           if kind.instance_methods.include?(meth)
             out = obj.__send__(meth)
             return true if out == 1
             return out if obj.ref?(kind.ref)
-          elsif allref.include?(kind.ref)
+          elsif obj.ref?(kind.ref)
             ret = true
           end
         end
@@ -199,6 +199,10 @@ module Squared
         already_invoked?(parallel, val)
       end
 
+      def exclude?(key, empty = false)
+        @exclude.include?(key) || (empty && @data[key].empty?)
+      end
+
       private
 
       def already_invoked?(list, val)

data/lib/squared/workspace.rb

@@ -10,15 +10,14 @@ module Squared
           if id.is_a?(Symbol)
             project id
           else
-            id = dirpath(id) if id.is_a?(String)
-            __get__(:project).find { |_, val| val.path.to_s == id.to_s }
+            __get__(:project).find { |_, val| File.expand_path(val.path) == File.expand_path(id) }
           end
         end
         ret.size == 1 ? ret.first : ret
       end
 
       def expect(name)
-        ret = project(name)
+        ret = project name
         return ret if ret&.path&.directory?
 
         raise NoMethodError, "project is not initialized (#{name})"
@@ -33,12 +32,6 @@ module Squared
       def project(name)
         __get__(:project)[name.to_s]
       end
-
-      def dirpath(val, absolute: true)
-        Pathname.new(val).realdirpath
-      rescue StandardError
-        absolute ? Pathname.pwd.join(val) : Pathname.new(val)
-      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.9
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []