squared 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77cd278e7e9855e6601d497f876db37b4e118e8b13af1ef2535eff1ef5799f84
-  data.tar.gz: e5ef173753eff1f9de0a31f0a0db590ec45f8c0d6e1d0b79f7168160c8b03204
+  metadata.gz: 17d98e04832d29621058a1dafa1f9440f0734849aa2b68aecffed2b0c50c0e26
+  data.tar.gz: 31391a2561c19025ddd25a20c980f10cf605de2593a24e793eee87ee3d1ccc67
 SHA512:
-  metadata.gz: 73c1cb07ee0f10476bd47493455231341bd4a3e42107e74c5e16123ddf99e832cc2c96b870615c0ff5a632a1de4ac9176a9d8cb0b1be460018699140f1c15b48
-  data.tar.gz: 365c543051f2a2fc01f445c3e3f3f8b2162e6d0ad0663b91f0928667504193511f59e55683d1b832f56e82d20ef2adc7033673d888a366ab01ed12256504af33
+  metadata.gz: 246be3dde753890551351e232e8f804b7cf3e32ea610113983ad465dd863365f800142d18c91e732df7152e3cfdc6c8c727c980d85b1079dc7acc39ecde6a0aa
+  data.tar.gz: 3a9f07b19f697678bacf6d15914df6c33f74e2aa9a0d9b5f10b033b10c29e3460b34e2da3890ae62ed655858d499fb34dae49098096c73b9a2279bb8f9745bd1

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.7.1] - 2025-01-20
+
+### Added
+
+- Git task revbuild can run auxiliary tasks before and after changes.
+
+### Changed
+
+- Git task revbuild can be configured to not accept a failed run.
+
+### Fixed
+
+- Git task show was completely non-functional due to excessive formatting.
+
 ## [0.7.0] - 2025-01-07
 
 ### Added
@@ -1666,6 +1680,7 @@
 
 - Changelog was created.
 
+[0.7.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.1
 [0.7.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.0
 [0.6.9]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.9
 [0.6.8]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.8

data/README.md

@@ -246,12 +246,15 @@ Workspace::Application
     }
   )
   .with(:node) do                                               # rake clone:node
-    add("e-mc", "emc")                                          # https://github.com/anpham6/e-mc
+    add("e-mc", "emc") do                                       # https://github.com/anpham6/e-mc
+      revbuild(before: %w[status squared:status],               # emc:status + squared:status (always)
+               after: "refresh")                                # emc:refresh (changed)
+    end                                                         #
     add("pi-r", "pir")                                          # https://github.com/anpham6/pi-r
     add("squared")                                              # https://github.com/anpham6/squared
   end
   .with(:python) do                                             # rake clone:python
-    add("android-docs")
+    add("android-docs") { revbuild(pass: false) }               # Do not update status on a failed run
     add("chrome-docs") do
       revbuild(include: "source/", exclude: ["source/conf.py"]) # Limit files being watched
     end
@@ -844,7 +847,7 @@ REPO_MANIFEST        # e.g. latest,nightly,prod
 REPO_GROUPS          # e.g. base,prod,docs
 REPO_STAGE           # 0,1|sync,2|depend,4|build,8|copy,16|lint,512|dev
 REPO_SUBMODULES      # 0,1
-REPO_Y               # 0,1
+REPO_Y               # 0,1 (bypass interactive prompt)
 REPO_TIMEOUT         # confirm dialog (seconds)
 ```
 
@@ -874,7 +877,7 @@ Features can be enabled through ENV when calling global tasks such as through *C
 | :------------- | :------------- | :----------------------------------------------- |
 | depend         | -              | FORCE CI IGNORE_SCRIPTS                          |
 | outdated       | -              | U|UPDATE=major|minor|patch DIFF DRY_RUN          |
-| publish        | -              | OTP=s TAG=s ACCESS=0,1,s DRY_RUN                 |
+| publish        | -              | OTP=s TAG=s ACCESS=0,1,s DRY_RUN Y               |
 | depend package | *              | PACAKGE_LOCK|LOCKFILE=0 NO_LOCKFILE=1 Y          |
 | npm pnpm       | depend package | CPU=s OS=s LIBC=s                                |
 | npm            | package        | SAVE IGNORE_SCRIPTS STRICT_PEER_DEPS             |

data/lib/squared/version.rb

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

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

@@ -1339,6 +1339,24 @@ module Squared
           end
         end
 
+        def run_p(*cmd, sync: true, banner: verbose?, from: nil, **kwargs)
+          case cmd.last
+          when Hash, true, false
+            var = cmd.pop
+          end
+          ws = workspace
+          cmd.each do |meth|
+            meth = meth.to_s
+            if !meth.include?(':') && has?(meth) && respond_to?(meth)
+              __send__(meth, sync: sync)
+            elsif ws.task_defined?(val = task_join(name, meth)) || (meth.include?(':') && ws.task_defined?(val = meth))
+              run(val, var, sync: sync, banner: banner, **kwargs)
+            elsif from
+              print_error(from, "method: #{meth}", subject: name, hint: 'undefined')
+            end
+          end
+        end
+
         def graph_branch(target, data, tasks = nil, out = nil, sync: true, pass: [], done: [], depth: 0, single: false,
                          last: false, order: nil, **kwargs)
           tag = ->(proj) { "#{proj.name}#{"@#{proj.version}" if SEM_VER.match?(proj.version)}" }
@@ -1436,7 +1454,7 @@ module Squared
                     run(cmd, sync: false, banner: false)
                     ENV.delete(key) if key
                   elsif proj.has?(meth, tasks || graph ? nil : workspace.baseref)
-                    proj.__send__(meth.to_sym, sync: sync)
+                    proj.__send__(meth, sync: sync)
                   end
                 end
             end
@@ -1709,7 +1727,7 @@ module Squared
           ret.join("\n")
         end
 
-        def print_status(*args, from: :completed, **kwargs)
+        def print_status(*args, loglevel: Logger::INFO, from: :completed, **kwargs)
           return if stdin? || silent?
 
           case from
@@ -1718,10 +1736,10 @@ module Squared
             sub_style!(out[1], **opt_style(theme[:major], /^( +major )(\d+)(.+)$/, 2))
             sub_style!(out[1], **opt_style(theme[:active], /^(.+)(minor )(\d+)(.+)$/, 3))
             sub_style!(out[1], **opt_style(theme[:current], /^(.+)(patch )(\d+)(.+)$/, 3)) if theme[:current]
-          when :completed
+          when :completed, :failed
             return unless kwargs[:start]
 
-            out = log_message(Logger::INFO, *args, sub_style('completed', theme[:active]),
+            out = log_message(loglevel, *args, sub_style(from.to_s, theme[:active]),
                               subject: kwargs[:subject], hint: time_format(time_epoch - kwargs[:start]))
           else
             return
@@ -2017,8 +2035,10 @@ module Squared
           args
         end
 
-        def confirm_basic(msg, target, default = 'Y', style: :inline, **kwargs)
-          confirm("#{msg} [#{sub_style(target.to_s, style.is_a?(Symbol) ? theme[style] : style)}]", default, **kwargs)
+        def confirm_basic(msg, hint, default = 'Y', style: :inline, target: @session, prefix: nil, **kwargs)
+          return true if prefix ? option('y', prefix: prefix) : target && option('y', target: target)
+
+          confirm("#{msg} [#{sub_style(hint.to_s, style.is_a?(Symbol) ? theme[style] : style)}]", default, **kwargs)
         end
 
         def confirm_semver(msg, type, style: (type == 1 && theme[:major]) || :inline, timeout: 0, **kwargs)

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

@@ -1278,12 +1278,24 @@ module Squared
           kw = lambda do
             {
               include: relativepath(*Array(kwargs[:include]), all: true),
-              exclude: relativepath(*Array(kwargs[:exclude]), all: true)
+              exclude: relativepath(*Array(kwargs[:exclude]), all: true),
+              before: kwargs[:before],
+              after: kwargs[:after],
+              pass: kwargs.fetch(:pass, true)
             }
           end
           unless workspace.closed
             if @revbuild
-              kw.call.each { |key, val| @revbuild[key] += val }
+              kw.call.each do |key, val|
+                case @revbuild[key]
+                when Array
+                  @revbuild[key].concat(val)
+                when Hash
+                  @revbuild[key].update(val)
+                else
+                  @revbuild[key] = val
+                end
+              end
             else
               @revbuild = kw.call
             end
@@ -1293,7 +1305,7 @@ module Squared
           return if sha.empty?
 
           sync = kwargs.fetch(:sync) { invoked_sync?('revbuild', flag) }
-          kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? kw.call : @revbuild || {}
+          kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? kw.call : @revbuild || { pass: true }
           case flag
           when :build
             op = OptionPartition.new(opts, VAL_GIT[:revbuild].map { |key| "#{key}=b?" }, project: self)
@@ -1306,6 +1318,7 @@ module Squared
                    .compact
             OptionPartition.uniq!(args)
           end
+          run_p(*Array(kwargs[:before]), sync: sync, from: :revbuild) if kwargs[:before]
           if (cur = workspace.rev_entry(name)) && cur['revision'] == sha && !env('REVBUILD_FORCE')
             files = status_digest(*args, **kwargs)
             if cur['files'].size == files.size && cur['files'].find { |key, val| files[key] != val }.nil?
@@ -1315,13 +1328,19 @@ module Squared
             end
           end
           start = time_epoch
-          build(*@output, sync: sync, from: symjoin('git', 'revbuild'))
+          ret = build(*@output, sync: sync, from: symjoin('git', 'revbuild'))
         rescue => e
           print_error(e, pass: true)
         else
-          print_status('revbuild', subject: name, start: start)
-          workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
-                              sync: sync, utc: 'build')
+          if ret == false && !kwargs[:pass]
+            print_status('revbuild', subject: name, start: start, loglevel: Logger::WARN, from: :failed)
+            workspace.rev_timeutc name, 'build'
+          else
+            run_p(*Array(kwargs[:after]), sync: sync, from: :revbuild) if kwargs[:after] && ret != false
+            print_status('revbuild', subject: name, start: start)
+            workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
+                                sync: sync, utc: 'build')
+          end
         end
 
         def reset(flag, opts = [], refs: nil, ref: nil, mode: nil, commit: nil)
@@ -1781,8 +1800,9 @@ module Squared
             opts << format if format
           end
           list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + OPT_GIT[:log][:diff] + OPT_GIT[:log][:diff_context]
-          op = OptionPartition.new(opts, list, cmd, project: self, pass: [:base],
-                                                    no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log]))
+          op = OptionPartition.new(opts, list, cmd,
+                                   project: self,
+                                   no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log], pass: [:base]))
           op.append(delim: true)
           source(exception: false, banner: flag != :oneline)
         end

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

@@ -1331,7 +1331,7 @@ module Squared
 
         def remove_modules(prefix = dependbin)
           modules = basepath 'node_modules'
-          return false unless modules.directory? && (option('y', prefix: prefix) || confirm_basic('Remove?', modules))
+          return false unless modules.directory? && confirm_basic('Remove?', modules, prefix: prefix)
 
           modules.rmtree
         rescue Timeout::Error => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - An Pham