squared 0.4.14 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fafee0b2a60973f9363c71173b9de4ed4779090e2ef3c2331d3ecd9f3a2a9398
-  data.tar.gz: 8eb5bfef9ec19b7985866ffd1f0b55a849ff7d27a895b76d29a1cd85553e717a
+  metadata.gz: 0cf3c1ed045970581434b5e6571a75ccb21a8ea564d83b1f85c6deca107424d5
+  data.tar.gz: 2300104c9cf7fcd5babbe2989c9a68af8f8b024546baf3969198df1973ab98fe
 SHA512:
-  metadata.gz: 464952bd65f6c404a89ef8624549e04a7a4ec0cc2c0b211e73d0464cf1bcd8094f760449ab7e0e944fd390cf01029f14ef2b6a082ae67d1ad071d243821ee527
-  data.tar.gz: d36b6c580ccabb5bde29585cdb4642c7a81dadfff59b5766fa76efece506983ed0335551fdd31a41eced8c6631967573a6ad4a19f22b912e61a93f6f10e334ec
+  metadata.gz: 5983d6fa81ba44335c2af020292f6260a02ffd4c6a8c9c9213b68d50606a14aa33fd4df032a5abfcc0677d44f5e30e69d726b3c5dcc2ac0dfbb378bdd9fa0618
+  data.tar.gz: dcd11eb155202c2dbbcb1d7a533516c4c0d16381caccb49a0b67612e915297242b7caa74d684afcb9db08530d68a1f0a693512189f8e6b7d9fe6579f2c5e444a

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [0.4.15] - 2025-07-16
+
+### Added
+
+- Python command outdated option user was implemented.
+- Git command commit action amend and amend-orig are interactive.
+
+### Changed
+
+- Ruby task copy does not guess Gem directory when version is used.
+- Workspace hash-based data uses global method for key creation.
+
+## [0.3.13] - 2025-07-16
+
+### Fixed
+
+- See `0.2.13`.
+
+## [0.2.13] - 2025-07-16
+
+### Fixed
+
+- Project graph did not ignore circular references.
+
+## [0.1.10] - 2025-07-16
+
+### Fixed
+
+- Module namespaces were not combined in the right order.
+- Workspace group tasks were not registered.
+
 ## [0.4.14] - 2025-07-05
 
 ### Added
@@ -802,6 +833,7 @@
 
 - Changelog was created.
 
+[0.4.15]: https://github.com/anpham6/squared/releases/tag/v0.4.15-ruby
 [0.4.14]: https://github.com/anpham6/squared/releases/tag/v0.4.14-ruby
 [0.4.13]: https://github.com/anpham6/squared/releases/tag/v0.4.13-ruby
 [0.4.12]: https://github.com/anpham6/squared/releases/tag/v0.4.12-ruby
@@ -817,6 +849,7 @@
 [0.4.2]: https://github.com/anpham6/squared/releases/tag/v0.4.2-ruby
 [0.4.1]: https://github.com/anpham6/squared/releases/tag/v0.4.1-ruby
 [0.4.0]: https://github.com/anpham6/squared/releases/tag/v0.4.0-ruby
+[0.3.13]: https://github.com/anpham6/squared/releases/tag/v0.3.13-ruby
 [0.3.12]: https://github.com/anpham6/squared/releases/tag/v0.3.12-ruby
 [0.3.11]: https://github.com/anpham6/squared/releases/tag/v0.3.11-ruby
 [0.3.10]: https://github.com/anpham6/squared/releases/tag/v0.3.10-ruby
@@ -830,6 +863,7 @@
 [0.3.2]: https://github.com/anpham6/squared/releases/tag/v0.3.2-ruby
 [0.3.1]: https://github.com/anpham6/squared/releases/tag/v0.3.1-ruby
 [0.3.0]: https://github.com/anpham6/squared/releases/tag/v0.3.0-ruby
+[0.2.13]: https://github.com/anpham6/squared/releases/tag/v0.2.13-ruby
 [0.2.12]: https://github.com/anpham6/squared/releases/tag/v0.2.12-ruby
 [0.2.11]: https://github.com/anpham6/squared/releases/tag/v0.2.11-ruby
 [0.2.10]: https://github.com/anpham6/squared/releases/tag/v0.2.10-ruby
@@ -843,6 +877,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.10]: https://github.com/anpham6/squared/releases/tag/v0.1.10-ruby
 [0.1.9]: https://github.com/anpham6/squared/releases/tag/v0.1.9-ruby
 [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

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -92,7 +92,7 @@ module Squared
         @prefix = prefix
         @series = Application.series_wrap(self)
         @project = {}
-        @kind = {}
+        @kind = Workspace.hashlist
         @extensions = []
         @envname = env_key(@main).freeze
         @pipe = env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
@@ -106,20 +106,20 @@ module Squared
         else
           @theme = {}
         end
-        @chain = {}
+        @chain = Workspace.hashlist
         @script = {
-          group: {},
-          ref: {},
+          group: Workspace.hashobj,
+          ref: Workspace.hashobj,
           group!: {},
           ref!: {}
         }.freeze
         @events = {
-          group: {},
-          ref: {}
+          group: Workspace.hashobj,
+          ref: Workspace.hashobj
         }.freeze
         @pass = {
-          group: {},
-          ref: {},
+          group: Workspace.hashobj,
+          ref: Workspace.hashobj,
           global: {},
           pattern: []
         }.freeze
@@ -225,7 +225,7 @@ module Squared
           end
         end
         data = Struct::ChainData.new(action, step, ns.call(with), ns.call(before), ns.call(after), sync)
-        (@chain[task_name(task.to_s)] ||= []) << data
+        @chain[task_name(task.to_s)] << data
         self
       end
 
@@ -267,9 +267,9 @@ module Squared
 
       def pass(name, group: @group, ref: @ref, &blk)
         data = if group
-                 @pass[:group][group] ||= {}
+                 @pass[:group][group]
                elsif ref
-                 @pass[:ref][ref] ||= {}
+                 @pass[:ref][ref]
                else
                  @pass[:global]
                end
@@ -826,8 +826,8 @@ module Squared
           items = as_a(ref, :to_sym)
         end
         items.each do |name|
-          (@script[label][name] ||= {})[task] = val
-          (@events[label][name] ||= {})[task] = on if on.is_a?(Hash)
+          @script[label][name][task] = val
+          @events[label][name][task] = on if on.is_a?(Hash)
         end
         self
       end
@@ -844,15 +844,17 @@ module Squared
       end
 
       def data_get(*args, group: nil, ref: nil, target: nil)
-        target[:group][group.to_sym] if group
-        if ref.is_a?(Enumerable)
+        if group && target[:group].key?(key = group.to_sym)
+          target[:group][key]
+        elsif ref.is_a?(Enumerable)
           ref.each do |key|
-            next unless (ret = target[:ref][key])
+            next unless target[:ref].key?(key)
 
+            ret = target[:ref][key]
             return ret if args.empty? || args.any? { |val| ret.key?(val) }
           end
           nil
-        elsif ref
+        elsif ref && target[:ref].key?(ref)
           target[:ref][ref]
         end
       end

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

@@ -9,7 +9,6 @@ module Squared
   module Workspace
     module Project
       class Base
-        include Comparable
         include Common::Format
         include System
         include Shell
@@ -17,6 +16,7 @@ module Squared
         include Utils
         include Support
         include Rake::DSL
+        include ::Comparable
 
         VAR_SET = %i[parent global script index envname desc dependfile dependindex theme archive env dev prod graph
                      pass exclude].freeze
@@ -238,8 +238,13 @@ module Squared
           end
         end
 
+        def ==(other)
+          equal?(other)
+        end
+
         def <=>(other)
-          return 0 unless workspace == other.workspace
+          return unless workspace == other.workspace
+          return 0 if equal?(other)
 
           a, b = graph_deps
           return 1 if a.include?(other)
@@ -266,14 +271,12 @@ module Squared
             -1
           elsif f.any? { |val| e.include?(val) }
             1
-          elsif @index != -1 && (i = other.instance_variable_get(:@index)) != -1
-            @index < i ? -1 : 1
-          else
-            0
+          elsif @index >= 0 && (i = other.instance_variable_get(:@index)) >= 0
+            @index <=> i
           end
         rescue StandardError => e
           log&.debug e
-          0
+          nil
         end
 
         def ref
@@ -1145,7 +1148,7 @@ module Squared
           done
         end
 
-        def graph_collect(target, start = [], data: {}, pass: [])
+        def graph_collect(target, start = [], data: {}, pass: [], root: [])
           deps = []
           (start.empty? ? target.instance_variable_get(:@graph) : start)&.each do |val|
             next if pass.include?(val)
@@ -1158,10 +1161,12 @@ module Squared
               items = workspace.find(group: val, ref: val.to_sym)
             end
             items.each do |proj|
-              next if pass.include?(proj.name)
+              next if pass.include?(name = proj.name)
 
-              graph_collect(proj, data: data, pass: pass) if proj.graph? && !data.key?(proj.name)
-              next if (objs = data.fetch(proj.name, [])).include?(target)
+              if proj.graph? && !data.key?(name) && !root.include?(name)
+                graph_collect(proj, data: data, pass: pass, root: root + [name, target.name])
+              end
+              next if (objs = data.fetch(name, [])).include?(target)
 
               deps << proj
               deps.concat(objs)

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

@@ -265,7 +265,6 @@ module Squared
           when Enumerable
             ret.merge(opts.to_a)
           end
-
           [args, flags].each_with_index do |target, index|
             if target.is_a?(String)
               ret << target

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

@@ -3,7 +3,7 @@
 module Squared
   module Workspace
     module Git
-      GIT_REPO = {}
+      GIT_REPO = Workspace.hashobj
       GIT_PROTO = %r{^(?:https?|ssh|git|file)://}i.freeze
       private_constant :GIT_REPO, :GIT_PROTO
 
@@ -58,8 +58,8 @@ module Squared
             end
           end
           key = task_name key
-          (GIT_REPO[main] ||= {})[key] = [uri.to_s, opts]
-          (@kind[key] ||= []) << Project::Git
+          GIT_REPO[main][key] = [uri.to_s, opts]
+          @kind[key] << Project::Git
         end
         if cache == true
           revbuild
@@ -396,12 +396,12 @@ module Squared
                         if flag == :fixup
                           ref, squash, pick = choice_commit(accept: [['Auto squash?', true]], reflog: false,
                                                             values: ['Pick [amend|reword]'])
-                          pick = case pick&.downcase
-                                 when 'a', 'amend'
-                                   'amend'
-                                 when 'r', 'reword'
-                                   'reword'
-                                 end
+                          pick &&= case pick.downcase
+                                   when 'a', 'amend'
+                                     'amend'
+                                   when 'r', 'reword'
+                                     'reword'
+                                   end
                           if squash
                             found = false
                             git_spawn(git_output('log --format=%h'), stdout: false).each do |val|
@@ -413,12 +413,14 @@ module Squared
                             end
                           end
                         end
-                        refs = pick == 'reword' ? [] : param_guard(action, flag, args: args.to_a)
-                        if flag == :add
-                          opts = refs
-                          refs = []
-                        else
-                          opts = []
+                        opts = []
+                        refs = []
+                        unless pick == 'reword'
+                          if flag == :add
+                            opts = param_guard(action, flag, args: args.to_a)
+                          elsif (refs = args.to_a).empty?
+                            refs = readline('Enter file patterns', force: true).shellsplit
+                          end
                         end
                         commit(flag, opts, refs: refs, ref: ref, squash: squash, pick: pick)
                       end

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

@@ -280,7 +280,7 @@ module Squared
                         end
                       end
                     when 'outdated'
-                      format_desc action, flag, 'eager?'
+                      format_desc action, flag, 'eager?,user?'
                       task flag do |_, args|
                         outdated flag, args.to_a
                       end
@@ -431,7 +431,9 @@ module Squared
                     when :patch
                       patch
                     end
-              install(:upgrade, pkg, strategy: opts.include?('eager') ? 'eager' : nil) unless !pkg || pkg.empty?
+              unless !pkg || pkg.empty?
+                install(:upgrade, pkg, strategy: opts.include?('eager') ? 'eager' : nil, user: opts.include?('user'))
+              end
             elsif start == 0
               puts 'No updates were found'
             end
@@ -439,7 +441,7 @@ module Squared
           on :last, :outdated
         end
 
-        def install(flag, opts = [], strategy: nil)
+        def install(flag, opts = [], strategy: nil, user: nil)
           cmd = pip_session 'install'
           out = append_pip(flag, opts, from: :install)
           case flag
@@ -449,6 +451,7 @@ module Squared
           when :upgrade
             raise_error('no packages listed', hint: flag) if out.empty?
             cmd << '--upgrade'
+            cmd << '--user' if user
             cmd << basic_option('upgrade-strategy', strategy) if strategy
             append_value out
           end

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

@@ -4,7 +4,7 @@ module Squared
   module Workspace
     module Project
       class Ruby < Git
-        GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
+        GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb gems.rb Isolate].freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_RUBY = {
           ruby: %w[0=im? a c e=q E=bm F=qm i=bm? I=pm l n p r=bm s S w W=bm? x=pm? d|debug jit rjit v|verbose y|yydebug
@@ -849,18 +849,20 @@ module Squared
             pwd_set(pass: !pwd.nil?) do
               out = `#{gem_output(pwd, 'list --local -d', project)}`
               if out =~ /#{Regexp.escape(project)} \(([^)]+)\)/
-                ver = $1.split(/\s*,\s*/)
-                ver.unshift(@version).uniq!
-                ver.each do |val|
-                  next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
-
-                  set.call(val, $1)
-                  break
-                end
+                $1.split(/\s*,\s*/)
+                  .unshift(@version)
+                  .uniq
+                  .each do |val|
+                    next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
+
+                    set.call(val, $1)
+                    return gemdir? if @gemdir
+                  end
               end
             end
-          end
-          unless @gemdir
+            require 'rubygems'
+            @gemdir = Pathname.new(Gem.dir) + gempath
+          else
             parse = lambda do |path|
               next unless path
 
@@ -873,9 +875,10 @@ module Squared
               target = RUBY_VERSION.start_with?('2.6') ? RubyVM : $LOAD_PATH
               parse.call(target.resolve_feature_path(project)&.last)
             end
-            pwd_set { parse.call(`#{bundle_output('show', project)}`) } unless @gemdir
+            if !@gemdir && !pwd_set { parse.call(`#{bundle_output('show', project)}`) }
+              raise_error 'gems directory not found'
+            end
           end
-          raise_error('parse failed', hint: @version || 'path') unless @gemdir
         rescue StandardError => e
           log.error e
           @version = nil

data/lib/squared/workspace/series.rb

@@ -10,16 +10,16 @@ module Squared
 
       TASK_BASE = []
       TASK_BATCH = {}
-      TASK_EXTEND = {}
+      TASK_EXTEND = Workspace.hashlist
       TASK_KEYS = []
-      TASK_ALIAS = {}
+      TASK_ALIAS = Workspace.hashobj
       TASK_NAME = {}
       private_constant :TASK_BASE, :TASK_BATCH, :TASK_EXTEND, :TASK_KEYS, :TASK_ALIAS, :TASK_NAME
 
       class << self
         def add(task, obj)
           key_set task
-          (TASK_EXTEND[task] ||= []) << obj
+          TASK_EXTEND[task] << obj
         end
 
         def batch(*args, obj)
@@ -37,7 +37,7 @@ module Squared
 
         def alias(ref, obj)
           if obj.is_a?(Hash)
-            obj.each { |key, val| (TASK_ALIAS[key] ||= {})[ref] = val }
+            obj.each { |key, val| TASK_ALIAS[key][ref] = val }
           else
             TASK_ALIAS[obj]&.delete(ref)
           end
@@ -79,8 +79,8 @@ module Squared
         @chain = {}
         @exclude = exclude.freeze
         @session = {
-          group: {},
-          parent: {},
+          group: Workspace.hashlist,
+          parent: Workspace.hashlist,
           id: []
         }
         @data = {}
@@ -95,7 +95,7 @@ module Squared
 
           if (g = proj.group)
             id << g
-            (group[:"#{key}:#{g}"] ||= []).concat(tasks)
+            group[:"#{key}:#{g}"].concat(tasks)
           else
             items.concat(tasks)
           end
@@ -106,7 +106,7 @@ module Squared
           next unless (b = ws.find_base(proj)) && (n = b.ref.to_s) != g
 
           id << n
-          (parent[:"#{key}:#{n}"] ||= []).concat(tasks)
+          parent[:"#{key}:#{n}"].concat(tasks)
         end
       end
 

data/lib/squared/workspace.rb

@@ -27,6 +27,14 @@ module Squared
         !!project(name)&.enabled?
       end
 
+      def hashobj
+        Hash.new { |data, key| data[key] = {} }
+      end
+
+      def hashlist
+        Hash.new { |data, key| data[key] = [] }
+      end
+
       private
 
       def project(name)

metadata

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