squared 0.4.22 → 0.4.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f67ab37dd0b66feaeb78631ac257ba860df78acba313f2e5fe2ffeb01136acf
-  data.tar.gz: 8d0570c44cbdf41ba282b5c2fd9a0196b4c5678d595ca5774393b442b88eb854
+  metadata.gz: 8d6cb2868bb0cf1337f5b55837f5347d280408fece9d5ced520fa0a4b4dcf66a
+  data.tar.gz: 473e53ee64c8f98d4005ae4a36a31f652f67513fb9892f3beb9696a6eba27df4
 SHA512:
-  metadata.gz: 01b00bf5afdd80a370ef363c0d546f76d8f2533474b25029fc37c9bb0bfb1b2104ea4aa78c38cb044cf8d2f194630496b6d1b48ad4d94e8be284b28dd5dfa03c
-  data.tar.gz: 3968c3a15796f1c41939b95b4e50c8a8830f7f95fb6570a193c24c0043e259c82c6ac28571bd4cdbcddd2b77d6b47f38b55a963c3e567bad6e8e949a41ba8698
+  metadata.gz: e99a8c8804d50e7b051ccb3a3fc5233f8209a0a2ec9a4b8ca82fae5a5917da851b639123294f5948a1dbe1e1749157e0a150c9b7b9a4053f043fc600477d2f9a
+  data.tar.gz: bbc77a9801a42360e468a388c008e24f7e2c5d2d431de46174871bcc11d482b7595d9339455824d9077861d889577c55649bcfada9a5617c058ab1ba95db04ad

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.4.23] - 2025-10-11
+
+### Fixed
+
+- Node task outdated did not compare wanted and latest by semver.
+- Project base method append_hash did not have target when joined.
+- Docker build for compose and bake was completely incapacitated.
+
 ## [0.4.22] - 2025-10-08
 
 ### Added
@@ -1010,6 +1018,7 @@
 
 - Changelog was created.
 
+[0.4.23]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.23
 [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

data/lib/squared/version.rb

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

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

@@ -2,7 +2,6 @@
 
 require 'json'
 require 'date'
-require 'time'
 require 'logger'
 
 module Squared
@@ -209,7 +208,7 @@ module Squared
         def initialize_env(dev: nil, prod: nil, **)
           @dev = env_match('BUILD', dev, suffix: 'DEV', strict: true)
           @prod = env_match('BUILD', prod, suffix: 'PROD', strict: true)
-          unless @output[2] == false || !(val = env('BUILD', suffix: 'ENV'))
+          if (val = env('BUILD', suffix: 'ENV')) && @output[2] != false
             @output[2] = parse_json(val, hint: "BUILD_#{@envname}_ENV") || @output[2]
           end
           unless @output[0] == false || @output[0].is_a?(Array)
@@ -465,11 +464,11 @@ module Squared
               a, b, c, d, e = val
               case b
               when Hash
-                b = append_hash(b, build: true).join(' ')
+                b = append_hash(b, target: [], build: true).join(' ')
               when Enumerable
                 b = b.to_a.join(' ')
               end
-              d = append_hash(d).join(' ') if d.is_a?(Hash)
+              d = append_hash(d, target: []).join(' ') if d.is_a?(Hash)
               if a
                 cmd << [a, d, b].compact.join(' ')
               else
@@ -490,11 +489,13 @@ module Squared
           if cmd
             cmd = as_get(cmd, from)
             opts = compose(opts, script: false) if opts && respond_to?(:compose)
-            flags = append_hash(flags).join(' ') if flags.is_a?(Hash)
+            flags = append_hash(flags, target: []).join(' ') if flags.is_a?(Hash)
             case opts
             when Hash
-              opts = append_hash(opts, build: true)
-              cmd = Array(cmd).push(flags).concat(opts).compact.join(' ')
+              cmd = Array(cmd).push(flags)
+                              .concat(append_hash(opts, target: [], build: true))
+                              .compact
+                              .join(' ')
             when Enumerable
               cmd = Array(cmd).concat(opts.to_a)
               cmd.map! { |val| "#{val} #{flags}" } if flags
@@ -1267,11 +1268,11 @@ module Squared
         end
 
         def option(*args, target: @session, prefix: target&.first, **kwargs)
-          if prefix
-            args.each do |val|
-              ret = env(env_key(stripext(prefix), val), **kwargs)
-              return ret if ret
-            end
+          return unless prefix
+
+          args.each do |val|
+            ret = env(env_key(stripext(prefix), val), **kwargs)
+            return ret if ret
           end
           nil
         end
@@ -1450,7 +1451,7 @@ module Squared
           opts.each { |val| target << shell_option(flag, val) }
         end
 
-        def append_hash(data, target: @session, build: false)
+        def append_hash(data, target: @session || [], build: false)
           if build && (type = env('BUILD', suffix: 'TYPE') || ENV['BUILD_TYPE'])
             type = "__#{type}__"
             if (extra = data[type] || data[type.to_sym]).is_a?(Hash)
@@ -1553,7 +1554,7 @@ module Squared
             when String
               "#{base} #{data}"
             when Hash
-              "#{append_hash(base).join(' ')} #{data}"
+              "#{append_hash(base, target: []).join(' ')} #{data}"
             when Enumerable
               "#{base.to_a.join(' ')} #{data}"
             else
@@ -1562,11 +1563,11 @@ module Squared
           when Hash
             case base
             when String
-              "#{base} #{append_hash(data).join(' ')}"
+              "#{base} #{append_hash(data, target: []).join(' ')}"
             when Hash
               base.merge(data)
             when Enumerable
-              Set.new(base.to_a + append_hash(data)).to_a
+              Set.new(base.to_a + append_hash(data, target: [])).to_a
             else
               data
             end
@@ -1575,7 +1576,7 @@ module Squared
             when String
               "#{base} #{data.to_a.join(' ')}"
             when Hash
-              "#{append_hash(base).join(' ')} #{data.to_a.join(' ')}"
+              "#{append_hash(base, target: []).join(' ')} #{data.to_a.join(' ')}"
             when Enumerable
               Set.new(base.to_a + data.to_a).to_a
             else

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

@@ -264,11 +264,11 @@ module Squared
           ret = docker_session
           if from == :run
             if bake?(n = filetype)
-              ret << 'buildx' << 'bake'
+              ret << 'buildx bake'
               append_file n
               from = :bake
             elsif compose?(n)
-              ret << 'compose' << 'build'
+              ret << 'compose build'
               append_file n
               from = :compose
             else
@@ -281,7 +281,7 @@ module Squared
           when String
             ret << opts
           when Hash
-            ret.merge(append_hash(opts, build: true))
+            ret.merge(append_hash(opts, target: [], build: true))
           when Enumerable
             ret.merge(opts.to_a)
           end
@@ -622,7 +622,7 @@ module Squared
           target << list.join(' && ') unless list.empty?
         end
 
-        def append_file(type, target: @session)
+        def append_file(type, target: @session, index: 2)
           return if !@file || (ENV['COMPOSE_FILE'] && compose?(type))
 
           unless @file.is_a?(Array)
@@ -635,10 +635,10 @@ module Squared
           end
           files = Array(@file).map { |val| quote_option('file', basepath(val)) }
           if target.is_a?(Set)
-            opts = target.to_a.insert(2, *files)
+            opts = target.to_a.insert(index, *files)
             target.clear.merge(opts)
           else
-            target.insert(2, *files)
+            target.insert(index, *files)
           end
         end
 

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

@@ -604,7 +604,7 @@ module Squared
                             detach = args.detach
                             commit = commithead args.commit
                           end
-                          param_guard(action, flag, args: { create: create }, key: :create, pat: /\Ab\z/i) if create
+                          param_guard(action, flag, args: { create: create }, key: :create, pat: /\A[Bb]\z/) if create
                         else
                           branch = choice_refs 'Choose a branch to switch'
                         end
@@ -824,7 +824,7 @@ module Squared
                                  []
                                else
                                  commit = choice_refs 'Choose "onto" branch'
-                                 target, opts = choice_commit(multiple: 2, values: ['Options'], reflog: false)
+                                 target, opts = choice_commit(reflog: false, multiple: 2, values: ['Options'])
                                  branch, upstream = target
                                  OptionPartition.strip(opts)
                                end

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

@@ -134,13 +134,13 @@ module Squared
                       exact = true
                       save = save[1..-1]
                     end
-                    case save
-                    when 'prod', 'dev', 'optional', 'peer'
-                      packages = args.extras
-                    else
-                      save = 'prod'
-                      packages = args.to_a
-                    end
+                    packages = case save
+                               when 'prod', 'dev', 'optional', 'peer'
+                                 args.extras
+                               else
+                                 save = 'prod'
+                                 args.to_a
+                               end
                     param_guard(action, 'name', args: packages)
                     depend(:add, packages: packages, save: save, exact: exact)
                   end
@@ -527,7 +527,19 @@ module Squared
                 next
               end
               current = val['current'] || file
-              want = rev == :major && !latest[SEM_VER, 6] ? latest : val['wanted']
+              want = val['wanted']
+              unless latest[SEM_VER, 6]
+                case rev
+                when :major
+                  want = latest
+                when :minor
+                  want = latest if latest[SEM_VER, 1] == want[SEM_VER, 1]
+                when :patch
+                  if (g = latest.match(SEM_VER)) && (h = want.match(SEM_VER)) && g[1] == h[1] && g[3] == h[3]
+                    want = latest
+                  end
+                end
+              end
               next unless (current != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
 
               f = semscan file
@@ -845,7 +857,7 @@ module Squared
             when String
               target
             when Hash
-              append_hash(target).join(' ')
+              append_hash(target, target: []).join(' ')
             when Enumerable
               target.to_a.join(' ')
             else

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

@@ -7,7 +7,7 @@ module Squared
         DEP_PYTHON = %w[poetry.lock setup.cfg pyproject.toml setup.py requirements.txt].freeze
         DIR_PYTHON = (DEP_PYTHON + %w[README.rst]).freeze
         OPT_PYTHON = {
-          common: %w[b B d E h i I O OO P q s S u v x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
+          common: %w[b B d E h i I O P q s S u v x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
           build: %w[n|no-isolation s|sdist x|skip-dependency-check v|verbose w|wheel C|config-setting=q installer=b
                     o|outdir=p].freeze,
           venv: %w[clear copies symlinks system-site-packages upgrade upgrade-deps without-scm-ignore-files without-pip
@@ -614,7 +614,7 @@ module Squared
         def python_session(*cmd, opts: nil)
           return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
 
-          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: /\Av+\z/)
+          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: /\A(?:v+|OO)\z/)
           ret = session('python', *op.to_a, *cmd, path: venv.nil?)
           [ret, op.extras]
         end
@@ -874,7 +874,7 @@ module Squared
           op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
           op.append(dir, delim: true)
             .clear(pass: false)
-          status = op.arg?(/\A-v+\z/, 'verbose')
+          status = op.arg?(/\A-v+\z/)
           run(op, env, exception: true, banner: banner)
           puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
         end

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

@@ -77,7 +77,7 @@ module Squared
             def select(list, bare: true, no: true, single: false, double: false)
               ret = bare ? list.grep_v(/=/) : list.grep(/=/).map! { |val| val.split('=', 2).first }
               ret.map! { |val| val.split('|', 2).last }
-              ret = ret.grep_v(/^no-/) unless no
+              ret = ret.grep_v(/\Ano-/) unless no
               return ret if single == double
 
               ret.select { |val| single ? val.size == 1 : val.size > 1 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.22
+  version: 0.4.23
 platform: ruby
 authors:
 - An Pham