squared 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da84184d479e255a0a9916bfa33d081259b3965fb61ab40f32f7417fad7751b5
-  data.tar.gz: 9dceba3df95cf08e724c13f0ab63c7ba607f7253e2cefe5f5ebab78858c58c78
+  metadata.gz: b8b2e8a394034cfe323c5997a02b1e7c3f9ea0e2c9df925a87801fc8b9a61061
+  data.tar.gz: c30e2dcd5d3cea0526eea68f47ae8740949a4eb3b32ff1e76f9a15fc5e115f85
 SHA512:
-  metadata.gz: bed08c89a0f41d484b8d18d951abbd1386b1138365ab0f9add293ec81865303c3e6861ec6cb8a6326e3e91c1b2692fad6ceb64b11410c5f4df8015f3da1226d7
-  data.tar.gz: fc545d2ecb6a324d3a1d4869d73223d5122b15517268e248d5cbda19be39e4ddcfb5fb07627d090c9010334e7747f7121c8e6b8dbce7c2ca08f44131263a6681
+  metadata.gz: 4ec98cbf7dd9a4f0c63d316650fd3163cc0ec78934c30f638bbc531c31c8bfec075c8911c28a3af1b5f74ae1b5cdb92721f5f17e4e0973e3a7ecdbd326664a0b
+  data.tar.gz: 4b4f4270e87a1a427c30ed8c2f1fadeea9aad227592bd2268117f303919c27ec14adb596fb7668f611bbad20000376cf936050537f202533613ba333330b48c5

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [0.2.10] - 2025-04-27
+
+### Fixed
+
+- Project run and script tasks did not fire first and last callbacks.
+- Git command clone did not read booleans for recurse-submodules.
+
+## [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.2.9] - 2025-04-17
 
 ### Changed
@@ -252,6 +269,7 @@
 
 - Changelog was created.
 
+[0.2.10]: https://github.com/anpham6/squared/releases/tag/v0.2.10-ruby
 [0.2.9]: https://github.com/anpham6/squared/releases/tag/v0.2.9-ruby
 [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
@@ -262,6 +280,7 @@
 [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.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

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.2.9'
+  VERSION = '0.2.10'
 end

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

@@ -352,10 +352,10 @@ module Squared
           self
         end
 
-        def build(*args, from: :build, sync: invoked_sync?('build'), **)
+        def build(*args, from: :run, sync: invoked_sync?('build'), **)
           banner = verbose
           if args.empty?
-            return unless from == :build
+            return unless from == :run
 
             cmd, opts, var, flags = @output
             banner = verbose == 1 if task_invoked?('build', 'build:sync')
@@ -376,6 +376,7 @@ module Squared
             return unless respond_to?(:compose)
 
             cmd = compose(opts, flags, from: from, script: true)
+            from = :script if from == :run && script?
           end
           run(cmd, var, from: from, banner: banner, sync: sync)
         end
@@ -1118,7 +1119,7 @@ module Squared
           pwd = Pathname.pwd
           if block_given?
             begin
-              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

@@ -543,6 +543,7 @@ module Squared
         def status(*, sync: invoked_sync?('status'), **)
           cmd = git_session 'status'
           cmd << (option('long') ? '--long' : '--short')
+          cmd << '--branch' if option('branch')
           if (val = option('ignore-submodules', ignore: false))
             cmd << basic_option('ignore-submodules', case val
                                                      when '0', 'none'
@@ -722,53 +723,39 @@ 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 = nil
-          source(git_output('fetch --no-tags --quiet'), io: true, banner: false)
-          source(git_output('branch -vv --list'), io: true, banner: false).first.each do |val|
-            next unless (data = /^\*\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_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 |s|
-                    next unless s.end_with?("/#{branch}")
-
-                    origin = s[0..s.size - branch.size - 2]
-                    break
-                  end
-                end
-              end
-              upstream = true if origin
-            elsif (data = Regexp.new("^(.+)/#{Regexp.escape(branch)}$").match(data[3]))
-              origin = data[1]
+          origin = nil
+          source(git_output('fetch --no-tags --quiet'), io: true, banner: false, stdout: true)
+          cmd = git_output("for-each-ref --format=\"#{format}\" refs/heads")
+          source(cmd, 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', option('dry-run') && '--dry-run', options: false)
-          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')
             cmd << '--no-edit'
           end
           a = git_output 'add', '--verbose'
-          b = git_output 'push', upstream && '--set-upstream'
-          if dryrun?
-            a << '--dry-run'
-            b << '--dry-run'
-          end
+          b = git_output 'push'
+          b << '--dry-run' if dryrun?
           a << pathspec
-          b << '--force' if amend
+          b << '--force-with-lease' if amend
           b << origin << branch
           puts if pass
           source a
@@ -1097,16 +1084,22 @@ module Squared
           return unless (val = option('recurse-submodules', target: target, ignore: false))
 
           if from == :clone
-            projectmap(split_escape(val)).each do |path|
-              target << basic_option('recurse-submodules', path)
+            case val
+            when '0', 'false'
+              target << '--no-recurse-submodules'
+            when '1', 'true'
+              target << '--recurse-submodules'
+            else
+              projectmap(split_escape(val)).each do |path|
+                target << basic_option('recurse-submodules', path)
+              end
             end
-            target
           else
             target << case val
                       when 'no', '0'
                         '--no-recurse-submodules'
                       when 'yes', 'on-demand'
-                        "--recurse-submodules#{from == :reset ? '' : "=#{val}"}"
+                        "--recurse-submodules=#{val}"
                       else
                         '--recurse-submodules'
                       end

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

@@ -577,8 +577,8 @@ module Squared
           run
         end
 
-        def compose(opts, flags = nil, script: false, from: :build)
-          return unless opts && script && from == :build
+        def compose(opts, flags = nil, script: false, from: nil)
+          return unless opts && script
 
           ret = session dependbin, 'run', flags
           append_loglevel
@@ -588,7 +588,7 @@ module Squared
           when String
             ret << opts
           else
-            raise_error("#{dependbin} script name", hint: opts.nil? ? 'missing' : 'invalid')
+            raise_error("#{dependbin} script name: given #{opts}", hint: from)
           end
           ret
         end

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

@@ -192,13 +192,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
@@ -210,10 +212,10 @@ 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}"
             begin
-              copy_dir(a, b, c, pass: exclude, verbose: verbose)
+              copy_dir(a, b, c, pass: pass, verbose: verbose)
             rescue StandardError => e
               log.error e
               ret = on(:error, :copy, e)

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,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-04-28 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.8
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []