squared 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ae11aaf561b6e6d821f7590e37982c408cb4f09aa4946084e4d3ec29c6fdff
-  data.tar.gz: 3ef75c9101dfd1676c035396055bd5585b33e3be41498dbd19eac2a98ea80a81
+  metadata.gz: eef895f1332463b52f24d46188726f55878170e90ba8ed9c7dcf1a1fac3bdd41
+  data.tar.gz: d8ac6097a8ec74b0dd266558ad273e8ea23ba5994f5c79602875e6ce75d7367a
 SHA512:
-  metadata.gz: cf24602228107b3e1a760749acf96f367cd0877ea6d45a2b0153ea08ba2a3bb014b547986e2406d2aaca4744e005bad2d9994d4a5807a7cc1afe517191aca775
-  data.tar.gz: 87e429e0eb78518ea637ecd863aab3359fef584b3c87340cc5a4d9f83718e7b89ac7b258a9e7a9f7d7ece3169776a8fb61d6e5f575c7420778510f3a122d84db
+  metadata.gz: 8569824e8b5cedbb189666ba9e1b67590887afa004ac43bd5c42cc854cf1a61f51ea5709f16a0c55988cfc7ad5cadab0b4b751ce4864bbb46195f3bc97181248
+  data.tar.gz: 7f3c48efd9652ee0ad67f5f35bfba87596e6c13f4bb5fb45ebd68aecfb2947e7f43c0ea7dad1bb04e365d45a001d82651e8b59f976274b07e6dda806d0e3bb4c

data/CHANGELOG.md

@@ -1,5 +1,64 @@
 # Changelog
 
+## [0.6.6] - 2025-11-30
+
+### Added
+
+- Python application method with stored command options was created.
+- Ruby task depend can install binstubs through ENV.
+- Project application methods can throw exceptions to halt processing.
+- Project application methods can read multiple files from STDIN.
+- Ruby attribute setter gemdir for copy method was created.
+
+### Changed
+
+- Project base method semgte? optional argument compares with RUBY_VERSION.
+- Project task branch in a single workspace displays all branches.
+- Ruby application method first argument can be used as a symbol flag.
+- Ruby task copy does not write into protected system directories.
+
+### Fixed
+
+- RuboCop did not include config file when default was not found.
+- RuboCop path globs are not expanded except for choice selections.
+- Ruby target application file appeared before the delimiter.
+- JoinSet can keep arguments with a duplicate value.
+- OptionPartition did not quarantine options added from extras.
+- Python method pyprojectfile did not always return nil.
+
+## [0.5.18] - 2025-11-25
+
+### Fixed
+
+- See `0.5.18`.
+
+## [0.4.32] - 2025-11-25
+
+### Fixed
+
+- Git method commit did not include --dry-run with add command.
+- JoinSet method include? did not always search to start of delimiter.
+- Config viewer did not check for a readable package registry document.
+- Powershell executable did not check for alternate path location.
+
+## [0.5.17] - 2025-11-22
+
+### Fixed
+
+- See `0.4.31`.
+
+## [0.4.31] - 2025-11-22
+
+### Changed
+
+- Ruby command flag is given precedence to a program file.
+
+### Fixed
+
+- Project change directory context did not always restore when raised.
+- Ruby file method attributes did not always return nil.
+- JoinSet with a delimiter did not report correct size.
+
 ## [0.6.5] - 2025-11-18
 
 ### Added
@@ -1434,12 +1493,15 @@
 
 - Changelog was created.
 
+[0.6.6]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.6
 [0.6.5]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.5
 [0.6.4]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.4
 [0.6.3]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.3
 [0.6.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.2
 [0.6.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.1
 [0.6.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.0
+[0.5.18]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.18
+[0.5.17]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.17
 [0.5.16]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.16
 [0.5.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.15
 [0.5.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.14
@@ -1457,6 +1519,8 @@
 [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.32]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.32
+[0.4.31]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.31
 [0.4.30]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.30
 [0.4.29]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.29
 [0.4.28]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.28

data/README.md

@@ -24,23 +24,9 @@ The range chart indicates the latest Ruby tested against at the time of release.
 gem install squared
 ```
 
-### Optional
-
-* [Repo](https://source.android.com/docs/setup/reference/repo)
-* https://github.com/anpham6/squared-repo
-* Python 3.6
-* Not compatible with Windows
-
-```sh
-mkdir -p ~/.bin
-PATH="${HOME}/.bin:${PATH}"
-curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
-chmod a+rx ~/.bin/repo
-```
-
 ## Example - Rakefile
 
-Projects from any accessible folder can be added relative to the parent directory (e.g. *REPO_ROOT*) or absolutely. The same Rakefile can also manage other similarly cloned `Repo` repositories remotely by setting the `REPO_ROOT` environment variable to the location. Missing projects will simply be excluded from the task runner.
+Projects from any accessible folder can be added relative to the parent directory or absolutely. Missing projects will simply be excluded from the task runner.
 
 ```ruby
 require "squared"
@@ -56,14 +42,6 @@ require "squared/app"                                # All workspace related mod
 
 # NODE_ENV  = production
 
-# REPO_ROOT = /workspaces                            |
-# REPO_HOME = /workspaces/squared                    | Dir.pwd
-# rake      = /workspaces/squared/Rakefile           | main?
-# OR
-# REPO_ROOT = /workspaces                            | Dir.pwd
-# rake      = /workspaces/Rakefile                   |
-# REPO_HOME = /workspaces/squared                    | main: "squared"
-
 # pathname  = /workspaces/pathname
 # optparse  = /workspaces/optparse
 # log       = /workspaces/logger
@@ -82,7 +60,6 @@ Workspace::Application.load_ref('lib/squared/workspace/project', gem: 'squared')
 Workspace::Application
   .new(Dir.pwd, main: "squared") # Dir.pwd? (main? is implicitly basename)
   .banner("group", "project", styles: ["yellow", "black"], border: "bold") # name | project | path | ref | group? | parent? | version?
-  .repo("https://github.com/anpham6/squared-repo", "nightly", script: ["build:dev", "prod"], install: "#{ENV["HOME"]}/.bin", ref: :node) # Repo (optional)
   .run("rake install", ref: :ruby)
   .depend(false, group: "default")
   .clean("rake clean", group: "default")
@@ -92,7 +69,9 @@ Workspace::Application
     "CFLAGS" => "-fPIC -O1"
   })
   .add("optparse", doc: "rake rdoc", gemspec: "optparse.gemspec", group: "default") # Uses bundler/gem_tasks (without C extensions)
-  .add("logger", copy: { from: "lib", glob: "**/*.rb", into: "~/.rvm/gems/ruby-3.4.0/gems/logger-1.6.1" }, clean: ["tmp/"]) # autodetect: true | "rvm" | "rbenv" | "asdf" | "bundler"
+  .add("logger", copy: { from: "lib", glob: "**/*.rb", into: "/home/user/.local/gem/ruby/3.4.0/gems/logger-1.7.0" }, clean: ["tmp/"]) do # autodetect: true | "rvm" | "rbenv" | "asdf" | "bundler"
+    self.gemdir = "/home/user/.local/gem/ruby/3.4.0/gems/logger-1.7.0" # Default for "into"
+  end
   .add("e-mc", "emc", copy: { from: "publish", scope: "@e-mc", also: [:pir, "squared-express/"] }, ref: :node) # Node
   .add("pi-r", "pir", copy: { from: "publish", scope: "@pi-r" }, clean: ["publish/**/*.js", "tmp/"]) # Trailing slash required for directories
   .add("pi-r2", "pir2", copy: { from: :npm, also: %i[squared express], files: ["LICENSE", ["README.md.ruby", "README.md"]] }) # Uses dist files from NPM package spec
@@ -780,7 +759,37 @@ Workspace::Application
 
 ### Repo
 
-These global options also can target the application main suffix `${NAME}`. (e.g. REPO_ROOT_SQUARED)
+* [Repo](https://source.android.com/docs/setup/reference/repo)
+* https://github.com/anpham6/squared-repo
+* Python 3.6
+* Not compatible with Windows
+
+```sh
+mkdir -p ~/.bin
+PATH="${HOME}/.bin:${PATH}"
+curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
+chmod a+rx ~/.bin/repo
+```
+
+```ruby
+# REPO_ROOT = /workspaces                            |
+# REPO_HOME = /workspaces/squared                    | Dir.pwd
+# rake      = /workspaces/squared/Rakefile           | main?
+#
+# OR
+#
+# REPO_ROOT = /workspaces                            | Dir.pwd
+# rake      = /workspaces/Rakefile                   |
+# REPO_HOME = /workspaces/squared                    | main: "squared"
+
+Workspace::Application
+  .new(main: "squared")
+  .repo("https://github.com/anpham6/squared-repo", "nightly", script: ["build:dev", "prod"], install: "#{ENV["HOME"]}/.bin", ref: :node)
+  .add("squared", script: ["build:stage1", "build:stage2"])
+  .build
+```
+
+These global options also can target the application main suffix `${NAME}`. (e.g. *REPO_ROOT_SQUARED*)
 
 ```sh
 REPO_ROOT            # parent dir
@@ -801,6 +810,51 @@ REPO_Y               # 0,1
 REPO_TIMEOUT         # confirm dialog (seconds)
 ```
 
+Other similarly cloned `Repo` repositories can be managed remotely by setting the `REPO_ROOT` environment variable to the location.
+
+### Project
+
+Features can be enabled through ENV when calling global tasks such as through *CI/CD* automation (e.g. Repo).
+
+#### Ruby
+
+* Prefix: BUNDLE/GEM/RBS
+
+| Command    | Flag      | ENV                                                               |
+| :--------- | :-------- | :---------------------------------------------------------------- |
+| depend     | -         | BINSTUBS=s JOBS=n                                                 |
+| outdated   | -         | U|UPDATE=major|minor|patch DRY_RUN                                |
+| gem        | outdated  | DOCUMENT=0,1 USER_INSTALL=0,1                                     |
+| rbs        | prototype | Y=0,1                                                             |
+
+#### Node
+
+* Prefix: NPM/PNPM/YARN
+
+| Command        | Flag           | ENV                                                      |
+| :------------- | :------------- | :------------------------------------------------------- |
+| depend         | -              | FORCE CI IGNORE_SCRIPTS                                  |
+| outdated       | -              | U|UPDATE=major|minor|patch DIFF DRY_RUN                  |
+| publish        | -              | OTP=s TAG=s ACCESS=0,1,s DRY_RUN                         |
+| depend package | *              | PACAKGE_LOCK|LOCKFILE=0 NO_LOCKFILE=1 Y                  |
+| npm pnpm       | depend package | CPU=s OS=s LIBC=s                                        |
+| npm            | package        | SAVE IGNORE_SCRIPTS STRICT_PEER_DEPS                     |
+| pnpm           | depend         | ALLOW_BUILD=s PUBLIC_HOIST_PATTERN=s                     |
+| yarn           | depend package | IGNORE_ENGINES=0                                         |
+
+#### Python
+
+* Prefix: PIP/POETRY
+
+| Command    | Flag      | ENV                                                               |
+| :--------- | :-------- | :---------------------------------------------------------------- |
+| global     | *         | CACHE_DIR=0,s PROXY=s PYTHON=s COLOR=0                            |
+| depend     | -         | E|EDITABLE=0,s BUILD_ISOLATION=0                                  |
+| outdated   | -         | U|UPDATE=major|minor|patch NOT_REQUIRED=0 L|LOCAL DRY_RUN         |
+| venv       | exec      | INTERACTIVE=0                                                     |
+| poetry     | *         | PROJECT=s                                                         |
+| poetry     | depend    | NO_ROOT                                                           |
+
 ## LICENSE
 
 BSD 3-Clause

data/lib/squared/common/format.rb

@@ -219,6 +219,10 @@ module Squared
         end
       end
 
+      def log_warn(*args, **kwargs)
+        log_message(Logger::WARN, *args, **kwargs)
+      end
+
       def log_console(*args, pipe: 1)
         return if args.first == false && args.size == 1
 
@@ -266,7 +270,7 @@ module Squared
         out = []
         draw = lambda do |a, b|
           ret = a + (b1 * (n + 2)) + b
-          next ret unless border
+          return ret unless border
 
           sub_style ret, border
         end

data/lib/squared/common/shell.rb

@@ -83,7 +83,11 @@ module Squared
         end
         sep = unless flag.empty?
                 if flag[0] == '-'
-                  flag[1] == '-' ? sep : ' '
+                  if flag[1] == '-'
+                    sep
+                  else
+                    merge ? '' : ' '
+                  end
                 elsif flag.size == 1
                   pre = '-'
                   merge ? '' : ' '
@@ -146,7 +150,8 @@ module Squared
       end
 
       def shell_bin(name, env: true)
-        key = name.upcase
+        key = name.to_s.upcase
+        key = File.basename(key, '.*') if Rake::Win32.windows?
         shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name,
                     option: false, force: false, double: true)
       end

data/lib/squared/config.rb

@@ -22,8 +22,8 @@ module Squared
           nil
         end
 
-        def link(project, main = project.dependfile.basename, name = nil, **kwargs, &blk)
-          return unless project.enabled?
+        def link(project, main = project.dependfile&.basename, name = nil, **kwargs, &blk)
+          return unless project.enabled? && main
 
           ret = new(main, name, project: project, **kwargs)
           ret.instance_eval(&blk) if block_given?
@@ -87,7 +87,7 @@ module Squared
                       @required = true
                       project ? [project, 'missing'] : %w[name missing]
                     end
-        warn log_message(Logger::WARN, msg, subject: self.class, hint: hint)
+        warn log_warn(msg, subject: self.class, hint: hint)
       end
 
       def build
@@ -159,7 +159,7 @@ module Squared
       end
 
       def also(path, type = nil, name: nil, **kwargs)
-        return self if @mime.frozen? || !(file = basepath(path)).exist?
+        return self unless (file = basepath(path)).exist? && !@mime.frozen?
 
         ext = mimetype file
         type ||= ext
@@ -242,7 +242,7 @@ module Squared
                                                 opt_style(theme[:key], /\A((?~ : ))( : (?!undefined).+)\z/m),
                                                 opt_style(theme[:number], /\A((?~: ): )(-?[\d.]+)(\s*)\z/m, 2),
                                                 opt_style(theme[:string], /\A((?~: ): ")(.+)("\s*)\z/m, 2),
-                                                opt_style(theme[:hash], /\A((?~: ): \{)(.+)(}\s*)\z/m, 2),
+                                                opt_style(theme[:hash], /\A((?~: ): \{)(.+)(\}\s*)\z/m, 2),
                                                 opt_style(theme[:array], /\A((?~: ): \[)(.+)(\]\s*)\z/m, 2),
                                                 opt_style(theme[:boolean], /\A((?~: ): )(true|false)(\s*)\z/m, 2),
                                                 opt_style(theme[:value], /\A((?~: ): (?!undefined))([^"\[{].*)\z/m, 2)
@@ -287,7 +287,7 @@ module Squared
         if stdin?
           puts out.map!(&:last).join("\n")
         else
-          out.map! { |item| '%-*s : %s' % [pad, item[0], item[1]] }
+          out.map! { |a, b| '%-*s : %s' % [pad, a, b] }
         end
       end
 
@@ -316,7 +316,9 @@ module Squared
       end
 
       def warning?
-        project ? project.workspace.warning : true
+        return true unless project
+
+        project.workspace.warning
       end
 
       def stdin?
@@ -341,7 +343,9 @@ module Squared
       end
 
       def basepath(*args)
-        project ? project.basepath(*args) : Pathname.pwd.join(*args)
+        return Pathname.pwd.join(*args) unless project
+
+        project.basepath(*args)
       end
     end
   end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -191,15 +191,11 @@ module Squared
           end
           series.populate(proj, **kwargs)
         end
-
         Application.kind_project.each { |obj| obj.populate(self, **kwargs) }
         @extensions.uniq.each { |ext| __send__(ext, **kwargs) }
-
         series.build(**kwargs)
         __build__(**kwargs)
-
         yield self if block_given?
-
         __chain__(**kwargs)
         @closed = true
         self
@@ -240,18 +236,16 @@ module Squared
 
       def chain(task, *action, project: nil, step: 0, with: nil, before: nil, after: nil, sync: false,
                 group: @group, ref: @ref)
-        keys = if project
-                 action.map! { |val| task_join(project.name, val) }
-                 nil
-               elsif (target = group || ref)
-                 action.map! { |val| task_name(task_join(val, target)) }
-                 nil
-               else
-                 action.map! { |val| task_name(val) }
-                 @project.keys unless prefix
-               end
+        if project
+          action.map! { |val| task_join(project.name, val) }
+        elsif (target = group || ref)
+          action.map! { |val| task_name(task_join(val, target)) }
+        else
+          action.map! { |val| task_name(val) }
+          keys = @project.keys unless prefix
+        end
         ns = lambda do |val|
-          next if (ret = as_a(val, :to_s, flat: true)).empty?
+          return if (ret = as_a(val, :to_s, flat: true)).empty?
 
           ret.map! do |arg|
             if arg.include?(':') || (keys && !keys.include?(arg))
@@ -433,7 +427,7 @@ module Squared
           if key.start_with?(/(\\A|\^)/) || key.match?(/(\\z|\$)\z/)
             @describe[:replace] << [Regexp.new(key), val]
           else
-            @describe[val.is_a?(Regexp) ? :pattern : :alias][key.to_s] = val
+            @describe[val.is_a?(Regexp) ? :pattern : :alias][key] = val
           end
         end
         self
@@ -452,7 +446,7 @@ module Squared
           if ret.empty? && (path || name)
             path &&= rootpath path
             name &&= name.to_s
-            if (proj = find { |item| (path && item.path == path) || (name && item.name == name) })
+            if (proj = find { |item| item.path == path || item.name == name })
               ret << proj
             end
           end
@@ -592,9 +586,9 @@ module Squared
 
       def script_find(*args)
         args.reverse_each do |val|
-          next unless val && (ret = val.is_a?(Symbol) ? @script[:ref!][val] : @script[:group!][val.to_sym])
-
-          return ret
+          if val && (ret = val.is_a?(Symbol) ? @script[:ref!][val] : @script[:group!][val.to_sym])
+            return ret
+          end
         end
         @script[:ref!][:''] ||= scriptobj
       end

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

@@ -429,7 +429,7 @@ module Squared
                                                                       .sort { |a, b| b <=> a }
                                                                       .push('latest', 'system'),
                                                               accept: [accept_y('Confirm?')],
-                                                              values: 'Options', force: true)
+                                                              values: 'Options')
                                  OptionPartition.strip(opts)
                                end
                         asdf(flag, args, version: version)
@@ -1158,7 +1158,7 @@ module Squared
           path.parent.ascend.each do |dir|
             target = dir.join(*args)
             return target if target.exist?
-            break if (ascend && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
+            break if (ascend.is_a?(String) && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
           end
           ret
         end
@@ -1249,7 +1249,7 @@ module Squared
                          single: false, last: false, context: nil)
           tag = ->(proj) { "#{proj.name}#{"@#{proj.version}" if SEM_VER.match?(proj.version)}" }
           uniq = lambda do |name|
-            next [] unless (ret = data[name])
+            return [] unless (ret = data[name])
 
             ret.dup.each do |proj|
               next if proj.name == name
@@ -1528,7 +1528,9 @@ module Squared
         end
 
         def print_error(*args, loglevel: Logger::WARN, **kwargs)
-          warn log_message(loglevel, *args, **kwargs) if warning?
+          return unless warning?
+
+          warn log_message(loglevel, *args, **kwargs)
         end
 
         def print_run(cmd, banner = true, verbose: nil, **)
@@ -1696,8 +1698,8 @@ module Squared
           msg.subhint(obj.is_a?(Numeric) ? "#{obj} #{title}" : message(title, obj.to_s))
         end
 
-        def append_repeat(flag, opts, target: @session)
-          opts.each { |val| target << shell_option(flag, val) }
+        def append_repeat(flag, opts, target: @session, **kwargs)
+          opts.each { |val| target << shell_option(flag, val, **kwargs) }
         end
 
         def append_hash(data, target: @session || [], build: false)
@@ -1722,6 +1724,8 @@ module Squared
               target << basic_option(key, val)
             when FalseClass
               target << shell_option(key).sub(/^--(?!no-)/, '--no-')
+            when Pathname
+              target << shell_option(key, val, escape: false)
             else
               target << shell_option(key, (val if val.is_a?(String)))
             end
@@ -1774,20 +1778,18 @@ module Squared
           return if list.empty?
 
           kwargs[:ignore] = false if no && !kwargs.key?(:ignore)
-          [].tap do |ret|
-            list.flatten.each do |flag|
-              next unless (val = option(flag, target: target, **kwargs))
+          ret = []
+          list.flatten.each do |flag|
+            next unless (val = option(flag, target: target, **kwargs))
 
-              if no && val == '0'
-                flag = "no-#{flag}"
-                val = nil
-              end
-              ret << shell_option(flag, (val if equals), escape: escape, quote: quote, force: force)
+            if no && val == '0'
+              flag = "no-#{flag}"
+              val = nil
             end
-            next if ret.empty?
-
-            merge_list target, ret
+            ret << shell_option(flag, (val if equals), escape: escape, quote: quote, force: force)
           end
+          merge_list target, ret unless ret.empty?
+          ret
         end
 
         def append_nocolor(target: @session)
@@ -2003,10 +2005,15 @@ module Squared
           nil
         end
 
-        def command(*args)
-          return args.join(' && ') unless workspace.powershell?
-
-          "powershell.exe -Command #{shell_quote("& {#{args.join(' ; ')}}", option: false, double: true)}"
+        def command(*args, verbose: true)
+          out = unless verbose
+                  [">#{File::NULL}", '2>&1'].tap { |a| a.reverse if File::NULL == 'NUL' }.unshift('').join(' ')
+                end
+          if workspace.powershell?
+            "#{shell_bin('powershell.exe')} -Command \"& {#{args.join(' ; ')}}\"#{out}"
+          else
+            args.map! { |val| "#{val}#{out}" }.join(' && ')
+          end
         end
 
         def relativepath(*list, all: false)
@@ -2117,7 +2124,11 @@ module Squared
           end
         end
 
-        def semgte?(val, other)
+        def semgte?(val, other = nil)
+          unless other
+            other = val
+            val = RUBY_VERSION
+          end
           semcmp(val, other) != 1
         end
 
@@ -2210,13 +2221,15 @@ module Squared
         end
 
         def pwd_set(pass: false, exception: self.exception, dryrun: false, from: nil)
-          pwd = Dir.pwd
-          return yield if (path.to_s == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
+          return yield if (path.to_s == Dir.pwd || pass == true) && (workspace.mri? || !workspace.windows?)
 
-          Dir.chdir path
-          yield.tap { Dir.chdir pwd }
+          pwd = Dir.pwd
+          Dir.chdir(path)
+          yield
         rescue StandardError => e
           on_error(e, from, exception: exception, dryrun: dryrun)
+        ensure
+          Dir.chdir(pwd) if pwd
         end
 
         def run_set(cmd, val = nil, opts: nil, global: false, **)