squared 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3ad5f0881e8642ae1d57fccbba6a1fdc3ff555b6efcd7eb2989a5675ff5bcd3
-  data.tar.gz: 426a514ca02ddf64fa2009ad165d0bf9e0053905c58643c7398e7c1d17630fcc
+  metadata.gz: a84fd3fef43628c438131d98c9ac058b2511a7a7f0edab355ae534137a612d1d
+  data.tar.gz: 46e0925a6e7d854d71602aee88d54c2efff7e7ff782d847fd85e95759bad3ffb
 SHA512:
-  metadata.gz: af9e72989be1dbbf614f8c7dd5989a0081775e4433ad280a4bae600660e56bd1ba20aa6a3f33ad367b349a209227be5b823c4e496367533260c1a86ae3a6dd6c
-  data.tar.gz: d0dd6f39e8b8f8834768c93ab26718618d0d0023f99a242321f6925bee9fcc782ebbfd86a698bdcebe17fb1deb763c79d46d77001d55a13b24ddc391beb0a3c8
+  metadata.gz: e90a44a3914f551b4567d2013882ce362dfdc43b44bb157cb24fb2b6171cb64c46dbbb680ba7fcc17fd32f76d0e8d82bfa5ddc411eb00de5524ab5407135d413
+  data.tar.gz: 993f3899bf89ed18f8b89ddda7019c33484b76d2a770a72b8280fa898af6a7caecceafe862de7854236c9e52ddb7c2100cd9e388b8afb4dd3d0f4427647f15ad

data/CHANGELOG.md

@@ -1,6 +1,26 @@
 # Changelog
 
-## [0.1.5] - 2024-02-25
+## [0.1.7] - 2025-04-27
+
+### Fixed
+
+- Project directory context method option pass was inverted.
+- Shell options with spaces and without quotes were not escaped.
+- Git task status did not display branch information.
+- Ruby copy method argument include was ignored when used directly.
+- Git commit could not push branch without same name as remote.
+
+## [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 +30,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 +39,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 +118,8 @@
 
 - Changelog was created.
 
+[0.1.7]: https://github.com/anpham6/squared/releases/tag/v0.1.7-ruby
+[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

@@ -53,7 +53,7 @@ module Squared
         end
         wrap = ->(s, n) { "\x1B[#{n.join(';')}m#{s}\x1B[0m" }
         code = []
-        args.concat(as_a(styles)).each_with_index do |type, i|
+        args.concat(as_a(styles)).flatten.each_with_index do |type, i|
           next unless type
 
           if index == -1
@@ -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/prompt.rb

@@ -21,7 +21,7 @@ module Squared
                 return false
               end
               attempts -= 1
-              exit 1 unless attempts >= 0
+              exit 1 unless attempts > 0
             end
           rescue Interrupt
             puts

data/lib/squared/common/shell.rb

@@ -10,7 +10,7 @@ module Squared
 
       def shell_escape(val, quote: false, force: false)
         if (data = /\A(--?[^= ]+)((=|\s+)(["'])?(.+?)(["'])?)?\z/m.match(val = val.to_s))
-          return val if !data[2] || (!data[4] && data[5] =~ /\s/)
+          return val if !data[2] || (!data[4] && !data[5].match?(/\s/))
 
           join = ->(opt) { data[1] + data[3] + shell_quote(opt) }
           if data[4] == data[6]
@@ -21,7 +21,7 @@ module Squared
         elsif Rake::Win32.windows?
           quote ? shell_quote(val, force: force) : val
         else
-          Shellwords.escape(val)
+          val.empty? ? '' : Shellwords.escape(val)
         end
       end
 
@@ -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.7'
 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
@@ -921,7 +922,7 @@ module Squared
         def pwd_set(done = nil, pass: false, &blk)
           pwd = Pathname.pwd
           if block_given?
-            if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join >= RUBY_VERSION)
+            if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join <= RUBY_VERSION)
               ret = instance_eval(&blk)
             else
               Dir.chdir(path)
@@ -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

@@ -295,6 +295,7 @@ module Squared
 
         def status
           cmd = git_session 'status', option('long') ? '--long' : '--short'
+          cmd << '--branch' if option('branch')
           if (val = option('ignore-submodules', ignore: false))
             cmd << shell_option('ignore-submodules', case val
                                                      when '0', 'none'
@@ -465,41 +466,29 @@ module Squared
                        raise_error('commit', 'pathspec', hint: 'missing') if (files = projectmap(files)).empty?
                        "-- #{files.join(' ')}"
                      end
-          origin = nil
+          format = '%(if)%(HEAD)%(then)%(refname:short)...%(upstream:short)...%(upstream:track)%(end)'
           branch = nil
-          upstream = false
-          source('git fetch --no-tags --quiet', io: true, banner: false)
-          source('git branch -vv --list', io: true, banner: false).first.each do |val|
-            next unless (data = /\A\*\s(\S+)\s+(\h+)(?:\s\[(.+?)(?=\]\s)\])?\s/.match(val))
-
-            branch = data[1]
-            sha = data[2]
-            if !data[3]
-              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}")
-
-                    origin = val[0..val.size - branch.size - 2]
-                    break
-                  end
-                end
-              end
-              upstream = !origin.nil?
-            elsif (data = Regexp.new("\\A(.+)/#{Regexp.escape(branch)}\\z").match(data[3]))
-              origin = data[1]
+          origin = nil
+          source('git fetch --no-tags --quiet', io: true, banner: false, stdout: true)
+          source("git for-each-ref --format=\"#{format}\" refs/heads", io: true, banner: false).first.each do |line|
+            next if (line = line.chomp).empty?
+
+            branch, origin, hint = line.split('...')
+            if hint && !hint.match?(/^\[(\D+0,\D+0)\]$/)
+              raise_error('work tree is not usable', hint: hint[1..-2])
+            elsif origin.empty?
+              return nil if pass
+
+              raise_error('no remote upstream', hint: branch)
             end
             break
           end
-          raise_error('commit', 'work tree is not usable') unless origin && branch
+          i = origin.index('/')
+          branch = "#{branch}:#{origin[i + 1..-1]}" unless origin.end_with?("/#{branch}")
+          origin = origin[0..i - 1]
           cmd = git_session 'commit'
           cmd << '--dry-run' if option('dry-run')
-          if amend
-            cmd << '--amend'
-          else
-            cmd.delete('--amend')
-          end
+          cmd << '--amend' if amend
           if message
             append_message message
           elsif flag == :'amend-orig' || option('no-edit')
@@ -507,13 +496,9 @@ module Squared
           end
           a = ['git add --verbose']
           b = ['git push']
-          b << '--set-upstream' if upstream
-          if dry_run?
-            a << '--dry-run'
-            b << '--dry-run'
-          end
+          b << '--dry-run' if dry_run?
           a << pathspec
-          b << '--force' if amend
+          b << '--force-with-lease' if amend
           b << origin << branch
           puts if pass
           source a.join(' ')

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

@@ -207,13 +207,15 @@ module Squared
           end
         end
 
-        def copy(from: 'lib', include: nil, exclude: nil, into: @gemdir, override: false)
+        def copy(from: 'lib', into: @gemdir, override: false, **kwargs)
+          glob = kwargs[:include]
+          pass = kwargs[:exclude]
           if @copy && !override
             return super if runnable?(@copy)
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:include] if @copy.key?(:include)
-            exclude = @copy[:exclude] if @copy.key?(:exclude)
+            pass = @copy[:exclude] if @copy.key?(:exclude)
             into = @copy[:into] if @copy.key?(:into)
           end
           return unless into
@@ -224,9 +226,9 @@ module Squared
           as_a(from).each_with_index do |val, i|
             a = basepath(val)
             b = dest.join(val)
-            c = glob[i] || glob[0]
+            c = glob[i] || glob.first
             log.info "cp #{a.join(c)} #{b}"
-            copy_d(a, b, glob: c, pass: exclude, verbose: verbose)
+            copy_d(a, b, glob: c, pass: pass, verbose: verbose)
           end
         end
 
@@ -364,11 +366,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
 

data/lib/squared/workspace/repo.rb

@@ -3,8 +3,6 @@
 module Squared
   module Workspace
     module Repo
-      include Common::Format
-
       class << self
         def read_manifest(path)
           require 'rexml/document'

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - An Pham
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -106,6 +107,7 @@ metadata:
   homepage_uri: https://github.com/anpham6/squared
   source_code_uri: https://github.com/anpham6/squared
   documentation_uri: https://squared.readthedocs.io
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,7 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []