squared 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 447c24bc317440fcf3f5b8e8c8f542f5e8f7641e3b548c5ee0204ba948460881
-  data.tar.gz: 1f048b1de055cd375e9e50f18361ef61a26c87602bb56a5f40245951faf05358
+  metadata.gz: 82c53d370d6535fd30824fafd72a2f68fd7db161600d2740fd643f270d68d6f6
+  data.tar.gz: 26b8eb9e45b508923bacce4bc06502d3031fc7a8b9c844dfd02775a86191ec3c
 SHA512:
-  metadata.gz: bf73faecb83832adfa1cbb21212939a93cc2fa133c4a13d24f008eb432cbc663a198294a944b35449921902fa3045cfa581839e52bea6723703c95772e537e05
-  data.tar.gz: a9db1c7dfd58750be1285fb1c2b39f9c087a3488560c6c2d35eb77939f69753127b2d97121450c5409f8b0c7b7fd821cd722291d57cabc0c5a7930f50ae338fb
+  metadata.gz: f32e8ae4585c328c298791628eca4e18e00ac2818bee7aa9c5e1f1f680fd6b60f0a59cc1fd1b4313794d1d7d926dfc195762cf9912e83034d553d248f90f8743
+  data.tar.gz: '091805806ce97b61bf45f6df58bf5232ce75f65e0d1bcbcdffb0aed949e3e38200b5ea8d9bd600e9c2150e24296af2faf2ac3a99312ec290112bf55770ea38a7'

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [0.2.2] - 2025-01-19
+
+### Fixed
+
+- Ruby version detection did not parse currently installed gem.
+- Build options with array args were not recognized.
+- Base clean command did not enumerate non-string values.
+- Git pull did not append origin without option separator.
+- Command options from a hash did not parse single character flags.
+- Git command refs did not include ref option.
+- Base copy command did not accept array parameters.
+- Shell option escape did not detect quotes for Windows.
+- Git command reset did not include mode argument.
+- Git command show format argument was not optional.
+- Clean directory did not set verbose flag.
+- Git clone was not enabled when all project folders were missing.
+- Git commit does not parse global ENV options.
+
+## [0.2.1] - 2025-01-08
+
+### Fixed
+
+- Ruby command options were misquoted.
+
 ## [0.2.0] - 2025-01-07
 
 ### Added
@@ -145,6 +169,8 @@
 
 - Changelog was created.
 
+[0.2.2]: https://github.com/anpham6/squared/releases/tag/v0.2.2-ruby
+[0.2.1]: https://github.com/anpham6/squared/releases/tag/v0.2.1-ruby
 [0.2.0]: https://github.com/anpham6/squared/releases/tag/v0.2.0-ruby
 [0.1.3]: https://github.com/anpham6/squared/releases/tag/v0.1.3-ruby
 [0.1.2]: https://github.com/anpham6/squared/releases/tag/v0.1.2-ruby

data/lib/squared/common/shell.rb

@@ -39,7 +39,7 @@ module Squared
         val.join(join.is_a?(::String) ? join : ' ')
       end
 
-      def shell_option(flag, val = nil, quote: false, escape: true)
+      def shell_option(flag, val = nil, escape: true, quote: true)
         a, b = flag.size == 1 ? ['-', ' '] : ['--', '=']
         "#{a}#{flag}#{if val
                         "#{b}#{if escape
@@ -57,11 +57,11 @@ module Squared
       end
 
       def quote_option(flag, val)
-        shell_option(flag, val, escape: false, quote: true)
+        shell_option(flag, val, escape: false)
       end
 
       def basic_option(flag, val)
-        shell_option(flag, val, escape: false)
+        shell_option(flag, val, escape: false, quote: false)
       end
 
       def single_quote(val)

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -513,7 +513,7 @@ module Squared
       end
 
       def enabled?
-        !@extensions.empty? || @project.values.any?(&:enabled?)
+        !@extensions.empty? || @project.values.any? { |proj| proj.enabled?(base: false) }
       end
 
       def task_base?(key)

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

@@ -348,20 +348,22 @@ module Squared
         end
 
         def build(*args, from: :build, sync: invoked_sync?('build'), **)
+          banner = verbose
           if args.empty?
+            return unless from == :build
+
             cmd, opts, var, flags = @output
-            banner = verbose == 1
+            banner = verbose == 1 if task_invoked?('build', 'build:sync')
           else
             cmd = args.shift
             opts = args.map { |val| shell_quote(val, force: false) }.join(' ')
-            banner = verbose
           end
           if cmd
             case opts
             when String
               cmd = "#{cmd} #{opts}"
             when Array
-              cmd = cmd.join(' && ')
+              cmd = as_a(cmd).concat(opts).join(' && ')
             else
               cmd = [cmd, compose(opts, script: false)].compact.join(' ') unless opts == false || !respond_to?(:compose)
             end
@@ -388,13 +390,13 @@ module Squared
         def doc(*, sync: invoked_sync?('doc'), **)
           return unless @doc
 
-          build(@doc, from: :doc, sync: sync)
+          build(*as_a(@doc), from: :doc, sync: sync)
         end
 
         def test(*, sync: invoked_sync?('test'), **)
           return unless @test
 
-          build(@test, from: :test, sync: sync)
+          build(*as_a(@test), from: :test, sync: sync)
         end
 
         def clean(*, sync: invoked_sync?('clean'), **)
@@ -403,21 +405,21 @@ module Squared
           on :first, :clean
           case @clean
           when String
-            run_s(@clean, from: :clean, sync: sync)
+            run(@clean, from: :clean, sync: sync)
           when Enumerable
-            as_a(@clean).each do |val|
-              if val =~ %r{[\\/]$}
-                dir = Pathname.new(val.to_s)
-                dir = basepath(dir) unless dir.absolute?
-                next unless dir.directory?
-
-                log.warn "rm -rf #{dir}"
-                dir.rmtree
+            (@clean.is_a?(Hash) ? @clean.values : as_a(@clean)).each do |val|
+              val = val.to_s
+              path = basepath(val)
+              if path.directory? && val =~ %r{[\\/]\z}
+                log.warn "rm -rf #{path}"
+                path.rmtree(verbose: true)
               else
-                files = val.include?('*') ? Dir[basepath(val)] : [basepath(val)]
-                files.each do |file|
+                log.warn "rm #{path}"
+                (val.include?('*') ? Dir[path] : [path]).each do |file|
+                  next unless File.file?(file)
+
                   begin
-                    File.delete(file) if File.file?(file)
+                    File.delete(file)
                   rescue StandardError => e
                     log.error e
                   end
@@ -558,6 +560,12 @@ module Squared
           @prod != false && workspace.prod?(pat: @prod, **scriptargs)
         end
 
+        def exclude?(*refs)
+          return false if @exclude.empty?
+
+          refs.flatten.any? { |ref| @exclude.include?(ref) }
+        end
+
         def task_include?(key, ref = nil)
           workspace.task_include?(self, key, ref) && !@pass.include?(key.to_s)
         end
@@ -639,7 +647,7 @@ module Squared
         def run_s(*cmd, env: nil, sync: true, banner: verbose != false, from: nil, **kwargs)
           on :first, from if from
           begin
-            cmd.each { |val| run(val, env, sync: sync, banner: banner, **kwargs) }
+            cmd.flatten.each { |val| run(val, env, sync: sync, banner: banner, **kwargs) }
           rescue StandardError => e
             ret = on(:error, from, e) if from
             raise unless ret == true
@@ -971,21 +979,21 @@ module Squared
         end
 
         def append_repeat(flag, opts, target: @session)
-          opts.each { |val| target << shell_option(flag, val, quote: true) }
+          opts.each { |val| target << shell_option(flag, val) }
         end
 
-        def append_value(opts, target: @session, delim: false, escape: true)
-          return if opts.empty?
+        def append_value(*opts, target: @session, delim: false, escape: true, quote: false)
+          return if (opts = opts.flatten).empty?
 
           target << '--' if delim
-          opts.each { |val| target << (escape ? shell_escape(val) : shell_quote(val)) }
+          opts.each { |val| target << (escape ? shell_escape(val, quote: quote) : shell_quote(val)) }
         end
 
         def append_hash(opts, target: @session)
           out = target.to_s
           opts.each do |key, val|
             key = key.to_s
-            key = "--#{key}" unless key[0] == '-'
+            key = shell_option(key) unless key[0] == '-'
             next if out =~ Regexp.new(" #{key}(?: |=|$)")
 
             case val
@@ -994,7 +1002,7 @@ module Squared
             when Array
               append_repeat(key, val, target: target)
             when Numeric
-              target << (key + (key.start_with?('--') ? '=' : '') + val)
+              target << (key + (key.start_with?('--') ? '=' : '') + val.to_s)
             when false
               target << key.sub(/^--(?!no-)/, '--no-')
             else
@@ -1013,6 +1021,7 @@ module Squared
                                 shell_quote(val)
                               end)
           end
+          nil
         end
 
         def append_option(list, target: @session, equals: false, quote: false, escape: true, **kwargs)
@@ -1097,7 +1106,7 @@ module Squared
             when Proc, Method
               cmd.call(*args, **opts)
             when String
-              run_s(cmd, **opts)
+              run(cmd, **opts)
             end
           end
         end

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

@@ -9,7 +9,7 @@ module Squared
 
       def git(name, uri = nil, base: nil, repo: [], options: {})
         data = {}
-        check = ->(proj) { proj.is_a?(Project::Git) && git_clone?(proj.path) }
+        check = ->(proj) { proj.is_a?(Project::Git) && !proj.exclude?(Project::Git.ref) && git_clone?(proj.path) }
         if uri.is_a?(Array)
           base = name
           uri.each { |val| repo << proj if (proj = @project[val.to_s]) && check.(proj) }
@@ -569,7 +569,7 @@ module Squared
           list_result(ret, 'files', from: from, action: 'modified')
         end
 
-        def reset(flag, files = [], ref: nil)
+        def reset(flag, files = nil, mode: nil, ref: nil)
           cmd = git_session 'reset'
           case flag
           when :mode
@@ -591,7 +591,7 @@ module Squared
             cmd << '--patch'
           end
           append_commit ref
-          append_pathspec files unless files.empty?
+          append_pathspec files if files
           source
         end
 
@@ -746,7 +746,7 @@ module Squared
             break
           end
           raise_error('commit', 'work tree is not usable') unless origin && branch
-          cmd = git_session 'commit', option('dry-run') && '--dry-run'
+          cmd = git_session('commit', option('dry-run') && '--dry-run', options: false)
           if amend
             cmd << '--amend'
           else
@@ -865,12 +865,16 @@ module Squared
         def show(objs, format: nil, opts: nil)
           cmd = git_session 'show'
           if format
-            cmd << case (val = format.downcase)
-                   when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
-                     basic_option('format', val)
-                   else
-                     quote_option('pretty', format)
-                   end
+            case (val = format.downcase)
+            when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
+              cmd << basic_option('format', val)
+            else
+              if format =~ /^t?format:/ || format.include?('%')
+                cmd << quote_option('pretty', format)
+              else
+                objs << format
+              end
+            end
           end
           if opts
             append_hash opts
@@ -879,7 +883,7 @@ module Squared
             cmd << basic_option('abbrev', val) if (val = option('abbrev')) && val.to_i > 0
             banner = true
           end
-          append_value objs
+          append_value(objs, delim: true)
           source(exception: false, banner: banner)
         end
 
@@ -894,7 +898,7 @@ module Squared
         end
 
         def ls_remote(flag, grep: nil)
-          git_session 'ls-remote', " --#{flag}"
+          git_session 'ls-remote', "--#{flag}", '--refs'
           out, banner, from = source(io: true)
           print_item banner
           ret = write_lines(out, grep: grep)
@@ -902,7 +906,7 @@ module Squared
         end
 
         def ls_files(flag, grep: nil)
-          git_session 'ls-files', " --#{flag}"
+          git_session 'ls-files', "--#{flag}"
           out, banner, from = source(io: true)
           print_item banner
           ret = write_lines(out, grep: grep)
@@ -1029,7 +1033,7 @@ module Squared
 
                 target << quote_option($1, val.strftime('%F %T'))
               when 'recurse-submodules'
-                target << shell_option($1, $2, quote: false) unless modules
+                target << basic_option($1, $2) unless modules
               when 'shallow-exclude', 'gpg-sign', 'signoff', 'strategy', 'strategy-option'
                 target << shell_option($1, $2)
               when 'refmap', 'negotiation-tip'
@@ -1044,9 +1048,9 @@ module Squared
             end
           end
           if remote
-            target << shell_escape(remote, quote: true)
+            append_value(remote, target: target, delim: true, quote: true)
             if (val = option('refspec', strict: true))
-              append_value(split_escape(val), escape: false)
+              append_value(split_escape(val), target: target, escape: false)
             else
               target.merge(refspec)
             end
@@ -1060,7 +1064,7 @@ module Squared
 
         def append_commit(val, target: @session)
           val = val.to_s.strip
-          target << (val.empty? ? 'HEAD' : val)
+          target << (val.empty? ? append_head(target: target) || 'HEAD' : val)
         end
 
         def append_pathspec(files = [], target: @session, expect: false, parent: false)

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

@@ -294,7 +294,7 @@ module Squared
               end
               cmd << '--prod' if flag && prod?
               if (val = option('public-hoist-pattern', ignore: false))
-                split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt, quote: true) }
+                split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt) }
               end
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
               append_nocolor

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

@@ -121,7 +121,7 @@ module Squared
               when :force
                 cmd << '--force-reinstall'
               when :target
-                cmd << shell_option('target', basepath(param), quote: true)
+                cmd << quote_option('target', basepath(param))
               else
                 append_global
               end
@@ -275,7 +275,7 @@ module Squared
                 target << quote_option($1, val =~ %r{^[a-z]+\+[a-z]+://} ? val : basepath(val))
               when 'proxy', 'config-settings', 'global-option', 'extra-index-url',
                    'f', 'find-links', 'i', 'index-url'
-                target << shell_option($1, $2, quote: true)
+                target << quote_option($1, $2)
               when 'retries', 'timeout'
                 target << basic_option($1, $2) if $2.to_i > 0
               else
@@ -297,7 +297,7 @@ module Squared
                      quote_option('cache-dir', basepath(val))
                    end
           end
-          cmd << shell_option('proxy', val, quote: true) if (val = option('proxy'))
+          cmd << quote_option('proxy', val) if (val = option('proxy'))
           cmd << quote_option('python', basepath(val)) if (val = option('python'))
           append_nocolor
         end

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

@@ -367,7 +367,7 @@ module Squared
                    'n', 'bindir', 'g', 'file', 'i', 'install-dir'
                 cmd << quote_option($1, basepath($2))
               when 'p', 'http-proxy', 's', 'source'
-                cmd << shell_quote($1, $2)
+                cmd << quote_option($1, $2)
               when 'bulk-threshold'
                 cmd << basic_option($1, $2) if $2.to_i > 0
               else
@@ -482,6 +482,7 @@ module Squared
         end
 
         def bundle(cmd, *args)
+          args = args.flatten
           run_s(bundle_session(cmd, *args), from: :bundle)
         end
 
@@ -489,7 +490,8 @@ module Squared
           if cmd.empty?
             run_s(rake_output(rakeapp), from: :rake, chdir: workspace.pwd)
           else
-            run_s(*cmd.map { |val| rake_output(rakeapp, val) }, from: :rake, chdir: workspace.pwd, banner: false)
+            cmd = cmd.flatten.map { |val| rake_output(rakeapp, val) }
+            run_s(cmd, from: :rake, chdir: workspace.pwd, banner: false)
           end
         end
 
@@ -511,22 +513,24 @@ module Squared
             log.warn "using version #{val} (given #{@version})" if @version && @version != val
             @version = val
           end
-          out = pwd_set { `#{gem_output('list', '--local', '-d', shell_escape(project, quote: true))}` }
-          if (data = /#{Regexp.escape(project)} \(([^)]+)\)/.match(out))
-            ver = data[1].split(/\s*,\s*/)
-            ver.unshift(@version).uniq! if @version
-            ver.each do |val|
-              next unless (data = /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/.match(out))
-
-              set.(val)
-              break
+          if @version
+            out = pwd_set { `#{gem_output('list', '--local', '-d', shell_escape(project, quote: true))}` }
+            if (data = /#{Regexp.escape(project)} \(([^)]+)\)/.match(out))
+              ver = data[1].split(/\s*,\s*/)
+              ver.unshift(@version).uniq!
+              ver.each do |val|
+                next unless (data = /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/.match(out))
+
+                set.(val)
+                break
+              end
             end
           end
           unless data || RUBY_VERSION < '2.6'
             target = RUBY_VERSION.start_with?('2.6') ? RubyVM : $LOAD_PATH
             if (path = target.resolve_feature_path(project)&.last)
               gems = ['', 'gems', "#{project}-([^#{File::SEPARATOR}]+)", ''].join(File::SEPARATOR)
-              if (ver = Regexp.new(gems).match(path)) && (data = /\A(.+)#{gempath}/.match(path))
+              if (ver = Regexp.new(gems).match(path)) && (data = /\A(.+)#{gempath(ver[1])}/.match(path))
                 set.(ver[1])
               end
             end
@@ -561,7 +565,7 @@ module Squared
               when 'path', 'gemfile', 'binstubs', 'target-rbconfig'
                 target << quote_option($1, basepath($2))
               when 'standalone', 'with', 'without', 'g', 'group'
-                target << shell_quote($1, $2)
+                target << quote_option($1, $2)
               when 'retry', 'j', 'jobs'
                 target << basic_option($1, $2) if $2.to_i > 0
               else
@@ -634,8 +638,8 @@ module Squared
           quote_option 'rakefile', Rake.application.rakefile
         end
 
-        def gempath
-          File.join('gems', "#{project}-#{@version}")
+        def gempath(val = @version)
+          File.join('gems', "#{project}-#{val}")
         end
 
         def gemoption(flag)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake