squared 0.4.5 → 0.4.7

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

@@ -33,20 +33,25 @@ module Squared
         OPT_GEM = {
           common: %w[backtrace debug q|quiet no-verbose norc silent V|verbose config-file=p].freeze,
           install: %w[version=b].freeze,
+          install_base: %w[f b|both clear-sources conservative default development development-all E|explain
+                           ignore-dependencies l|local N|no-document r|remote w|vendor n|bindir=p build-root=p
+                           bulk-threshold=i document=b? g|file=p? p|http-proxy=q i|install-dir=p platform=q s|source=q
+                           target-rbconfig=p? P|trust-policy=b without=b].freeze,
           update: %w[system=b?].freeze,
+          uninstall: %w[a D I x vendor n|bindir=p i|install-dir=p platform=b v|version=b].freeze,
           outdated: %w[b|both clear-sources l|local no-http-proxy r|remote B|bulk-threshold=i p|http-proxy=q?
                        platform=q source=q].freeze,
           push: %w[no-http-proxy attestation=p host=q key=b otp=b p|http-proxy=q?].freeze,
           build: %w[force strict o|output=p platform=q].freeze,
-          exec: %w[conservative prerelease no-prerelease g|gem=b version=b].freeze,
+          exec: %w[conservative prerelease no-prerelease g|gem=v version=b].freeze,
           pristine: %w[all env-shebang extensions no-env-shebang no-extensions only-executables only-missing-extensions
                        only-plugins n|bindir=p i|install-dir=p skip=b v|version=b].freeze,
-          shared: %w[f b|both clear-sources conservative default development development-all E|explain
-                     ignore-dependencies l|local N|no-document r|remote w|vendor n|bindir=p build-root=p
-                     bulk-threshold=i document=b? g|file=p? p|http-proxy=q i|install-dir=p platform=q s|source=q
-                     target-rbconfig=p? P|trust-policy=b without=b].freeze,
-          shared_no: %w[env-shebang force format-executable http-proxy lock minimal-deps post-install-message
-                        prerelease suggestions user-install wrappers].freeze
+          no: {
+            install: %w[env-shebang force format-executable http-proxy lock minimal-deps post-install-message
+                        prerelease suggestions user-install wrappers].freeze,
+            uninstall: %w[abort-on-dependent all check-development executables force format-executable
+                          ignore-dependencies user-install].freeze
+          }.freeze
         }.freeze
         private_constant :GEMFILE, :DIR_RUBY, :OPT_RUBY, :OPT_BUNDLE, :OPT_GEM
 
@@ -72,7 +77,7 @@ module Squared
           'install' => %i[redownload local prefer-local].freeze,
           'update' => %i[patch minor major all].freeze,
           'outdated' => %i[patch minor major].freeze,
-          'gem' => %i[install user-install update pristine outdated push build exec].freeze,
+          'gem' => %i[install uninstall update pristine outdated push build exec].freeze,
           'exec' => nil,
           'cache' => nil,
           'config' => nil,
@@ -99,7 +104,7 @@ module Squared
             File.foreach(file) do |line|
               next unless line.match?(%r{\brequire\s+(["'])bundler/gem_tasks\1})
 
-              cmd = bundle_output('exec', 'rake').to_s
+              cmd = bundle_output('exec rake').to_s
               @output[0] = "#{cmd} build"
               @copy = "#{cmd} install"
               @clean = "#{cmd} clean" if @clean.nil?
@@ -149,7 +154,7 @@ module Squared
                   end
                 when 'irb'
                   next unless (spec = basepath("#{project}.gemspec") || basepath("#{name}.gemspec"))
-                  next unless basepath('lib').join("#{gemname = File.basename(spec, File.extname(spec))}.rb").exist?
+                  next unless basepath('lib').join("#{gemname = stripext(spec)}.rb").exist?
 
                   format_desc action, nil, 'opts*,args*'
                   task action do |_, args|
@@ -201,7 +206,7 @@ module Squared
           if @depend
             super
           elsif outdated?
-            workspace.rev_clear name
+            workspace.rev_clear(name)
             cmd = bundle_session 'install'
             if (n = option('jobs')).to_i > 0
               cmd << "-j#{n}"
@@ -375,46 +380,44 @@ module Squared
           cmd = gem_session
           case flag
           when :outdated
-            if (pwd = gempwd)
-              cmd << pwd
-            end
-            cmd << 'outdated'
+            cmd << gempwd << 'outdated'
           when :push
             cmd << 'push' << project
-          when :'user-install'
-            cmd << 'install' << '--user-install'
           else
             cmd << flag
           end
-          list = OPT_GEM[flag == :'user-install' ? :install : flag] + OPT_GEM[:common]
+          list = OPT_GEM[flag] + OPT_GEM[:common]
+          from = :"gem:#{flag}"
           case flag
-          when :install, :'user-install', :update
-            list += OPT_GEM[:shared]
-            no = OPT_GEM[:shared_no]
+          when :install, :update
+            list.concat(OPT_GEM[:install_base])
+            no = OPT_GEM[:no][:install]
+            first = true
+          when :uninstall
+            no = OPT_GEM[:no][:uninstall]
             first = true
           when :pristine
             first = true
           end
-          opts, pat = option_sanitize(opts, list, no: no, first: first)
-          out = []
-          err = []
-          opts.each do |opt|
-            if opt =~ pat
+          cmd.merge(preopts)
+          op = OptionPartition.new(opts, list, cmd, project: self, no: no, first: first)
+          op.each do |opt|
+            if opt =~ op.values
               case $1
               when 'g', 'gem'
-                cmd << (flag == :exec ? shell_option($1, $2) : quote_option($1, basepath($2)))
+                op << (flag == :exec ? shell_option($1, $2) : quote_option($1, basepath($2)))
               end
-            elsif opt.match?(/^\w+=/) && !%i[outdated build push exec].include?(flag)
-              err << opt
+            elsif opt.include?('=') && !%i[outdated build push exec].include?(flag)
+              op.errors << opt
             else
-              out << opt
+              op.found << opt
             end
           end
-          from = :"gem:#{flag == :'user-install' ? 'install' : flag}"
+          op.swap
           case flag
           when :outdated
             log.info cmd.to_s
-            option_clear out
+            op.clear
             on :first, from
             print_item format_banner(cmd.to_s)
             pwd_set(pass: !pwd.nil?, from: from) do
@@ -491,39 +494,39 @@ module Squared
             on :last, from
             return
           when :build, :push
-            if !out.empty?
-              if flag == :build && out.size == 1
-                cmd << shell_quote(basepath(out.first))
+            if !op.empty?
+              if flag == :build && op.size == 1
+                op << shell_quote(basepath(op.first))
               else
-                raise_error("unknown args: #{out.join(', ')}", hint: flag)
+                raise_error("unknown args: #{op.join(', ')}", hint: flag)
               end
             elsif flag == :build
-              cmd << "#{project}.gemspec"
+              spec = [basepath("#{project}.gemspec"), basepath("#{name}.gemspec"), *Dir.glob(basepath('*.gemspec'))]
+              op << File.basename(spec) if (spec = spec.find { |val| File.exist?(val) })
             end
           when :exec
-            raise_error('no command given', hint: flag) if out.empty?
-            cmd << project << out.join(' ')
+            raise_error('missing command', hint: flag) if op.empty?
+            op << project << op.join(' ')
           else
-            raise_error('no gemname given', hint: flag) if out.empty? && !session_arg?('system')
+            raise_error('missing gemname', hint: flag) if op.empty? && !op.arg?('system')
             if flag == :pristine
-              if session_arg?('all')
-                append_repeat 'skip', out
-                out.clear
-              elsif (n = out.first.index('@'))
-                name = out.first
+              if op.arg?('all')
+                append_repeat 'skip', op.extras
+                op.clear
+              elsif (n = op.first.index('@'))
+                name = op.shift
                 if n == 0
-                  cmd << project
+                  op << project
                   ver = name[1..-1]
                 else
-                  cmd << shell_escape(name[0, n])
+                  op << shell_escape(name[0, n])
                   ver = name[n + 1..-1]
                 end
-                cmd << shell_option('version', ver)
-                out.clear
+                op << shell_option('version', ver)
+                op.clear
               end
             end
-            append_value(out, escape: true)
-            option_clear err
+            op.append.clear(errors: true)
           end
           run_rb(from: from)
         end
@@ -532,13 +535,14 @@ module Squared
           cmd = bundle_session flag
           args = case flag
                  when 'exec', 'cache', 'check'
-                   option_sanitize(args, OPT_BUNDLE[flag.to_sym] + OPT_BUNDLE[:common], args: flag == :exec).first
+                   list = OPT_BUNDLE[flag.to_sym] + OPT_BUNDLE[:common]
+                   OptionPartition.new(args, list, cmd, project: self, args: flag == :exec).extras
                  else
                    args.flatten
                  end
           case flag
           when 'exec', 'config'
-            raise_error('no command given', hint: flag) if args.empty?
+            raise_error('no command args', hint: flag) if args.empty?
             cmd.merge(args)
           else
             option_clear args
@@ -547,24 +551,23 @@ module Squared
         end
 
         def rake(*args, opts: [])
-          target = [quote_option('f', rakefile)]
-          args += option_sanitize(opts, OPT_RUBY[:rake], target: target).first
+          op = OptionPartition.new(opts, OPT_RUBY[:rake], [quote_option('f', rakefile)], project: self)
+          args.concat(op.extras)
           if args.empty?
             args << nil
           else
             args.flatten!
           end
-          cmd = rake_output(*target)
+          cmd = rake_output(*op.to_a)
           args.map! { |val| cmd.temp(val) }
           run_s(args, banner: false, from: :rake)
         end
 
         def irb(name, opts = [], path: basepath('lib'))
-          cmd = session 'irb'
-          args = option_sanitize(opts, OPT_RUBY[:irb], first: true).first
-          as_a(name).each { |val| cmd << shell_option('r', val) }
-          as_a(path).each { |val| cmd << quote_option('I', val) }
-          cmd.merge(args)
+          op = OptionPartition.new(opts, OPT_RUBY[:irb], session('irb'), project: self, first: true)
+          as_a(name).each { |val| op << shell_option('r', val) }
+          as_a(path).each { |val| op << quote_option('I', val) }
+          op.merge(op.extras)
           run(banner: false)
         end
 
@@ -590,7 +593,7 @@ module Squared
           if @version
             pwd = gempwd
             pwd_set(pass: !pwd.nil?) do
-              out = `#{gem_output(pwd, 'list', '--local', '-d', project)}`
+              out = `#{gem_output(pwd, 'list --local -d', project)}`
               if out =~ /#{Regexp.escape(project)} \(([^)]+)\)/
                 ver = $1.split(/\s*,\s*/)
                 ver.unshift(@version).uniq!
@@ -639,32 +642,41 @@ module Squared
         end
 
         def append_bundle(opts, list, target: @session, append: nil)
-          out = option_sanitize(opts, list, target: target).first
+          op = OptionPartition.new(opts, list, target, project: self)
           if append
             if append.is_a?(Regexp)
-              out, err = out.partition { |val| !val.match?(append) }
-              option_clear(err, target: target)
+              op.each do |opt|
+                if opt.match?(append)
+                  op.errors << opt
+                else
+                  op.found << opt
+                end
+              end
+              op.swap.clear(errors: true)
             end
-            append_value(out, target: target, escape: true)
+            op.append(escape: true)
           else
-            option_clear(out, target: target)
+            op.clear
           end
         end
 
         def gem_session(*cmd, **kwargs)
           ret = session('gem', *cmd, **kwargs)
-          ret << '--no-verbose' unless verbose
-          ret
+          return ret if cmd.empty?
+
+          ret.merge(preopts)
         end
 
         def bundle_session(*cmd, **kwargs)
           ret = session('bundle', *cmd, **kwargs)
+          return ret if cmd.empty?
+
           append_nocolor
-          ret
+          ret.merge(preopts)
         end
 
         def rake_session(*cmd, **kwargs)
-          session('rake', *cmd, **kwargs)
+          session('rake', *preopts, *cmd, **kwargs)
         end
 
         def gem_output(*cmd, **kwargs)
@@ -694,6 +706,10 @@ module Squared
           @rakelist = ret
         end
 
+        def preopts
+          verbosetype > 1 && !session_arg?('quiet') ? ['--verbose'] : []
+        end
+
         def gemdir?
           @gemdir.exist? && !@gemdir.empty?
         end

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

@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+module Squared
+  module Workspace
+    module Project
+      module Support
+        class OptionPartition
+          include Common::Shell
+          extend Forwardable
+
+          class << self
+            include Common::Format
+            include Shell
+            include Prompt
+
+            def append(target, *args, delim: false, escape: false, quote: true)
+              return if args.empty?
+
+              target << '--' if delim && !target.include?('--')
+              ret = args.flatten.map { |val| escape ? shell_escape(val, quote: quote) : shell_quote(val) }
+              if target.is_a?(Set)
+                target.merge(ret)
+              else
+                target.concat(ret)
+              end
+              ret
+            end
+
+            def clear(target, opts, pass: true, styles: nil, **kwargs)
+              return if opts.empty?
+
+              kwargs[:subject] ||= stripext(target.first)
+              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)
+
+              raise_error 'user cancelled'
+            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) } }
+            end
+          end
+
+          attr_reader :target, :extras, :found, :errors, :values, :project, :path
+
+          def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
+                         :merge, :delete, :delete?, :grep, :inspect, :to_a, :to_s
+          def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :first, :last, :shift, :pop, :push,
+                         :join, :map, :map!, :dup, :size
+
+          def initialize(opts, list, target = Set.new, project: nil, path: nil, **kwargs, &blk)
+            @target = target.is_a?(Set) ? target : Set.new(target)
+            @project = project
+            @path = path || project&.path
+            @errors = []
+            @found = []
+            parse(list, opts, **kwargs, &blk)
+          end
+
+          def parse(list, opts = extras, no: nil, single: nil, args: false, first: false, pass: ['='], &blk)
+            @extras = []
+            @values = []
+            bare = []
+            e = []
+            b = []
+            m = []
+            p = []
+            q = []
+            qq = []
+            i = []
+            f = []
+            si = []
+            list.map do |val|
+              x, y = val.split('|')
+              if y
+                if (n = val.index('='))
+                  x += val[n..-1]
+                end
+                [x, y]
+              else
+                x
+              end
+            end
+            .flatten
+            .each do |val|
+              if (n = val.index('='))
+                flag = val[0, n]
+                case val[n + 1]
+                when 'e'
+                  e << flag
+                when 'b'
+                  b << flag
+                when 'm'
+                  m << flag
+                when 'q'
+                  qq << flag if val[n + 2] == 'q'
+                  q << flag
+                when 'p'
+                  p << flag
+                when 'i'
+                  i << flag
+                when 'f'
+                  f << flag
+                when 'n'
+                  si << flag
+                when 'v'
+                  @values << Regexp.escape(flag)
+                else
+                  next
+                end
+                bare << flag if val.end_with?('?')
+              else
+                bare << val
+              end
+            end
+            no = (no || []).map { |val| (n = val.index('=')) ? val[0, n] : val }
+            bare.concat(no)
+            skip = false
+            opts.each do |opt|
+              next @extras << opt if skip
+
+              if single&.match?(opt)
+                target << "-#{opt}"
+              elsif bare.include?(opt)
+                target << (opt.size == 1 ? "-#{opt}" : "--#{opt}")
+              elsif opt.start_with?('no-') && no.include?(name = opt[3..-1])
+                target << "--no-#{name}"
+              else
+                if opt =~ /\A([^=]+)=(.+)\z/
+                  key = $1
+                  val = $2
+                  match = ->(flag, pat) { flag.include?(key) && pat.match?(val) }
+                  if e.include?(key)
+                    target << shell_option(key, val)
+                  elsif q.include?(key)
+                    target << quote_option(key, val, double: qq.include?(key))
+                  elsif p.include?(key) && path
+                    target << quote_option(key, path.join(val))
+                  elsif m.include?(key)
+                    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
+                  opt = key
+                else
+                  @extras << opt
+                  skip = true if args
+                end
+                skip = true if first && pass.none? { |s| opt.include?(s) }
+              end
+            end
+            @values = @values.empty? ? /\A\s+\z/ : /\A(#{@values.join('|')})=(.+)\z/
+            @extras.each_with_index(&blk) if block_given?
+            self
+          end
+
+          def swap(opts = nil)
+            unless opts
+              opts = found
+              @found = []
+            end
+            @extras = opts
+            self
+          end
+
+          def append(*args, **kwargs)
+            OptionPartition.append(target, *(args.empty? ? extras : args), **kwargs)
+            self
+          end
+
+          def clear(opts = nil, **kwargs)
+            opts ||= (kwargs[:errors] ? errors : extras)
+            styles = project.theme[:inline] if project
+            OptionPartition.clear(target, opts.reject { |val| found.include?(val) }, styles: styles, **kwargs)
+            opts.clear
+            self
+          end
+
+          def arg?(*args, **kwargs)
+            OptionPartition.arg?(target, *args, **kwargs)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'support/class'

data/lib/squared/workspace/project.rb

@@ -22,5 +22,6 @@ module Squared
   end
 end
 
+require_relative 'project/support'
 require_relative 'project/base'
 require_relative 'project/git'

data/lib/squared/workspace/series.rb

@@ -135,7 +135,7 @@ module Squared
           task_desc(val, name: key)
           task key => items
         end
-        @multiple += sync
+        @multiple.concat(sync)
       end
 
       def name_get(key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - An Pham
@@ -97,6 +97,8 @@ files:
 - lib/squared/workspace/project/node.rb
 - lib/squared/workspace/project/python.rb
 - lib/squared/workspace/project/ruby.rb
+- lib/squared/workspace/project/support.rb
+- lib/squared/workspace/project/support/class.rb
 - lib/squared/workspace/repo.rb
 - lib/squared/workspace/series.rb
 - squared.gemspec
@@ -121,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []