squared 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7630bfea46c3328ad2c6a12c865a913c3efad5609815b4b5dee647abd9e43665
-  data.tar.gz: 7c791bd8356e85949829196c6eddca1ad29227189471a9a89c02b8eb48c101cc
+  metadata.gz: 2de07baaee5e8dab48b40441f8ec83a471e1b54c464fe8d06bb360eeef06c6d0
+  data.tar.gz: 3f2fab32edfcbec1cd13a0f320ce540f174d8da54b89e70c29eff9033c3b8244
 SHA512:
-  metadata.gz: 8fa16263ea3d1d1012d308bc41dda0f72557329c1e0e491fce519b3cb9d9fd67b6ebc635747737053213ffb3dd21e86d4318b49c1de72dbffdce7d93f5cb698a
-  data.tar.gz: 73d2f5163e5d5c87abbb9894933829a88a8d589424eb70bfb39ae8c8721af1050da7f8e1c2e3d2566f914ccd90ea230fc7138dcad7d77fbd559131aa4121c7aa
+  metadata.gz: e9199678633fe880e68d0adc7d9a2bb61cef4b9d7298b395e4d34621669f8db4b74f38321bc644f5113783d4b722a0547228e21d53c36ea22d5f25f34778aff1
+  data.tar.gz: 6c4905fd7a1d74e68951644633c40f78e3acc6dde48ac8ba397c853759101439ef7d43ef5a2e446cc1c99eb73ef237ebd3caf22764b9593331c44b87b764b034

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.1.8] - 2025-05-15
+
+### Fixed
+
+- Disabled batch and alias tasks were not hidden.
+- Log messages were written to terminal twice when emphasized.
+- Node outdated interactive for major would sometimes deactivate.
+- Node outdated interactive for major was mislabeled as minor.
+
+## [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
@@ -108,6 +127,8 @@
 
 - Changelog was created.
 
+[0.1.8]: https://github.com/anpham6/squared/releases/tag/v0.1.8-ruby
+[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

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
@@ -171,7 +171,7 @@ module Squared
         if args.size > 1
           title = log_title(level, color: false)
           sub = { pat: /^(#{title})(.+)$/, styles: __get__(:theme)[:logger][log_sym(level)] } if color
-          emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub)
+          emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub, pipe: -1)
         else
           msg = [log_title(level, color: color)]
           msg << (color ? sub_style(subject, :underline) : subject) if subject
@@ -257,6 +257,8 @@ module Squared
           yield out
         elsif pipe
           case pipe
+          when -1
+            return out
           when 0
             pipe = $stdin
           when 2

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
 

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -343,7 +343,7 @@ module Squared
           tasks << key if obj.has?(key, baseref)
         elsif (batch = series.batch_get(key))
           obj.allref.each do |ref|
-            next unless (data = batch[ref])
+            next unless obj.has?(key, ref) && (data = batch[ref])
 
             data.each do |val|
               if (items = task_resolve(obj, val)).empty?
@@ -362,7 +362,7 @@ module Squared
           return [] if (base && !obj.ref?(baseref)) || !(data = series.alias_get(key))
 
           obj.allref.each do |ref|
-            next unless (alt = data[ref])
+            next unless obj.has?(key, ref) && (alt = data[ref])
 
             ret = task_resolve(obj, alt)
             break unless ret.empty?

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

@@ -922,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)

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 |s|
-                    next unless s.end_with?("/#{branch}")
-
-                    origin = s[0..s.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/node.rb

@@ -340,7 +340,7 @@ module Squared
                 index = if a != c
                           1
                         elsif b != d
-                          3
+                          a == '0' ? 1 : 3
                         else
                           5
                         end
@@ -373,7 +373,8 @@ module Squared
             col2 = size_col.(found, 1) + 4
             found.each_with_index do |item, i|
               a, b, c, d, e = item
-              if inter && (rev != :major || e || semmajor?(item[5], item[6])) && !confirm_outdated(a, c, d, e)
+              f = inter && (rev != :major || e || semmajor?(item[5], item[6]))
+              if f && !confirm_outdated(a, c, d, e)
                 cur = -1
               else
                 cur = modified
@@ -532,6 +533,10 @@ module Squared
           dependfile.exist?
         end
 
+        def refresh?
+          !Node.prod?
+        end
+
         def yarn?
           (@pm[:yarn] ||= if basepath('yarn.lock', ascend: dependext).exist?
                             if (rc = basepath('.yarnrc.yml', ascend: dependext)).exist?

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
 

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.6
+  version: 0.1.8
 platform: ruby
 authors:
 - An Pham
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-05-15 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.8
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []