squared 0.4.6 → 0.4.7

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

@@ -5,7 +5,7 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=b].freeze,
+          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=v].freeze,
           install: %w[prefer-dedupe package-lock-only cpu=b libc=b os=b].freeze,
           install_base: %w[ignore-scripts install-links strict-peer-deps include=b omit=b install-strategy=b].freeze,
           install_no: %w[audit bin-links fund package-lock].freeze,
@@ -242,7 +242,7 @@ module Squared
             items << @workspace.home
             @workspace.rev_clear(@workspace.find(@workspace.home).name)
           end
-          items += as_a(also) if also
+          items.concat(as_a(also)) if also
           return if items.empty?
 
           on :first, :copy
@@ -280,7 +280,7 @@ module Squared
               dest = dir.path
               @workspace.rev_clear(dir.name)
             else
-              raise_error "copy given: #{dir}"
+              raise_error "copy: given #{dir}"
             end
             next unless from && dest&.directory?
 
@@ -598,48 +598,48 @@ module Squared
                                   else
                                     flag
                                   end
-            out = option_sanitize(opts, if yarn == 1
-                                          OPT_PNPM[:install_base] + OPT_YARN.fetch(flag, []) + OPT_YARN[:common]
-                                        else
-                                          OPT_BERRY[flag]
-                                        end).first
+            op = OptionPartition.new(opts, if yarn == 1
+                                             OPT_PNPM[:install_base] + OPT_YARN.fetch(flag, []) + OPT_YARN[:common]
+                                           else
+                                             OPT_BERRY[flag]
+                                           end, cmd, project: self)
+            op.clear
             append_loglevel
-            option_clear out
             run(from: :"package:#{flag}")
             return
           elsif pnpm?
             cmd = session 'pnpm', flag
             list = OPT_PNPM[:install_base] + OPT_PNPM.fetch(flag, []) + OPT_PNPM[:common]
-            list += OPT_PNPM[:install_as] unless flag == :dedupe
-            opts = option_sanitize(opts, list, no: OPT_PNPM[:"#{flag}_no"]).first
+            list.concat(OPT_PNPM[:install_as]) unless flag == :dedupe
+            no = OPT_PNPM[:"#{flag}_no"]
           else
             cmd = session 'npm', flag
             list = OPT_NPM[:install_base] + OPT_NPM.fetch(flag, []) + OPT_NPM[:common]
-            list += OPT_NPM[:install_as] unless flag == :dedupe
-            opts, pat = option_sanitize(opts, list, no: OPT_NPM[:install_no])
+            list.concat(OPT_NPM[:install_as]) unless flag == :dedupe
+            no = OPT_NPM[:install_no]
           end
-          out = []
-          err = []
-          opts.each do |opt|
-            if pat && opt =~ pat
+          op = OptionPartition.new(opts, list, cmd, no: no, project: self)
+          op.each do |opt|
+            if opt =~ op.values
               case $1
               when 'w', 'workspace'
-                cmd << (%r{[\\/]}.match?($2) ? quote_option($1, basepath($2)) : shell_option($1, $2))
+                op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
               end
             elsif opt.include?('=')
-              err << opt
+              op.errors << opt
             else
-              out << opt
+              op.found << opt
             end
           end
+          op.swap
           append_nocolor
           append_loglevel
           if flag == :dedupe
-            option_clear out
+            op.clear
           else
-            append_value(out, escape: true)
+            op.append(escape: true)
           end
-          option_clear err
+          op.clear(errors: true)
           run(from: :"package:#{flag}")
         end
 
@@ -693,7 +693,8 @@ module Squared
             end
           rescue StandardError => e
             log.debug e
-            raise if exception
+            ret = on(:error, :bump, e)
+            raise if exception && ret != true
           end
         end
 
@@ -702,13 +703,25 @@ module Squared
 
           cmd = session dependbin, 'pack'
           if dependtype(:yarn) > 1
-            out = option_sanitize(opts, OPT_BERRY[:pack]).first
-            cmd << quote_option('out', Pathname.pwd.join("#{project}-#{version}.tgz")) unless session_arg?('out')
+            op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self)
+            op << quote_option('out', Pathname.pwd.join("#{project}-#{version}.tgz")) unless op.arg?('out')
           else
-            out = option_sanitize(opts, pnpm? ? OPT_PNPM[:pack] : OPT_NPM[:pack] + OPT_NPM[:common]).first
-            cmd << quote_option('pack-destination', Dir.pwd) unless session_arg?('pack-destination')
+            op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : OPT_NPM[:pack] + OPT_NPM[:common], cmd,
+                                     project: self)
+            unless pnpm?
+              op.each do |opt|
+                next unless opt =~ op.values
+
+                case $1
+                when 'w', 'workspace'
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
+                  op.found << opt
+                end
+              end
+            end
+            op << quote_option('pack-destination', Dir.pwd) unless op.arg?('pack-destination')
           end
-          option_clear out
+          op.clear
           run(from: :pack)
         end
 
@@ -731,7 +744,7 @@ module Squared
             when Enumerable
               target.to_a.join(' ')
             else
-              raise_error("compose given: #{target}", hint: from)
+              raise_error("compose: given #{target}", hint: from)
             end
           end
         end

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

@@ -20,7 +20,7 @@ module Squared
           install: %w[break-system-packages check-build-dependencies compile dry-run force-reinstall I|ignore-installed
                       ignore-requires-python no-build-isolation no-clean no-compile no-deps no-index no-warn-conflicts
                       no-warn-script-location pre prefer-binary require-hashes U|upgrade use-pep517 user abi=b
-                      config-settings=q c|constraint=p extra-index-url=q f|find-links=q global-option=q
+                      config-settings=q c|constraint=p e|editable=v extra-index-url=q f|find-links=q global-option=q
                       implementation=b i|index-url=q no-binary=q only-binary=q platform=q prefix=p progress-bar=b
                       python-version=q report=p r|requirement=p root=p root-user-action=b src=p t|target=p
                       upgrade-strategy=b].freeze,
@@ -120,12 +120,13 @@ module Squared
                       format_desc action, flag, 'dir,opts*'
                       task flag, [:dir] do |_, args|
                         dir = basepath(param_guard(action, flag, args: args, key: :dir))
-                        opts = python_session('-m venv', opts: args.extras).last
-                        opts = option_sanitize(opts, OPT_PYTHON[:venv]).first
-                        append_value(dir, delim: true)
-                        option_clear(opts, pass: false)
+                        cmd, opts = python_session('-m venv', opts: args.extras)
+                        op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
+                        op.append(dir, delim: true)
+                          .clear(pass: false)
+                        v = op.arg?(/^-v+$/, 'verbose')
                         run(exception: true)
-                        puts(dir.directory? ? "Success: #{dir}" : 'Failed')
+                        puts(dir.directory? ? "Success: #{dir}" : 'Failed') unless v
                       end
                     elsif venv
                       case flag
@@ -134,7 +135,7 @@ module Squared
 
                         format_desc action, flag, 'c|reate?,d|epend?'
                         task flag do |_, args|
-                          FileUtils.rm_rf(venv, verbose: true)
+                          rm_rf(venv, verbose: true)
                           venv_init if has_value?(%w[c create], args.to_a)
                           depend if has_value?(%w[d depend], args.to_a)
                         end
@@ -341,6 +342,7 @@ module Squared
             cmd << quote_option('e', out.pop || editable || '.')
             option_clear out
           when :upgrade
+            raise_error('no packages listed', hint: flag) if out.empty?
             cmd << '--upgrade'
             cmd << basic_option('upgrade-strategy', strategy) if strategy
             append_value out
@@ -349,8 +351,6 @@ module Squared
         end
 
         def buildx(flag, opts = [])
-          out = []
-          srcdir = nil
           case flag
           when :python
             cmd, opts = python_session('-m build', opts: opts)
@@ -362,20 +362,23 @@ module Squared
             cmd, opts = hatch_session('build', opts: opts)
             list = OPT_HATCH[:build]
           end
-          option_sanitize(opts, list, single: flag == :python ? /^(?:v+|q+|b+)$/ : /^(?:v+|q+)$/).first.each do |opt|
+          srcdir = nil
+          op = OptionPartition.new(opts, list, cmd, project: self, single: singleopt(flag))
+          op.each do |opt|
             if !srcdir && basepath(opt).exist? && projectpath?(opt)
               srcdir = opt
             else
-              out << opt
+              op.found << opt
             end
           end
+          op.swap
           case flag
           when :poetry
             if srcdir
-              if session_arg?('o', 'output')
-                out << srcdir
+              if op.arg?('o', 'output')
+                op.extras << srcdir
               else
-                cmd << quote_option('output', basepath(srcdir))
+                op << quote_option('output', basepath(srcdir))
               end
               srcdir = nil
             end
@@ -385,10 +388,10 @@ module Squared
             else
               srcdir ||= path
             end
-            cmd << basic_option('p', project) unless ENV['HATCH_PROJECT'] || session_arg?('p', 'project')
+            op << basic_option('p', project) unless ENV['HATCH_PROJECT'] || op.arg?('p', 'project')
           end
-          cmd << shell_quote(basepath(srcdir)) if srcdir
-          option_clear out
+          op << shell_quote(basepath(srcdir)) if srcdir
+          op.clear
           run(from: :"#{flag}:build")
         end
 
@@ -404,13 +407,13 @@ module Squared
             opts = hatch_session('publish', opts: opts).last
             list = OPT_HATCH[:publish]
           end
-          out = option_sanitize(opts, list, single: flag == :twine ? nil : /^(?:v+|q+)$/).first
-          if out.empty?
+          op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
+          if op.empty?
             dist = basepath.join('dist')
             raise_error('no source files found', hint: dist) unless dist.directory? && !dist.empty?
-            out << "#{dist}/*" unless flag == :poetry
+            op.extras << "#{dist}/*" unless flag == :poetry
           end
-          append_value out
+          op.append
           run(from: :"#{flag}:publish")
         end
 
@@ -419,7 +422,7 @@ module Squared
           out = append_pip(nil, opts, from: flag)
           case flag
           when :uninstall
-            raise_error('no packages listed', subject: name, hint: 'uninstall') if out.empty?
+            raise_error('no packages listed', hint: 'uninstall') if out.empty?
             cmd.merge(out)
           when :freeze
             venv_init
@@ -465,10 +468,9 @@ module Squared
         def python_session(*cmd, opts: nil)
           return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
 
-          out = []
-          opts = option_sanitize(opts, OPT_PYTHON[:common], target: out, single: /^v+$/).first
-          ret = session('python', *out, *cmd, path: venv.nil?)
-          [ret, opts]
+          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: /^v+$/)
+          ret = session('python', *op.to_a, *cmd, path: venv.nil?)
+          [ret, op.extras]
         end
 
         def poetry_session(*cmd)
@@ -482,48 +484,47 @@ module Squared
         def hatch_session(*cmd, opts: nil)
           return session('hatch', *preopts, *cmd, path: venv.nil?) unless opts
 
-          out = []
-          opts = option_sanitize(opts, OPT_HATCH[:common], target: out, single: /^(?:v+|q+)$/).first
-          ret = session('hatch', *out, *cmd, path: venv.nil?)
-          [ret, opts]
+          op = OptionPartition.new(opts, OPT_HATCH[:common], project: self, single: singleopt)
+          ret = session('hatch', *op.to_a, *cmd, path: venv.nil?)
+          [ret, op.extras]
         end
 
-        def append_pip(flag, opts, from: nil)
+        def append_pip(flag, opts, target: @session, from: nil)
           if !from || opts.empty?
-            append_global
+            append_global(target: target)
             return []
           end
-          opts, pat = option_sanitize(opts, OPT_PIP[from] + OPT_PIP[:common], single: /^(?:v+|q+)$/)
-          append_global
+          op = OptionPartition.new(opts, OPT_PIP[from] + OPT_PIP[:common], target, project: self, single: singleopt)
+          append_global(target: target)
           if from == :install
-            out = []
             edit = nil
-            opts.each do |opt|
-              if opt =~ pat
+            op.each do |opt|
+              if opt =~ op.values
                 case $1
                 when 'e', 'editable'
-                  out << edit if edit && flag == :editable
+                  op.found << edit if edit && flag == :editable
                   edit = $2
                 end
               elsif flag == :editable && !edit
                 edit = opt
               else
-                out << opt
+                op.found << opt
               end
             end
+            op.swap
             if edit
               edit = basepath(edit) unless %r{^[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
               if flag == :editable
-                out << edit
+                op.extras << edit
               else
                 target << quote_option('e', edit)
               end
             end
             case flag
             when :editable, :upgrade
-              out
+              op.extras
             else
-              option_clear out
+              op.clear
               []
             end
           else
@@ -531,25 +532,25 @@ module Squared
           end
         end
 
-        def append_editable
+        def append_editable(target: @session)
           return if requirements?
 
-          if (val = option('editable', 'e', ignore: false))
-            session_delete('e', 'editable')
+          if (val = option('editable', 'e', target: target, ignore: false))
+            session_delete('e', 'editable', target: target)
             case val
             when '0', 'false'
               return
             else
               val = basepath(val)
             end
-          elsif session_arg?('e', 'editable') || !(val = editable)
+          elsif session_arg?('e', 'editable', target: target) || !(val = editable)
             return
           end
-          @session << quote_option('e', val)
+          target << quote_option('e', val)
         end
 
         def append_global(target: @session)
-          if (val = option('cache-dir'))
+          if (val = option('cache-dir', target: target))
             target << case val
                       when '0', 'false'
                         '--no-cache-dir'
@@ -557,11 +558,22 @@ module Squared
                         quote_option('cache-dir', basepath(val))
                       end
           end
-          target << shell_option('proxy', val) if (val = option('proxy'))
-          target << quote_option('python', basepath(val)) if (val = option('python'))
+          target << shell_option('proxy', val) if (val = option('proxy', target: target))
+          target << quote_option('python', basepath(val)) if (val = option('python', target: target))
           append_nocolor(target: target)
         end
 
+        def singleopt(flag = nil)
+          case flag
+          when :python
+            /^(?:v+|q+|b+)$/
+          when :twine
+            nil
+          else
+            /^(?:v+|q+)$/
+          end
+        end
+
         def preopts(quiet: true)
           ret = []
           case verbose

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,
@@ -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|
@@ -378,41 +383,41 @@ module Squared
             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
           cmd.merge(preopts)
-          opts, pat = option_sanitize(opts, list, no: no, first: first)
-          out = []
-          err = []
-          opts.each do |opt|
-            if opt =~ pat
+          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
@@ -489,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
@@ -530,7 +535,8 @@ 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
@@ -545,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
 
@@ -637,15 +642,21 @@ 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
 
@@ -696,7 +707,7 @@ module Squared
         end
 
         def preopts
-          verbosity > 0 && !session_arg?('quiet') ? ['--verbose'] : []
+          verbosetype > 1 && !session_arg?('quiet') ? ['--verbose'] : []
         end
 
         def gemdir?