squared 0.4.20 → 0.4.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1b0859a60110d19550ba8436a184dbf5475d9103cc844d4bcab7850f2065dc5
-  data.tar.gz: 887a31b94a66e59b0981f6dcbe64544e1f721b07cb5d82d9a71b8bbbc209820e
+  metadata.gz: 4f67ab37dd0b66feaeb78631ac257ba860df78acba313f2e5fe2ffeb01136acf
+  data.tar.gz: 8d0570c44cbdf41ba282b5c2fd9a0196b4c5678d595ca5774393b442b88eb854
 SHA512:
-  metadata.gz: 5936f90594961c71af2f1420607ed9c739bd0f182a440aff4c2d474a8bcc9bbb3e0db1c2bfa6ba27052823414d2f6db981f4251a32c09769595b89a561ecfc84
-  data.tar.gz: 19cc6e69dda54b8d0a3f2cb43606bfb23e25f1f20c071b8e47421156af30d5763162f4a5b14df5f8787a465e53bbabf18b0a9943e7a3c809c31a9825e885e32a
+  metadata.gz: 01b00bf5afdd80a370ef363c0d546f76d8f2533474b25029fc37c9bb0bfb1b2104ea4aa78c38cb044cf8d2f194630496b6d1b48ad4d94e8be284b28dd5dfa03c
+  data.tar.gz: 3968c3a15796f1c41939b95b4e50c8a8830f7f95fb6570a193c24c0043e259c82c6ac28571bd4cdbcddd2b77d6b47f38b55a963c3e567bad6e8e949a41ba8698

data/CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## [0.4.22] - 2025-10-08
+
+### Added
+
+- Node package managers support ENV platform options.
+
+### Changed
+
+- User installed Ruby is detected before system installed Ruby.
+
+### Fixed
+
+- Yarn classic package installs did not recognize dedupe flag.
+- Node command outdated option prune called undefined method.
+- OptionPartition method exist? called undefined method.
+- Ruby method copy? did not perform Hash property override check.
+- OptionPartition static method arg? did not detect single values.
+
+## [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.4.20] - 2025-09-14
 
 ### Changed
@@ -962,6 +1010,8 @@
 
 - Changelog was created.
 
+[0.4.22]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.22
+[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

@@ -105,9 +105,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",
@@ -303,7 +303,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
@@ -495,22 +495,23 @@ 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                                |
-| stash      | stash            | push pop apply branch drop clear list all     |
+| 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         |
 | submodule  | submodule        | status update branch url sync                 |
 | switch     | switch           | branch create detach                          |
 | tag        | tag              | add sign delete list                          |
@@ -597,6 +598,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
 
@@ -639,7 +643,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

@@ -189,7 +189,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
@@ -223,12 +223,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 = as_a(v, :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/config.rb

@@ -213,7 +213,7 @@ module Squared
             ext[0] = mime
           elsif file
             keys.unshift(file)
-            alt = basepath("#{main}.{#{ext.join(',')}}")
+            alt = basepath "#{main}.{#{ext.join(',')}}"
             file = Dir[alt].first
           else
             alt = main
@@ -346,8 +346,8 @@ module Squared
         basepath(file = main + @ext).to_s rescue file
       end
 
-      def basepath(file)
-        project ? project.basepath(file) : Pathname.new(file).realdirpath
+      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.4.20'
+  VERSION = '0.4.22'
 end

data/lib/squared/workspace/application.rb

@@ -629,7 +629,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].freeze
@@ -83,6 +83,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]
@@ -99,7 +100,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
@@ -196,7 +196,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))
@@ -288,7 +288,7 @@ module Squared
         end
 
         def verbose=(val)
-          @verbose = case val
+          @verbose = case (val = env('VERBOSE', val))
                      when NilClass
                        workspace.verbose
                      when String
@@ -363,7 +363,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
                   end
                 end
@@ -411,7 +411,6 @@ module Squared
           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
@@ -420,10 +419,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
 
@@ -437,7 +435,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
@@ -485,6 +483,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)
@@ -528,7 +530,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)
@@ -583,7 +585,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)
@@ -716,7 +718,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
@@ -807,6 +809,56 @@ 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
+            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
+            if cmd.match?(/\A[^:]+:[^:]/) && 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 variables.include?(key) || blocks.include?(key)
             val = case args.size
@@ -856,6 +908,8 @@ module Squared
           self
         end
 
+        alias apply variable_set
+
         def enabled?(ref = nil, **)
           return false if ref && !ref?(ref)
 
@@ -966,7 +1020,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
@@ -993,56 +1047,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
-            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
-            if cmd.match?(/\A[^:]+:[^:]/) && 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
@@ -1241,15 +1245,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)
@@ -1295,8 +1291,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)
@@ -1305,7 +1301,7 @@ module Squared
           puts val unless val.empty? || (val.size == 1 && val.first.nil?)
         end
 
-        def print_banner(*lines, styles: theme[:banner], border: borderstyle, client: false)
+        def print_banner(*lines, client: false, styles: theme[:banner], border: borderstyle, **)
           pad = 0
           if styles
             if styles.any? { |s| s.to_s.end_with?('!') }
@@ -1329,14 +1325,14 @@ module Squared
           (lines << sub_style(ARG[:BORDER][1] * n, styles: border)).join("\n")
         end
 
-        def print_footer(*lines, sub: nil, reverse: false, right: false, **kwargs)
+        def print_footer(*lines, sub: nil, reverse: false, right: false, border: borderstyle, **)
           n = Project.max_width(lines)
           lines.map! do |val|
             s = right ? val.rjust(n) : val.ljust(n)
             sub&.each { |h| s = sub_style(s, **h) }
             s
           end
-          ret = [sub_style(ARG[:BORDER][1] * n, styles: kwargs.key?(:border) ? kwargs[:border] : borderstyle), *lines]
+          ret = [sub_style(ARG[:BORDER][1] * n, styles: border), *lines]
           ret.reverse! if reverse
           ret.join("\n")
         end
@@ -1467,7 +1463,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
@@ -1601,7 +1597,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
@@ -1739,7 +1735,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)
@@ -2006,7 +2002,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
 
@@ -251,9 +251,11 @@ module Squared
         end
 
         def clean(*, sync: invoked_sync?('clean'), **)
-          return super unless @clean.nil?
-
-          image(:rm, sync: sync)
+          if runnable?(@clean)
+            super
+          else
+            image(:rm, sync: sync)
+          end
         end
 
         def compose(opts, flags = nil, script: false, args: nil, from: :run, **)
@@ -312,7 +314,7 @@ module Squared
             append_context
           when :bake, :compose
             if (val = option(from == :bake ? 'target' : 'service', ignore: false))
-              ret.merge(split_escape(val).map! { |s| shell_escape(s) })
+              ret.merge(split_escape(val).map! { |s| shell_quote(s) })
             end
           end
           ret
@@ -401,7 +403,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}"
@@ -575,16 +577,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
@@ -622,17 +623,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)
@@ -812,7 +813,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: '/')