squared 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe89fb72998e6b7f728add465bb1a56a43d235949b335b18ac75a03899d5a01c
-  data.tar.gz: 36b8255d2d4a0b8e9574d81191b469b4a8258dddd33c8ad9146c9c78c71d3a23
+  metadata.gz: 9df30ac582767f0c30d058c5b3bf72ebbf51f926bb67b648c206d076b2525bc1
+  data.tar.gz: 2a1dcc43352eb74a8c1b94434916a28cb7579fde20a466bc5fdba81b14956d11
 SHA512:
-  metadata.gz: 85d16ee391ec6668b1f658940c1f1c945c5b2389585ba0283b98d605f74329d715f890b6b8373eace007fe157a594b85ea7457f6175f222d890b30dee59253ef
-  data.tar.gz: f4a9f773d117a6aea52238c05ae4e3eefdedd3b18bf2ecf5955e8b4dc889193fe72efd35a40f3579006fecfe62b8c09e4579f7ac5bbb1e10b745bf5a95e7d9d7
+  metadata.gz: 614b1a06a725ce69a54573f4c0ab2718c5aae60442ba0f75b87f105bb60212032295beff46ac9a2cd2cbf921eb05632cb7d6391a39d0ee21679224d0b1623748
+  data.tar.gz: ec15f7265c437e5bb8d042eb1730e6499ecfd81a893a4456514a4b1ab6f2c0917d560f4a94285e4c982c0f6cd42d5eca8a9b474728830753461c7f78668d2b5c

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [0.2.8] - 2025-04-12
+
+### Fixed
+
+- User-defined program paths were not sanitized for ENV.
+- Project clean task used incompatible rmtree flag.
+- Git branch unset-upstream used undefined variable.
+
+## [0.2.7] - 2025-04-08
+
+### Fixed
+
+- Paths that conflict with git options can be quoted.
+- Bundle command update did not append package names.
+- Git result status type was truncated.
+- Log messages were concatenated without separator.
+- Python pip environment options used undefined session.
+- Regexp "o" modifier was not used properly.
+- Rake did not run individual project Rakefile.
+- Ruby commands did not delimit exec arguments.
+
 ## [0.2.6] - 2025-03-06
 
 ### Fixed
@@ -213,6 +234,8 @@
 
 - Changelog was created.
 
+[0.2.8]: https://github.com/anpham6/squared/releases/tag/v0.2.8-ruby
+[0.2.7]: https://github.com/anpham6/squared/releases/tag/v0.2.7-ruby
 [0.2.6]: https://github.com/anpham6/squared/releases/tag/v0.2.6-ruby
 [0.2.5]: https://github.com/anpham6/squared/releases/tag/v0.2.5-ruby
 [0.2.4]: https://github.com/anpham6/squared/releases/tag/v0.2.4-ruby

data/lib/squared/common/format.rb

@@ -114,7 +114,7 @@ module Squared
           if !val.is_a?(::Numeric)
             val = val.to_sym
             ret << val if colors.key?(val) || TEXT_STYLE.include?(val)
-          elsif val >= 0 && val <= 256
+          elsif val.between?(0, 256)
             ret << val
           elsif val < 0 && (b = val.to_s.split('.')[1])
             b = b[0..2]
@@ -174,12 +174,8 @@ module Squared
           emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub)
         else
           msg = [log_title(level, color: color)]
-          if subject
-            msg << (color ? sub_style(subject, :underline) : subject)
-          else
-            msg += args
-            args.clear
-          end
+          msg << (color ? sub_style(subject, :underline) : subject) if subject
+          msg << args.shift if msg.size == 1
           message(msg.join(' '), *args, hint: hint)
         end
       end

data/lib/squared/common/shell.rb

@@ -27,7 +27,8 @@ module Squared
 
       def shell_quote(val, force: true)
         val = val.to_s
-        return val if (!force && !val.include?(' ')) || val.match?(/(?:^|\S=|[^=]\s+)(["']).+\1\z/m)
+        return val if !force && !val.include?(' ')
+        return val if option && val =~ /(?:^|\S=|[^=]\s+|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/m
 
         Rake::Win32.windows? ? "\"#{double_quote(val)}\"" : "'#{single_quote(val)}'"
       end
@@ -79,7 +80,7 @@ module Squared
       end
 
       def split_escape(val, char: ',')
-        val.split(/\s*(?<!\\)#{char}\s*/o)
+        val.split(/\s*(?<!\\)#{char}\s*/)
       end
     end
   end

data/lib/squared/common/utils.rb

@@ -77,7 +77,7 @@ module Squared
             return ret.to_i
           end
         when ::Numeric
-          return key if key >= 0 && key <= 2
+          return key if key.between?(0, 2)
         end
         default
       end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -376,7 +376,7 @@ module Squared
       end
 
       def task_localname(val)
-        prefix && val.is_a?(String) ? val.sub(/\A#{Regexp.escape(prefix)}:/o, '') : val.to_s
+        prefix && val.is_a?(String) ? val.sub(/\A#{Regexp.escape(prefix)}:/, '') : val.to_s
       end
 
       def task_desc(*args, **kwargs)

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

@@ -412,7 +412,7 @@ module Squared
               path = basepath(val)
               if path.directory? && val =~ %r{[\\/]\z}
                 log&.warn "rm -rf #{path}"
-                path.rmtree(verbose: true)
+                FileUtils.rm_rf(path, verbose: verbose)
               else
                 log&.warn "rm #{path}"
                 (val.include?('*') ? Dir[path] : [path]).each do |file|
@@ -800,6 +800,7 @@ module Squared
 
         def option(*args, prefix: @session&.first, **kwargs)
           if prefix
+            prefix = File.basename(prefix, File.extname(prefix))
             args.each do |val|
               ret = env("#{prefix}_#{val.gsub(/\W/, '_')}".upcase, **kwargs)
               return ret if ret
@@ -837,9 +838,11 @@ module Squared
         end
 
         def option_clear(params, target: @session, **kwargs)
+          return if params.empty?
+
           kwargs[:subject] ||= target&.first
-          kwargs[:hint] ||= 'not used'
-          warn log_message(:warn, params.join(', '), **kwargs) unless params.empty?
+          kwargs[:hint] ||= 'unrecognized'
+          warn log_message(:warn, params.join(', '), **kwargs)
         end
 
         def print_item(*val)
@@ -1034,7 +1037,7 @@ module Squared
 
         def param_guard(action, flag, args: nil, key: nil, pat: nil)
           if args && key
-            val = args[key]
+            val = args.fetch(key, nil)
             return val unless val.nil? || (pat && !val.match?(pat))
 
             @session = nil

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

@@ -732,10 +732,10 @@ module Squared
               unless (origin = option('repository', prefix: 'git', ignore: false))
                 out = source(git_output('log -n1 --format=%h%d'), io: true, stdout: true, banner: false).first
                 if (data = /^#{sha} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)$/.match(out))
-                  split_escape(data[1]).each do |val|
-                    next unless val.end_with?("/#{branch}")
+                  split_escape(data[1]).each do |s|
+                    next unless s.end_with?("/#{branch}")
 
-                    origin = val[0..val.size - branch.size - 2]
+                    origin = s[0..s.size - branch.size - 2]
                     break
                   end
                 end
@@ -791,7 +791,7 @@ module Squared
             cmd << '--force' if option('force')
           when :set
             if ref.start_with?('!')
-              cmd << '--unset-upstream' << shell_escape(arg[1..-1])
+              cmd << '--unset-upstream' << shell_escape(ref[1..-1])
               target = nil
               stdout = true
             else
@@ -1009,7 +1009,7 @@ module Squared
             if size > 0
               styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
               styles << :bold if styles.size <= 1
-              puts print_footer("#{size} #{size == 1 ? type.sub(/s\z/, '') : type}",
+              puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
                                 sub: { pat: /\A(\d+)(.+)\z/, styles: styles })
             else
               puts empty_status("No #{type} were #{action}", 'grep', grep)

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

@@ -242,11 +242,14 @@ module Squared
         end
 
         def append_pip(flag, opts, target: @session)
-          append_nocolor(target: target)
-          return if opts.empty?
+          if opts.empty?
+            append_global(target: target)
+            return
+          end
 
           out = []
           opts, pat = option_partition(opts, OPT_INSTALL + OPT_GENERAL, target: target)
+          append_global(target: target)
           opts.each do |opt|
             if opt =~ /^(v+|q+)$/
               cmd << "-#{$1}"
@@ -277,18 +280,18 @@ module Squared
           end
         end
 
-        def append_global
+        def append_global(target: @session)
           if (val = option('cache-dir'))
-            cmd << case val
-                   when '0', 'false'
-                     '--no-cache-dir'
-                   else
-                     quote_option('cache-dir', basepath(val))
-                   end
+            target << case val
+                      when '0', 'false'
+                        '--no-cache-dir'
+                      else
+                        quote_option('cache-dir', basepath(val))
+                      end
           end
-          cmd << quote_option('proxy', val) if (val = option('proxy'))
-          cmd << quote_option('python', basepath(val)) if (val = option('python'))
-          append_nocolor
+          target << quote_option('proxy', val) if (val = option('proxy'))
+          target << quote_option('python', basepath(val)) if (val = option('python'))
+          append_nocolor(target: target)
         end
       end
 

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

@@ -342,7 +342,7 @@ module Squared
 
         def update(flag, opts: [])
           bundle_session 'update', "--#{flag}"
-          append_bundle opts, FOR_INSTALL + OPT_UPDATE
+          append_bundle(opts, FOR_INSTALL + OPT_UPDATE, append: flag != :all)
           run_rb(from: :update)
         end
 
@@ -358,7 +358,7 @@ module Squared
             cmd << flag
           end
           no = flag == :pristine || flag == :outdated ? [] : OPT_GEM[:NO_GENERAL]
-          opts, pat = option_partition(opts, gemoption(flag), no: no, first: true)
+          opts, pat = option_partition(opts, gemoption(flag), no: no, first: flag != :outdated)
           out = []
           opts.each do |opt|
             if opt =~ pat
@@ -488,7 +488,7 @@ module Squared
 
         def rake(*cmd)
           if cmd.empty?
-            run_s(rake_output(rakeapp), from: :rake, chdir: workspace.pwd)
+            run_s(rake_output(rakeapp), from: :rake, chdir: workspace.pwd, banner: false)
           else
             cmd = cmd.flatten.map { |val| rake_output(rakeapp, val) }
             run_s(cmd, from: :rake, chdir: workspace.pwd, banner: false)
@@ -556,7 +556,7 @@ module Squared
           run(banner: !@session.include?('--quiet'), **kwargs)
         end
 
-        def append_bundle(opts, list, target: @session)
+        def append_bundle(opts, list, target: @session, append: false)
           opts, pat = option_partition(opts, list, target: target)
           out = []
           opts.each do |opt|
@@ -575,7 +575,11 @@ module Squared
               out << opt
             end
           end
-          option_clear(out, target: target)
+          if append
+            append_value(out, target: target, escape: true)
+          else
+            option_clear(out, target: target)
+          end
         end
 
         def gem_session(*cmd, **kwargs)
@@ -635,7 +639,7 @@ module Squared
         end
 
         def rakeapp
-          quote_option 'rakefile', Rake.application.rakefile
+          quote_option 'f', rakefile
         end
 
         def gempath(val = @version)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []