squared 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2f2ae101197ffdfdc4f744db59b842e2d1d7f333f9fd2f450ea94aa89a57dcd
-  data.tar.gz: b935b9e2787c79ea413e3449df1ba53e524928f0f1a48e90639147c91a945e43
+  metadata.gz: ec0306a0e60a4854a3c3be267b5c66577702dee8908bf36eb7c4ccfb98b2b4ff
+  data.tar.gz: 3463f8bce9cfe67a18a2e09d9d7358a4f8c8bebcddc9037612bfc1cb2b213d93
 SHA512:
-  metadata.gz: 982f19b327aa713258196aeaa3514edbc685840f838cc25eef01c7fef812807c9ac089b67d0145e6d6ee70ee1f57620b5254b9fe23bf6315a40a8d8dfa9a9816
-  data.tar.gz: 59ba49e317403c120081d842afb0e9747a63b79669bd852fa064e09da51176a3bdcbad973b7c64b771a1ccb8ac58654918d830719c8700610c5de07fb7096d07
+  metadata.gz: 1f47734d5f11de8e4106ab249a276b3e42ca9d70de61863a24f51e65b579a187a27cfad2b21593d9a79bb0aeb9a6a192775e3753d3ff02d546fee06057cf7cd1
+  data.tar.gz: 01b1520fe506cdb8d8e08213794aaa72d8a55e7ddb51b139573d67ee46e613d9ee600809799972b57a1f3435e8672f0b3ea3d8398e381cc72bdf955d9e330c58

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## [0.5.8] - 2025-10-01
+
+### Fixed
+
+- See `0.4.21`.
+
+## [0.4.21] - 2025-10-01
+
+### Added
+
+- Project base method variable_set was aliased to the name apply.
+
+### Changed
+
+- Project base method run visibility was changed to public.
+- OptionPartition method uniq! returns self or nil.
+
+### Fixed
+
+- Docker attribute file did not search for nearest config.
+- Project task run did not accept Proc or Method definitions.
+- Gem command options were revalidated to 3.7.2.
+- Bundler command options were revalidated to 2.7.2.
+- Ruby class method bundle did not pass through commands.
+- Ruby task ruby did not separate options and arguments.
+- Pip commands uninstall and freeze did not filter options.
+- Ruby command gem action update did not append packages.
+- OptionPartition did not detect short options with a merged value.
+- Gem commands option version did not use quotes.
+- Git command pull action all used undefined delete_prefix! method.
+- OptionPartition did not delete added values from extras.
+- Python editable projects can override requirements detection.
+- Project session method did delete short options with a merged value.
+- Gem command install did not try to resolve local paths.
+- Ruby commands did not always check for file target exists.
+
 ## [0.5.7] - 2025-09-14
 
 ### Fixed
@@ -1047,6 +1083,7 @@
 
 - Changelog was created.
 
+[0.5.8]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.8
 [0.5.7]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.7
 [0.5.6]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.6
 [0.5.5]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.5
@@ -1055,6 +1092,7 @@
 [0.5.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.2-ruby
 [0.5.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.1-ruby
 [0.5.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.0-ruby
+[0.4.21]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.21
 [0.4.20]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.20
 [0.4.19]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.19
 [0.4.18]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.18

data/README.md

@@ -108,9 +108,9 @@ Workspace::Application
     revbuild(include: %w[src/ framework/ types/])                            # Synchronous is recommended
   end
   .add("squared/sqd", exclude: :git, pass: [:node, "checkout", "bump"]) do   # Skip initialize(:node) + squared:checkout:* + squared:bump:*
-    variable_set :script, "build:sqd"                                        # Override detection
-    variable_set :depend, false
-    variable_set :clean, ["build/sqd/"]
+    apply :script, "build:sqd"                                               # Override detection
+    apply :depend, false                                                     #
+    apply :clean, ["build/sqd/"]                                             # variable_set (alias)
   end
   .with(:docker, only: ["build", "compose"]) do
     .add("squared", "docker", file: "Dockerfile", context: ".", tag: "latest", registry: "localhost:5000", username: "squared",
@@ -306,7 +306,7 @@ Workspace::Application
     doc(windows? ? ".\make.bat html" : "make html")                            # rake android-docs:doc | rake doc:python
     add("android-docs", "android", venv: "/home/user/.venv")                   # rake android-docs:depend
     add("chrome-docs", "chrome", graph: "android", venv: %w[.venv --clear]) do # /workspaces/chrome-docs/.venv
-      variable_set :dependindex, 1                                             # Use Poetry for dependencies (optional)
+      apply :dependindex, 1                                                    # Use Poetry for dependencies (optional)
     end
   end
   .with(:node) do
@@ -498,21 +498,22 @@ Most project classes will inherit from `Git` which enables these tasks:
 
 | Task       | Git              | Command                                       |
 | :--------- | :--------------- | :-------------------------------------------- |
-| branch     | branch           | create set delete move copy list edit current |
+| branch     | branch           | create track delete move copy list current    |
 | checkout   | checkout         | commit branch track detach path               |
 | commit     | commit           | add all amend amend-orig fixup                |
-| diff       | diff             | head cached branch files between contain      |
+| diff       | diff             | head branch files view between contain        |
 | fetch      | fetch            | origin remote all                             |
 | files      | ls-files         | cached modified deleted others                |
-| git        |                  | add blame clean mv rm revert status           |
+| git        |                  | add blame clean mv revert rm status           |
+| log        | log              | view between contain                          |
 | merge      | merge            | commit no-commit send                         |
 | pull       | pull             | origin remote all                             |
 | rebase     | rebase           | branch onto send                              |
 | refs       | ls-remote --refs | heads tags remote                             |
-| reset      | reset            | commit index patch mode                       |
-| restore    | restore          | staged worktree                               |
-| rev        | rev              | commit output                                 |
-| show       | show             | format oneline                                |
+| reset      | reset            | commit index patch mode undo                  |
+| restore    | restore          | source staged worktree                        |
+| rev        | rev              | commit build output                           |
+| show       | show             | format oneline textconv                       |
 | stash      | stash            | push pop apply branch drop clear list all     |
 | submodule  | submodule        | status update branch url sync                 |
 | switch     | switch           | branch create detach                          |
@@ -599,6 +600,9 @@ BUILD_${NAME}_VERSION=0.1.0  # publish + detection
 BANNER=0                     # hide banner
 BANNER_${NAME}=0             #
 
+VERBOSE=0                    # console output level
+VERBOSE_${NAME}=0            # 0,1,2,n
+
 REVBUILD_FORCE=1             # Rebuild all targets
 REVBUILD_FORCE_${NAME}=1     # Rebuild project
 
@@ -641,7 +645,7 @@ GIT_AUTOSTASH_${NAME}=0     # rebase (project only)
 | :--------- | :---------------- | :-------------------------------------------------------------------- |
 | branch     | create            | TRACK=0,1,s F|FORCE                                                   |
 | branch     | move copy         | F|FORCE                                                               |
-| branch     | set delete        | COUNT=n                                                               |
+| branch     | delete            | COUNT=n                                                               |
 | branch     | global            | SYNC                                                                  |
 | checkout   | branch            | DETACH TRACK=s COUNT=n                                                |
 | checkout   | detach            | REFLOG=1                                                              |

data/lib/squared/common/format.rb

@@ -191,7 +191,7 @@ module Squared
           emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub, pipe: -1)
         else
           msg = [log_title(level, color: color)]
-          msg << (color ? sub_style(subject, styles: (@theme && @theme[:subject]) || :bold) : subject) if subject
+          msg << (color ? sub_style(subject.to_s, styles: (@theme && @theme[:subject]) || :bold) : subject) if subject
           msg << args.shift if msg.size == 1
           message(msg.join(' '), *args, hint: hint)
         end
@@ -225,12 +225,8 @@ module Squared
       def emphasize(val, title: nil, footer: nil, right: false, cols: nil, sub: nil, pipe: nil,
                     border: @theme && @theme[:border])
         n = 0
-        max = ->(v) { n = [n, v.max_by(&:size).size].max }
-        set = lambda do |v|
-          ret = Array(v).map(&:to_s)
-          max.call(ret)
-          ret
-        end
+        max = ->(a) { n = [n, a.max_by(&:size).size].max }
+        set = ->(s) { Array(s).map(&:to_s).tap { |a| max.call(a) } }
         title &&= set.call(title)
         footer &&= set.call(footer)
         if val.is_a?(::Array)

data/lib/squared/common/utils.rb

@@ -89,8 +89,11 @@ module Squared
       end
 
       def time_since(val, ms: true)
-        s = ms ? '%s%L' : '%s'
-        Time.now.utc.strftime(s).to_i - Time.parse(val).utc.strftime(s).to_i
+        time_epoch(ms: ms) - time_epoch(Time.parse(val), ms: ms)
+      end
+
+      def time_epoch(val = Time.now, ms: true)
+        val.utc.strftime(ms ? '%s%L' : '%s').to_i
       end
 
       def rand_s(size)

data/lib/squared/config.rb

@@ -213,7 +213,7 @@ module Squared
             ext[0] = mime
           elsif file
             keys.prepend(file)
-            alt = basepath("#{main}.{#{ext.join(',')}}")
+            alt = basepath "#{main}.{#{ext.join(',')}}"
             file = Dir[alt].first
           else
             alt = main
@@ -347,8 +347,8 @@ module Squared
         basepath(file = main + @ext).to_s rescue file
       end
 
-      def basepath(file)
-        project ? project.basepath(file) : Pathname.pwd + file
+      def basepath(*args)
+        project ? project.basepath(*args) : Pathname.pwd.join(*args)
       end
     end
   end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -634,7 +634,9 @@ module Squared
       end
 
       def home?
-        !(proj = find(home)).nil? && proj.enabled?
+        return false unless (proj = find(home))
+
+        proj.enabled?
       end
 
       def windows?

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]
@@ -105,7 +106,6 @@ module Squared
           @children = []
           @events = hashobj.update({ first: first, last: last, error: error })
           @as = hashobj
-          @envname = env_key(@name).freeze
           @desc = (@name.include?(':') ? @name.split(':').join(ARG[:SPACE]) : @name).freeze
           @parent = nil
           @global = false
@@ -208,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))
@@ -300,7 +300,7 @@ module Squared
         end
 
         def verbose=(val)
-          @verbose = case val
+          @verbose = case (val = env('VERBOSE', val))
                      when NilClass
                        workspace.verbose
                      when String
@@ -375,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
@@ -435,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
@@ -451,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
 
@@ -468,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
@@ -516,6 +514,10 @@ 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, from)
             opts = compose(opts, script: false) if opts && respond_to?(:compose)
@@ -559,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)
@@ -614,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)
@@ -623,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
@@ -748,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
@@ -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,7 +2035,7 @@ 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
 

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}"
@@ -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: '/')