squared 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d5c87e8fd0e459e55e900839ba9f5f43e51ee1990d1fa103f9de264ae94c4e1
-  data.tar.gz: 1e38b9df0a7d3f2b48d6912b880d1c2d593dcf04a1942a01791b84ea8b9e023c
+  metadata.gz: e2fd23c5964fe7c987966b8d237b569883b2dae5b70d9c120a924e2cc0227873
+  data.tar.gz: 8ef09d80e13c53fda678aa6a7194e33abf04728fb9d1c17739a5dc6c814e3b03
 SHA512:
-  metadata.gz: f4b9df6f9d39a24bd1db9e056ab4b5864e36a6d5daf46403881845e3d1d725033b31a4c9d11274595a74c59dbf13ac77845e96a0c3e2f74c09317a3a1f123a62
-  data.tar.gz: fcd0370d7ba7b6b590c9fec4a411a302dde15c8124f832aa5ed1a1e58cef209481ac9d595a5d8d385fefce87a8dc0e53a9208b0da6916c00d3a3e8f853748813
+  metadata.gz: c41b98512dfc370a056716c3af2a599321b6113fa4883ab1f9c6b1418332f6b973560ce2cb1550c3813521eaa326150371ef3e60906cb694d6a6fd41ac1e0f05
+  data.tar.gz: cedbdcb188a6fb4a8407fc36836ffbeb4b93893217cec168d291845ce9a4f3f4dede9936022b8c950efa48ec21e2f93d013dc7e6fa929397ac80df7d6e3b099a

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [0.1.1] - 2024-12-14
+
+### Added
+
+- Node package manager update command was implemented.
+- Git pull and fetch retrieve options were expanded.
+
+### Changed
+
+- Git show does not require an object argument.
+- Project base class is implemented through Application.
+
+### Fixed
+
+- Listing tasks did not check for rake -C option availability.
+- Listing gems did not check for gem -C option availability.
+- Disabled extension tasks by individual project were being created.
+- Git commit did not locate origin from nested branches.
+- Project clean command used incompatible folder delete option.
+- Rake did not set original dir when calling itself.
+- Rake did not set original rakefile when calling itself.
+- Extended tasks were not associated to their supporting class method.
+
 ## [0.1.0] - 2024-12-7
 
 ### Added
@@ -27,5 +50,6 @@
 
 - Changelog was created.
 
+[0.1.1]: https://github.com/anpham6/squared/releases/tag/v0.1.1-ruby
 [0.1.0]: https://github.com/anpham6/squared/releases/tag/v0.1.0-ruby
 [0.0.12]: https://github.com/anpham6/squared/releases/tag/v0.0.12-ruby

data/README.md

@@ -108,7 +108,7 @@ Workspace management uses [Ruby](https://www.ruby-lang.org/en/documentation/inst
 mkdir workspaces
 cd workspaces            # REPO_ROOT
 
-wget https://raw.githubusercontent.com/anpham6/squared/master/Rakefile
+wget https://unpkg.com/squared/Rakefile
 
 rake -T                  # List tasks
 

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -18,12 +18,19 @@ module Squared
       private_constant :SCRIPT_OBJ
 
       class << self
-        def implement(*objs)
+        def implement(*objs, base: false)
+          return if base && objs.size > 1
+
           objs.each do |obj|
-            next unless obj < impl_project
+            next unless base || obj < impl_project
 
-            kind_project.unshift(obj)
-            obj.tasks&.each { |task| impl_series.add(task, obj) }
+            if base
+              @impl_project = obj
+              impl_series.base_set(obj)
+            else
+              kind_project.unshift(obj)
+              obj.tasks&.each { |task| impl_series.add(task, obj) }
+            end
             if (args = obj.batchargs)
               impl_series.batch(*args)
             end

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

@@ -14,7 +14,7 @@ module Squared
         include Utils
         include Rake::DSL
 
-        VAR_SET = %i[parent global envname dependfile theme run script env depend graph doc test copy clean].freeze
+        VAR_SET = %i[parent global envname dependfile theme run script env].freeze
         SEM_VER = /(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?/.freeze
         private_constant :VAR_SET, :SEM_VER
 
@@ -25,7 +25,7 @@ module Squared
           def bannerargs(*); end
 
           def tasks
-            [].freeze
+            %i[build depend graph doc test copy clean].freeze
           end
 
           def as_path(val)
@@ -288,10 +288,10 @@ module Squared
 
         def add(path, name = nil, **kwargs, &blk)
           checkdir = lambda do |val|
-            if val.directory? && val.exist?
+            if val.directory? && !val.empty?
               true
             else
-              log.warn "workspace \"#{val}\" (not found)"
+              log.warn "workspace \"#{val}\" (#{val.empty? ? 'empty' : 'not found'})"
               false
             end
           end
@@ -383,7 +383,7 @@ module Squared
                 next unless dir.directory?
 
                 log.warn "rm -rf #{dir}"
-                dir.rmtree(verbose: true)
+                dir.rmtree
               else
                 files = val.include?('*') ? Dir[basepath(val)] : [basepath(val)]
                 files.each do |file|
@@ -419,7 +419,7 @@ module Squared
         def variable_set(key, *val, **kwargs)
           if variables.include?(key)
             case key
-            when :run
+            when :build, :run
               run_set(*val, **kwargs)
             when :script
               script_set(*val, **kwargs)
@@ -546,18 +546,17 @@ module Squared
           puts_oe(*args, pipe: pipe)
         end
 
-        def run(cmd = @session, var = nil, exception: @exception, sync: true, banner: true, **)
+        def run(cmd = @session, var = nil, exception: @exception, sync: true, banner: true, chdir: path, **)
           cmd = session_done(cmd)
           log.info cmd
           begin
-            if cmd =~ /^\S+:(\S+:?)+$/ && workspace.task_defined?(cmd)
-              print_item if sync
+            if cmd =~ /^[^:]+:[^:]/ && workspace.task_defined?(cmd)
               log.warn "ENV was discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
               print_item format_banner(cmd, banner: banner) if sync
               args = var.is_a?(Hash) ? [var, cmd] : [cmd]
-              shell(*args, chdir: path, exception: exception)
+              shell(*args, chdir: chdir, exception: exception)
             end
           rescue StandardError => e
             log.error e
@@ -837,7 +836,8 @@ module Squared
           opts.each { |val| @session << "--#{flag}=#{shell_escape(val, quote: true)}" }
         end
 
-        def append_value(opts)
+        def append_value(opts, delim: false)
+          @session << '--' if delim && !opts.empty?
           opts.each { |val| @session << shell_escape(val) }
         end
 
@@ -900,16 +900,17 @@ module Squared
           ret && !ret.empty? ? ret : [val]
         end
 
-        def pwd_set(done = nil, &blk)
+        def pwd_set(done = nil, pass: false, &blk)
           pwd = Pathname.pwd
           if block_given?
-            if path == pwd
-              instance_eval(&blk)
+            if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join >= RUBY_VERSION)
+              ret = instance_eval(&blk)
             else
               Dir.chdir(path)
-              instance_eval(&blk)
+              ret = instance_eval(&blk)
               Dir.chdir(pwd)
             end
+            ret
           elsif @pwd == pwd
             @pwd = nil
             pwd unless done
@@ -1003,7 +1004,7 @@ module Squared
         end
 
         def variables
-          VAR_SET
+          Base.tasks + VAR_SET
         end
 
         def borderstyle
@@ -1021,7 +1022,7 @@ module Squared
         end
       end
 
-      Application.impl_project = Base
+      Application.implement(Base, base: true)
       Application.attr_banner = Common::SymSet.new(%i[name project path ref group parent])
     end
   end

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

@@ -4,8 +4,8 @@ module Squared
   module Workspace
     module Project
       class Git < Base
-        OPT_PULL = %w[all tags prune ff-only autostash dry-run].freeze
-        OPT_FETCH = %w[tags prune prune-tags depth=n dry-run].freeze
+        OPT_PULL = %w[all ff-only autostash prune tags depth=n since=d jobs=n dry-run].freeze
+        OPT_FETCH = %w[prune-tags].concat(OPT_PULL[3..-1]).freeze
         private_constant :OPT_PULL, :OPT_FETCH
 
         class << self
@@ -202,16 +202,16 @@ module Squared
                     end
                   when :show
                     if flag == :oneline
-                      desc format_desc(action, flag, 'object+')
+                      desc format_desc(action, flag, 'object*')
                       task flag, [:object] do |_, args|
-                        objs = guard_params(action, flag, args: args.to_a)
+                        objs = args.to_a
                         show(objs, pretty: 'oneline', abbrev: true)
                       end
                     else
-                      desc format_desc(action, flag, 'format,object+')
+                      desc format_desc(action, flag, 'format,object*')
                       task flag, [:format, :object] do |_, args|
                         format = guard_params(action, flag, args: args, key: :format)
-                        objs = guard_params(action, flag, args: args.to_a[1..-1] || [])
+                        objs = args.to_a[1..-1] || []
                         show(objs, "#{flag}": format)
                       end
                     end
@@ -422,12 +422,29 @@ module Squared
                      end
           origin = nil
           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 = %r{^\* [^\[]+(?<= )\[([\w.-/]+?)/([\w.-]+)\] }.match(val))
-
-            origin = data[1]
-            branch = data[2]
+            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 log -n1 --format=%h%d', io: true, stdout: true, banner: false).first
+                if (data = /^#{sha} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)$/m.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("^(.+)/#{Regexp.escape(branch)}$").match(data[3]))
+              origin = data[1]
+            end
             break
           end
           raise_error('commit', 'work tree is not usable') unless origin && branch
@@ -445,6 +462,7 @@ module Squared
           end
           a = ['git add --verbose']
           b = ['git push']
+          b << '--set-upstream' if upstream
           if dry_run?
             a << '--dry-run'
             b << '--dry-run'
@@ -493,10 +511,10 @@ module Squared
           cmd = session_done(cmd)
           log.info cmd
           banner = format_banner(cmd.gsub(File.join(path, ''), ''), banner: banner)
-          cmd = cmd.sub(/^git\b/, "git --work-tree #{shell_quote(path)} --git-dir #{shell_quote(gitpath)}")
+          cmd = cmd.sub(/^git\b/, "git --work-tree=#{shell_quote(path)} --git-dir=#{shell_quote(gitpath)}")
           begin
             if io
-              [IO.popen(cmd), banner]
+              [stdout ? `#{cmd}` : IO.popen(cmd), banner]
             elsif stdin? ? sync : stdout
               print_item banner
               ret = `#{cmd}`
@@ -572,10 +590,10 @@ module Squared
         def append_pull(opts, list, flag = nil)
           append_submodules flag
           opts.each do |opt|
-            if list.include?(opt)
+            if list.include?(opt) || opt.match(/^(?:depth|jobs)=\d+$/)
               @session << "--#{opt}"
-            elsif opt.match(/^depth=(\d+)$/)
-              @session << "--depth=#{$1}"
+            elsif opt.match(/^since=(.+)$/) && (val = Date.parse($1))
+              @session << "--shallow-since=\"#{val.strftime('%F %T')}\""
             end
           end
         end
@@ -598,7 +616,7 @@ module Squared
         end
 
         def append_message(val)
-          @session << "--message \"#{double_quote(val)}\"" if val
+          @session << "--message=\"#{double_quote(val)}\"" if val
         end
 
         def append_head

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

@@ -38,6 +38,7 @@ module Squared
           install: %i[force frozen dedupe].freeze,
           outdated: %i[major minor patch].freeze,
           bump: %i[major minor patch].freeze,
+          update: nil,
           run: nil
         }.freeze
 
@@ -89,6 +90,11 @@ module Squared
                       end
                     end
                   end
+                when :update
+                  desc format_desc(action, nil, 'packages*')
+                  task action, [:packages] do |_, args|
+                    update args.to_a
+                  end
                 end
               else
                 namespace action do
@@ -128,7 +134,7 @@ module Squared
             into = @copy[:into] if @copy.key?(:into)
             workspace = @copy[:workspace] if @copy.key?(:workspace)
             glob = @copy[:include]
-            pass = @copy[:exclude]
+            exclude = @copy[:exclude]
             scope = @copy[:scope]
             also = @copy[:also]
             create = @copy[:create]
@@ -150,7 +156,7 @@ module Squared
               log.warn message("copy project :#{dir}", hint: 'not found') unless dest
             when Hash
               glob = dir[:include]
-              pass = dir[:exclude]
+              exclude = dir[:exclude]
               from = dir[:from] if dir.key?(:from)
               into = dir[:into] if dir.key?(:into)
               scope = dir[:scope] if dir.key?(:scope)
@@ -179,7 +185,7 @@ module Squared
                           doc = JSON.parse(file.read)
                           doc['name']
                         rescue StandardError => e
-                          log.warn e
+                          log.error e
                           raise if exception
                         end
                       end
@@ -194,7 +200,7 @@ module Squared
             end
             target.each do |src, to|
               glob.each { |val| log.info "cp #{from.join(val)} #{to}" }
-              copy_d(src, to, glob: glob, create: create, pass: pass, verbose: verbose)
+              copy_d(src, to, glob: glob, create: create, pass: exclude, verbose: verbose)
             end
           end
         end
@@ -262,7 +268,7 @@ module Squared
           end
         end
 
-        def outdated(rev = nil, opts: [])
+        def outdated(rev = nil, opts: [], sync: invoked_sync?('outdated', rev))
           dryrun = opts.include?('dry-run')
           if pnpm? && read_packagemanager(version: '7.15')
             cmd = 'pnpm outdated'
@@ -273,22 +279,31 @@ module Squared
           end
           log.info cmd
           banner = format_banner("#{cmd}#{dryrun ? ' --dry-run' : ''}")
-          if invoked_sync?('outdated', rev)
+          if sync
             print_item banner
             banner = nil
           end
-          data = nil
-          pwd_set { data = `#{cmd} --json --loglevel=error` }
-          json = JSON.parse(doc = dependfile.read)
-          dep1 = json['dependencies'] || {}
-          dep2 = json['devDependencies'] || {}
+          begin
+            data = pwd_set { `#{cmd} --json --loglevel=error` }
+            json = JSON.parse(doc = dependfile.read)
+          rescue StandardError => e
+            log.error e
+            raise if exception
+
+            warn log_message(Logger::WARN, e) if warning?
+            return
+          else
+            dep1 = json['dependencies'] || {}
+            dep2 = json['devDependencies'] || {}
+            target = json['name']
+          end
           found = []
           avail = []
           rev ||= (prod? ? :patch : :minor)
           inter = opts.include?('interactive')
           unless data.empty?
             JSON.parse(data).each_pair do |key, val|
-              val = val.find { |obj| obj['dependent'] == json['name'] } if val.is_a?(Array)
+              val = val.find { |obj| obj['dependent'] == target } if val.is_a?(Array)
               next unless val && (file = dep1[key] || dep2[key]) && file != '*'
 
               latest = val['latest']
@@ -417,7 +432,7 @@ module Squared
           end
         end
 
-        def bump(flag = nil, sync: invoked_sync?('bump', flag))
+        def bump(flag = nil)
           return unless (ver = version)
 
           seg = semscan(ver, fill: false)
@@ -461,8 +476,31 @@ module Squared
             end
           rescue StandardError => e
             log.debug e
-            raise if sync
+            raise if exception
+          end
+        end
+
+        def update(pkgs = [])
+          if (yarn = dependtype(:yarn)) > 0
+            cmd = session 'yarn'
+            if yarn > 1
+              cmd << 'up'
+            else
+              cmd << 'upgrade'
+              cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
+            end
+          elsif pnpm?
+            cmd = session 'pnpm', 'update'
+            cmd << '--prod' if prod?
+            append_nocolor option('no-color')
+          else
+            cmd = session 'npm', 'update'
+            cmd << '--omit=dev' if prod?
+            append_nocolor option('no-color')
           end
+          append_loglevel
+          append_value pkgs
+          run
         end
 
         def compose(opts, flags = nil, script: false)

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

@@ -127,10 +127,10 @@ module Squared
           end
         end
 
-        def outdated(*)
+        def outdated(*, sync: invoked_sync?('outdated'))
           pip_session 'list', '--outdated'
           append_pip
-          run
+          run(sync: sync)
         end
 
         def variable_set(key, *val, **)

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

@@ -212,7 +212,7 @@ module Squared
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:include] if @copy.key?(:include)
-            pass = @copy[:exclude] if @copy.key?(:exclude)
+            exclude = @copy[:exclude] if @copy.key?(:exclude)
             into = @copy[:into] if @copy.key?(:into)
           end
           return unless into
@@ -225,17 +225,17 @@ module Squared
             b = dest.join(val)
             c = glob[i] || glob[0]
             log.info "cp #{a.join(c)} #{b}"
-            copy_d(a, b, glob: c, pass: pass, verbose: verbose)
+            copy_d(a, b, glob: c, pass: exclude, verbose: verbose)
           end
         end
 
-        def outdated(rev = nil, opts: [])
+        def outdated(rev = nil, opts: [], sync: invoked_sync?('outdated', rev))
           cmd = bundle_session 'outdated', rev && "--#{rev}"
           append_bundle opts, OPT_OUTDATED
           cmd = session_done(cmd)
           log.info cmd
           banner = format_banner(cmd)
-          if invoked_sync?('outdated', rev)
+          if sync
             print_item banner
             banner = nil
           end
@@ -364,10 +364,11 @@ module Squared
         end
 
         def rake(*cmd)
+          file = shell_quote(Rake.application.rakefile)
           if cmd.empty?
-            run_s 'rake'
+            run_s("rake --rakefile=#{file}", chdir: workspace.pwd)
           else
-            run_s(*cmd.map { |val| "rake #{val}" }, banner: false)
+            run_s(*cmd.map { |val| "rake --rakefile=#{file} #{val}" }, chdir: workspace.pwd, banner: false)
           end
         end
 
@@ -386,9 +387,8 @@ module Squared
           return false unless @autodetect
 
           unsafe = ->(hint) { raise_error('failed to parse', hint: hint) }
-          out = `gem -C #{shell_quote(path)} list --local -d #{project}`
-          data = /#{Regexp.escape(project)} \(([^)]+)\)/.match(out)
-          unsafe.('version') unless data
+          out = pwd_set { `gem list --local -d #{project}` }
+          unsafe.('version') unless (data = /#{Regexp.escape(project)} \(([^)]+)\)/.match(out))
           ver = data[1].split(/\s*,\s*/)
           ver.unshift(@version).uniq! if @version
           ver.each do |v|
@@ -453,10 +453,13 @@ module Squared
           return @rakelist if @rakelist
 
           ret = []
-          IO.popen("rake -C #{shell_quote(path)} -AT").each do |line|
-            next unless (data = /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/.match(line))
+          pass = Rake::VERSION >= '13.0.4'
+          pwd_set(pass: pass) do
+            IO.popen("rake#{pass ? " -C #{shell_quote(path)}" : ''} -AT").each do |line|
+              next unless (data = /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/.match(line))
 
-            ret << [data[1], data[2]]
+              ret << [data[1], data[2]]
+            end
           end
           @rakelist = ret
         end

data/lib/squared/workspace/series.rb

@@ -8,13 +8,13 @@ module Squared
       include Rake::DSL
       extend Forwardable
 
-      TASK_BASE = %i[build depend graph doc test copy clean]
+      TASK_BASE = []
       TASK_BATCH = {}
       TASK_EXTEND = {}
-      TASK_KEYS = TASK_BASE + TASK_BATCH.keys
+      TASK_KEYS = []
       TASK_ALIAS = {}
       TASK_NAME = {}
-      private_constant :TASK_BASE, :TASK_BATCH, :TASK_KEYS, :TASK_NAME, :TASK_EXTEND
+      private_constant :TASK_BASE, :TASK_BATCH, :TASK_EXTEND, :TASK_KEYS, :TASK_ALIAS, :TASK_NAME
 
       class << self
         def add(task, obj)
@@ -47,6 +47,15 @@ module Squared
           TASK_NAME[key.to_sym] = task.to_sym
         end
 
+        def base_set(obj)
+          TASK_BASE.clear
+                   .concat((if TASK_KEYS.empty?
+                              obj.tasks.dup
+                            else
+                              obj.tasks.reject { |val| TASK_KEYS.include?(val) }
+                            end).freeze)
+        end
+
         private
 
         def key_set(val)
@@ -72,7 +81,7 @@ module Squared
           id: []
         }
         @data = {}
-        TASK_KEYS.each { |key| @data[key] = [] }
+        (TASK_BASE + TASK_KEYS).each { |key| @data[key] = [] }
       end
 
       def populate(proj)
@@ -154,7 +163,21 @@ module Squared
       end
 
       def extend?(obj, key)
-        TASK_EXTEND.fetch(key, []).any? { |kind| obj.is_a?(kind) && obj.ref?(kind.ref) }
+        return false unless (items = TASK_EXTEND[key]) && !(items = items.select { |kind| obj.is_a?(kind) }).empty?
+
+        meth = :"#{key}?"
+        allref = obj.allref.to_a
+        ret = false
+        items.each do |kind|
+          if kind.instance_methods.include?(meth)
+            out = obj.__send__(meth)
+            return true if out == 1
+            return out if obj.ref?(kind.ref)
+          elsif allref.include?(kind.ref)
+            ret = true
+          end
+        end
+        ret
       end
 
       def multiple?(val = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - An Pham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-08 00:00:00.000000000 Z
+date: 2024-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake