squared 0.4.20 → 0.4.21

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

@@ -5,11 +5,11 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run=!? include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
-          install: %w[prefer-dedupe=!? package-lock-only=!? audit=! bin-links=! cpu=b fund=! libc=b os=b
+          common: %w[dry-run=!? include-workspace-root=!? loglevel=b workspaces=!? w|workspace=v].freeze,
+          install: %w[package-lock-only=!? prefer-dedupe=!? audit=! bin-links=! cpu=b fund=! libc=b os=b
                       package-lock=!].freeze,
-          install_base: %w[ignore-scripts=!? install-links=!? strict-peer-deps=!? include=b omit=b
-                           install-strategy=b].freeze,
+          install_base: %w[ignore-scripts=!? install-links=!? strict-peer-deps=!? include=b install-strategy=b
+                           omit=b].freeze,
           install_no: %w[audit bin-links fund package-lock].freeze,
           install_as: %w[no-save save-bundle save-dev save-optional save-peer save-prod foreground-scripts=!?
                          g|global=!? S|save=!? E|save-exact=!?].freeze,
@@ -108,7 +108,7 @@ module Squared
             initialize_build(Node.ref, prod: prod?, **kwargs)
             initialize_env(**kwargs)
           end
-          @dependfile = @path + 'package.json'
+          @dependfile = basepath 'package.json'
           @pm = { __: init }
         end
 
@@ -259,11 +259,6 @@ module Squared
                           otp = args.first
                         else
                           tag, otp = param_guard(action, flag, args: args)
-                          unless SEM_VER.match?(tag)
-                            a = sub_style(project, styles: theme[:active])
-                            b = sub_style(tag, styles: theme[:inline])
-                            exit 1 unless confirm("Publish #{a}@#{b}? [y/N] ", 'N')
-                          end
                         end
                         publish(flag, otp: otp, tag: tag, dryrun: dryrun, access: access)
                       end
@@ -371,7 +366,7 @@ module Squared
                     subdir << target.to_s
                   end
                   begin
-                    FileUtils.cp(path + s, dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
+                    FileUtils.cp(basepath(s), dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
                   rescue StandardError => e
                     print_error e
                     errors += 1
@@ -386,7 +381,7 @@ module Squared
             end
             glob = Array(glob || '**/*')
             target = []
-            from = path + from
+            from = basepath from
             if workspace
               Dir.glob(from + '*').each do |path|
                 next unless (path = Pathname.new(path)).directory?
@@ -471,7 +466,7 @@ module Squared
               if flag == :add
                 cmd << "--save-#{save}"
                 cmd << '--save-exact' if exact
-                cmd.merge(packages.map { |pkg| shell_escape(pkg) })
+                cmd.merge(packages.map { |pkg| shell_quote(pkg) })
               end
               cmd << '--workspaces=false' if env('NODE_WORKSPACES', equals: '0')
               cmd << '--package-lock=false' if option('package-lock', equals: '0')
@@ -654,14 +649,19 @@ module Squared
         end
 
         def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
-          if !version || read_packagemanager(:private)
-            warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: version ? 'private' : nil)
+          unless version && !read_packagemanager(:private)
+            print_error('invalid task "publish"', subject: name, hint: version ? 'private' : nil)
             return
           end
           cmd = session 'npm', 'publish'
           cmd << basic_option('otp', otp) if otp ||= option('otp')
-          cmd << basic_option('tag', tag) if tag ||= option('tag')
-          cmd << basic_option('access', access) if access ||= option('access')
+          cmd << basic_option('tag', tag.tr(' ', '-')) if tag ||= option('tag')
+          case access || option('access')
+          when 'p', 'public'
+            cmd << '--access=public'
+          when 'r', 'restricted'
+            cmd << '--access=restricted'
+          end
           dryrun ||= dryrun?('npm')
           if dryrun
             cmd << '--dry-run'
@@ -718,7 +718,7 @@ module Squared
               if opt =~ op.values
                 case $1
                 when 'w', 'workspace'
-                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
                 end
               elsif opt.include?('=')
                 op.errors << opt
@@ -811,7 +811,7 @@ module Squared
 
                 case $1
                 when 'w', 'workspace'
-                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
                   op.found << opt
                 end
               end

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

@@ -207,7 +207,7 @@ module Squared
                       if flag == :create
                         format_desc action, flag, 'dir,opts*'
                         task flag, [:dir] do |_, args|
-                          dir = path + param_guard(action, flag, args: args, key: :dir)
+                          dir = basepath param_guard(action, flag, args: args, key: :dir)
                           venv_create dir, args.extras
                         end
                       elsif venv
@@ -245,10 +245,7 @@ module Squared
                       when :upgrade
                         format_desc action, flag, 'opts*'
                         task flag do |_, args|
-                          args = args.to_a
-                          args.unshift('upgrade')
-                          args << 'pip'
-                          install flag, args
+                          install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
                         format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
@@ -351,7 +348,7 @@ module Squared
                 when :user
                   cmd << '--user'
                 when :target
-                  cmd << quote_option('target', path + target)
+                  cmd << quote_option('target', basepath(target))
                 when :force
                   cmd << '--force-reinstall'
                 end
@@ -474,11 +471,7 @@ module Squared
             cmd << '--user' if user
             cmd << basic_option('upgrade-strategy', strategy) if strategy
             append_value out
-            if workspace.windows?
-              pip = cmd.to_a.drop(1)
-              cmd = python_session '-m pip'
-              cmd.merge(pip)
-            end
+            python_session('-m pip', *cmd.to_a.drop(1)) if workspace.windows?
           end
           run(from: :install)
         end
@@ -515,7 +508,7 @@ module Squared
               if op.arg?(*args)
                 op.push(srcdir)
               else
-                op << quote_option(args.last, path + srcdir)
+                op << quote_option(args.last, basepath(srcdir))
               end
               srcdir = nil
             end
@@ -549,7 +542,7 @@ module Squared
           end
           op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
           dist = lambda do
-            (path + 'dist').tap do |dir|
+            basepath('dist').tap do |dir|
               raise_error('no source files found', hint: dir) unless dir.directory? && !dir.empty?
             end
           end
@@ -558,7 +551,7 @@ module Squared
             if op.empty?
               op.push("#{dist.call}/*")
             else
-              op.map! { |val| path + val }
+              op.map! { |val| basepath(val) }
             end
             op.append
           else
@@ -629,7 +622,7 @@ module Squared
         def poetry_session(*cmd)
           ret = session('poetry', *cmd, *preopts)
           if (val = option('project', ignore: false))
-            ret << quote_option('project', path + val)
+            ret << quote_option('project', basepath(val))
           end
           ret
         end
@@ -651,7 +644,7 @@ module Squared
         end
 
         def append_pip(flag, opts, target: @session, from: nil)
-          if !from || opts.empty?
+          unless from && !opts.empty?
             append_global(target: target)
             return []
           end
@@ -674,11 +667,11 @@ module Squared
             end
             op.swap
             if edit
-              edit = path + edit unless %r{\A[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
+              edit = basepath(edit) unless %r{\A[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
               if flag == :editable
                 op.push(edit)
               else
-                target << quote_option('e', edit)
+                op << quote_option('e', edit)
               end
             end
             case flag
@@ -689,25 +682,25 @@ module Squared
               []
             end
           else
-            opts
+            op.extras
           end
         end
 
         def append_editable(target: @session)
-          return if requirements?
+          return if requirements? && editable == '.'
 
           if (val = option('editable', 'e', target: target, ignore: false))
-            session_delete('e', 'editable', target: target)
+            OptionPartition.delete_key(target, 'e', 'editable')
             case val
             when '0', 'false'
               return
             else
-              val = path + val
+              val = basepath val
             end
           elsif session_arg?('e', 'editable', target: target) || !(val = editable)
             return
           end
-          target << quote_option('e', val)
+          target << quote_option('e', basepath(val))
         end
 
         def append_global(target: @session)
@@ -716,11 +709,11 @@ module Squared
                       when '0', 'false'
                         '--no-cache-dir'
                       else
-                        quote_option('cache-dir', path + val)
+                        quote_option('cache-dir', basepath(val))
                       end
           end
           target << shell_option('proxy', val) if (val = option('proxy', target: target))
-          target << quote_option('python', path + val) if (val = option('python', target: target))
+          target << quote_option('python', basepath(val)) if (val = option('python', target: target))
           append_nocolor(target: target)
         end
 
@@ -842,7 +835,7 @@ module Squared
                       when '.', Pathname
                         val
                       when String
-                        Pathname.new(editable)
+                        Pathname.new(val) unless val.empty?
                       end
         end
 
@@ -853,8 +846,7 @@ module Squared
             val, *opts = val
             @venvopts = opts
           end
-          @venv = Pathname.new(val)
-          @venv = @path + @venv unless @venv.absolute?
+          @venv = basepath(val)
           if projectpath?(@venv)
             if @venv.exist?
               log.debug "venv found: #{@venv}"

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

@@ -7,14 +7,13 @@ module Squared
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb gems.rb Isolate].freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_RUBY = {
-          ruby: %w[0=im? a c e=q E=bm F=qm i=bm? I=pm l n p r=bm s S w W=bm? x=pm? d|debug jit rjit v|verbose y|yydebug
+          ruby: %w[0=im? a c e=q E=bm F=qm i=bm? I=pm l n p r=bm s S w W=bm? x=pm? d|debug jit rjit verbose y|yydebug
                    backtrace-limit=i crash-report=q disable=q dump=q enable=q encoding=b external-encoding=b
                    internal-encoding=b parser=b].freeze,
-          rake: %w[A|all B|build-all comments n|dry-run p|execute-print=q m|multitask P|prereqs q|quiet
-                   X|no-deprecation-warnings N|no-search G|no-system nosearch nosystem rules s|silent g|system
-                   v|verbose backtrace=b? D|describe=q? e|execute=q E|execute-continue=q job-stats=b? j|jobs=i?
-                   I|libdir=p R|rakelib=p rakelibdir=p r|require=b suppress-backtrace=q T|tasks=q? t|trace=b?
-                   W|where=q?].freeze,
+          rake: %w[A|all B|build-all comments n|dry-run m|multitask P|prereqs q|quiet X|no-deprecation-warnings
+                   N|no-search G|no-system nosearch nosystem rules s|silent g|system v|verbose backtrace=b?
+                   D|describe=q? e|execute=q E|execute-continue=q p|execute-print=q job-stats=b? j|jobs=i? I|libdir=p
+                   R|rakelib=p rakelibdir=p r|require=b suppress-backtrace=q T|tasks=q? t|trace=b? W|where=q?].freeze,
           irb: %w[d f U w E=b I=p r=b W=im? autocomplete colorize echo echo-on-assignment extra-doc-dir inf-ruby-mode
                   inspect multiline no-pager noautocomplete nocolorize noecho noecho-on-assignment noinspect
                   nomultiline noprompt noscript nosingleline noverbose regexp-completor sample-book-mode script
@@ -22,38 +21,41 @@ module Squared
                   back-trace-limit=i context-mode=i prompt=b prompt-mode=b].freeze
         }.freeze
         OPT_BUNDLE = {
-          common: %w[no-color V|verbose retry=i].freeze,
+          common: %w[no-color V|verbose r|retry=i].freeze,
           install: %w[frozen no-cache no-prune system binstubs=p? path=p standalone=q? target-rbconfig=p trust-policy=b
                       with=q without=q].freeze,
-          install_base: %w[force full-index quiet redownload retry gemfile=p j|jobs=i].freeze,
-          update: %w[conservative local pre ruby strict bundler=b? g|group=q source=b].freeze,
+          install_base: %w[force full-index quiet redownload gemfile=p j|jobs=i].freeze,
+          update: %w[all conservative local major minor patch pre ruby strict bundler=b? g|group=q source=b].freeze,
           outdated: %w[filter-major filter-minor filter-patch groups local parseable pre only-explicit strict
-                       update-strict g|group=q source=b].freeze,
+                       update-strict group=q source=b].freeze,
           exec: %w[gemfile=p].freeze,
-          cache: %w[all-platforms frozen no-install no-prune quiet cache-path=p gemfile=p path=p].freeze,
-          check: %w[dry-run gemfile=p].freeze
+          cache: %w[all all-platforms frozen no-all no-install no-prune quiet cache-path=p gemfile=p path=p].freeze,
+          check: %w[dry-run gemfile=p path=p].freeze
         }.freeze
         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,
+          install: %w[version=q].freeze,
+          install_base: %w[E f w b|both clear-sources conservative default development development-all explain
+                           ignore-dependencies l|local N|no-document r|remote vendor n|bindir=p build-root=p
+                           B|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
+          uninstall: %w[a D I x vendor n|bindir=p i|install-dir=p platform=b v|version=q].freeze,
+          outdated: %w[b|both clear-sources l|local r|remote B|bulk-threshold=i p|http-proxy=q? platform=q
                        source=q].freeze,
-          push: %w[no-http-proxy attestation=p host=q p|http-proxy=q? key=b otp=b].freeze,
-          build: %w[force strict o|output=p platform=q].freeze,
-          exec: %w[conservative no-prerelease prerelease g|gem=v version=b].freeze,
-          pristine: %w[all only-executables only-missing-extensions only-plugins n|bindir=p i|install-dir=p skip=b
-                       v|version=b].freeze,
+          push: %w[attestation=p host=q p|http-proxy=q? k|key=b otp=b].freeze,
+          build: %w[C=p force strict o|output=p platform=q].freeze,
+          exec: %w[conservative g|gem=b v|version=q].freeze,
+          pristine: %w[E all only-executables only-missing-extensions only-plugins n|bindir=p i|install-dir=p skip=b
+                       v|version=q].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,
+            outdated: %w[http-proxy].freeze,
+            push: %w[http-proxy].freeze,
+            exec: %w[prerelease].freeze,
             pristine: %w[env-shebang extensions].freeze
           }.freeze
         }.freeze
@@ -67,7 +69,7 @@ module Squared
           end
 
           def bannerargs
-            [:dependfile].freeze
+            %i[dependfile gemname].freeze
           end
 
           def config?(val)
@@ -105,9 +107,7 @@ module Squared
           @gemfile = if gemspec == false
                        false
                      elsif gemspec
-                       path + (gemspec.include?('.') ? gemspec : "#{gemspec}.gemspec")
-                     elsif (gemspec = path + "#{name}.gemspec").exist? || (gemspec = path + "#{project}.gemspec").exist?
-                       gemspec
+                       basepath(gemspec.include?('.') ? gemspec : "#{gemspec}.gemspec")
                      end
           return if !@output[0].nil? || !@copy.nil? || version || @autodetect || !rakefile
 
@@ -235,21 +235,26 @@ module Squared
                         format_desc action, flag, 'path,opts*,args*'
                         task flag, [:rb] do |_, args|
                           file = args.rb
-                          args = args.extras
-                          unless file && !file.include?('*')
-                            file, opts, prog = choice_index('Select a file', Dir.glob(file || (path + '*.rb')),
-                                                            values: (file ? [] : ['Options']) << 'Arguments',
-                                                            force: true, series: !args.include?('v'))
-                            if file
-                              prog = opts
-                            else
-                              args.concat(OptionPartition.strip(opts))
-                            end
-                          end
-                          ruby(flag, args, file: file, args: prog)
+                          opts = args.extras
+                          args = if file && !file.include?('*')
+                                   ENV['RUBY_ARGS']
+                                 else
+                                   a, b, c = choice_index('Select a file', Dir.glob(file || path.join('*.rb')),
+                                                          values: (file ? [] : ['Options']).push('Arguments'),
+                                                          force: true, series: true)
+                                   if file
+                                     file = a
+                                     b
+                                   else
+                                     file = a
+                                     opts.concat(OptionPartition.strip(b))
+                                     c
+                                   end
+                                 end
+                          ruby(flag, opts, file: file, args: args)
                         end
                       when :script
-                        format_desc action, flag, 'opts*,args*'
+                        format_desc action, flag, 'opts*'
                         task flag do |_, args|
                           command = ENV['RUBY_E'] || readline('Enter script', force: true, multiline: ['##', ';'])
                           ruby(flag, args.to_a, command: command)
@@ -302,7 +307,7 @@ module Squared
           print_item unless @output[0] || task_invoked?(/^copy(?::#{Ruby.ref}|$)/)
           glob = Array(glob || '**/*')
           Array(from).each_with_index do |val, i|
-            a = path + val
+            a = basepath val
             b = dest + val
             c = glob[i] || glob.first
             log.info "cp #{a + c} #{b}"
@@ -439,7 +444,7 @@ module Squared
             if flag != :redownload
               op << '--redownload'
             elsif (lock = basepath('Gemfile.lock')).exist?
-              config = basepath('.bundle', 'config')
+              config = basepath '.bundle', 'config'
               lock.delete unless config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
             end
           end
@@ -458,11 +463,11 @@ module Squared
           when :file, :script
             op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, args: true)
             if file
-              op.unshift(shell_quote(path + file))
+              op.unshift(shell_quote(basepath(file)))
             elsif command
               op << quote_option('e', command, option: false)
             end
-            op.push(args) if (args = ENV.fetch('RUBY_ARGS', args))
+            op.push(args) if args
             op.append(delim: true, escape: false, quote: false) unless op.empty?
           when :version
             pwd_set do
@@ -539,14 +544,14 @@ module Squared
             end
             return
           end
-          run_rb(banner: op.arg?('v'), from: :"ruby:#{flag}")
+          run_rb(banner: false, from: :"ruby:#{flag}")
         end
 
         def gem!(flag, opts = [], filter: nil)
           cmd = gem_session
           case flag
           when :outdated
-            cmd << gempwd << 'outdated'
+            cmd << gempwd << flag
           else
             cmd << flag
           end
@@ -559,12 +564,7 @@ module Squared
           cmd.merge(preopts)
           op = OptionPartition.new(opts, list, cmd, project: self, no: OPT_GEM[:no][flag])
           op.each do |opt|
-            if opt =~ op.values
-              case $1
-              when 'g', 'gem'
-                op << (flag == :exec ? shell_option($1, $2) : quote_option($1, path + $2))
-              end
-            elsif opt.include?('=') && !%i[outdated build push exec].include?(flag)
+            if !opt.match?(/\A[A-Za-z\d][A-Za-z\d_.-]*\z/) && %i[install uninstall update pristine].include?(flag)
               op.errors << opt
             else
               op.found << opt
@@ -573,17 +573,18 @@ module Squared
           op.swap
           case flag
           when :outdated
-            log.info cmd.to_s
             op.clear
+            cmd = cmd.done
+            log.info cmd
             on :first, from
-            print_item format_banner(cmd.to_s)
+            print_item format_banner(cmd)
             major = 0
             minor = 0
             patch = 0
             update = []
             pwd_set(pass: !gempwd.nil?, from: from) do
               items = [[%w[Gem Current Latest], nil]]
-              IO.popen(cmd.done).each do |line|
+              IO.popen(cmd).each do |line|
                 if line =~ /^(\S+) \((\S+) < ([^)]+)\)$/
                   cur = semscan $2
                   lat = semscan $3
@@ -710,17 +711,17 @@ module Squared
             end
           when :push
             if op.empty?
-              file = path + (if (spec = gemspec)
-                               "#{spec.name}-#{spec.version}.gem"
-                             else
-                               gems = Dir.glob(path.join('*.gem')).map { |val| File.basename(val) }
-                               choice_index('Select a file', gems, force: true)
-                             end)
+              file = basepath(if (spec = gemspec)
+                                "#{spec.name}-#{spec.version}.gem"
+                              else
+                                gems = Dir.glob(basepath('*.gem')).map { |val| File.basename(val) }
+                                choice_index('Select a file', gems, force: true)
+                              end)
             else
-              file = path + op.shift
-              raise_error('gem not found', hint: file) unless file.exist?
+              file = op.shift
               raise_error("unknown args: #{op.join(', ')}", hint: flag) unless op.empty?
             end
+            raise_error('gem not found', hint: file) unless op.exist?(file)
             op.add_path(file)
             run_rb(from: from, interactive: "Push #{sub_style(gemname, styles: theme[:active])}")
             return
@@ -740,39 +741,40 @@ module Squared
             op.append(quote: false)
           when :update
             unless op.arg?('system')
-              op.push(gemname) if op.empty?
-              op.adjoin
+              if op.empty?
+                op << gemname
+              else
+                op.append
+              end
             end
             op.clear(errors: true)
-          else
+          when :install, :uninstall, :pristine
             raise_error('missing gemname', hint: flag) if op.empty?
-            case flag
-            when :install, :uninstall, :pristine
-              post = readline('Enter command [args]', force: true) if flag == :install && op.remove(':')
-              if op.arg?('all')
-                if flag == :pristine
-                  append_repeat 'skip', op.extras
-                  op.reset
-                else
-                  op.clear
-                end
-              elsif (n = op.index { |val| val.match?(/(\A|[a-z])@\d/) })
-                name = op.delete_at(n)
-                if (n = name.index('@')) == 0
-                  pre = gemname
-                  ver = name[1..-1]
-                else
-                  pre = name[0, n]
-                  ver = name[(n + 1)..-1]
-                end
-                op.adjoin(pre, shell_option('version', ver))
-                  .clear
-              elsif flag != :install
-                op.adjoin
+            if op.arg?('all')
+              if flag == :pristine
+                append_repeat 'skip', op.extras
+                op.reset
+              else
+                op.clear
               end
+            elsif (n = op.index { |val| val.match?(/(\A|[a-z])@\d/) })
+              name = op.delete_at(n)
+              pre, ver = if (n = name.index('@')) == 0
+                           [gemname, name[1..-1]]
+                         else
+                           [name[0, n], name[(n + 1)..-1]]
+                         end
+              op.adjoin(pre, shell_option('version', ver))
+                .clear
+            elsif flag == :install
+              op.append_any
+            else
+              op.append
             end
-            op.append.clear(errors: true)
-            op << '--' << post if post
+            op.clear(errors: true)
+            op << '--' << readline('Enter command [args]', force: true) if flag == :install && op.remove(':')
+          else
+            op.append
           end
           run_rb(from: from)
         end
@@ -782,26 +784,24 @@ module Squared
           args = case flag
                  when 'exec', 'cache', 'check'
                    list = OPT_BUNDLE[flag.to_sym] + OPT_BUNDLE[:common]
-                   OptionPartition.new(args, list, cmd, project: self, args: flag == :exec).extras
+                   OptionPartition.new(args, list, cmd, project: self, args: flag == 'exec').extras
                  else
                    args.flatten
                  end
           case flag
           when 'exec', 'config'
-            if args.empty?
-              cmd << readline('Enter arguments', force: true)
-            else
-              args << command_args(args)
-              cmd.merge(args)
-            end
-          else
+            cmd << readline('Enter arguments', force: true) if args.empty?
+          when 'cache', 'check'
             option_clear args
+            args.clear
           end
+          cmd.merge(args)
           run(from: :"bundle:#{flag}")
         end
 
         def rake(*args, opts: [])
-          op = OptionPartition.new(opts, OPT_RUBY[:rake], [quote_option('f', rakefile)], project: self)
+          op = OptionPartition.new(opts, OPT_RUBY[:rake], [(quote_option('f', rakefile) if rakefile)].compact,
+                                   project: self)
           args.concat(op.extras)
           if args.empty?
             args << nil
@@ -998,14 +998,14 @@ module Squared
         end
 
         def variables
-          (super + %i[version autodetect]).freeze
+          (super + %i[autodetect]).freeze
         end
 
         def rakefile
           return @rakefile unless @rakefile.nil?
 
           file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }
-          @rakefile = file ? path + file : false
+          @rakefile = file ? basepath(file) : false
         end
 
         def rakepwd
@@ -1036,8 +1036,8 @@ module Squared
         def gemfile
           return @gemfile unless @gemfile.nil?
 
-          @gemfile = [project, name].map! { |val| path + "#{val}.gemspec" }
-                                    .concat(Dir.glob(path.join('*.gemspec')))
+          @gemfile = [project, name].map! { |val| basepath("#{val}.gemspec") }
+                                    .concat(Dir.glob(basepath('*.gemspec')))
                                     .find { |file| File.exist?(file) } || false
         end