squared 0.5.6 → 0.5.8

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

@@ -9,6 +9,7 @@ module Squared
   module Workspace
     module Project
       class Base
+        include Comparable
         include Common::Format
         include System
         include Shell
@@ -16,7 +17,6 @@ module Squared
         include Utils
         include Support
         include Rake::DSL
-        include ::Comparable
 
         VAR_SET = %i[parent global script index envname desc dependfile dependindex theme archive env dev prod graph
                      pass only exclude asdf].freeze
@@ -89,6 +89,7 @@ module Squared
           @name = name.to_s.freeze
           @project = @path.basename.to_s.freeze
           @group = group&.to_s.freeze
+          @envname = env_key(@name).freeze
           @depend = kwargs[:depend]
           @doc = kwargs[:doc]
           @lint = kwargs[:lint]
@@ -104,7 +105,7 @@ module Squared
           @ref = []
           @children = []
           @events = hashobj.update({ first: first, last: last, error: error })
-          @envname = env_key(@name).freeze
+          @as = hashobj
           @desc = (@name.include?(':') ? @name.split(':').join(ARG[:SPACE]) : @name).freeze
           @parent = nil
           @global = false
@@ -207,7 +208,7 @@ module Squared
             file &&= @workspace.home.join(env('LOG_DIR', ''), file).realdirpath
           rescue StandardError => e
             file = nil
-            warn log_message(Logger::WARN, e) if warning?
+            print_error e
           end
           log[:progname] ||= @name
           if (val = env('LOG_LEVEL', ignore: false))
@@ -299,7 +300,7 @@ module Squared
         end
 
         def verbose=(val)
-          @verbose = case val
+          @verbose = case (val = env('VERBOSE', val))
                      when NilClass
                        workspace.verbose
                      when String
@@ -374,7 +375,7 @@ module Squared
                       else
                         force = args.fetch(:force, false)
                       end
-                      unpack(path + dir, uri: tag, digest: digest, ext: ext, force: force)
+                      unpack(basepath(dir), uri: tag, digest: digest, ext: ext, force: force)
                     end
                   when 'asdf'
                     break unless @asdf
@@ -434,14 +435,13 @@ module Squared
             name = @name if name == true
             path.each { |val| add(val, name && task_join(name, File.basename(val)), **kwargs, &blk) }
             return self
-          elsif !projectpath?(path = basepath(path)) || !checkdir?(path)
-            return self
           end
+          return self unless projectpath?(path = basepath(path)) && checkdir?(path)
+
           kwargs = @withargs.yield_self { |data| data.dup.update(kwargs) } if @withargs
           kwargs[:group] = group unless kwargs.key?(:group)
           kwargs[:ref] = ref unless kwargs.key?(:ref)
           parent = self
-          proj = nil
           name = case name
                  when String, Symbol
                    name.to_s
@@ -450,10 +450,9 @@ module Squared
                  end
           workspace.add(path, name, **kwargs) do
             __send__ :parent_set, parent
-            proj = self
+            @children << self
+            instance_eval(&blk) if block_given?
           end
-          @children << proj
-          proj.instance_eval(&blk) if block_given?
           self
         end
 
@@ -467,7 +466,7 @@ module Squared
 
           out = obj.link(self, *args, **kwargs, &blk) if obj.respond_to?(:link)
           if !out
-            warn log_message(Logger::WARN, 'link not compatible', subject: obj.to_s, hint: name)
+            print_error('link not compatible', subject: obj, hint: name)
           elsif out.respond_to?(:build)
             out.build
           end
@@ -507,7 +506,7 @@ module Squared
               else
                 next unless respond_to?(:compose)
 
-                cmd << a if (a = compose(as_get(b), d, script: true, args: e, from: from))
+                cmd << a if (a = compose(as_get(b, from), d, script: true, args: e, from: from))
               end
               var.update(c) if c.is_a?(Hash)
             end
@@ -515,8 +514,12 @@ module Squared
           else
             cmd, opts, var, flags, extra = args
           end
+          if cmd.is_a?(Proc) || cmd.is_a?(Method)
+            run_b(cmd, sync: sync, from: from)
+            return
+          end
           if cmd
-            cmd = as_get cmd
+            cmd = as_get(cmd, from)
             opts = compose(opts, script: false) if opts && respond_to?(:compose)
             flags = append_hash(flags).join(' ') if flags.is_a?(Hash)
             case opts
@@ -533,7 +536,7 @@ module Squared
           else
             return unless (opts || extra) && respond_to?(:compose)
 
-            cmd = compose(as_get(opts), flags, script: true, args: extra, from: from)
+            cmd = compose(as_get(opts, from), flags, script: true, args: extra, from: from)
             from = :script if from == :run && script?
           end
           run(cmd, var, sync: sync, from: from, banner: banner)
@@ -558,7 +561,7 @@ module Squared
                     on_error(:prereqs, e, exception: true)
                   end
                 end
-                warn log_message(Logger::WARN, name, 'method not found', subject: 'prereqs', hint: meth)
+                print_error(name, 'method not found', subject: 'prereqs', hint: meth)
               end
             elsif proj.build?
               proj.build(sync: sync)
@@ -613,7 +616,7 @@ module Squared
           else
             if @clean.is_a?(Enumerable) && !series?(@clean)
               @clean.each do |val|
-                entry = path + (val = val.to_s)
+                entry = basepath(val = val.to_s)
                 if entry.directory? && val.match?(%r{[\\/]\z})
                   log&.warn "rm -rf #{entry}"
                   rm_rf(entry, verbose: verbose)
@@ -622,11 +625,9 @@ module Squared
                   (val.include?('*') ? Dir[entry] : [entry]).each do |file|
                     next unless File.file?(file)
 
-                    begin
-                      File.delete(file)
-                    rescue StandardError => e
-                      log&.error e
-                    end
+                    File.delete(file)
+                  rescue StandardError => e
+                    log&.error e
                   end
                 end
               end
@@ -747,7 +748,7 @@ module Squared
               delete = true
             end
             if create
-              warn log_message(Logger::WARN, 'force remove', subject: name, hint: target)
+              print_error('force remove', subject: name, hint: target)
               target.rmtree
               target.mkpath
             end
@@ -847,9 +848,8 @@ module Squared
         end
 
         def as(cmd, script, to = nil)
-          script = { "#{script}": to } if to
-          data = (@as ||= {})[cmd.to_sym] ||= {}
-          script.each { |key, val| data[key.to_s] = val }
+          data = @as[cmd.to_sym]
+          (to ? [[script, to]] : script).each { |key, val| data[key.to_s] = val }
           self
         end
 
@@ -866,6 +866,55 @@ module Squared
           self
         end
 
+        def run(cmd = @session, var = nil, exception: self.exception, sync: true, from: nil, banner: true, chdir: path,
+                interactive: nil, hint: nil, **)
+          unless cmd
+            print_error('no command given', subject: project, hint: from || 'unknown', pass: true)
+            return
+          end
+          cmd = cmd.target if cmd.is_a?(OptionPartition)
+          if interactive && (!@session || !option('y'))
+            title, y = case interactive
+                       when Array
+                         interactive
+                       when String
+                         [interactive, 'N']
+                       else
+                         ['Run', 'Y']
+                       end
+            exit 1 unless confirm("#{title}? [#{sub_style(cmd.to_s, styles: theme[:inline])}]", y)
+          end
+          cmd = session_done cmd
+          log&.info cmd
+          on :first, from
+          begin
+            if cmd.start_with?(/[^:]+:[^:]/) && workspace.task_defined?(cmd)
+              log&.warn "ENV discarded: #{var}" if var
+              task_invoke(cmd, exception: exception, warning: warning?)
+            else
+              print_item format_banner(hint ? "#{cmd} (#{hint})" : cmd, banner: banner) if sync
+              if var != false && (pre = runenv)
+                case pre
+                when Hash
+                  var = var.is_a?(Hash) ? pre.merge(var) : pre
+                when Enumerable
+                  cmd = command(*pre.to_a, cmd)
+                else
+                  cmd = command pre, cmd
+                end
+              end
+              args = var.is_a?(Hash) ? [var, cmd] : [cmd]
+              ret = shell(*args, chdir: chdir, exception: exception)
+            end
+          rescue StandardError => e
+            on_error(from, e, exception: true)
+            false
+          else
+            on :last, from
+            ret
+          end
+        end
+
         def variable_set(key, *args, **kwargs, &blk)
           if block_given?
             if blocks.include?(key)
@@ -917,6 +966,8 @@ module Squared
           self
         end
 
+        alias apply variable_set
+
         def enabled?(ref = nil, **)
           return false if ref && !ref?(ref)
 
@@ -1027,7 +1078,7 @@ module Squared
           path.parent.ascend.each do |dir|
             target = dir.join(*args)
             return target if target.exist?
-            break if (ascend.is_a?(String) && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
+            break if (ascend && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
           end
           ret
         end
@@ -1054,55 +1105,6 @@ module Squared
           log_console(*args, pipe: kwargs[:pipe] || pipe)
         end
 
-        def run(cmd = @session, var = nil, exception: self.exception, sync: true, from: nil, banner: true, chdir: path,
-                interactive: nil, hint: nil, **)
-          unless cmd
-            warn log_message(Logger::WARN, 'no command given', subject: project, hint: from || 'unknown', pass: true)
-            return
-          end
-          cmd = cmd.target if cmd.is_a?(OptionPartition)
-          if interactive && (!@session || !option('y'))
-            title, y = case interactive
-                       when Array
-                         interactive
-                       when String
-                         [interactive, 'N']
-                       else
-                         ['Run', 'Y']
-                       end
-            exit 1 unless confirm("#{title}? [#{sub_style(cmd.to_s, styles: theme[:inline])}]", y)
-          end
-          cmd = session_done cmd
-          log&.info cmd
-          on :first, from
-          begin
-            if cmd.start_with?(/[^:]+:[^:]/) && workspace.task_defined?(cmd)
-              log&.warn "ENV discarded: #{var}" if var
-              task_invoke(cmd, exception: exception, warning: warning?)
-            else
-              print_item format_banner(hint ? "#{cmd} (#{hint})" : cmd, banner: banner) if sync
-              if var != false && (pre = runenv)
-                case pre
-                when Hash
-                  var = var.is_a?(Hash) ? pre.merge(var) : pre
-                when Enumerable
-                  cmd = command(*pre.to_a, cmd)
-                else
-                  cmd = command pre, cmd
-                end
-              end
-              args = var.is_a?(Hash) ? [var, cmd] : [cmd]
-              ret = shell(*args, chdir: chdir, exception: exception)
-            end
-          rescue StandardError => e
-            on_error(from, e, exception: true)
-            false
-          else
-            on :last, from
-            ret
-          end
-        end
-
         def run_s(*cmd, env: nil, sync: true, from: nil, banner: verbose != false, **kwargs)
           on :first, from
           begin
@@ -1301,15 +1303,7 @@ module Squared
         end
 
         def session_delete(*args, target: @session)
-          ret = []
-          args.each do |val|
-            pat = /\A#{Regexp.escape(shell_option(val))}(?: |=|\z)/
-            if (key = target.find { |opt| opt.match?(pat) })
-              target.delete(key)
-              ret << key
-            end
-          end
-          ret
+          OptionPartition.delete(target, *args)
         end
 
         def session_output(*cmd, **kwargs)
@@ -1351,8 +1345,8 @@ module Squared
           puts 'Success'
         end
 
-        def print_error(err, loglevel: Logger::WARN, pass: false)
-          warn log_message(loglevel, err, pass: pass) if warning?
+        def print_error(*args, loglevel: Logger::WARN, **kwargs)
+          warn log_message(loglevel, *args, **kwargs) if warning?
         end
 
         def print_item(*val)
@@ -1410,7 +1404,7 @@ module Squared
             if verbose && kwargs[:start]
               msg = sub_style('completed', styles: theme[:active])
               puts log_message(Logger::INFO, *args, msg, subject: kwargs[:subject],
-                                                         hint: time_format(epochtime - kwargs[:start]))
+                                                         hint: time_format(time_epoch - kwargs[:start]))
             end
           end
         end
@@ -1522,7 +1516,7 @@ module Squared
             next if (key = key.to_s).start_with?('__')
 
             if val.nil? || extra || session_arg?(key, target: target)
-              session_delete(key, target: target)
+              OptionPartition.delete_key(target, key)
               next if val.nil?
             end
             case val
@@ -1658,7 +1652,7 @@ module Squared
           raise_error("invalid JSON #{kind.name}", val, hint: hint) if kind && !ret.is_a?(kind)
         rescue StandardError => e
           log&.warn e
-          warn log_message(Logger::WARN, e, subject: name) if warning?
+          print_error(e, subject: name)
         else
           ret
         end
@@ -1786,7 +1780,7 @@ module Squared
             raise_error 'pathspec not within worktree' unless pass || files.size == proj.size
             files = proj
           end
-          files.map { |val| val == '.' ? '.' : shell_quote(path + val) }
+          files.map { |val| val == '.' ? '.' : shell_quote(basepath(val)) }
         end
 
         def matchmap(list, prefix = nil)
@@ -2041,14 +2035,12 @@ module Squared
 
         def dependfile_set(list)
           @dependindex = list.index { |file| basepath(file).exist? }.tap do |index|
-            @dependfile = @path + list[index || 0]
+            @dependfile = basepath(list[index || 0])
           end
         end
 
-        def as_get(val)
-          return unless val
-
-          @global && (ret = @as && @as[from] && @as[from][val]) ? ret : val
+        def as_get(val, from)
+          (@global && @as[from][val]) || val
         end
 
         def task_build(keys)

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

@@ -6,7 +6,7 @@ module Squared
       class Docker < Base
         COMPOSEFILE = %w[compose.yaml compose.yml docker-compose.yaml docker-compose.yml].freeze
         BAKEFILE = %w[docker-bake.json docker-bake.hcl docker-bake.override.json docker-bake.override.hcl].freeze
-        DIR_DOCKER = (COMPOSEFILE + BAKEFILE).freeze
+        DIR_DOCKER = (COMPOSEFILE + BAKEFILE + ['Dockerfile']).freeze
         OPT_DOCKER = {
           common: %w[tls tlsverify config=p c|context=b D|debug H|host=q l|log-level=b tlscacert=p tlscert=p
                      tlskey=p].freeze,
@@ -91,7 +91,7 @@ module Squared
           def config?(val)
             return false unless (val = as_path(val))
 
-            val.join('Dockerfile').exist? || DIR_DOCKER.any? { |file| val.join(file).exist? }
+            DIR_DOCKER.any? { |file| val.join(file).exist? }
           end
         end
 
@@ -310,7 +310,7 @@ module Squared
             append_context
           when :bake, :compose
             option(from == :bake ? 'target' : 'service', ignore: false) do |a|
-              ret.merge(split_escape(a).map! { |b| shell_escape(b) })
+              ret.merge(split_escape(a).map! { |b| shell_quote(b) })
             end
           end
           ret
@@ -412,7 +412,7 @@ module Squared
                       args << k
                       next
                     when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-path'
-                      v = path + v
+                      v = basepath v
                       v = shell_quote(v, option: false, force: false) if q == ''
                     end
                     args << "#{k}=#{q + v + q}"
@@ -531,7 +531,7 @@ module Squared
             list_image(flag, docker_output('image ls -a'), from: from) do |val|
               op << val
               if flag == :tag
-                op << tagname("#{@project}:#{op.extras.first}")
+                op << tagname("#{@project}:#{op.first}")
                 break
               end
             end
@@ -586,16 +586,15 @@ module Squared
         end
 
         def dockerfile(val = nil)
-          if val == 'Dockerfile'
-            @file = false
-          elsif val
+          if val
             @file = if val.is_a?(Array)
                       val = val.select { |file| basepath(file).exist? }
                       val.size > 1 ? val : val.first
-                    else
-                      val || DIR_DOCKER.find { |file| basepath(file).exist? }
+                    elsif val == true
+                      DIR_DOCKER.find { |file| basepath(file).exist? }
+                    elsif val != 'Dockerfile'
+                      val
                     end
-            @file ||= false
           end
           basepath((@file.is_a?(Array) ? @file.first : @file) || 'Dockerfile')
         end
@@ -604,9 +603,9 @@ module Squared
 
         def read_composefile(*keys, target: nil)
           require 'yaml'
-          target = ENV['COMPOSE_FILE']&.split(workspace.windows? ? ';' : ':') if !target || target.empty?
+          target = ENV['COMPOSE_FILE']&.split(workspace.windows? ? ';' : ':') unless target && !target.empty?
           Array(target || dockerfile).each do |val|
-            doc = YAML.load_file(path + val)
+            doc = YAML.load_file(basepath(val))
             if keys.empty?
               yield doc
             elsif (data = doc.dig(*keys))
@@ -648,17 +647,17 @@ module Squared
         end
 
         def append_file(type, target: @session)
-          return if ENV['COMPOSE_FILE'] && compose?(type)
+          return if !@file || (ENV['COMPOSE_FILE'] && compose?(type))
 
           unless @file.is_a?(Array)
             case type
             when 2, 4
               return
             when 3
-              return unless COMPOSEFILE.map { |val| path + val }.select(&:exist?).size > 1
+              return unless COMPOSEFILE.map { |val| basepath(val) }.select(&:exist?).size > 1
             end
           end
-          files = Array(@file).map { |val| quote_option('file', path + val) }
+          files = Array(@file).map { |val| quote_option('file', basepath(val)) }
           if target.is_a?(Set)
             opts = target.to_a.insert(2, *files)
             target.clear.merge(opts)
@@ -839,7 +838,7 @@ module Squared
         end
 
         def contextdir(val = nil)
-          val && projectpath?(val) ? shell_quote(path + val) : '.'
+          val && projectpath?(val) ? shell_quote(basepath(val)) : '.'
         end
 
         def tagjoin(*args, char: '/')

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

@@ -104,11 +104,11 @@ module Squared
       end
 
       def rev_timeutc(*keys)
-        rev_entry(*keys, val: rev_timenow)
+        rev_entry(*keys, val: time_epoch)
       end
 
       def rev_timesince(*keys, clock: false)
-        epoch = rev_timenow - rev_entry(*keys).to_i
+        epoch = time_epoch - rev_entry(*keys).to_i
       rescue StandardError
         nil
       else
@@ -545,7 +545,7 @@ module Squared
                           commit1 = commithead args.commit1
                           if commit1
                             commit2 = commithead param_guard(action, flag, args: args, key: :commit2)
-                            args = args.extras.to_a
+                            args = args.extras
                             range = [commit1, commit2]
                           else
                             range, opts, refs = choice_commit(multiple: view ? true : 2, values: %w[Options Pathspec])
@@ -752,12 +752,12 @@ module Squared
                           args = args.extras
                         else
                           commit, mode = choice_commit(values: ['Mode [mixed|soft|hard|N]'])
-                          args = args.extras.to_a.concat(case mode&.downcase
-                                                         when 'h', 'hard' then ['hard']
-                                                         when 's', 'soft' then ['soft']
-                                                         when 'n', 'N' then ['mixed', 'N']
-                                                         else ['mixed']
-                                                         end)
+                          args = args.extras.concat(case mode&.downcase
+                                                    when 'h', 'hard' then ['hard']
+                                                    when 's', 'soft' then ['soft']
+                                                    when 'n', 'N' then ['mixed', 'N']
+                                                    else ['mixed']
+                                                    end)
                         end
                         print_success if success?(reset(flag, args, commit: commit))
                       end
@@ -1028,7 +1028,7 @@ module Squared
             return unless upstream
 
             op = OptionPartition.new(opts, OPT_GIT[:rebase], cmd, project: self, no: OPT_GIT[:no][:rebase])
-            cmd << upstream
+            op << upstream
             append_head op.shift
             op.clear(pass: false)
           when :onto
@@ -1117,7 +1117,7 @@ module Squared
                   if op.empty?
                     values = [['Branch name', true]]
                   else
-                    op << op.pop
+                    op << op.shift
                   end
                 end
                 out = choice_index('Choose a stash', git_spawn('stash list', stdout: false),
@@ -1128,7 +1128,7 @@ module Squared
                   op << out
                 end
               elsif !op.empty?
-                op << op.pop
+                op << op.shift
               elsif flag == :branch
                 raise_error 'no branch name'
               end
@@ -1236,10 +1236,10 @@ module Squared
               return
             end
           end
-          start = epochtime
+          start = time_epoch
           build(@output, sync: sync, from: :'git:revbuild')
         rescue StandardError => e
-          warn log_message(Logger::WARN, e, pass: true) if warning?
+          print_error(e, pass: true)
         else
           print_status(name, subject: 'revbuild', start: start, from: :completed)
           workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
@@ -1270,7 +1270,6 @@ module Squared
             end
           when :patch
             cmd << '--patch'
-            append_pathspec(refs, pass: false)
           when :undo
             cmd << '--hard HEAD@{1}'
             ref = false
@@ -1490,12 +1489,12 @@ module Squared
           case flag
           when :commit, :'no-commit'
             op = OptionPartition.new(opts, OPT_GIT[:merge], cmd, project: self, no: OPT_GIT[:no][:merge])
-            raise_error 'no branch/commit' if op.empty?
             op << "--#{flag}" << '--'
             if branch
               op << branch
               op.clear(pass: false)
             else
+              raise_error 'no branch/commit' if op.empty?
               append_commit(*op.extras)
             end
           else
@@ -1602,9 +1601,7 @@ module Squared
               end
               on :last, from
             end
-            if ret == 0
-              warn log_message(Logger::WARN, name, 'no ref found', subject: 'branch', hint: 'head', pass: true)
-            end
+            print_error(name, 'no ref found', subject: 'branch', hint: 'head', pass: true) if ret == 0
             return
           end
           return unless success?(source(stdout: stdout))
@@ -1747,8 +1744,8 @@ module Squared
                                                                                  end)
           case flag
           when :blame
-            raise_error 'no file found' unless (n = op.index { |s| (path + s).file? })
-            op << '--' << shell_quote(path + op.delete_at(n))
+            raise_error 'no file found' unless (n = op.index { |s| basepath(s).file? })
+            op << '--' << shell_quote(basepath(op.delete_at(n)))
             op.clear
           when :revert
             if VAL_GIT[:rebase][:send].any? { |val| op.arg?(val) }
@@ -1812,7 +1809,10 @@ module Squared
             from = nil
             banner = nil
           else
-            banner = nil if banner && (multiple || !banner?)
+            if banner
+              banner = nil unless banner? && !multiple
+              args = true
+            end
             if cmd.respond_to?(:done)
               if from.nil? && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z-]*\z/) })
                 from = :"git:#{from}"
@@ -1825,17 +1825,14 @@ module Squared
           log&.info cmd
           banner = if banner
                      banner = (banner.is_a?(String) ? banner : cmd).gsub(File.join(path, ''), '')
-                     format_banner(hint ? "#{banner} (#{hint})" : banner, banner: true)
+                     format_banner(hint ? "#{banner} (#{hint})" : banner)
                    end
           on :first, from
           begin
             if io
-              ret = if stdout
-                      `#{cmd}`
-                    else
-                      banner ? [IO.popen(cmd), banner, from] : IO.popen(cmd)
-                    end
-              return ret
+              return `#{cmd}` if stdout
+
+              return args ? [IO.popen(cmd), banner || '', from] : IO.popen(cmd)
             elsif stdin? ? sync : stdout
               print_item banner unless multiple
               ret = `#{cmd}`
@@ -1951,7 +1948,7 @@ module Squared
             next if !glob.empty? && glob.none? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
             next if !pass.empty? && pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
 
-            ret[file] = algorithm.hexdigest(File.read(path + file))
+            ret[file] = algorithm.hexdigest(File.read(basepath(file)))
           end
           ret
         end
@@ -1983,7 +1980,7 @@ module Squared
               when 'recurse-submodules'
                 op.append?($1, $2, type: :basic)
               when 'refspec'
-                refspec << shell_escape($2, quote: true)
+                refspec << shell_quote($2)
               end
             elsif op.arg?('multiple')
               op.found << opt
@@ -2001,12 +1998,12 @@ module Squared
             end
             op.delete('--all')
           elsif op.arg?('multiple')
-            op.swap.merge(op.map! { |opt| shell_escape(opt, quote: true) })
+            op.add_quote(*op.found)
             return
           elsif option('all')
             op << '--all'
           end
-          op.clear(errors: true, subject: flag.to_s) if flag
+          op.clear(errors: true, subject: flag) if flag
         end
 
         def append_commit(*val, target: @session, head: false)