squared 0.8.7 → 0.9.0.pre1

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

@@ -21,25 +21,24 @@ module Squared
                   nomultiline noprompt noscript nosingleline noverbose regexp-completor sample-book-mode script
                   simple-prompt single-irb singleline tracer truncate-echo-on-assignment type-completor verbose
                   back-trace-limit=i context-mode=i prompt=b prompt-mode=b].freeze,
-          rdbg: %w[e=q no-color no-rc no-sigint-hook c|command n|nonstop stop-at-load cookie=q host=q x|init-script=p
+          rdbg: %w[no-color no-rc no-sigint-hook c|command n|nonstop stop-at-load cookie=q e=q host=q x|init-script=p
                    O|open=q? port=i port-range=b session-name=q sock-path=q util=q].freeze,
           rbs: %w[I=pm r=bm no-collection no-stdlib collection=p log-level=b log-output=p repo=p].freeze,
-          rubocop: %w[D P r=bm auto-gen-config a|autocorrect A|autocorrect-all d|debug diff disable-all-cops
-                      disable-pending-cops display-only-correctable display-only-fail-level-offenses display-only-failed
-                      display-only-safe-correctable S|display-style-guide display-suppressed display-time
-                      disable-uncorrectable editor-mode enable-pending-cops E|extra-details F|fail-fast
-                      force-default-config force-exclusion x|fix-layout ignore-disable-comments ignore-parent-exclusion
-                      ignore-unrecognized-cops init l|lint L|list-target-files lsp mcp memory no-detach no-exclude-limit
-                      only-guide-cops only-recognized-file-types profile raise-cop-error regenerate-todo
-                      report-unused-todo-entries restart-server safe server-status start-server stderr stop-server
-                      verbose-version C|cache=b cache-root=p changed=b config=p exclude-limit=i fail-level=b f|format=b
-                      except=q list-enabled-cops-for=p only=q o|out=p plugin=p require=p show-cops=q show-docs-url=q
-                      s|stdin=p].freeze,
+          rubocop: %w[D P r=bm auto-gen-config a|autocorrect A|autocorrect-all d|debug disable-pending-cops
+                      display-only-correctable display-only-fail-level-offenses display-only-failed
+                      display-only-safe-correctable S|display-style-guide display-time disable-uncorrectable editor-mode
+                      enable-pending-cops E|extra-details F|fail-fast force-default-config force-exclusion x|fix-layout
+                      ignore-disable-comments ignore-parent-exclusion ignore-unrecognized-cops init l|lint
+                      list-enabled-cops-for=p L|list-target-files lsp memory no-detach only-guide-cops
+                      only-recognized-file-types no-exclude-limit profile raise-cop-error regenerate-todo
+                      restart-server safe server-status start-server stderr stop-server C|cache=b cache-root=p config=p
+                      exclude-limit=i fail-level=b f|format=b except=q only=q o|out=p plugin=p require=p show-cops=q
+                      show-docs-url=q s|stdin=p].freeze,
           pry: %w[f e=q I=pm no-color no-history no-multiline no-pager no-plugins simple-prompt c|context=q
                   d|disable-plugin=q gem=b r|require=bm s|select-plugin=q].freeze,
           no: {
             rubocop: %w[auto-gen-enforced-style auto-gen-only-exclude auto-gen-timestamp color display-cop-names
-                        offense-counts parallel preview server].freeze
+                        offense-counts parallel server].freeze
           }
         }.freeze
         OPT_BUNDLE = {
@@ -227,10 +226,9 @@ module Squared
           serve_set kwargs[:serve]
           gemfile_set kwargs[:gemspec]
           self.autodetect = autodetect
-          @bundle = { exec: exec }
+          @bundle = { exec: exec.is_a?(String) ? basepath!(exec) : false }
           @steepfile = basepath! steep if steep
-          rubocop = rootpath('.rubocop.yml', ascend: Dir.home) if rubocop == true
-          @rubocopfile = basepath! rubocop if rubocop
+          @rubocopfile = Pathname.new(rubocop).realpath rescue basepath!(Dir.home, '.rubocop.yml') if rubocop
           @rubygems = kwargs.fetch(:rubygems, 0)
           return unless rakefile && @output[0].nil? && @copy.nil? && !version && !self.autodetect
 
@@ -238,10 +236,10 @@ module Squared
             File.foreach(rakefile) do |line|
               next unless line.match?(%r{\brequire\s+(["'])bundler/gem_tasks\1})
 
-              cmd = bundle_output('exec rake').to_s
-              @output[0] = "#{cmd} build"
-              @copy = "#{cmd} install"
-              @clean = "#{cmd} clean" if @clean.nil?
+              cmd = "#{bundle_output('exec rake')} %s"
+              @output[0] = cmd % 'build'
+              @copy = cmd % 'install'
+              @clean = cmd % 'clean' if @clean.nil?
               break
             end
           rescue => e
@@ -331,7 +329,7 @@ module Squared
                     opts = args.to_a
                     cmd = opts.delete('::')
                     if (n = opts.index('c'))
-                      args = opts.slice!(n.succ..-1)
+                      args = opts.slice!(n.succ..)
                     else
                       file = opts.shift
                       args = []
@@ -461,11 +459,13 @@ module Squared
                       when :build, :push, :exec, :update
                         format_desc(action, flag, 'opts*', after: case flag
                                                                   when :exec then 'command,args*'
-                                                                  when :push then 'file/:'
+                                                                  when :push then 'file/:,d/dry-run?'
                                                                   when :update then 'name*'
                                                                   end)
                         task flag do |_, args|
-                          gem(flag, opts: args.to_a, banner: true)
+                          opts = args.to_a
+                          filter = { dryrun: true } if flag == :push && has_value!(opts, 'd', 'dry-run')
+                          gem(flag, opts: opts, banner: true, filter: filter)
                         end
                       when :install, :uninstall, :pristine
                         format_desc(action, flag, 'opts*', after: flag == :pristine ? 'name*|name?@version' : 'name*')
@@ -572,13 +572,18 @@ module Squared
                                       else
                                         %w[## ;]
                                       end
-                          msg = if Prompt.reline.respond_to?(:readmultiline)
-                                  'ruby>'
-                                else
-                                  multiline = Array(multiline)
-                                  'Enter script'
-                                end
-                          command = ENV['RUBY_E'] || readline(msg, force: true, multiline: multiline)
+                          unless (command = ENV['RUBY_E'])
+                            command = if Prompt.reline.respond_to?(:readmultiline)
+                                        require 'ripper'
+                                        readline('ruby>', force: true, multiline: multiline) do |code|
+                                          next if code.strip.empty? || !Ripper.sexp(code)
+
+                                          Array(multiline).any? { |s| code.split.last.match?(/(?<!#{s[-1]})#{s}$/) }
+                                        end
+                                      else
+                                        readline('Enter script', force: true, multiline: Array(multiline))
+                                      end
+                          end
                           ruby(flag, opts: args.to_a, command: command)
                         end
                       when :version
@@ -701,7 +706,7 @@ module Squared
                                                    .lines
                                                    .map { |line| line.sub(/#.*$/, '').strip }
                                                    .reject(&:empty?)
-                                                   .yield_self do |lines|
+                                                   .then do |lines|
                                                      target = lines.find { |line| line.include?(tool) }
                                                      target ? [target] : lines
                                                    end
@@ -788,7 +793,7 @@ module Squared
                                                     when '1', 'true' then nil
                                                     else
                                                       if val.start_with?('~')
-                                                        val = File.join(Dir.home, val == '~' ? '.bundle' : val[1..-1])
+                                                        val = File.join(Dir.home, val == '~' ? '.bundle' : val[1..])
                                                         if prod?
                                                           config_set('binstubs', shell_quote(val), global: true)
                                                           val = nil
@@ -978,8 +983,9 @@ module Squared
             if found > 0
               unless Array(items).empty?
                 gems = if se
-                         choice('Select a package', items.map(&:first),
-                                multiple: true, force: false, index: true, border: true).map { |n| items[n.pred].last }
+                         choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                        border: true, **parse_select)
+                           .map { |n| items[n.pred].last }
                        else
                          items.map(&:last)
                        end
@@ -1041,7 +1047,7 @@ module Squared
             end
           end
           print_run(op, banner, **kwargs) unless flag
-          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: from || :ruby)
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: from || :ruby)
         end
 
         def gem(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1213,8 +1219,9 @@ module Squared
               puts 'No updates were found'
             else
               if items
-                update = choice('Select a package', items.map(&:first),
-                                multiple: true, force: false, index: true, border: true).map { |n| items[n.pred].last }
+                update = choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                        border: true, **parse_select)
+                           .map { |n| items[n.pred].last }
               end
               unless Array(update).empty?
                 opts = ['f']
@@ -1298,7 +1305,12 @@ module Squared
 
               op.add_path(file)
             end
-            return run(from: from, interactive: ['Push', 'N', target || gemname]) unless with || !banner
+            if dryrun? || kwargs[:filter]&.fetch(:dryrun, nil)
+              print_item "> #{op}"
+              exit 0
+            elsif !with && banner
+              return run(from: from, interactive: ['Push', 'N', target || gemname])
+            end
           when :exec
             min = if op.arg?('g', 'gem')
                     1
@@ -1367,9 +1379,9 @@ module Squared
               name = op.remove_at(n)
               n = name.index('@')
               pre, ver = if n == 0
-                           [gemname, name[1..-1]]
+                           [gemname, name[1..]]
                          else
-                           [name[0, n], name[n.succ..-1]]
+                           [name[0, n], name[n.succ..]]
                          end
               op.adjoin(pre, quote_option('version', ver))
                 .clear
@@ -1418,7 +1430,7 @@ module Squared
           op.clear(errors: true) if gems
           print_run(op, banner, **kwargs)
           run(banner: banner && %w[q silent quiet no-verbose].none? { |s| op.include?(shell_option(s)) },
-              exception: exception?(**kwargs), from: from)
+              exception: kwargs.fetch(:exception, exception?), from: from)
         end
 
         def bundle(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1555,7 +1567,7 @@ module Squared
             op.clear
           end
           print_run(op, banner, **kwargs)
-          ret = run(sync: sync, banner: banner, exception: exception?(**kwargs),
+          ret = run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?),
                     from: symjoin('bundle', flag))
           success?(ret, banner, output)
         end
@@ -1568,7 +1580,7 @@ module Squared
           op.append(escape: true)
           print_run(op, banner, **kwargs)
           var = { 'BANNER' => '0' } unless banner
-          run(op, var, sync: sync, banner: false, exception: exception?(**kwargs), from: :rake)
+          run(op, var, sync: sync, banner: false, exception: kwargs.fetch(:exception, exception?), from: :rake)
         end
 
         def irb(*args, banner: verbose?, with: nil, pass: PASS_RUBY[:irb], **kwargs)
@@ -1583,7 +1595,7 @@ module Squared
 
         def rdbg(*args, banner: verbose?, with: nil, pass: PASS_RUBY[:rdbg], **kwargs)
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          cmd = session(*bundle_args('rdbg'))
+          cmd = session 'rdbg'
           args.each_with_index do |val, i|
             break if val == '--'
             next unless exist?(val, type: 'f')
@@ -1596,7 +1608,7 @@ module Squared
           op.concat(args)
           op.append(quote: false, delim: true)
           print_run(op, banner, **kwargs)
-          run(banner: false, exception: exception?(**kwargs), from: :rdbg)
+          run(banner: false, exception: kwargs.fetch(:exception, exception?), from: :rdbg)
         end
 
         def rbs(flag, *args, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1645,7 +1657,7 @@ module Squared
             op.clear
               .append(*args)
             print_run(op, banner, **kwargs)
-            run(banner: false, exception: exception?(**kwargs), from: symjoin('rbs', flag))
+            run(banner: false, exception: kwargs.fetch(:exception, exception?), from: symjoin('rbs', flag))
           end
         end
 
@@ -1668,7 +1680,7 @@ module Squared
           op.append(delim: true)
             .clear(errors: true)
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: :rubocop)
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: :rubocop)
         end
 
         def serve(root, *, bind: nil, port: 3000, **kwargs)
@@ -1828,10 +1840,7 @@ module Squared
                 set.call(ver, val)
               end
             end
-            if semgte?('2.6')
-              target = RUBY_VERSION.start_with?('2.6') ? RubyVM : $LOAD_PATH
-              parse.call(target.resolve_feature_path(gemname)&.last)
-            end
+            parse.call($LOAD_PATH.resolve_feature_path(gemname)&.last)
             unless gemdir || pwd_set { parse.call(`#{bundle_output('show', gemname)}`) }
               raise Errno::ENOENT, 'gems home'
             end
@@ -1862,11 +1871,11 @@ module Squared
           op.concat(args)
           op.append(delim: delim)
           print_run(op, banner, **kwargs)
-          run(banner: false, exception: exception?(**kwargs), from: from)
+          run(banner: false, exception: kwargs.fetch(:exception, exception?), from: from)
         end
 
         def ruby_session(*cmd, **kwargs)
-          session(*bundle_args('ruby'), *preopts, *cmd, **kwargs)
+          session('ruby', *preopts, *cmd, **kwargs)
         end
 
         def gem_session(*cmd, **kwargs)
@@ -1884,10 +1893,11 @@ module Squared
         end
 
         def rbs_session(*cmd, opts: nil)
-          return session(*bundle_args('rbs'), *cmd) unless opts
+          args = bundle_args 'rbs'
+          return session(*args, *cmd) unless opts
 
           op = OptionPartition.new(opts, OPT_RUBY[:rbs], project: self, strict: strict?)
-          [session(*bundle_args('rbs'), *op.to_a, *cmd), op.extras]
+          [session(*args, *op.to_a, *cmd), op.extras]
         end
 
         def gem_output(*cmd, **kwargs)
@@ -1895,7 +1905,7 @@ module Squared
         end
 
         def ruby_output(*cmd, **kwargs)
-          session_output(*bundle_args('ruby'), *cmd, **kwargs)
+          session_output('ruby', *cmd, **kwargs)
         end
 
         def bundle_output(*cmd, **kwargs)
@@ -1908,20 +1918,7 @@ module Squared
 
         def bundle_args(*args)
           if (val = @bundle[:exec])
-            app = args.first
-            if val.is_a?(Hash)
-              env = val[app.to_s] || val[app.to_sym]
-              return args unless env
-
-              val = env.is_a?(String) ? basepath!(env) : true
-            elsif app == 'ruby'
-              return args
-            end
-            if val.is_a?(String)
-              return args unless (val = basepath!(val))
-
-              args.unshift("--gemfile=#{shell_escape(val.relative_path_from(path), quote: true)}")
-            end
+            args.unshift(quote_option('gemfile', val)) unless val == true
             args.unshift('bundle', 'exec')
           end
           args
@@ -2071,7 +2068,7 @@ module Squared
         end
 
         def gemlib
-          @gemlib ||= Set.new(['lib']).yield_self do |lib|
+          @gemlib ||= Set.new(['lib']).then do |lib|
             if (spec = gemspec)
               lib.merge(spec.require_paths || [])
             end

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

@@ -153,7 +153,7 @@ module Squared
             return true if super
             return extras.include?(obj) unless (n = extras.index(@partition))
 
-            extras[0..n].include?(obj)
+            extras[..n].include?(obj)
           end
 
           def multiple?(val)

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

@@ -19,7 +19,6 @@ module Squared
           class << self
             include Common::Format
             include Shell
-            include Prompt
 
             def append(target, *args, delim: false, escape: false, quote: true, strip: nil, double: false, filter: nil,
                        pass: nil, **kwargs)
@@ -82,7 +81,7 @@ module Squared
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
               warn log_warn(opts.join(', '), pass: true, **kwargs)
-              exit 1 unless !strict && (pass || confirm("Run? [#{sub_style(target, styles)}]", 'N'))
+              exit 1 unless !strict && (pass || Common::Prompt.confirm("Run? [#{sub_style(target, styles)}]", 'N'))
             end
 
             def delete_key(target, *args, value: false, reverse: false, count: -1)
@@ -104,7 +103,7 @@ module Squared
                 next if s.empty? || pass == i
 
                 if s == '--'
-                  ret << s << args[i.succ..-1].join(' ')
+                  ret << s << args[i.succ..].join(' ')
                   break
                 end
                 next ret << s unless s.start_with?('-')
@@ -139,7 +138,7 @@ module Squared
                            j = val =~ OPT_VALUE ? $1 : val
                            (out[j] ||= []) << i unless pass.include?(j)
                          end
-                         .map { |item| item[1].size > 1 ? item[1][0..-2] : [] }
+                         .map { |item| item[1].size > 1 ? item[1][..-2] : [] }
                          .reject(&:empty?)
               return if data.empty?
 
@@ -152,12 +151,12 @@ module Squared
               val = val.strip
               return [val, nil, ''] unless (i = val.index('='))
 
-              last = val[i.succ..-1].strip
+              last = val[i.succ..].strip
               if last =~ /\A(["'])(.*)\1\z/m
                 last = $2
                 quote = $1
               end
-              [val[0..i.pred], last, quote || '']
+              [val[...i], last, quote || '']
             end
 
             def parse_arg!(name, val)
@@ -174,7 +173,7 @@ module Squared
               r << matchopts(s, value) unless s.empty?
               a = target.to_a
               if (n = a.index('--'))
-                a = a[0..n]
+                a = a[..n]
               end
               r.any? { |pat| a.any?(pat) }
             end
@@ -193,6 +192,8 @@ module Squared
               false
             end
 
+            alias filter select
+
             private
 
             def matchopt(val, value = false)
@@ -219,13 +220,12 @@ module Squared
           end
 
           attr_reader :target, :extras, :found, :errors, :values, :project, :path, :sep
-          attr_accessor :stdout
 
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
                          :merge, :compact, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
           def_delegators :@extras, :empty?, :member?, :each, :each_with_index, :each_with_object, :partition, :dup,
                          :first, :shift, :unshift, :pop, :push, :concat, :index, :join, :detect, :map, :map!, :select,
-                         :select!, :reject, :slice, :slice!, :size
+                         :select!, :filter, :filter!, :reject, :slice, :slice!, :size
 
           def_delegator :@extras, :delete, :remove
           def_delegator :@extras, :delete_at, :remove_at
@@ -242,16 +242,14 @@ module Squared
             @sep = sep
             @errors = []
             @found = []
-            @stdout = false
             parse(list, opts, **kwargs, &blk)
           end
 
           def parse(list, opts = extras, no: nil, single: nil, args: false, multiple: nil, first: nil, underscore: nil,
-                    explicit: false, bool: %w[true false], auto: [], regexp: {}, enum: {}, stdin: false, &blk)
+                    explicit: false, bool: %w[true false], stdin: false, &blk)
             @extras = []
             @values = []
             bare = []
-            auto = auto.flat_map { |val| val.split('|', 2) }
             e = []
             b = []
             m = []
@@ -264,13 +262,15 @@ module Squared
             bl = []
             ex = []
             ml = []
+            re = {}
+            ar = {}
             sw = {}
             se = {}
             list.flat_map do |val|
               x, y = val.split('|', 2)
               if y
                 if (n = val.index('='))
-                  x += val[n..-1]
+                  x += val[n..]
                 end
                 [x, y]
               else
@@ -285,10 +285,10 @@ module Squared
               end
               if (n = val.index('='))
                 flag = val[0, n]
-                opt = flag.split(':')
-                mod = if opt.size > 1
-                        pre = opt.shift
-                        opt.map { |s| "#{pre}:#{s}" }
+                enum = flag.split(':')
+                mod = if enum.size > 1
+                        pre = enum.shift
+                        enum.map { |s| "#{pre}:#{s}" }
                       else
                         [flag]
                       end
@@ -319,18 +319,18 @@ module Squared
                   bare.concat(mod)
                 when '/'
                   begin
-                    val = val[n.succ..-1]
+                    val = val[n.succ..]
                     pat = eval(val)
                     raise SyntaxError unless pat.is_a?(Regexp)
 
-                    mod.each { |key| regexp[key] = pat }
+                    mod.each { |key| re[key] = pat }
                   rescue SyntaxError
                     warn "#{self.class}: invalid pattern (#{val})"
                   end
                 when '{'
-                  group = val[(n + 2)..-1].chomp!('}')&.split(',')
+                  group = val[(n + 2)..].chomp!('}')&.split(',')
                   if group
-                    mod.each { |key| enum[key] = group }
+                    mod.each { |key| ar[key] = group }
                   else
                     warn "#{self.class}: invalid group (#{val})"
                   end
@@ -351,7 +351,6 @@ module Squared
               tr = ->(a) { a.map { |val| val.tr('-', '_') } }
               @values.concat(tr.call(@values))
               bare.concat(tr.call(bare))
-              auto.concat(tr.call(auto))
               e.concat(tr.call(e))
               b.concat(tr.call(b))
               m.concat(tr.call(m))
@@ -365,7 +364,6 @@ module Squared
               ml.concat(tr.call(ml))
               no.concat(tr.call(no))
             end
-            bare.concat(auto)
             if target.is_a?(JoinSet)
               target.multiple = multiple if multiple
               target.multiple = ml.map { |val| val.size == 1 ? "-#{val}" : "--#{val}" }
@@ -398,12 +396,8 @@ module Squared
                   add "#{sw[opt]}#{opt}"
                 else
                   add(opt.size == 1 ? "-#{opt}" : "--#{opt}")
-                  if auto.include?(opt)
-                    @stdout = true
-                    break
-                  end
                 end
-              elsif opt.start_with?(/no[-_]/) && no.include?(s = opt[3..-1])
+              elsif opt.start_with?(/no[-_]/) && no.include?(s = opt[3..])
                 add "--no-#{s}"
               else
                 has = lambda do |list, key|
@@ -437,8 +431,8 @@ module Squared
                     else
                       push opt
                     end
-                  elsif !enum.empty? && has.call(enum.keys, key)
-                    group = get.call(enum)
+                  elsif !ar.empty? && has.call(ar.keys, key)
+                    group = get.call(ar)
                     if group.include?(val)
                       add shell_option(key, val, force: false, **kwargs)
                     elsif @strict
@@ -446,10 +440,10 @@ module Squared
                     else
                       push opt
                     end
-                  elsif !regexp.empty? && has.call(regexp.keys, key)
-                    pat = get.call(regexp)
+                  elsif !re.empty? && has.call(re.keys, key)
+                    pat = get.call(re)
                     if val.match?(pat)
-                      add __send__(kwargs[:merge] ? :basic_option : :quote_option, key, val, **kwargs)
+                      add quote_option(key, val, **kwargs)
                     elsif @strict
                       clear([opt], hint: "match != /#{pat.source}/")
                     else
@@ -461,7 +455,7 @@ module Squared
                     push opt
                   end
                   opt = key unless opt == last
-                elsif has.call(m, key = opt[0]) && opt[1..-1] =~ QUOTE_VALUE
+                elsif has.call(m, key = opt[0]) && opt[1..] =~ QUOTE_VALUE
                   add basic_option(key, $2, double: $1 == '"' || has.call(qq, key), **kwargs, merge: true)
                   opt = key
                 else
@@ -619,7 +613,7 @@ module Squared
               else
                 args.each { |val| remove val }
               end
-              args = temp[0, index] + args + temp[index..-1]
+              args = temp[0, index] + args + temp[index..]
               target.clear
             end
             merge args
@@ -828,10 +822,6 @@ module Squared
             end
           end
 
-          def style?(*args)
-            !stdout && args.none?(&:!)
-          end
-
           def uniq!(list)
             list = uniq list
             return if list.empty?

data/lib/squared/workspace/repo.rb

@@ -215,8 +215,8 @@ module Squared
                   opts << '--force-checkout'
                 when 'rebase', 'detach'
                   opts << "--#{val}"
-                when /^(fetch-)?submodules$/
-                  opts << '--fetch-submodules' if repo_submodules?(true, **envargs)
+                when /^(recurse-)?submodules$/
+                  opts << '--recurse-submodules' if repo_submodules?(true, **envargs)
                 when /^(fail-)?fast$/
                   opts << '--fail-fast'
                 when /^no-(manifest-)?update$/
@@ -228,7 +228,7 @@ module Squared
               if (jobs = ENV['REPO_JOBS']) || opts.none?(/^--?j(obs)?$/)
                 opts << "-j#{jobs || Rake::CpuCounter.count}"
               end
-              opts << '--fetch-submodules' if repo_submodules?(**envargs)
+              opts << '--recurse-submodules' if repo_submodules?(**envargs)
               begin
                 repo_run('sync', opts, exception: opts.include?('--fail-fast'), options: stage != 'init')
               rescue Errno::ENOENT => e
@@ -262,7 +262,7 @@ module Squared
         return false unless root.directory?
 
         path = sub_style root, theme[:inline]
-        @repo_override = case env('REPO_Y')
+        @repo_override = case __arg__('YES', 'REPO') || env('REPO_Y')
                          when '0', 'false'
                            false
                          when '1', 'true'
@@ -345,7 +345,7 @@ module Squared
       def repo_opts(*args)
         return args unless (n = ARGV.index('--'))
 
-        ARGV[n.succ..-1].concat(args)
+        ARGV[n.succ..].concat(args)
       end
 
       def repo_submodules?(val = false, **kwargs)

data/lib/squared/workspace/series.rb

@@ -9,6 +9,7 @@ module Squared
       extend Forwardable
 
       attr_reader :sync, :multiple, :parallel
+      attr_writer :ref_min
 
       def_delegators :@data, :[], :each, :each_key, :keys, :key?, :include?, :fetch, :update, :merge!, :any?, :none?,
                      :delete, :delete_if, :find, :find_all, :to_a, :to_s, :inspect
@@ -19,6 +20,7 @@ module Squared
         @sync = []
         @multiple = []
         @parallel = []
+        @ref_min = 2
         @chain = {}
         @exclude = exclude.freeze
         @task = Struct::SeriesData.new(workspace.config_get(:rename))
@@ -56,7 +58,7 @@ module Squared
         @session = {
           group: Support.hashlist,
           parent: Support.hashlist,
-          id: []
+          id: Set.new
         }.freeze
       end
 
@@ -85,7 +87,7 @@ module Squared
 
       def build(parallel: [], pattern: [], **)
         subcheck = ->(val) { (ns = task_namespace(val)) && parallel.include?(ns) }
-        update @session[:parent] if @session[:id].uniq.size > 1
+        update @session[:parent] if @session[:id].size >= @ref_min
         update @session[:group]
         each do |key, items|
           next if exclude?(key, empty: true) || @workspace.task_exclude?(t = name_get(key))