squared 0.4.17 → 0.4.19

data/lib/squared/common/base.rb

@@ -94,7 +94,7 @@ module Squared
       PATH.freeze
       ARG.freeze
       VAR.each_value(&:freeze)
-      VAR[:theme].each_value(&:freeze)
+      VAR[:theme].each_value { |val| val.freeze.each_value(&:freeze) }
       VAR.freeze
     end
 

data/lib/squared/common/format.rb

@@ -141,11 +141,11 @@ module Squared
       def apply_style(data, key, args, empty: true)
         return if data.is_a?(::Symbol) && (data = __get__(:theme)[data]).nil?
 
-        set = ->(k, v) { data[k] = check_style(v, empty: empty) }
+        set = ->(k, v) { data[k.to_sym] = check_style(v, empty: empty) }
         if key.is_a?(::Hash)
           key.each { |k, v| set.call(k, v || args) }
         else
-          set.call(key.to_sym, args)
+          set.call(key, args)
         end
       end
 
@@ -157,7 +157,8 @@ module Squared
           when Logger::WARN then :warn
           when Logger::ERROR then :error
           when Logger::FATAL then :fatal
-          else :unknown end
+          else :unknown
+          end
         else
           level.to_s.downcase.to_sym
         end
@@ -194,7 +195,7 @@ module Squared
         end
       end
 
-      def puts_oe(*args, pipe: 1)
+      def log_console(*args, pipe: 1)
         return if args.first == false && args.size == 1
 
         if pipe.is_a?(Pathname)
@@ -211,6 +212,8 @@ module Squared
         (pipe == 2 ? $stderr : $stdout).puts(*args)
       end
 
+      alias puts_oe log_console
+
       module_function
 
       def message(*args, hint: nil, empty: false, space: ARG[:SPACE])

data/lib/squared/common/prompt.rb

@@ -42,7 +42,7 @@ module Squared
           list.each do |val|
             next if grep&.none? { |pat| pat.match?(line) }
 
-            items << val.chomp
+            items << val.to_s.chomp
             puts "#{items.size.to_s.rjust(2)}. #{val}"
           end
           max = items.size

data/lib/squared/common/shell.rb

@@ -92,10 +92,16 @@ module Squared
         ret.join(join.is_a?(::String) ? join : ' ')
       end
 
-      def fill_option(val, double: false)
+      def shell_bin(name, env: true)
+        key = name.upcase
+        shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name,
+                    option: false, force: false)
+      end
+
+      def fill_option(val, **kwargs)
         return "-#{val}" if val.match?(/\A(?:[a-z]\d*|\d)\z/i)
 
-        shell_escape(val.start_with?('-') ? val : "--#{val}", double: double)
+        shell_escape(val.start_with?('-') ? val : "--#{val}", **kwargs)
       end
 
       def quote_option(flag, val, option: true, double: false, merge: false)

data/lib/squared/common/system.rb

@@ -24,7 +24,7 @@ module Squared
         else
           return Kernel.send(name, *args, **kwargs)
         end
-        return ret if ret || !e
+        return ret unless e && !ret && name == :system
 
         raise $?.to_s
       end

data/lib/squared/config.rb

@@ -94,10 +94,10 @@ module Squared
       def build
         return unless enabled?
 
-        namespace(ns = task_name(name)) do
+        namespace task_name(name) do |ns|
           @mime.each do |type, items|
             items.each do |command, file, opts|
-              next if Rake::Task.task_defined?("#{ns}:#{command}:#{type}")
+              next if Rake::Task.task_defined?("#{ns.scope.path}:#{command}:#{type}")
 
               namespace command do
                 unless (data = @@mime_obj[type])
@@ -196,7 +196,7 @@ module Squared
       private
 
       def puts(*args)
-        puts_oe(*args, pipe: pipe)
+        log_console(*args, pipe: pipe)
       end
 
       def log

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.4.17'
+  VERSION = '0.4.19'
 end

data/lib/squared/workspace/application.rb

@@ -95,9 +95,15 @@ module Squared
         @kind = Support.hashlist
         @extensions = []
         @envname = env_key(@main).freeze
-        @pipe = env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
+        @pipe = $DEBUG ? 2 : env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
         @exception = env_bool exception
-        @verbose = env_bool(verbose, verbose.nil? || verbose.is_a?(String) ? @pipe != 0 : verbose, index: true)
+        @verbose = if $VERBOSE.nil?
+                     false
+                   elsif verbose.nil?
+                     @pipe != 0
+                   else
+                     env_bool(verbose, verbose.is_a?(String) ? @pipe != 0 : verbose, index: true)
+                   end
         @warning = @verbose != false
         @closed = false
         if common
@@ -423,7 +429,7 @@ module Squared
             ret << proj if proj
           end
         end
-        return (group || ref ? ret : ret[0]) unless block_given?
+        return (group || ref ? ret : ret.first) unless block_given?
 
         ret.each(&blk)
         self
@@ -678,6 +684,10 @@ module Squared
         { exception: exception, warning: warning }
       end
 
+      def size
+        @project.size
+      end
+
       def to_s
         (home? ? home : root).to_s
       end
@@ -800,8 +810,8 @@ module Squared
           format_desc key
           task key do
             unless failed.empty? && group.empty?
-              puts log_message(Logger::ERROR, *(failed + group.map { |val| val.action }.flatten),
-                               subject: 'failed placement', hint: false)
+              puts(log_message(Logger::ERROR, *(failed + group.map { |val| val.action }.flatten),
+                               subject: 'failed placement', hint: false), pipe: 2)
             end
             cols = level.flatten(1).map(&:size).max
             level.each_with_index do |grp, n|
@@ -817,8 +827,8 @@ module Squared
         end
       end
 
-      def puts(*args)
-        puts_oe(*args, pipe: pipe)
+      def puts(*args, **kwargs)
+        log_console(*args, pipe: kwargs[:pipe] || pipe)
       end
 
       def script_command(task, val, group, ref, on, &blk)

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

@@ -21,7 +21,7 @@ module Squared
         VAR_SET = %i[parent global script index envname desc dependfile dependindex theme archive env dev prod graph
                      pass only exclude].freeze
         BLK_SET = %i[run depend doc lint test copy clean].freeze
-        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?-?(\S+)?\b/.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
@@ -262,9 +262,9 @@ module Squared
             -1
           elsif h.any? { |val| e.include?(val) }
             1
-          elsif e.any? { |val| f.include?(val) }
+          elsif e.any? { |val| f.include?(val) } # rubocop:disable Lint/DuplicateBranch
             -1
-          elsif f.any? { |val| e.include?(val) }
+          elsif f.any? { |val| e.include?(val) } # rubocop:disable Lint/DuplicateBranch
             1
           elsif @index >= 0 && (i = other.instance_variable_get(:@index)) >= 0
             @index <=> i
@@ -313,7 +313,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|
@@ -455,13 +455,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
@@ -948,7 +948,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
@@ -989,8 +989,8 @@ 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,
@@ -999,10 +999,8 @@ module Squared
             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
@@ -1011,10 +1009,10 @@ module Squared
                        else
                          ['Run', 'Y']
                        end
-            unless confirm("#{title}? [#{sub_style(cmd, styles: theme[:inline])}] #{y == 'Y' ? '[Y/n]' : '[y/N]'} ", y)
-              exit 1
-            end
+            yn = y == 'Y' ? 'Y/n' : 'y/N'
+            exit 1 unless confirm("#{title}? [#{sub_style(cmd.to_s, styles: theme[:inline])}] [#{yn}] ", y)
           end
+          cmd = session_done cmd
           log&.info cmd
           on :first, from
           begin
@@ -1231,12 +1229,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
@@ -1420,9 +1418,9 @@ module Squared
           unless items.empty?
             pad = items.size.to_s.size
             items.each_with_index do |val, i|
-              next unless matchany?(val[0], reg)
+              next unless matchany?(val.first, reg)
 
-              out << "#{i.succ.to_s.rjust(pad)}. #{each ? each.call(val) : val[0]}"
+              out << "#{i.succ.to_s.rjust(pad)}. #{each ? each.call(val) : val.first}"
             end
           end
           sub = [headerstyle]
@@ -1779,7 +1777,14 @@ module Squared
           return -1 if b.empty?
           return 1 if a.empty?
 
-          a, b = [a.first, b.first].map! { |c| [c[0], c[2], c[4] || '0', c[5] ? '-1' : '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])
 
@@ -2098,8 +2103,8 @@ module Squared
           val != action && invoked_sync?(val)
         end
 
-        def success?(ret)
-          ret == true && stdout? && banner?
+        def success?(ret, display = true)
+          ret == true && display && stdout? && banner?
         end
 
         def banner?

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

@@ -4,7 +4,7 @@ module Squared
   module Workspace
     module Project
       class Docker < Base
-        COMPOSEFILE = %w[compose.yaml compose.yml docker-compose.yaml compose.yml docker-compose.yml].freeze
+        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
         OPT_DOCKER = {
@@ -12,56 +12,57 @@ module Squared
                      tlskey=p].freeze,
           buildx: {
             common: %w[builder=b D|debug],
-            build: %w[load pull push add-host=q annotation=q attest=q build-arg=qq ent=q iidfile=p label=q a-file=p
-                      network=b no-cache-filter=b o|output=q platform=b q|quiet secret=qq shm-size=b ssh=qq t|tag=b
-                      target=b ulimit=q].freeze,
-            bake: %w[load print pull push list=q metadata-file=p set=q].freeze,
-            shared: %w[check no-cache allow=q call=b? f|file=p progress=b provenance=q sbom=q].freeze
+            build: %w[add-host=q annotation=q attest=q build-arg=qq build-context=qq cache-from=q cache-to=q
+                      cgroup-parent=b ent=q iidfile=p label=q a-file=p network=b no-cache-filter=b o|output=q platform=b
+                      q|quiet secret=qq shm-size=b ssh=qq t|tag=b target=b ulimit=q].freeze,
+            bake: %w[print list=q set=q].freeze,
+            shared: %w[check load no-cache pull push allow=q call=b? f|file=p metadata-file=p progress=b provenance=q
+                       sbom=q].freeze
           }.freeze,
           compose: {
-            common: %w[all-resources compatibility dry-run ansi|b env-file=p f|file=p parallel=b profile=b progress=b
+            common: %w[all-resources compatibility dry-run ansi|b env-file=p f|file=p parallel=n profile=b progress=b
                        project-directory=p p|project-name=e].freeze,
-            build: %w[check no-cache pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
-                      ssh=qq].freeze,
-            exec: %w[dry-run privileged d|detach e|env=qq index=i T|no-TTY=b? user=e w|workdir=q].freeze,
-            run: %w[build dry-run no-deps quiet-pull remove-orphans rm P|service-ports use-aliases cap-add=b cap-drop=b
-                    d|detach entrypoint=q e|env=qq i|interactive=b? l|label=q name=b T|no-TTY=b? p|publish=e pull=b
-                    u|user=e v|volume=q w|workdir=q].freeze,
-            up: %w[y abort-on-container-exit abort-on-container-failure always-recreate-deps attach-dependencies build
-                   d|detach dry-run force-recreate menu no-build no-color no-deps no-log-prefix no-recreate no-start
-                   quiet-pull remove-orphans V|renew-anon-volumes timestamps wait w|watch attach=b exit-code-from=b
-                   no-attach=b pull=b scale=i t|timeout=i wait-timeout=i].freeze
+            build: %w[check no-cache print pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
+                      provenance=q sbom=q ssh=qq].freeze,
+            exec: %w[d|detach privileged e|env=qq index=i T|no-TTY=b? user=e w|workdir=q].freeze,
+            run: %w[build d|detach no-deps q|quiet quiet-build quiet-pull remove-orphans rm P|service-ports use-aliases
+                    cap-add=b cap-drop=b q e|env=qq env-from-file=p i|interactive=b? l|label=q name=b T|no-TTY=b?
+                    p|publish=e pull=b u|user=e v|volume=q w|workdir=q].freeze,
+            up: %w[abort-on-container-exit abort-on-container-failure always-recreate-deps attach-dependencies build
+                   d|detach force-recreate menu no-build no-color no-deps no-log-prefix no-recreate no-start quiet-build
+                   quiet-pull remove-orphans V|renew-anon-volumes timestamps wait w|watch y|yes attach=b
+                   exit-code-from=b no-attach=b pull=b scale=i t|timeout=i wait-timeout=i].freeze,
+            down: %w[remove-orphans v|volumes rmi=b t|timeout=i].freeze
           }.freeze,
           container: {
             create: %w[init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet read-only
-                       rm runtime t|tty use-api-socket io-maxbandwidth=b io-maxiops=b add-host=q annotation=q
-                       a|attach=b blkio-weight=i blkio-weight-device=i cap-add=b cap-drop=b cgroup-parent=b cgroupns=b
-                       cidfile=p device=q device-cgroup-rule=q device-read-bps=q device-read-iops=q device-write-bps=q
+                       rm runtime t|tty use-api-socket io-maxbandwidth=b io-maxiops=b add-host=q annotation=q a|attach=b
+                       blkio-weight=i blkio-weight-device=i cap-add=b cap-drop=b cgroup-parent=b cgroupns=b cidfile=p
+                       device=q device-cgroup-rule=q device-read-bps=q device-read-iops=q device-write-bps=q
                        device-write-iops=q disable-content-trust=b? dns=e dns-option=e dns-search=e domainname=b
-                       entrypoint=q e|env=qq env-file=p expose=e gpus=q group-add=b health-cmd=q health-interval=b
-                       health-retries=i health-start-interval=b health-start-period=b health-timeout=b h|hostname=e ip=b
-                       ip6=e ipc=b isolation=b kernel-memory=b l|label=q label-file=p link=b link-local-ip=b
-                       log-driver=b log-opt=q mac-address=e m|memory=b memory-reservation=b memory-swap=n
-                       memory-swappiness=n mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b pids-limit=n
-                       platform=b p|publish=e pull=b restart=b runtime=b security-opt=q shm-size=b stop-signal=b
-                       stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q u|user=b userns=b uts=b v|volume=q
-                       volume-driver=b volumes-from=b w|workdir=q].freeze,
+                       entrypoint=q e|env=qq env-file=p expose=e gpus=q group-add=b health-cmd=q health-interval=b ip6=e
+                       ipc=b isolation=b kernel-memory=b l|label=q label-file=p link=b link-local-ip=b log-driver=b
+                       log-opt=q mac-address=e m|memory=b memory-reservation=b memory-swap=n memory-swappiness=n
+                       mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b pids-limit=n platform=b
+                       p|publish=e pull=b restart=b runtime=b security-opt=q shm-size=b stop-signal=b stop-timeout=i
+                       storage-opt=q sysctl=q tmpfs=q ulimit=q u|user=b userns=b uts=b v|volume=q volume-driver=b
+                       volumes-from=b w|workdir=q].freeze,
             run: %w[d|detach detach-keys=q sig-proxy=b?].freeze,
-            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p user=e
-                     w|workdir=q].freeze,
             update: %w[blkio-weight=i cpu-period=i cpu-quota=i cpu-rt-period=i cpu-rt-runtime=i c|cpu-shares=i cpus=f
                        cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=b pids-limit=n
                        restart=q].freeze,
+            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p user=e
+                     w|workdir=q].freeze,
             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 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
+            stats: %w[a|all no-stream no-trunc format|q].freeze
           }.freeze,
           image: {
-            list: %w[a|all digests no-trunc f|filter=q format=q].freeze,
+            list: %w[a|all q|quiet digests no-trunc tree 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 platform=b].freeze,
             save: %w[o|output=p platform=b].freeze
@@ -96,7 +97,7 @@ module Squared
 
         subtasks({
           'build' => %i[tag context].freeze,
-          'compose' => %i[build run exec up].freeze,
+          'compose' => %i[build run exec up down].freeze,
           'bake' => %i[build check].freeze,
           'image' => %i[list rm push tag save].freeze,
           'container' => %i[run create exec update commit inspect diff start stop restart pause unpause top stats kill
@@ -147,11 +148,11 @@ module Squared
                       end
                     end
                   when 'bake'
-                    next unless bake?
+                    break unless bake?
 
                     case flag
                     when :build
-                      format_desc action, flag, ':?,opts*,target*,context?'
+                      format_desc action, flag, 'opts*,target*,context?|:'
                       task flag do |_, args|
                         args = args.to_a
                         if args.first == ':'
@@ -168,10 +169,10 @@ module Squared
                       end
                     end
                   when 'compose'
-                    next unless compose?
+                    break unless compose?
 
                     case flag
-                    when :build, :up
+                    when :build, :up, :down
                       format_desc action, flag, 'opts*,service*'
                       task flag do |_, args|
                         compose! flag, args.to_a
@@ -222,7 +223,8 @@ module Squared
                       format_desc(action, flag, case flag
                                                 when :rm, :save then 'id*,opts*'
                                                 when :tag then 'version?'
-                                                else 'opts*,args*' end)
+                                                else 'opts*,args*'
+                                                end)
                       task flag do |_, args|
                         args = args.to_a
                         if args.empty? && flag != :list
@@ -259,12 +261,11 @@ module Squared
 
           ret = docker_session
           if from == :run
-            case (n = filetype)
-            when 1, 2
+            if bake?(n = filetype)
               ret << 'buildx' << 'bake'
               append_file n
               from = :bake
-            when 3, 4
+            elsif compose?(n)
               ret << 'compose' << 'build'
               append_file n
               from = :compose
@@ -337,7 +338,7 @@ module Squared
                   op.push(val)
                 end
               end
-              op.append(args, escape: true)
+              op.append(args, escape: true, strip: /^:/)
               contextdir context if context
             end
           end
@@ -350,15 +351,14 @@ module Squared
           op = OptionPartition.new(opts, OPT_DOCKER[:compose][:common], cmd, project: self)
           append_file filetype unless op.arg?('f', 'file')
           op << flag
-          op.parse(OPT_DOCKER[:compose][flag])
-          from = :"compose:#{flag}"
+          op.parse(OPT_DOCKER[:compose].fetch(flag, []))
           case flag
-          when :build, :up
-            op.append(escape: true)
+          when :build, :up, :down
+            op.append(escape: true, strip: /^:/)
           when :exec, :run
             append_command flag, service, op.extras
           end
-          run(from: from)
+          run(from: :"compose:#{flag}")
         end
 
         def container(flag, opts = [], id: nil)
@@ -390,10 +390,10 @@ module Squared
                   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
+                        next unless val.include?(k)
+
+                        type = key.to_s unless key == :common
+                        break
                       end
                     end
                     case k
@@ -416,7 +416,7 @@ module Squared
             append_command(flag, id || tagmain, op.extras)
           when :update
             raise_error('missing container', hint: flag) if op.empty?
-            op.append(escape: true)
+            op.append(escape: true, strip: /^:/)
           when :commit
             latest = op.shift || tagmain
             cmd << id << latest
@@ -469,7 +469,7 @@ module Squared
               end
               return
             else
-              op.append(escape: true)
+              op.append(escape: true, strip: /^:/)
             end
           end
           run(from: from)
@@ -546,7 +546,7 @@ module Squared
 
         def network(flag, opts = [], target: nil)
           cmd, opts = docker_session('network', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_DOCKER[:network][flag], cmd, project: self)
+          op = OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, project: self)
           op.clear
           from = :"network:#{flag}"
           list_image(flag, docker_output('ps -a'), from: from) do |img|
@@ -563,10 +563,14 @@ module Squared
         end
 
         def compose?(file = dockerfile)
+          return file == 3 || file == 4 if file.is_a?(Numeric)
+
           COMPOSEFILE.include?(File.basename(file))
         end
 
         def bake?(file = dockerfile)
+          return file == 1 || file == 2 if file.is_a?(Numeric)
+
           BAKEFILE.include?(File.basename(file))
         end
 
@@ -618,13 +622,22 @@ module Squared
         end
 
         def append_file(type, target: @session)
-          return unless type == 2 || type == 4 || @file.is_a?(Array)
+          return if 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
+            end
+          end
           files = Array(@file).map { |val| quote_option('file', path + val) }
           if target.is_a?(Set)
-            target.merge(files)
+            opts = target.to_a.insert(2, *files)
+            target.clear.merge(opts)
           else
-            target.concat(files)
+            target.insert(2, *files)
           end
         end
 
@@ -789,7 +802,7 @@ module Squared
             bake?(val) ? 1 : 2
           when '.yml', '.yaml'
             if compose?(val)
-              path.children.any? { |file| bake?(file) } ? 1 : 3
+              @only&.include?('compose') || path.children.none? { |file| bake?(file) } ? 3 : 1
             else
               4
             end