squared 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 258af4963cc0c6951fd5f14a96218cbb9cd3016714ba8b03d1fc016a7fb6d894
-  data.tar.gz: 58211867320953b6bd4c7fae463195e65590754369bd3cbb8896fd46e41f18d4
+  metadata.gz: 53991d0e40acab903d9e2715fcc37a2f69853bcbc25ba610c04c1a7331ac865c
+  data.tar.gz: fa4913add4c429e7bbceda66f75721af58620b54549591a911bb7b4b4081e913
 SHA512:
-  metadata.gz: 5f0026e471c3dcfd8f75eae152732a9ce7b12347f1e5a86464434adc1fbc4ea87e3fb627c456db49145ec534255155c1e3600c623159d4420e5ab0c5c33233d0
-  data.tar.gz: f692395f2fdc71738669010a392cbf5fe4793edc71b920dd7873748a97bc0e5bef8cc6e17d2af93ec16d92480b86b554204fd5f4a2ce04e52d2704988cb2b3a6
+  metadata.gz: 5a81aadedff0d5e4288879f31f80aa0cc3c1d2997958278e0724067da6faa0452223660829870349334d35f37d6936b6ea83313c76981f67b5d095a3f8f85202
+  data.tar.gz: 84a885286b2abad87cd7b381e1fb2b71c0f7619b0486b6647b5b766eccae2fc8bb9ae845853f42115ff019e10b9d15e225b4f19d480288b9b9d194a4730b2fd3

data/CHANGELOG.md

@@ -1,5 +1,52 @@
 # Changelog
 
+## [0.8.2] - 2026-07-05
+
+### Added
+
+- Docker client global options can be preconfigured for every session.
+- Docker command image action history was implemented.
+- NPM command install can bypass engines with ENV and engine-strict=false.
+
+### Changed
+
+- OptionPartition method uniq! parameter pass was converted into keyword.
+- Project global ENV for BANNER and STRICT can accept boolean values.
+- Series method exclude? parameter empty was converted into keyword.
+
+## [0.7.9] - 2026-07-04
+
+### Added
+
+- Docker command image action inspect was implemented.
+
+### Changed
+
+- Project global ENV for BANNER and STRICT can accept boolean values.
+
+## [0.6.16]
+
+### Added
+
+- Git command pull action all supports filter pattern negation.
+
+## [0.5.25]
+
+### Fixed
+
+- See `0.4.39`.
+
+## [0.4.39]
+
+### Changed
+
+- Common global argument OUT with a file separator overrides PIPE.
+
+### Fixed
+
+- Git output list results did not hide footer when banner was disabled.
+- Project banners which were empty were being printed.
+
 ## [0.8.1] - 2026-06-17
 
 ### Fixed
@@ -1938,8 +1985,10 @@
 
 - Changelog was created.
 
+[0.8.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.2
 [0.8.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.1
 [0.8.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.0
+[0.7.9]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.9
 [0.7.8]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.8
 [0.7.7]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.7
 [0.7.6]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.6
@@ -1949,6 +1998,7 @@
 [0.7.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.2
 [0.7.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.1
 [0.7.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.0
+[0.6.16]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.16
 [0.6.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.15
 [0.6.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.14
 [0.6.13]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.13
@@ -1965,6 +2015,7 @@
 [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.25]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.25
 [0.5.24]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.24
 [0.5.23]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.23
 [0.5.22]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.22
@@ -1990,6 +2041,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.39]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.39
 [0.4.38]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.38
 [0.4.37]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.37
 [0.4.36]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.36

data/README.md

@@ -98,6 +98,7 @@ Workspace::Application
   .with(:docker, only: ["build", "compose"], hide: [:windows?]) do           # When true hide entire group (formerly pass 0.6.0)
     .add("squared", "docker", file: "Dockerfile", context: ".", tag: "latest", registry: "localhost:5000", username: "squared", # compose publish => { oci: "oci://docker.io" }
                               args: "--ssh=default",
+                              client: { config: '/home/user/.docker', tls: true },           # global options
                               secrets: ["id=github,env=GITHUB_TOKEN"],
                               mounts: ["src=.,dst=/project,ro,bind-propagation=rshared"]) do # Docker
       series(:clean) do                                                                      # run | depend | doc | lint | test | copy | clean
@@ -871,44 +872,44 @@ Features can be enabled through ENV when calling global tasks such as through *C
 
 * Prefix: BUNDLE/GEM/RBS
 
-| Command    | Flag      | ENV                                                         |
-| :--------- | :-------- | :---------------------------------------------------------- |
-| depend     | -         | BINSTUBS=s JOBS=n                                           |
-| depend     | update    | VERSION=major|minor|patch STRICT CONSERVATIVE               |
-| outdated   | -         | U|UPDATE=major|minor|patch ONLY_EXPLICIT DRY_RUN            |
-| gem        | outdated  | DOCUMENT=0,1 USER_INSTALL=0,1                               |
-| rbs        | prototype | Y=0,1                                                       |
+| Command    | Flag      | ENV                                                                  |
+| :--------- | :-------- | :------------------------------------------------------------------- |
+| depend     | -         | BINSTUBS=s JOBS=n                                                    |
+| depend     | update    | VERSION=major|minor|patch STRICT CONSERVATIVE                        |
+| outdated   | -         | U|UPDATE=major|minor|patch ONLY_EXPLICIT 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 SAVE_EXACT DIFF DRY_RUN |
-| publish        | -              | OTP=s TAG=s ACCESS=0,1,s DRY_RUN Y                 |
-| depend package | *              | PACAKGE_LOCK|LOCKFILE=0 NO_LOCKFILE=1 Y            |
-| npm            | depend         | APPROVE_SCRIPTS=s                                  |
-| npm            | package        | SAVE IGNORE_SCRIPTS STRICT_PEER_DEPS               |
-| pnpm           | depend         | PUBLIC_HOIST_PATTERN=s APPROVE_BUILDS              |
-| pnpm           | depend:add     | ALLOW_BUILD=s                                      |
-| yarn           | depend package | IGNORE_ENGINES                                     |
-| yarn           | depend:add     | W|IGNORE_WORKSPACE_ROOT_CHECK=0                    |
-| npm pnpm       | depend package | CPU=s OS=s LIBC=s                                  |
+| Command        | Flag           | ENV                                                         |
+| :------------- | :------------- | :---------------------------------------------------------- |
+| depend         | -              | FORCE CI IGNORE_SCRIPTS                                     |
+| outdated       | -              | U|UPDATE=major|minor|patch SAVE_EXACT DIFF DRY_RUN          |
+| publish        | -              | OTP=s TAG=s ACCESS=0,1,s DRY_RUN Y                          |
+| depend package | *              | PACAKGE_LOCK|LOCKFILE=0 NO_LOCKFILE=1 Y                     |
+| npm            | depend         | APPROVE_SCRIPTS=0,1,s ALLOW_SCRIPTS=0,1,s ENGINE_STRICT=0,1 |
+| npm            | package        | SAVE IGNORE_SCRIPTS STRICT_PEER_DEPS                        |
+| pnpm           | depend         | PUBLIC_HOIST_PATTERN=s APPROVE_BUILDS                       |
+| pnpm           | depend:add     | ALLOW_BUILD=s                                               |
+| yarn           | depend package | IGNORE_ENGINES                                              |
+| yarn           | depend:add     | W|IGNORE_WORKSPACE_ROOT_CHECK=0                             |
+| npm pnpm       | depend package | CPU=s OS=s LIBC=s                                           |
 
 #### 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                                                     |
+| 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
 

data/lib/squared/common/utils.rb

@@ -166,11 +166,19 @@ module Squared
       end
 
       def env_pipe(key, default = 1, root: nil, **kwargs)
+        out = 1
         case key
         when ::String
           case (ret = env_value(key, **kwargs))
           when '0', '1', '2'
             return ret.to_i
+          else
+            out = default if default.is_a?(::Numeric)
+            if ret.include?(File::SEPARATOR)
+              default = ret
+            elsif key.include?(File::SEPARATOR)
+              default = key
+            end
           end
         when ::Numeric
           return key if key.between?(0, 2)
@@ -181,7 +189,7 @@ module Squared
           (root ? Pathname.new(root) + default : Pathname.new(default)).realdirpath
         rescue => e
           warn e
-          1
+          out
         end
       end
 

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -115,7 +115,13 @@ module Squared
         @stage = Support.hashlist
         self.home = home
         self.exception = env_bool exception
-        self.pipe = $DEBUG ? 2 : env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: home)
+        self.pipe = if $DEBUG
+                      2
+                    elsif (out = ARG[:OUT]) && out.include?(File::SEPARATOR)
+                      env_pipe(out, pipe, root: home)
+                    else
+                      env_pipe(pipe, (out && env(out)) || 1, root: home)
+                    end
         self.verbose = if $VERBOSE.nil?
                          false
                        elsif verbose.nil?

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

@@ -1612,7 +1612,7 @@ module Squared
             append_keys(kwargs, b, :opts)
             with.concat(c)
           end
-          OptionPartition.uniq!(args, pass) if pass
+          OptionPartition.uniq!(args, pass: pass) if pass
           [args, kwargs, with]
         end
 
@@ -1633,7 +1633,7 @@ module Squared
           end
           if args
             args.unshift(*a)
-            OptionPartition.uniq!(args, pass) if pass
+            OptionPartition.uniq!(args, pass: pass) if pass
           end
           kwargs&.update(b) { |_, obj| obj }
           nil
@@ -1703,7 +1703,13 @@ module Squared
             ret += 1
             break out if first
           end
-          print_item banner, lines if banner && (ret > 0 || (!pass && !first))
+          if banner && (ret > 0 || (!pass && !first))
+            if banner.empty?
+              print_item(*lines)
+            else
+              print_item(banner, *lines)
+            end
+          end
           ret
         end
 
@@ -1729,7 +1735,7 @@ module Squared
         end
 
         def print_run(cmd, banner = true, verbose: nil, **)
-          return if banner || !stdout? || verbose == false || env('BANNER', equals: '0')
+          return if banner || !stdout? || verbose == false || env('BANNER', equals: %w[0 false])
 
           puts "\n> #{cmd}"
           printsucc
@@ -1738,7 +1744,7 @@ module Squared
         def print_item(*val, series: false)
           puts unless printfirst?
           printsucc unless series
-          puts val unless val.empty? || (val.size == 1 && !val.first)
+          puts val unless val.empty? || (val.size == 1 && (!val.first || val.first.empty?))
         end
 
         def print_banner(*lines, client: false, styles: theme[:banner], border: borderstyle)
@@ -2701,7 +2707,12 @@ module Squared
         end
 
         def banner?
-          ARG[:BANNER] && env('BANNER', notequals: '0')
+          case (val = env('BANNER', ignore: false))
+          when '0', 'false'
+            false
+          else
+            !val.nil? || ARG[:BANNER]
+          end
         end
 
         def pwd?
@@ -2736,7 +2747,12 @@ module Squared
         end
 
         def strict?
-          (ARG[:STRICT] || exception?(Logger::FATAL)) && env('STRICT', notequals: '0')
+          case (val = env('STRICT', ignore: false))
+          when '0', 'false'
+            false
+          else
+            !val.nil? || ARG[:STRICT] || exception?(Logger::FATAL)
+          end
         end
 
         def serve?

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

@@ -56,7 +56,7 @@ module Squared
             exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p u|user=e
                      w|workdir=q].freeze,
             commit: %w[no-pause a|author=q c|change=q m|message=q pause=b?].freeze,
-            inspect: %w[s|size f|format=q type=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|timeout=i].freeze,
             restart: %w[s|signal=b t|timeout=i].freeze,
@@ -65,11 +65,14 @@ module Squared
             attach: %w[no-stdin detach-keys=q sig-proxy=!?].freeze
           }.freeze,
           image: {
+            common: %w[platform=q].freeze,
+            inspect: %w[f|format].freeze,
+            history: %w[f|format no-trunc q|quiet H|human=!?].freeze,
             ls: %w[a|all digests no-trunc q|quiet tree f|filter=q format=q].freeze,
-            pull: %w[a|all-tags platform=q q|quiet].freeze,
-            push: %w[a|all-tags platform=q q|quiet].freeze,
-            rm: %w[f|force no-prune platform=q].freeze,
-            save: %w[o|output=p platform=q].freeze
+            pull: %w[a|all-tags q|quiet].freeze,
+            push: %w[a|all-tags q|quiet].freeze,
+            rm: %w[f|force no-prune].freeze,
+            save: %w[o|output=p].freeze
           }.freeze,
           network: {
             connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=q link=b link-local-ip=q].freeze,
@@ -114,7 +117,7 @@ module Squared
           'build' => %i[tag context].freeze,
           'compose' => %i[build create publish run exec up down service].freeze,
           'bake' => %i[build compose check].freeze,
-          'image' => %i[ls rm pull push tag save].freeze,
+          'image' => %i[ls rm pull push tag save inspect history].freeze,
           'container' => %i[attach commit create diff exec inspect kill pause restart rm run start stats stop top
                             unpause update].freeze,
           'network' => %i[connect disconnect create].freeze,
@@ -124,13 +127,31 @@ module Squared
         attr_reader :context
         attr_accessor :tag
 
-        def initialize(*, mounts: [], **kwargs)
+        def initialize(*, client: nil, mounts: [], **kwargs)
           super
           self.global = nil
           return unless dockerfile(kwargs[:file]).exist?
 
           @tag = kwargs[:tag] || tagname("#{@project}:#{@version || 'latest'}")
           @context = kwargs[:context]
+          @client = if client
+                      opts = []
+                      client.each do |key, val|
+                        val = case (key = key.to_s)
+                              when 'config'
+                                basepath!(val, type: 'd')
+                              when 'tlscacert', 'tlscert', 'tlskey'
+                                basepath!(val, type: 'f')
+                              when 'context', 'host', 'log-level'
+                                quote_option(key, val)
+                              when 'debug', 'tls', 'tlsverify'
+                                opts << key
+                                next
+                              end
+                        opts << quote_option(key, val) if val
+                      end
+                      opts unless opts.empty?
+                    end
           @mounts = mounts
           @secrets = kwargs[:secrets]
           @registry = tagjoin kwargs[:registry], kwargs[:username]
@@ -278,7 +299,7 @@ module Squared
                           end
                         end
                       else
-                        format_desc action, flag, "opts*,id/name#{flag == :update ? '+' : '*'}"
+                        format_desc action, flag, "opts*,id/name#{flag == :update || flag == :inspect ? '+' : '*'}"
                         task flag do |_, args|
                           container flag, args.to_a
                         end
@@ -289,7 +310,7 @@ module Squared
                         next unless @registry
 
                         format_desc action, flag, 'tag?,registry/username?,opts*'
-                        task flag, [:tag] do |_, args|
+                        task flag do |_, args|
                           image flag, args.to_a
                         end
                       when :pull
@@ -298,6 +319,16 @@ module Squared
                           id = param_guard(action, flag, args: args, key: :tag)
                           image(flag, args.extras, id: id)
                         end
+                      when :inspect, :history
+                        format_desc action, flag, "opts*,id#{'+' if flag == :inspect}"
+                        task flag do |_, args|
+                          args = args.to_a
+                          if args.empty?
+                            choice_command :image, flag
+                          else
+                            image flag, args.to_a
+                          end
+                        end
                       else
                         format_desc(action, flag, case flag
                                                   when :rm, :save then 'id,opts*'
@@ -536,7 +567,7 @@ module Squared
               end
             end
             append_command(flag, id || tagmain, op.extras)
-          when :update
+          when :update, :inspect
             raise ArgumentError, message('missing container', hint: flag) if op.empty?
 
             op.append(escape: true, strip: /^:/)
@@ -576,7 +607,9 @@ module Squared
 
         def image(flag, opts = [], sync: true, id: nil, registry: nil, filter: nil)
           cmd, opts = docker_session('image', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_DOCKER[:image].fetch(flag, []), cmd, project: self, strict: strict?)
+          list = OPT_DOCKER[:image].fetch(flag, [])
+          list += OPT_DOCKER[:image][:common] unless flag == :ls || flag == :tag
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?)
           exception = exception?
           banner = true
           from = symjoin 'image', flag
@@ -654,6 +687,15 @@ module Squared
             sync = false
             exception ||= true
             banner = false
+          when :inspect, :history
+            raise ArgumentError, message('missing image', hint: flag) if op.empty?
+
+            if flag == :history
+              op.add_first(escape: true, strip: /^:/)
+                .clear
+            else
+              op.append(escape: true, strip: /^:/)
+            end
           end
           success?(run(sync: sync, exception: exception, banner: banner, from: from), flag == :tag || flag == :save)
         end
@@ -725,6 +767,7 @@ module Squared
         end
 
         def docker_session(*cmd, opts: nil)
+          opts = OptionPartition.union(Array(opts), @client) if @client
           return session('docker', *cmd) unless opts
 
           op = OptionPartition.new(opts, OPT_DOCKER[:common], project: self, strict: strict?)

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

@@ -1118,13 +1118,13 @@ module Squared
               op = OptionPartition.new(opts, OPT_GIT[:pull], cmd, project: self, strict: strict?,
                                                                   no: OPT_GIT[:no][:pull])
               opts -= op.extras
-              reg = matchmap op
+              reg, neg = matchmap(op, negate: true)
               session_done op.target
               heads = []
               cur = nil
               foreachref('heads', format: '%(if)%(HEAD)%(then)* %(end)%(refname:short)').each do |line|
                 cur ||= line.delete_prefix!('* ')
-                heads << line if matchany?(reg, line)
+                heads << line if matchany?(reg, line) && !matchany?(neg, line, empty: false)
               end
               raise message('head not found', hint: 'for-each-ref') unless cur
 
@@ -1304,7 +1304,7 @@ module Squared
               op.clear
               out, banner, from = source(io: true)
               print_item banner
-              list_result(write_lines(out), 'objects', from: from)
+              list_result(write_lines(out), 'objects', banner: banner, from: from)
               return
             end
           else
@@ -1356,7 +1356,7 @@ module Squared
           end
           out, banner, from = source(io: true)
           ret = write_lines(out, banner: banner, sub: sub)
-          list_result(ret, 'files', action: 'modified', from: from)
+          list_result(ret, 'files', action: 'modified', banner: banner, from: from)
         end
 
         def revbuild(flag = nil, opts = [], **kwargs)
@@ -1525,7 +1525,7 @@ module Squared
             out, banner, from = source(io: true)
             print_item banner
             ret = write_lines(out, grep: op.extras)
-            list_result(ret, 'tags', grep: op.extras, from: from)
+            list_result(ret, 'tags', grep: op.extras, banner: banner, from: from)
             return
           end
           if (ret = source) && (remote ||= option('remote'))
@@ -1536,9 +1536,9 @@ module Squared
 
         def log_(flag, opts = [], range: [], index: [], grep: [])
           cmd, opts = git_session('log', opts: opts)
-          op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd, project: self, strict: strict?,
-                                                                           no: collect_hash(OPT_GIT[:no][:log]),
-                                                                           first: matchpathspec)
+          op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd,
+                                   project: self, strict: strict?, no: collect_hash(OPT_GIT[:no][:log]),
+                                   first: matchpathspec)
           case flag
           when :between, :contain
             op.add_quote(range.join(flag == :between ? '..' : '...'))
@@ -1794,7 +1794,7 @@ module Squared
               opt_style(color(:green), /^(\*\s+)(\S+)(.*)$/, 2),
               opt_style(color(:red), %r{^(\s*)(remotes/\S+)(.*)$}, 2)
             ])
-            list_result(ret, 'branches', from: from)
+            list_result(ret, 'branches', banner: banner, from: from)
             return
           else
             if (head = git_spawn('rev-parse --abbrev-ref HEAD').chomp).empty?
@@ -1803,7 +1803,7 @@ module Squared
               git_spawn 'fetch --all --prune --quiet' if option('sync')
               cmd << '-vv --no-abbrev --list'
               out, banner, from = source(io: true)
-              first = workspace.size > 1
+              first = from_base?('branch')
               grep = first ? [/^\*\s+#{Regexp.escape(head)}\s/] : []
               ret = write_lines(out, grep: grep, banner: banner, first: first) do |line, index|
                 next line if stdin?
@@ -1876,9 +1876,7 @@ module Squared
 
         def restore(flag, opts = [], commit: nil, files: nil)
           cmd, opts = git_session('restore', shell_option(flag, commit, escape: false, force: false), opts: opts)
-          op = OptionPartition.new(opts,
-                                   OPT_GIT[:restore] + OPT_GIT[:log][:diff_context],
-                                   cmd,
+          op = OptionPartition.new(opts, OPT_GIT[:restore] + OPT_GIT[:log][:diff_context], cmd,
                                    project: self, strict: strict?, no: OPT_GIT[:no][:restore], first: matchpathspec)
           append_pathspec(op.extras + (files || []), pass: false)
           source(sync: false, stderr: true)
@@ -1907,8 +1905,7 @@ module Squared
           end
           list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + OPT_GIT[:log][:diff] + OPT_GIT[:log][:diff_context]
           op = OptionPartition.new(opts, list, cmd,
-                                   project: self,
-                                   strict: strict?,
+                                   project: self, strict: strict?,
                                    no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log], pass: [:base]))
           op.append(delim: true)
           source(exception: false, banner: flag != :oneline)
@@ -1933,8 +1930,8 @@ module Squared
               cmd << '--sq-quote'
               args = true
             end
-            OptionPartition.new(opts, OPT_GIT[:rev_parse], cmd,
-                                project: self, strict: strict?, no: OPT_GIT[:no][:rev_parse], args: args)
+            OptionPartition.new(opts, OPT_GIT[:rev_parse], cmd, project: self, strict: strict?, args: args,
+                                                                no: OPT_GIT[:no][:rev_parse])
                            .append(escape: args)
           end
           source(banner: verbose?)
@@ -1962,7 +1959,7 @@ module Squared
           out, banner, from = source(io: true)
           print_item banner
           ret = write_lines(out, grep: op.extras, prefix: "refs/#{flag}/")
-          list_result(ret, flag.to_s, grep: op.extras, from: from)
+          list_result(ret, flag.to_s, grep: op.extras, banner: banner, from: from)
         end
 
         def ls_files(flag, opts = [])
@@ -1972,7 +1969,7 @@ module Squared
           out, banner, from = source(io: true)
           print_item banner
           ret = write_lines(out, grep: op.extras)
-          list_result(ret, 'files', grep: op.extras, from: from)
+          list_result(ret, 'files', grep: op.extras, banner: banner, from: from)
         end
 
         def git(flag, opts = [], extras: [])
@@ -2147,10 +2144,10 @@ module Squared
           end
         end
 
-        def list_result(size, type, action: 'found', grep: [], from: nil)
+        def list_result(size, type, action: 'found', grep: [], banner: nil, from: nil)
           if size == 0
             puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
-          elsif stdout?
+          elsif stdout? && (banner.nil? || (banner.is_a?(String) && !banner.empty?))
             styles = theme.fetch(:banner, []).reject { |val| val.to_s.end_with?('!') }
             styles << :bold if styles.size <= 1
             puts print_footer("#{size} #{size == 1 ? type.sub(/((?<!l)e)?s\z/, '') : type}",
@@ -2219,8 +2216,8 @@ module Squared
           append_submodules(target: target, from: from)
           return if !remote && opts.empty?
 
-          op = OptionPartition.new(opts, remote ? list + ['refspec=v'] : list, target, project: self, strict: strict?,
-                                                                                       no: no)
+          op = OptionPartition.new(opts, remote ? list + ['refspec=v'] : list, target,
+                                   project: self, strict: strict?, no: no)
           refspec = op.each_with_object([]) do |opt, out|
             if opt =~ op.values
               case $1

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

@@ -8,8 +8,8 @@ module Squared
           common: %w[dry-run=!? force=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
           common_scripts: %w[dangerously-allow-all-scripts=!? strict-allow-scripts=!? allow-scripts=q].freeze,
           install: %w[package-lock-only=!? prefer-dedupe=!? E|save-exact=!? before=q cpu=b libc=b os=b].freeze,
-          install_a: %w[audit=! bin-links=! foreground-scripts=!? fund=! ignore-scripts=!? install-links=!?
-                        package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
+          install_a: %w[audit=! bin-links=! engine-strict=!? foreground-scripts=!? fund=! ignore-scripts=!?
+                        install-links=!? package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
           install_b: %w[no-save B|save-bundle D|save-dev O|save-optional save-peer P|save-prod g|global=!?
                         S|save=!?].freeze,
           install_c: %w[allow-directory=b? allow-file=b? allow-git=b? allow-remote=b?].freeze,
@@ -327,7 +327,7 @@ module Squared
                     when 'package'
                       format_desc(action, flag, 'opts*', before: case flag
                                                                  when :dedupe, :rebuild then nil
-                                                                 when :reinstall then 'force?'
+                                                                 when :reinstall then 'f/orce?'
                                                                  else 'name*'
                                                                  end)
                       task flag do |_, args|
@@ -672,8 +672,7 @@ module Squared
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              cmd = session 'npm'
-              cmd << (ci = option('ci') ? 'ci' : 'install')
+              cmd = session('npm', (ci = option('ci', prefix: 'npm')) ? 'ci' : 'install')
               option('approve-scripts') do |val|
                 cmd = npm_output 'approve-scripts'
                 cmd << case val
@@ -687,6 +686,26 @@ module Squared
                 print_run cmd, silent?
                 run(cmd, banner: false)
               end
+              option('allow-scripts', ignore: false) do |val|
+                cmd << case val
+                       when '0'
+                         '--ignore-scripts'
+                       when 'false'
+                         '--strict-allow-scripts'
+                       when '1', 'true'
+                         '--dangerously-allow-all-scripts'
+                       else
+                         quote_option 'allow-scripts', val
+                       end
+              end
+              option('engine-strict', ignore: false) do |val|
+                cmd << case val
+                       when '0', 'false'
+                         '--engine-strict=false'
+                       else
+                         '--engine-strict'
+                       end
+              end
               cmd << '--workspaces=false' if ws
               cmd << '--force' if option('force')
               append_nocolor
@@ -1088,6 +1107,7 @@ module Squared
 
         def package(flag, opts = [], packages: [], from: nil)
           workspace.rev_clear(name)
+          force = true if flag == :reinstall && has_value!(opts, 'f')
           yarn = dependtype(:yarn)
           if yarn > 0 && !(yarn == 1 && ((flag == :update && !packages.empty?) || %i[approve deny
                                                                                      rebuild].include?(flag)))
@@ -1101,8 +1121,8 @@ module Squared
                                     end
                                   when :reinstall
                                     if yarn == 1
-                                      remove_modules(prefix: 'yarn') if opts.include?('force')
-                                    elsif opts.delete('force')
+                                      remove_modules(prefix: 'yarn') if opts.include?('force') || force
+                                    elsif opts.delete('force') || force
                                       opts << 'check-cache'
                                     end
                                     opts << 'no-lockfile' if lockfile(true)
@@ -1171,7 +1191,7 @@ module Squared
                          spec = 1
                          flag = :install
                        when :reinstall
-                         remove_modules(prefix: 'npm') if opts.delete('force')
+                         remove_modules(prefix: 'npm') if opts.delete('force') || force
                          opts.unshift('package-lock=false') if lockfile(true)
                          flag = :install
                        end

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

@@ -507,16 +507,23 @@ module Squared
                         format_desc action, flag, 'f/orce?,l/ocal?,opts*'
                         task flag do |_, args|
                           opts = args.to_a
-                          opts << 'local' if has_value!(opts, 'l')
+                          opts << 'local' if has_value!(opts, 'l', 'local')
                           opts << 'redownload' if has_value!(opts, 'f', 'force')
                           if (lock = basepath!('Gemfile.lock'))
-                            config = basepath '.bundle', 'config'
-                            if config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
-                              if opts.include?('redownload')
-                                run(bundle_output('config unset frozen'), banner: false)
-                              else
-                                print_error('Gemfile.lock is frozen', subject: name, hint: flag)
+                            case (val = ENV['BUNDLE_FROZEN'])
+                            when '0', 'false'
+                              nil
+                            else
+                              if val
+                                print_error("BUNDLE_FROZEN: #{val}", loglevel: Logger::INFO, subject: name, hint: flag)
                                 lock = nil
+                              elsif basepath!('.bundle', 'config')&.read&.match?(/\bBUNDLE_FROZEN:\s+"true"/)
+                                if opts.include?('redownload')
+                                  run(bundle_output('config unset frozen'), banner: false)
+                                else
+                                  print_error('Gemfile.lock is frozen', subject: name, hint: flag)
+                                  lock = nil
+                                end
                               end
                             end
                             lock&.delete
@@ -1843,8 +1850,8 @@ module Squared
         private
 
         def run_repl(*args, opts:, banner:, from:, delim: true, **kwargs)
-          op = OptionPartition.new(opts, OPT_RUBY[from], session(*bundle_args(from)), project: self, strict: strict?,
-                                                                                      first: [/\.rb$/])
+          op = OptionPartition.new(opts, OPT_RUBY[from], session(*bundle_args(from)),
+                                   project: self, strict: strict?, first: [/\.rb$/])
           r = []
           r << 'bundler/setup' if !op.arg?('r') && bundle_load
           r.concat(Array(kwargs[:name])) if kwargs[:name]

data/lib/squared/workspace/project/support/optionpartition.rb

@@ -100,7 +100,17 @@ module Squared
               ret.select { |val| single ? val.size == 1 : val.size > 1 }
             end
 
-            def uniq!(list, pass = [])
+            def union(list, other)
+              base = list.map { |val| parse_option(val).first }
+              other.each do |val|
+                next if base.include?(parse_option(val).first)
+
+                list << val
+              end
+              list
+            end
+
+            def uniq!(list, pass: [])
               keys = {}
               list.each_with_index do |val, i|
                 j = val =~ OPT_VALUE ? $1 : val
@@ -564,11 +574,17 @@ module Squared
           end
 
           def add_first(fallback = nil, prefix: nil, path: false, escape: false, reverse: false, expect: false,
-                        **kwargs)
+                        strip: nil, **kwargs)
             val = (reverse ? pop : shift) || fallback
             if val
               temp = val
-              val = val.delete_prefix(prefix) if prefix && val.is_a?(String)
+              if val.is_a?(String)
+                val = val.delete_prefix(prefix) if prefix
+                if strip
+                  pat, s = Array(strip)
+                  val = val.gsub(pat, s || '')
+                end
+              end
               unless block_given? && !(val = yield val).is_a?(String)
                 if path
                   add_path(val, **kwargs)

data/lib/squared/workspace/project/support/utils.rb

@@ -35,13 +35,29 @@ module Squared
             end
           end
 
-          def matchmap(list, prefix: nil)
-            list.map do |val|
-              next val if val.is_a?(Regexp)
-
-              val = ".*#{val}" if prefix && !val.sub!(/\A(\^|\\A)/, '')
-              Regexp.new("#{prefix}#{val == '*' ? '.+' : val}")
+          def matchmap(list, prefix: nil, negate: false)
+            ret = negate ? [[], []] : []
+            list.each do |val|
+              unless val.is_a?(Regexp)
+                val = val.dup
+                n = 1 if negate && val.delete_prefix!('!')
+                if prefix
+                  a = nil
+                  val.sub!(/\A(\^|\\A)/) do |s|
+                    a = s
+                    nil
+                  end
+                  val = ".*#{val}" unless a
+                end
+              end
+              pat = Regexp.new("#{a}#{prefix}#{val == '*' ? '.+' : val}")
+              if negate
+                ret[n || 0] << pat
+              else
+                ret << pat
+              end
             end
+            ret
           end
 
           def matchany?(list, *args, empty: true)

data/lib/squared/workspace/repo.rb

@@ -157,8 +157,6 @@ module Squared
                   [proj, proj.build? && (script || run), doc && proj.doc?, lint && proj.lint?, test && proj.test?]
                 end
                 .select do |proj, run, doc, lint, test|
-                  next unless proj
-
                   proj.doc(sync: true) if doc
                   proj.build(sync: true) if run
                   next if n.anybits?(4)

data/lib/squared/workspace/series.rb

@@ -88,7 +88,7 @@ module Squared
         update @session[:parent] if @session[:id].uniq.size > 1
         update @session[:group]
         each do |key, items|
-          next if exclude?(key, true) || @workspace.task_exclude?(t = name_get(key))
+          next if exclude?(key, empty: true) || @workspace.task_exclude?(t = name_get(key))
 
           key = task_name t
           title = format_desc(key, out: true)
@@ -217,7 +217,7 @@ module Squared
         already_invoked? parallel, val
       end
 
-      def exclude?(key, empty = false)
+      def exclude?(key, empty: false)
         @exclude.include?(key) || (empty && (!key?(key) || self[key].empty?))
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - An Pham
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.15
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []