squared 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3ad5f0881e8642ae1d57fccbba6a1fdc3ff555b6efcd7eb2989a5675ff5bcd3
-  data.tar.gz: 426a514ca02ddf64fa2009ad165d0bf9e0053905c58643c7398e7c1d17630fcc
+  metadata.gz: 7630bfea46c3328ad2c6a12c865a913c3efad5609815b4b5dee647abd9e43665
+  data.tar.gz: 7c791bd8356e85949829196c6eddca1ad29227189471a9a89c02b8eb48c101cc
 SHA512:
-  metadata.gz: af9e72989be1dbbf614f8c7dd5989a0081775e4433ad280a4bae600660e56bd1ba20aa6a3f33ad367b349a209227be5b823c4e496367533260c1a86ae3a6dd6c
-  data.tar.gz: d0dd6f39e8b8f8834768c93ab26718618d0d0023f99a242321f6925bee9fcc782ebbfd86a698bdcebe17fb1deb763c79d46d77001d55a13b24ddc391beb0a3c8
+  metadata.gz: 8fa16263ea3d1d1012d308bc41dda0f72557329c1e0e491fce519b3cb9d9fd67b6ebc635747737053213ffb3dd21e86d4318b49c1de72dbffdce7d93f5cb698a
+  data.tar.gz: 73d2f5163e5d5c87abbb9894933829a88a8d589424eb70bfb39ae8c8721af1050da7f8e1c2e3d2566f914ccd90ea230fc7138dcad7d77fbd559131aa4121c7aa

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 
-## [0.1.5] - 2024-02-25
+## [0.1.6] - 2025-04-17
+
+### Fixed
+
+- Log messages were concatenated without separator.
+- Regexp "o" modifier was not used properly.
+- Rake did not run individual project Rakefile.
+- User-defined program paths were not reduced to bare name.
+- Project path validation did not include separator.
+
+## [0.1.5] - 2025-02-25
 
 ### Fixed
 
@@ -10,7 +20,7 @@
 - Logger is not initialized when using only base class.
 - Merging ENV build options were double escaped.
 
-## [0.1.4] - 2024-02-05
+## [0.1.4] - 2025-02-05
 
 ### Fixed
 
@@ -19,7 +29,7 @@
 - Git command refs did not include ref option.
 - Pip upgrade did not append package names.
 
-## [0.1.3] - 2024-01-02
+## [0.1.3] - 2025-01-02
 
 ### Fixed
 
@@ -98,6 +108,7 @@
 
 - Changelog was created.
 
+[0.1.6]: https://github.com/anpham6/squared/releases/tag/v0.1.6-ruby
 [0.1.5]: https://github.com/anpham6/squared/releases/tag/v0.1.5-ruby
 [0.1.4]: https://github.com/anpham6/squared/releases/tag/v0.1.4-ruby
 [0.1.3]: https://github.com/anpham6/squared/releases/tag/v0.1.3-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
@@ -278,6 +274,10 @@ module Squared
         val.gsub(/\x1B\[(\d+;?)+m/, '')
       end
 
+      def stripext(val)
+        File.basename(val, File.extname(val))
+      end
+
       def raise_error(*args, hint: nil, kind: ArgumentError)
         raise kind, message(*args, hint: hint, empty: true)
       end

data/lib/squared/common/shell.rb

@@ -65,7 +65,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.1.5'
+  VERSION = '0.1.6'
 end

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

@@ -679,7 +679,8 @@ module Squared
         end
 
         def session(*cmd, prefix: cmd.first)
-          if (val = env("#{prefix.upcase}_OPTIONS"))
+          prefix = stripext(prefix.to_s).upcase
+          if (val = env("#{prefix}_OPTIONS"))
             split_escape(val).each { |opt| cmd << fill_option(opt) }
           end
           @session = JoinSet.new(cmd)
@@ -696,7 +697,7 @@ module Squared
         def option(*args, prefix: @session&.first, **kwargs)
           if prefix
             args.each do |val|
-              ret = env("#{prefix}_#{val.gsub(/\W/, '_')}".upcase, **kwargs)
+              ret = env("#{stripext(prefix)}_#{val.gsub(/\W/, '_')}".upcase, **kwargs)
               return ret if ret
             end
           end
@@ -869,7 +870,7 @@ module Squared
 
         def guard_params(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
@@ -974,7 +975,8 @@ module Squared
         end
 
         def projectpath?(val)
-          Pathname.new(val).absolute? ? val.to_s.start_with?(File.join(path, '')) : !val.to_s.start_with?('..')
+          val = Pathname.new(val).cleanpath
+          val.absolute? ? val.to_s.start_with?(File.join(path, '')) : !val.to_s.start_with?(File.join('..', ''))
         end
 
         def semmajor?(cur, want)

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

@@ -478,10 +478,10 @@ module Squared
               unless (origin = option('repository', prefix: 'git', ignore: false))
                 out = source('git log -n1 --format=%h%d', io: true, stdout: true, banner: false).first
                 if (data = /\A#{sha} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)\z/.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

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

@@ -364,11 +364,11 @@ module Squared
         end
 
         def rake(*cmd)
-          rakefile = shell_option('rakefile', Rake.application.rakefile, quote: true, escape: false)
+          file = shell_option('rakefile', rakefile, quote: true, escape: false)
           if cmd.empty?
-            run_s("rake #{rakefile}", chdir: workspace.pwd)
+            run_s("rake #{file}", chdir: workspace.pwd)
           else
-            run_s(*cmd.map { |val| "rake #{rakefile} #{val}" }, chdir: workspace.pwd, banner: false)
+            run_s(*cmd.map { |val| "rake #{file} #{val}" }, chdir: workspace.pwd, banner: false)
           end
         end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-02-25 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.8
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []