squared 0.0.7 → 0.0.8

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

@@ -7,9 +7,8 @@ module Squared
         REQUIREMENTS = %w[requirements.txt pyproject.toml setup.py].freeze
         OPT_USER = %w[pre dry-run].freeze
         OPT_FORCE = [*OPT_USER, 'user'].freeze
-        OPT_UPGRADE = [*OPT_FORCE, 'eager'].freeze
         OPT_GENERAL = %w{venv isolated no-cache-dir [v]erbose}.freeze
-        private_constant :REQUIREMENTS, :OPT_USER, :OPT_FORCE, :OPT_UPGRADE, :OPT_GENERAL
+        private_constant :REQUIREMENTS, :OPT_USER, :OPT_FORCE, :OPT_GENERAL
 
         class << self
           def populate(*); end
@@ -42,12 +41,12 @@ module Squared
         end
 
         @@tasks[ref] = {
-          install: %i[user upgrade force]
+          install: %i[user target upgrade force]
         }.freeze
 
         def populate(*)
           super
-          return unless outdated? && !@exclude.include?(Python.ref)
+          return unless outdated? && ref?(Python.ref)
 
           namespace name do
             @@tasks[Python.ref].each do |action, flags|
@@ -56,16 +55,26 @@ module Squared
                   case action
                   when :install
                     list = case flag
+                           when :target
+                             req = 'dir'
+                             OPT_USER + %w[upgrade eager]
                            when :upgrade
-                             OPT_UPGRADE
+                             OPT_FORCE + ['eager']
                            when :force
                              OPT_FORCE
                            else
                              OPT_USER
                            end
-                    desc format_desc(action, flag, list + OPT_GENERAL)
-                    task flag do |_, args|
-                      depend(flag, opts: args.to_a, override: true)
+                    desc format_desc(action, flag, list + OPT_GENERAL, req: req)
+                    if flag == :target
+                      task flag, [:dir, :opts] do |_, args|
+                        guard_params(action, flag, args: args, key: :dir)
+                        depend(flag, dir: args.dir, opts: args.to_a)
+                      end
+                    else
+                      task flag do |_, args|
+                        depend(flag, opts: args.to_a)
+                      end
                     end
                   end
                 end
@@ -74,33 +83,42 @@ module Squared
           end
         end
 
-        def depend(flag = nil, opts: [], override: false)
-          if @depend && !override
+        def depend(flag = nil, dir: nil, opts: [])
+          if @depend && !flag
             super
           elsif outdated?
+            sync = invoked_sync?('depend', flag)
             case (type = install_type)
             when 1, 2
               cmd = pip_session 'install'
               case flag
               when :user
                 cmd << '--user'
-                append_general opts, OPT_USER
+                append_pip opts, OPT_USER
+              when :target
+                cmd << "--target=#{shell_escape(base_path(dir).to_s, quote: true)}"
+                append_pip opts, OPT_USER + ['upgrade']
+                append_eager opts
               when :upgrade
                 cmd << '--upgrade'
-                append_general opts, OPT_UPGRADE
+                append_pip opts, OPT_FORCE
+                append_eager opts
               when :force
                 cmd << '--force-reinstall'
-                append_general opts, OPT_FORCE
+                append_pip opts, OPT_FORCE
               end
               cmd << (type == 1 ? '-r requirements.txt' : '.')
-              run(sync: invoked_sync?('depend'))
+              run(sync: sync)
             when 3
-              run_s("#{@bin} setup.py install", sync: invoked_sync?('depend'))
+              run_s("#{@bin} setup.py install", sync: sync)
             end
           end
         end
 
-        def outdated(*); end
+        def outdated(*)
+          pip_session 'list', '--outdated'
+          run
+        end
 
         def install_type(*)
           requirements.exist? ? @reqindex + 1 : 0
@@ -116,14 +134,11 @@ module Squared
           session('pip', *cmd)
         end
 
-        def append_general(opts, list = [])
-          list += OPT_GENERAL
+        def append_pip(opts, list = [])
           opts.each do |opt|
-            next unless (v = opt.match(/^v+$/)) || list.include?(opt)
+            next unless list.include?(opt) || OPT_GENERAL.include?(opt) || (v = opt.match(/^v+$/))
 
             @session << case opt
-                        when 'eager'
-                          '--upgrade-strategy=eager'
                         when 'venv'
                           '--require-virtualenv'
                         else
@@ -135,8 +150,15 @@ module Squared
           if (val = env('PIP_PROXY'))
             @session << "--proxy=#{shell_escape(val, quote: true)}"
           end
+          if (val = env('PIP_LOG'))
+            @session << "--log=#{shell_escape(base_path(val).to_s, quote: true)}"
+          end
           append_nocolor
         end
+
+        def append_eager(opts)
+          @session << '--upgrade-strategy=eager' if opts.include?('eager')
+        end
       end
     end
   end

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

@@ -63,7 +63,7 @@ module Squared
 
         def populate(*)
           super
-          return unless outdated? && !@exclude.include?(Ruby.ref)
+          return unless outdated? && ref?(Ruby.ref)
 
           namespace name do
             @@tasks[Ruby.ref].each do |action, flags|
@@ -93,19 +93,19 @@ module Squared
                         task flag, [:name] do |_, args|
                           name = args.to_a
                           guard_params(action, flag, args: name)
-                          depend(flag, opts: name, override: true)
+                          depend(flag, opts: name)
                         end
                       when :with, :without
                         desc format_desc(action, flag, 'group+')
                         task flag, [:group] do |_, args|
                           group = args.to_a
                           guard_params(action, flag, args: group)
-                          depend(flag, opts: group, override: true)
+                          depend(flag, opts: group)
                         end
                       else
                         desc format_desc(action, flag, OPT_INSTALL)
                         task flag, [:opts] do |_, args|
-                          depend(flag, opts: args.to_a, override: true)
+                          depend(flag, opts: args.to_a)
                         end
                       end
                     when :update, :outdated
@@ -142,11 +142,17 @@ module Squared
           end
         end
 
-        def depend(flag = nil, opts: [], override: false)
-          if @depend && !override
+        def depend(flag = nil, opts: [])
+          if @depend && !flag
             super
           elsif outdated?
             case flag
+            when :gem
+              gem_session 'install'
+              append_value opts
+            when :with, :without
+              gem_session 'install'
+              append_repeat flag, opts
             when :redownload, :local, :'prefer-local'
               cmd = bundle_session 'install', "--#{flag}"
               if (val = env('BUNDLE_TRUST_POLICY'))
@@ -166,17 +172,11 @@ module Squared
                                          end}"
               end
               append_bundle opts, OPT_INSTALL
-            when :gem
-              gem_session 'install'
-              append_value opts
-            when :with, :without
-              gem_session 'install'
-              append_repeat flag, opts
             else
               bundle_session 'install'
               append_bundle
             end
-            run_rb
+            run_rb(sync: invoked_sync?('depend', flag))
           end
         end
 
@@ -207,7 +207,7 @@ module Squared
           append_bundle opts, OPT_OUTDATED
           cmd = cmd.done
           log.info cmd
-          print_item format_banner(cmd) if store_pwd || invoked_sync?("outdated#{rev ? ":#{rev}" : ''}")
+          print_item format_banner(cmd) if store_pwd || invoked_sync?("outdated#{rev && ":#{rev}"}")
           start = 0
           found = 0
           major = 0
@@ -224,41 +224,29 @@ module Squared
                   l = lat.join
                   styles = []
                   data.each do |val|
-                    break unless styles && (req = /(>?=|~>|!=|<=?) (#{Regexp.escape(val.join)})/.match(line))
+                    break unless (req = /(>=?|=|~>|!=|<=?) (#{Regexp.escape(val.join)})/.match(line))
 
                     v = semver(val).join
                     case req[1]
                     when '>', '>='
-                      if c == l
-                        styles = nil
-                      elsif l < v
-                        styles = %i[red underline]
-                        break
-                      elsif semmajor(cur, lat)
-                        styles = %i[green underline]
-                        major += 1
-                      elsif cur[3] != lat[3]
+                      if semmajor(cur, lat)
                         styles = %i[green bold]
+                        major += 1
                       else
-                        styles[0] = :green
+                        styles[0] = cur[2] == lat[2] ? :yellow : :green
                       end
                     when '<', '<='
                       if c <= v
                         if semmajor(cur, lat)
-                          styles = %i[green underline]
+                          styles = %i[green bold]
                           major += 1
                         else
                           styles[0] = :yellow
                         end
-                      elsif l >= v
-                        styles = nil
                       end
                     when '!='
-                      if c == v
-                        styles = %i[red underline]
-                        break
-                      elsif l == v
-                        styles = nil
+                      if c == l
+                        styles.clear
                       else
                         styles[1] = :bold
                       end
@@ -266,27 +254,23 @@ module Squared
                       if c < v && cur[0] == val[0] && !semmajor(cur, val)
                         styles[0] = :yellow
                       elsif semmajor(lat, val)
-                        styles = nil
-                      else
-                        styles[1] = :bold
-                      end
-                    when '='
-                      if c == v
                         styles[1] = :underline
                       else
-                        styles[0] = :red
+                        styles[1] = :bold
                       end
                     end
                   end
-                  next unless styles && !styles.empty?
-
-                  case styles[0]
-                  when :yellow, :green
-                    line = sub_style(line, pat: /^(\S+)(.+)$/, styles: theme[:active])
-                    found += 1
+                  unless styles.empty?
+                    case styles[0]
+                    when :green
+                      line = sub_style(line, pat: /^(\S+)(.+)$/, styles: theme[styles[1] == :bold ? :major : :active])
+                      found += 1
+                    when :yellow
+                      found += 1
+                    end
+                    line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.+)$/,
+                                           styles: styles.compact, index: 2)
                   end
-                  line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.+)$/,
-                                         styles: styles.compact, index: 2)
                 end
               end
               puts "#{start.to_s.rjust(2)}. #{line}"
@@ -393,8 +377,8 @@ module Squared
 
         private
 
-        def run_rb
-          run(banner: !@session.include?('--quiet'))
+        def run_rb(sync: true)
+          run(sync: sync, banner: !@session.include?('--quiet'))
         end
 
         def append_bundle(opts = nil, list = nil)
@@ -413,7 +397,7 @@ module Squared
         end
 
         def append_repeat(flag, opts)
-          opts.each { |val| @session << "--#{flag}=#{shell_escape(val)}" }
+          opts.each { |val| @session << "--#{flag}=#{shell_escape(val, quote: true)}" }
         end
 
         def append_value(opts)

data/lib/squared/workspace/repo.rb

@@ -7,8 +7,6 @@ module Squared
       include Format
       include System
 
-      attr_accessor :warning
-
       def repo(url, manifest = 'latest', run: nil, dev: nil, prod: nil, ref: @ref, group: @group)
         @home = if (val = env('REPO_HOME'))
                   home = Pathname.new(val)
@@ -34,11 +32,18 @@ module Squared
                   end
                   @root.join(main).realdirpath
                 else
-                  install?(pwd = Pathname.pwd) ? pwd.join(main) : pwd
+                  install?(pwd = @home) ? pwd.join(main) : pwd
                 end
         @root = @home.parent
         @manifest_url = url
         @manifest = manifest
+        set_ref = lambda do
+          if group
+            @script[:group][:_] = group.to_s
+          elsif ref
+            @script[:ref][:_] = ref.to_sym
+          end
+        end
         if repo?
           @script[:build] = case (val = env('REPO_BUILD'))
                             when 'verbose'
@@ -53,8 +58,15 @@ module Squared
                             end
           @script[:dev] = bool_match(env('REPO_DEV'), dev)
           @script[:prod] = bool_match(env('REPO_PROD'), prod)
-          @script[:ref][:_] = env('REPO_REF', ref)
-          @script[:group][:_] = env('REPO_GROUP', group)
+          if (val = env('REPO_GROUP'))
+            @script[:group][:_] = val.to_s
+            @script[:env] = true
+          elsif (val = env('REPO_REF'))
+            @script[:ref][:_] = val.to_sym
+            @script[:env] = true
+          else
+            set_ref
+          end
           @warning = case env('REPO_WARN')
                      when '0'
                        false
@@ -68,22 +80,11 @@ module Squared
           @script[:build] = run
           @script[:dev] = dev
           @script[:prod] = prod
-          @script[:ref][:_] = ref
-          @script[:group][:_] = group
+          set_ref
         end
         self
       end
 
-      protected
-
-      def repo?
-        !@manifest_url.nil? && (install? || !!@override)
-      end
-
-      def empty?(dir)
-        dir.empty? || (dir.children.size == 1 && dir.join(dir.children.first).to_s == __FILE__)
-      end
-
       private
 
       def __repo__(**kwargs)
@@ -125,7 +126,7 @@ module Squared
             stage ||= 'all'
             repo['sync'].invoke
             @project.select do |_, proj|
-              next unless proj.enabled?
+              next false unless proj.enabled? && proj.ref?(Project::Base.ref)
 
               proj.depend if proj.depend?
               proj.build?
@@ -192,6 +193,14 @@ module Squared
         end
       end
 
+      def repo?
+        !@manifest_url.nil? && (install? || !!@override)
+      end
+
+      def empty?(dir)
+        dir.empty? || (dir.children.size == 1 && dir.join(dir.children.first).to_s == __FILE__)
+      end
+
       def install?(dir = root)
         return true if empty?(dir) || dir.join('.repo').directory?
         return false unless dir == root && env('REPO_HOME').nil? && !env('REPO_ROOT').nil?

data/lib/squared/workspace/series.rb

@@ -8,18 +8,22 @@ module Squared
       include ::Rake::DSL
       extend Forwardable
 
+      TASK_BASE = %i[build refresh depend outdated doc test copy clean].freeze
+      TASK_KEYS = TASK_BASE.dup
+      TASK_EXTEND = {}
+      private_constant :TASK_BASE, :TASK_KEYS, :TASK_EXTEND
+
+      def self.add(task, obj)
+        TASK_KEYS << task unless TASK_KEYS.include?(task)
+        (TASK_EXTEND[task] ||= []).push(obj)
+      end
+
       attr_reader :sync, :multiple, :parallel
 
       def_delegators :@data, :[], :each, :each_key, :keys, :fetch, :to_a, :to_s, :inspect, :merge!, :key?
 
-      def initialize(tasks, keys: Workspace::Application::WORKSPACE_KEYS)
-        if tasks.is_a?(Array)
-          @data = {}
-          tasks.each { |key| __set__ key }
-        else
-          @data = tasks.dup
-        end
-        @keys = keys
+      def initialize(prefix = nil)
+        @prefix = prefix
         @sync = []
         @multiple = []
         @parallel = []
@@ -28,77 +32,80 @@ module Squared
           parent: {},
           id: []
         }
+        @data = {}
+        TASK_KEYS.each { |key| @data[key] = [] }
       end
 
       def __set__(key)
         self[key.to_sym] ||= []
       end
 
-      def populate(proj)
+      def __populate__(proj)
         return unless @session
 
         group, parent, id = @session.values
-        workspace = proj.workspace
+        ws = proj.workspace
         each do |key, items|
-          target = "#{proj.name}:#{key}"
-          if @keys.include?(key)
-            next unless proj.has?(key) || (target = workspace.task_base?(key, target))
-          else
-            next unless workspace.task_include?(proj, key)
-          end
-          next unless workspace.task_defined?(target)
+          task = "#{proj.name}:#{key}"
+          next if include?(key) ? !proj.has?(key) && !(task = ws.task_base?(key, task)) : !ws.task_extend?(proj, key)
+          next unless ws.task_defined?(task)
 
           if (g = proj.group)
             id << g
-            (group[:"#{key}:#{g}"] ||= []).push(target)
+            (group[:"#{key}:#{g}"] ||= []).push(task)
           else
-            items << target
+            items << task
           end
-          next unless (b = find_base(proj)) && (name = b.ref.to_s) != g
+          next unless (b = ws.find_base(proj)) && (name = b.ref.to_s) != g
 
           id << name
-          (parent[:"#{key}:#{name}"] ||= []).push(target)
+          (parent[:"#{key}:#{name}"] ||= []).push(task)
         end
       end
 
-      def build(**kwargs)
-        thread = kwargs.fetch(:parallel, []).map(&:to_s)
+      def __build__(parallel: [], **)
         group, parent, id = @session.values
         merge!(parent) if id.uniq.size > 1
         merge!(group)
         each do |key, items|
           next if items.empty?
 
-          key = key.to_s
+          name = key.to_s
+          key = @prefix ? "#{@prefix}:#{name}" : name
+          val = key.split(':').join(' => ')
           if items.size > 1
-            multiple << key
-            if thread.include?(key) || (key.include?(':') && thread.include?(key.split(':').first.to_sym))
-              desc "#{key} (thread)"
+            @multiple << key
+            if parallel.include?(name) || (name.include?(':') && parallel.include?(name.split(':').first.to_sym))
+              desc "#{val} (thread)"
               multitask key => items
-              parallel << key
+              @parallel << key
 
-              desc "#{key} (sync)"
-              task "#{key}:sync": items
-              sync << "#{key}:sync"
-              multiple << "#{key}:sync"
+              desc "#{val} (sync)"
+              task "#{key}:sync" => items
+              @sync << "#{key}:sync"
               next
             end
           end
 
-          desc key
+          desc val
           task key => items
         end
+        @multiple += sync
         @session = nil
       end
 
-      def method_missing(key, *)
-        self[key]
-      end
-
       def has?(key)
         !key.nil? && key?(key = key.to_sym) && !self[key].empty?
       end
 
+      def include?(key)
+        TASK_BASE.include?(key)
+      end
+
+      def extend?(obj, key)
+        TASK_EXTEND.fetch(key, []).any? { |kind| obj.is_a?(kind) && obj.ref?(kind.ref) }
+      end
+
       def multiple?(val = nil)
         already_invoked?(multiple, val)
       end
@@ -111,12 +118,14 @@ module Squared
         already_invoked?(parallel, val)
       end
 
-      def respond_to_missing?(key, *)
-        key?(key)
-      end
-
       private
 
+      def method_missing(key, *)
+        raise NoMethodError, key unless key?(key)
+
+        self[key]
+      end
+
       def already_invoked?(list, val)
         return list.include?(val) && Common::Task.invoked?(val) if val
 

data/lib/squared/workspace.rb

@@ -12,7 +12,7 @@ module Squared
           if id.is_a?(::Symbol)
             project id
           else
-            (id = Pathname.new(id).realdirpath.to_s) rescue nil if id.is_a?(::String)
+            id = dirpath(id) if id.is_a?(::String)
             __get__(:project).find { |_, val| val.path.to_s == id.to_s }
           end
         end
@@ -26,6 +26,12 @@ module Squared
         raise NoMethodError, message('project is not initialized', hint: name)
       end
 
+      def dirpath(val, absolute: true)
+        Pathname.new(val).realdirpath
+      rescue StandardError
+        absolute ? Pathname.pwd.join(val) : Pathname.new(val)
+      end
+
       def project?(name)
         !!project(name)&.enabled?
       end
@@ -39,6 +45,6 @@ module Squared
   end
 end
 
-require_relative 'workspace/application'
 require_relative 'workspace/series'
+require_relative 'workspace/application'
 require_relative 'workspace/project'

data/squared.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rake"
   spec.add_dependency "logger"
+  spec.add_dependency "rexml"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - An Pham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rake task generator for managing multi-language workspaces.
 email:
 - anpham6@gmail.com