squared 0.5.3 → 0.5.5

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

@@ -19,10 +19,10 @@ module Squared
         include ::Comparable
 
         VAR_SET = %i[parent global script index envname desc dependfile dependindex theme archive env dev prod graph
-                     pass only exclude].freeze
+                     pass only exclude asdf].freeze
         BLK_SET = %i[run depend doc lint test copy clean].freeze
-        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?\b/.freeze
-        URI_SCHEME = %r{^([a-z][a-z\d+-.]*)://[^@:\[\]\\^<>|\s]}i.freeze
+        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?[-.]?(\S+)?\b/.freeze
+        URI_SCHEME = %r{\A([a-z][a-z\d+-.]*)://[^@:\[\]\\^<>|\s]}i.freeze
         TASK_METADATA = Rake::TaskManager.record_task_metadata
         private_constant :VAR_SET, :BLK_SET, :SEM_VER, :URI_SCHEME, :TASK_METADATA
 
@@ -66,11 +66,17 @@ module Squared
 
         @@tasks = {}
         @@graph = { _: [] }
+        @@asdf = if File.exist?("#{Dir.home}/.asdf/asdf.sh")
+                   [Pathname.new("#{Dir.home}/.asdf"), 15]
+                 elsif ENV['ASDF_DATA_DIR']
+                   [Pathname.new(ENV['ASDF_DATA_DIR']), 16]
+                 end
         @@print_order = 0
 
         subtasks({
           'graph' => %i[run print].freeze,
-          'unpack' => %i[zip tar gem ext].freeze
+          'unpack' => %i[zip tar gem ext].freeze,
+          'asdf' => %i[set exec current]
         })
 
         attr_reader :name, :project, :workspace, :path, :theme, :group, :parent, :dependfile,
@@ -114,6 +120,7 @@ module Squared
           only_set kwargs[:only]
           exclude_set kwargs[:exclude]
           archive_set kwargs[:archive]
+          asdf_set kwargs[:asdf]
           theme_set common
           initialize_ref Base.ref
         end
@@ -213,7 +220,7 @@ module Squared
         def initialize_env(dev: nil, prod: nil, **)
           @dev = env_match('BUILD', dev, suffix: 'DEV', strict: true)
           @prod = env_match('BUILD', prod, suffix: 'PROD', strict: true)
-          if @output[2] != false && (val = env('BUILD', suffix: 'ENV'))
+          unless @output[2] == false || !(val = env('BUILD', suffix: 'ENV'))
             @output[2] = parse_json(val, hint: "BUILD_#{@envname}_ENV") || @output[2]
           end
           unless @output[0] == false || @output[0].is_a?(Array)
@@ -318,7 +325,7 @@ module Squared
                 flags.each do |flag|
                   case action
                   when 'graph'
-                    next unless graph?
+                    break unless graph?
 
                     format_desc action, flag, '(-)project*'
                     task flag do |_, args|
@@ -369,6 +376,32 @@ module Squared
                       end
                       unpack(path + dir, uri: tag, digest: digest, ext: ext, force: force)
                     end
+                  when 'asdf'
+                    break unless @asdf
+
+                    case flag
+                    when :set
+                      format_desc action, flag, 'version,opts*=u|home,p|parent'
+                      task flag, [:version] do |_, args|
+                        args = if (version = args.version)
+                                 args.extras
+                               else
+                                 version, opts = choice_index('Select a version',
+                                                              @asdf[1].children.map(&:basename).push('latest'),
+                                                              force: true, accept: [['Confirm?', false, true]],
+                                                              values: ['Options'])
+                                 OptionPartition.strip(opts)
+                               end
+                        asdf(flag, args, version: version)
+                      end
+                    else
+                      format_desc(action, flag, flag == :exec ? 'command' : nil)
+                      task flag do |_, args|
+                        args = args.to_a
+                        args << readline('Enter command', force: true) if args.empty? && flag == :exec
+                        asdf flag, args
+                      end
+                    end
                   end
                 end
               end
@@ -451,13 +484,13 @@ module Squared
           if args.first.is_a?(Struct)
             f, blk = args.first.to_a
             args[0] = instance_eval(&blk) || f
-            return unless args[0]
+            return unless args.first
           end
           if args.all? { |val| val.is_a?(Array) }
             cmd = []
             var = {}
             args.each do |val|
-              next instance_exec(*val[1..-1], &val[0]) if val.first.is_a?(Proc)
+              next instance_exec(*val[1..-1], &val.first) if val.first.is_a?(Proc)
 
               a, b, c, d, e = val
               case b
@@ -658,7 +691,7 @@ module Squared
                    when 128, 'sha512'
                      Digest::SHA512
                    else
-                     raise_error("invalid checksum: #{digest}", hint: name)
+                     raise_error "invalid checksum: #{digest}"
                    end
           end
           if (val = env('HEADERS')) && (val = parse_json(val, hint: "HEADERS_#{@envname}"))
@@ -761,6 +794,33 @@ module Squared
           end
         end
 
+        def asdf(flag, opts = [], version: nil)
+          return unless @asdf
+
+          cmd = session 'asdf', flag
+          name = @asdf.first
+          legacy = @@asdf[1] == 15
+          case flag
+          when :set
+            u = has_value?(opts, %w[u home])
+            cmd << if legacy
+                     cmd.delete(flag)
+                     u ? 'global' : 'local'
+                   elsif has_value?(opts, %w[p parent])
+                     '--parent'
+                   elsif u
+                     '--home'
+                   end
+            cmd << name << version
+          when :exec
+            cmd.merge(opts)
+          when :current
+            cmd << '--no-header' unless legacy
+            cmd << name
+          end
+          print_success if success?(run(from: :"asdf:#{flag}")) && flag == :set
+        end
+
         def first(key, *args, **kwargs, &blk)
           event(:first, key, *args, **kwargs, &blk)
         end
@@ -836,6 +896,8 @@ module Squared
               parent_set val
             when :archive
               archive_set val
+            when :asdf
+              asdf_set val
             when :run
               run_set(*args, **kwargs)
             when :script
@@ -945,7 +1007,7 @@ module Squared
         def log
           return @log unless @log.is_a?(Array)
 
-          @log = Logger.new(enabled? ? @log[0] : nil, **@log[1])
+          @log = Logger.new(enabled? ? @log.first : nil, **@log.last)
         end
 
         def allref
@@ -986,20 +1048,18 @@ module Squared
 
         private
 
-        def puts(*args)
-          puts_oe(*args, pipe: pipe)
+        def puts(*args, **kwargs)
+          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, **)
+                interactive: nil, hint: nil, **)
           unless cmd
             warn log_message(Logger::WARN, 'no command given', subject: project, hint: from || 'unknown', pass: true)
             return
           end
-          i = interactive && !(@session && option('y'))
           cmd = cmd.target if cmd.is_a?(OptionPartition)
-          cmd = session_done cmd
-          if i
+          if interactive && (!@session || !option('y'))
             title, y = case interactive
                        when Array
                          interactive
@@ -1008,8 +1068,9 @@ module Squared
                        else
                          ['Run', 'Y']
                        end
-            exit 1 unless confirm("#{title}? [#{sub_style(cmd, styles: theme[:inline])}]", y)
+            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
@@ -1017,7 +1078,7 @@ module Squared
               log&.warn "ENV discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
-              print_item format_banner(cmd, banner: banner) if sync
+              print_item format_banner(hint ? "#{cmd} (#{hint})" : cmd, banner: banner) if sync
               if var != false && (pre = runenv)
                 case pre
                 when Hash
@@ -1226,12 +1287,12 @@ module Squared
         end
 
         def session(*cmd, prefix: cmd.first, main: true, path: true, options: true)
-          prefix = stripext(prefix.to_s).upcase
-          if path && (val = ENV["PATH_#{prefix}"] || PATH[prefix] || PATH[prefix.to_sym])
+          prefix = stripext prefix.to_s
+          if path && (val = shell_bin(prefix))
             cmd[0] = shell_quote(val, force: false)
           end
           ret = JoinSet.new(cmd.flatten(1))
-          if options && (val = env("#{prefix}_OPTIONS"))
+          if options && (val = env("#{prefix.upcase}_OPTIONS"))
             split_escape(val).each { |opt| ret.last(fill_option(opt), /\A(--?[^ =]+)[ =].+\z/m) }
           end
           main ? @session = ret : ret
@@ -1256,7 +1317,7 @@ module Squared
         def session_done(cmd)
           return cmd unless cmd.respond_to?(:done)
 
-          raise_error('no args added', hint: cmd.first || name) unless cmd.size > 1
+          raise_error('no args added', hint: cmd.first) unless cmd.size > 1
           @session = nil if cmd == @session
           cmd.done
         end
@@ -1410,9 +1471,9 @@ module Squared
           unless items.empty?
             pad = items.size.to_s.size
             items.each_with_index do |val, i|
-              next unless reg.empty? || reg.any? { |pat| val[0].match?(pat) }
+              next unless matchany?(val.first, reg)
 
-              out << ('%*d. %s' % [pad, i.succ, each ? each.call(val) : val[0]])
+              out << ('%*d. %s' % [pad, i.succ, each ? each.call(val) : val.first])
             end
           end
           sub = [headerstyle]
@@ -1513,11 +1574,11 @@ module Squared
           list.flatten.each do |opt|
             next unless (val = option(opt, **kwargs))
 
-            return target << (if flag
-                                shell_option(opt, equals ? val : nil, quote: quote, escape: escape, force: force)
-                              else
-                                shell_quote val
-                              end)
+            return target << if flag
+                               shell_option(opt, equals ? val : nil, quote: quote, escape: escape, force: force)
+                             else
+                               shell_quote val
+                             end
           end
           nil
         end
@@ -1726,6 +1787,17 @@ module Squared
           files.map { |val| val == '.' ? '.' : shell_quote(path + val) }
         end
 
+        def matchmap(list, prefix = nil)
+          list.map do |val|
+            if val.is_a?(Regexp)
+              val
+            else
+              val = ".*#{val}" if prefix && !val.sub!(/\A(\^|\\A)/, '')
+              Regexp.new("#{prefix}#{val == '*' ? '.+' : val}")
+            end
+          end
+        end
+
         def semver(val)
           return val if val[3]
 
@@ -1743,12 +1815,20 @@ module Squared
         end
 
         def semcmp(val, other)
-          a, b = [val, other].map! { |ver| ver.match(SEM_VER) }
-          return 1 unless a
-          return -1 unless b
-          return 0 if a[0] == b[0]
+          return 0 if val == other
+
+          a, b = [val, other].map! { |ver| ver.scan(SEM_VER) }
+          return -1 if b.empty?
+          return 1 if a.empty?
 
-          a, b = [a, b].map! { |c| [c[1], c[3], c[5] || '0'] }
+          a, b = [a.first, b.first].map! do |c|
+            begin
+              d = Integer(c[5]).to_s
+            rescue StandardError
+              d = c[5] ? '-1' : '0'
+            end
+            [c[0], c[2], c[4] || '0', d]
+          end
           a.each_with_index do |c, index|
             next if c == (d = b[index])
 
@@ -1757,6 +1837,10 @@ module Squared
           0
         end
 
+        def semgte?(val, other)
+          semcmp(val, other) != 1
+        end
+
         def indexitem(val)
           [$1.to_i, $2 && $2[1..-1]] if val =~ /\A[=^#{indexchar}](\d+)(:.+)?\z/
         end
@@ -1800,7 +1884,7 @@ module Squared
         def on(event, from, *args, **kwargs)
           return unless from && @events.key?(event)
 
-          @events[event][from]&.each do |obj|
+          Array(@events[event][from]).each do |obj|
             target, opts = if obj.is_a?(Array) && obj[1].is_a?(Hash)
                              [obj[0], kwargs.empty? ? obj[1] : obj[1].merge(kwargs)]
                            else
@@ -1826,25 +1910,22 @@ module Squared
           print_error(err, pass: pass) unless ret
         end
 
-        def pwd_set(pass: false, from: nil)
-          pass = semscan(pass).join <= RUBY_VERSION if pass.is_a?(String)
+        def pwd_set(pass: false, dryrun: false, from: nil)
           pwd = Dir.pwd
-          if (path.to_s == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
-            ret = yield
-          else
-            Dir.chdir(path)
-            ret = yield
-            Dir.chdir(pwd)
-          end
+          return yield if (path.to_s == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
+
+          Dir.chdir path
+          ret = yield
+          Dir.chdir pwd
         rescue StandardError => e
-          on_error e, from
+          on_error(e, from, dryrun: dryrun)
         else
           ret
         end
 
         def run_set(cmd, val = nil, opts: nil, **)
-          diso = @output[1] == false && !@output[0].nil?
-          dise = @output[2] == false
+          noopt = @output[1] == false && !@output[0].nil?
+          noenv = @output[2] == false
           parse = lambda do |data|
             ret = []
             if data[:command]
@@ -1864,8 +1945,8 @@ module Squared
           case cmd
           when Array
             @output = if cmd.all? { |data| data.is_a?(Hash) }
-                        diso = false
-                        dise = false
+                        noopt = false
+                        noenv = false
                         cmd.map { |data| parse.call(data) }
                       else
                         cmd.dup
@@ -1876,14 +1957,14 @@ module Squared
           else
             @output[0] = cmd
           end
-          unless diso
+          unless noopt
             if opts == false
               @output[1] = false
             elsif opts && opts != true
               @output[1] = opts
             end
           end
-          return if dise
+          return if noenv
 
           if val.is_a?(Hash)
             @output[2] = val
@@ -1939,6 +2020,13 @@ module Squared
                      end
         end
 
+        def asdf_set(val)
+          @asdf = if @@asdf && val
+                    dir = @@asdf[0].join('installs', val)
+                    [val, dir] if dir.exist? && !dir.empty?
+                  end
+        end
+
         def theme_set(common)
           @theme = if !verbose
                      {}
@@ -1986,6 +2074,10 @@ module Squared
           @only ? !@only.include?(key) : @pass.include?(key)
         end
 
+        def matchany?(val, list, empty: true)
+          list.empty? ? empty : list.any? { |pat| val.match?(pat) }
+        end
+
         def projectpath?(val)
           Pathname.new(val).cleanpath.yield_self do |file|
             file.absolute? ? file.to_s.start_with?(File.join(path, '')) : !file.to_s.start_with?(File.join('..', ''))

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

@@ -55,15 +55,15 @@ module Squared
             commit: %w[a|author=q c|change=q m|message=q pause=b?].freeze,
             inspect: %w[s|size f|format=q].freeze,
             start: %w[a|attach i|interactive detach-keys=q].freeze,
-            stop: %w[s|signal=b t|time=i].freeze,
-            restart: %w[s|signal=b t|time=i].freeze,
+            stop: %w[s|signal=b t|time=i t|timeout=i].freeze,
+            restart: %w[s|signal=b t|time=i t|timeout=i].freeze,
             kill: %w[s|signal=b].freeze,
             stats: %w[no-trunc format|q].freeze
           }.freeze,
           image: {
             list: %w[a|all digests no-trunc f|filter=q format=q].freeze,
             push: %w[a|all-tags disable-content-trust=b? platform=b q|quiet].freeze,
-            rm: %w[f|force no-prune].freeze,
+            rm: %w[f|force no-prune platform=b].freeze,
             save: %w[o|output=p platform=b].freeze
           }.freeze,
           network: {
@@ -73,8 +73,11 @@ module Squared
         }.freeze
         VAL_DOCKER = {
           run: {
-            bind: %w[type source src destination dst target readonly ro bind-propagation].freeze,
-            tmpfs: %w[type destination dst target tmpfs-size tmpfs-mode].freeze
+            common: %w[source src destination dst target readonly ro].freeze,
+            bind: %w[bind-propagation].freeze,
+            volume: %w[volume-subpath volume-nocopy volume-opt].freeze,
+            tmpfs: %w[tmpfs-size tmpfs-mode].freeze,
+            image: %w[image-path].freeze
           }.freeze
         }.freeze
         private_constant :COMPOSEFILE, :BAKEFILE, :OPT_DOCKER, :VAL_DOCKER
@@ -92,7 +95,7 @@ module Squared
         end
 
         subtasks({
-          'build' => %i[tag context bake].freeze,
+          'build' => %i[tag context].freeze,
           'compose' => %i[build run exec up].freeze,
           'bake' => %i[build check].freeze,
           'image' => %i[list rm push tag save].freeze,
@@ -125,7 +128,7 @@ module Squared
 
         def populate(*, **)
           super
-          return unless ref?(Docker.ref)
+          return unless ref?(Docker.ref) || @only
 
           namespace name do
             Docker.subtasks do |action, flags|
@@ -134,7 +137,7 @@ module Squared
               namespace action do
                 flags.each do |flag|
                   case action
-                  when 'build', 'bake'
+                  when 'build'
                     case flag
                     when :tag, :context
                       format_desc(action, flag, 'opts*', before: flag == :tag ? 'name' : 'dir')
@@ -142,9 +145,12 @@ module Squared
                         param = param_guard(action, flag, args: args, key: flag)
                         buildx(:build, args.extras, "#{flag}": param)
                       end
-                    when :bake, :build
-                      next unless bake?
+                    end
+                  when 'bake'
+                    break unless bake?
 
+                    case flag
+                    when :build
                       format_desc action, flag, ':?,opts*,target*,context?'
                       task flag do |_, args|
                         args = args.to_a
@@ -155,8 +161,6 @@ module Squared
                         end
                       end
                     when :check
-                      next unless bake?
-
                       format_desc action, flag, 'target'
                       task flag, [:target] do |_, args|
                         target = param_guard(action, flag, args: args, key: :target)
@@ -164,6 +168,8 @@ module Squared
                       end
                     end
                   when 'compose'
+                    break unless compose?
+
                     case flag
                     when :build, :up
                       format_desc action, flag, 'opts*,service*'
@@ -348,7 +354,7 @@ module Squared
           when :build, :up
             op.append(escape: true)
           when :exec, :run
-            append_command(flag, service, op.extras, from: from)
+            append_command flag, service, op.extras
           end
           run(from: from)
         end
@@ -365,44 +371,54 @@ module Squared
           when :run, :create, :exec
             if rc && !op.arg?('mount')
               run = VAL_DOCKER[:run]
-              both = run[:bind] + run[:tmpfs]
-              diff = run[:bind].reject { |val| run[:tmpfs].include?(val) }
-              delim = Regexp.new(",\\s*(?=#{both.join('|')})")
+              all = collect_hash VAL_DOCKER[:run]
+              delim = Regexp.new(",\\s*(?=#{all.join('|')})")
               Array(@mounts).each do |val|
                 args = []
-                tmpfs = true
+                type = nil
                 val.split(delim).each do |opt|
                   k, v, q = split_option opt
-                  next unless both.include?(k)
-
                   if k == 'type'
-                    tmpfs = false if v == 'bind'
-                    next
-                  elsif diff.include?(k)
-                    tmpfs = false
-                  end
-                  case k
-                  when 'readonly', 'ro'
-                    args << k
-                    next
-                  when 'source', 'src', 'destination', 'dst', 'target'
-                    v = path + v
-                    v = shell_quote(v, option: false, force: false) if q == ''
-                    tmpfs = false if k[0] == 's'
+                    case v
+                    when 'bind', 'volume', 'image', 'tmpfs'
+                      type = v
+                    else
+                      raise_error("unknown type: #{v}", hint: flag)
+                    end
+                  elsif all.include?(k)
+                    unless type
+                      run.each_pair do |key, val|
+                        if val.include?(k)
+                          type = key.to_s unless key == :common
+                          break
+                        end
+                      end
+                    end
+                    case k
+                    when 'readonly', 'ro'
+                      args << k
+                      next
+                    when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-path'
+                      v = path + v
+                      v = shell_quote(v, option: false, force: false) if q == ''
+                    end
+                    args << "#{k}=#{q + v + q}"
+                  elsif verbose
+                    log_message(Logger::INFO, 'unrecognized option', subject: from, hint: k)
                   end
-                  args << "#{k}=#{q + v + q}"
                 end
-                cmd << "--mount type=#{tmpfs ? 'tmpfs' : 'bind'},#{args.join(',')}"
+                raise_error('missing type', hint: flag) unless type
+                cmd << "--mount type=#{type},#{args.join(',')}"
               end
             end
-            append_command(flag, id || tagmain, op.extras, from: from)
+            append_command(flag, id || tagmain, op.extras)
           when :update
-            raise_error('missing container', hint: from) if op.empty?
+            raise_error('missing container', hint: flag) if op.empty?
             op.append(escape: true)
           when :commit
             latest = op.shift || tagmain
             cmd << id << latest
-            raise_error("unknown args: #{op.join(', ')}", hint: from) unless op.empty?
+            raise_error("unknown args: #{op.join(', ')}", hint: flag) unless op.empty?
             return unless confirm_command(cmd.to_s, title: from, target: id, as: latest)
 
             registry = option('registry') || @registry
@@ -445,7 +461,7 @@ module Squared
               when :rm
                 status = %w[created exited dead]
               end
-              ps = docker_output('ps -a', *status.map { |s| "--filter=\"status=#{s}\"" })
+              ps = docker_output('ps -a', *status.map { |s| quote_option('filter', "status=#{s}") })
               list_image(flag, ps, no: no, hint: "status: #{status.join(', ')}", from: from) do |img|
                 run(cmd.temp(img), from: from)
               end
@@ -509,8 +525,8 @@ module Squared
           when :push
             id ||= option('tag', ignore: false) || tagmain
             registry ||= op.shift || option('registry') || @registry
-            raise_error(id ? "unknown args: #{op.join(', ')}" : 'no id/tag given', hint: from) unless id && op.empty?
-            raise_error('username/registry not provided', hint: from) unless registry
+            raise_error(id ? "unknown args: #{op.join(', ')}" : 'no id/tag given', hint: flag) unless id && op.empty?
+            raise_error('username/registry not provided', hint: flag) unless registry
             registry.chomp!('/')
             uri = shell_quote "#{registry}/#{id}"
             op << uri
@@ -544,6 +560,14 @@ module Squared
           super || dockerfile.exist?
         end
 
+        def compose?(file = dockerfile)
+          COMPOSEFILE.include?(File.basename(file))
+        end
+
+        def bake?(file = dockerfile)
+          BAKEFILE.include?(File.basename(file))
+        end
+
         def dockerfile(val = nil)
           if val == 'Dockerfile'
             @file = false
@@ -573,7 +597,7 @@ module Squared
           session('docker', *cmd, main: false, options: false, **kwargs)
         end
 
-        def append_command(flag, val, list, target: @session, from: nil)
+        def append_command(flag, val, list, target: @session)
           if list.delete(':')
             list << readline('Enter command [args]', force: true)
           elsif (args = env('DOCKER_ARGS'))
@@ -585,7 +609,7 @@ module Squared
               target << basic_option('name', dnsname("#{name}_%s" % rand_s(6)))
             end
           when :exec
-            raise_error('no command args', hint: from) if list.empty?
+            raise_error('no command args', hint: flag) if list.empty?
           end
           target << val << list.shift
           target << list.join(' && ') unless list.empty?
@@ -633,7 +657,7 @@ module Squared
             index = 0
             all = option('all', prefix: 'docker')
             y = from == :'image:rm' && option('y', prefix: 'docker')
-            pat = /^(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})(?:[_.,:-]|$)/
+            pat = /\b(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})\b/
             IO.popen(session_done(cmd << '--format=json')).each do |line|
               data = JSON.parse(line)
               id = data['ID']
@@ -681,7 +705,7 @@ module Squared
               end
               yield id
             end
-            puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) if found || y
+            puts log_message(Logger::INFO, 'none detected', subject: name, hint: hint || from) if !found && !y
           end
         rescue StandardError => e
           on_error e, from
@@ -801,14 +825,6 @@ module Squared
         def tagmain
           tag.is_a?(Array) ? tag.first : tag
         end
-
-        def compose?(file = dockerfile)
-          COMPOSEFILE.include?(File.basename(file))
-        end
-
-        def bake?(file = dockerfile)
-          BAKEFILE.include?(File.basename(file))
-        end
       end
 
       Application.implement Docker