squared 0.0.10 → 0.0.11

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

@@ -14,25 +14,25 @@ module Squared
 
         class << self
           def populate(*); end
+          def batchargs(*); end
+          def aliasargs(*); end
 
           def tasks
-            nil
+            %i[outdated].freeze
           end
 
-          def is_a?(val)
-            if (val = as_path(val))
-              RUBY_DIR.any? { |file| val.join(file).exist? }
-            else
-              super
-            end
+          def config?(val)
+            return false unless (val = as_path(val))
+
+            RUBY_DIR.any? { |file| val.join(file).exist? }
           end
         end
 
         @@tasks[ref] = {
-          install: %i[redownload local prefer-local gem with without],
-          update: %i[all patch minor major],
-          outdated: %i[patch minor major],
-          pristine: %i[gem all version],
+          install: %i[redownload local prefer-local gem with without].freeze,
+          update: %i[all patch minor major].freeze,
+          outdated: %i[patch minor major].freeze,
+          pristine: %i[gem all version].freeze,
           exec: nil,
           config: nil,
           rake: nil
@@ -154,7 +154,7 @@ module Squared
           end
         end
 
-        def depend(flag = nil, opts: [])
+        def depend(flag = nil, opts: [], sync: invoked_sync?('depend', flag))
           if @depend && !flag
             super
           elsif outdated?
@@ -167,7 +167,7 @@ module Squared
               append_repeat flag, opts
             when :redownload, :local, :'prefer-local'
               cmd = bundle_session 'install', "--#{flag}"
-              if (val = env('BUNDLE_TRUST_POLICY'))
+              if (val = option('trust-policy', ignore: false))
                 cmd << "--trust-policy=#{case val
                                          when '0'
                                            'NoSecurity'
@@ -188,28 +188,28 @@ module Squared
               bundle_session 'install'
               append_bundle
             end
-            run_rb(sync: invoked_sync?('depend', flag))
+            run_rb(sync: sync)
           end
         end
 
-        def copy(from: 'lib', glob: '**/*', gemdir: @gemdir, override: false)
+        def copy(from: 'lib', glob: '**/*', into: @gemdir, override: false)
           if @copy && !override
             return super if runnable?(@copy)
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:glob] if @copy.key?(:glob)
-            gemdir = @copy[:gemdir] if @copy.key?(:gemdir)
+            into = @copy[:into] if @copy.key?(:into)
           end
-          return unless gemdir
+          return unless into
 
-          dest = Pathname.new(gemdir).realpath
+          dest = Pathname.new(into).realpath
           print_item unless @output[0]
           glob = as_a(glob)
           as_a(from).each_with_index do |val, i|
             a = base_path(val)
             b = dest.join(val)
             c = glob[i] || '**/*'
-            log.warn "cp #{a.join(c)} #{b}"
+            log.info "cp #{a.join(c)} #{b}"
             copy_d(a, b, glob: c, verbose: verbose)
           end
         end
@@ -217,7 +217,7 @@ module Squared
         def outdated(rev = nil, opts: [])
           cmd = bundle_session 'outdated', rev && "--#{rev}"
           append_bundle opts, OPT_OUTDATED
-          cmd = close_session(cmd)
+          cmd = session_done(cmd)
           log.info cmd
           banner = format_banner(cmd)
           if invoked_sync?('outdated', rev)
@@ -232,31 +232,32 @@ module Squared
               if start > 0
                 unless stdin?
                   data = line.scan(SEM_VER)
-                  cur = data.shift
-                  lat = data.shift
-                  if cur && lat
-                    semver(cur)
-                    semver(lat)
-                    c = cur.join
-                    l = lat.join
-                    styles = []
+                  next unless (cur = data.shift) && (lat = data.shift)
+
+                  semver(cur)
+                  semver(lat)
+                  c = cur.join
+                  l = lat.join
+                  styles = []
+                  major_set = lambda do
+                    styles = %i[green bold]
+                    major += 1
+                  end
+                  minor_set = -> { styles[0] = cur[2] == lat[2] ? :yellow : :green }
+                  if data.empty?
+                    semmajor(cur, lat) ? major_set.() : minor_set.()
+                  else
                     data.each do |val|
                       break unless (req = /(>=?|=|~>|!=|<=?) (#{Regexp.escape(val.join)})/.match(line))
 
                       v = semver(val).join
                       case req[1]
                       when '>', '>='
-                        if semmajor(cur, lat)
-                          styles = %i[green bold]
-                          major += 1
-                        else
-                          styles[0] = cur[2] == lat[2] ? :yellow : :green
-                        end
+                        semmajor(cur, lat) ? major_set.() : minor_set.()
                       when '<', '<='
                         if c <= v
                           if semmajor(cur, lat)
-                            styles = %i[green bold]
-                            major += 1
+                            major_set.()
                           else
                             styles[0] = :yellow
                           end
@@ -277,20 +278,20 @@ module Squared
                         end
                       end
                     end
-                    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
-                      styles = styles.compact
-                                     .map { |s| s == :green || s == :yellow ? color(s) : s }
-                                     .flatten
-                      line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.+)$/, styles: styles,
-                                             index: 2)
+                  end
+                  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
+                    styles = styles.compact
+                                   .map { |s| s == :green || s == :yellow ? color(s) : s }
+                                   .flatten
+                    line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.*)$/, styles: styles,
+                                           index: 2)
                   end
                 end
                 puts "#{start.to_s.rjust(2)}. #{line}"
@@ -298,16 +299,24 @@ module Squared
               elsif line =~ /^Gem /
                 print_item banner if banner
                 unless stdin?
-                  puts print_footer(" #  #{line.chomp}", reverse: true, sub: [
-                    { pat: /^(.+)(Gem)(.+)$/, styles: theme[:header], index: 2 },
-                    { pat: /^(.+)(Latest)(.+)$/, styles: theme[:header], index: 2 }
-                  ])
+                  sub = { pat: /^(.+)(?<!\dm)(Gem|Latest)(.+)$/, styles: theme[:header], index: 2 }
+                  puts print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub])
                 end
                 start += 1
               end
             end
             if found > 0
-              puts print_footer(empty_status('Updates are available', 'major', major, always: true))
+              begin
+                if major == 0 && (data = /\b(?:source\s+(["'])(.+?)\1|remote:\s+(\S+))/.match(@gemfile.read))
+                  status = (data[2] || data[3]).chomp('/')
+                  right = true
+                end
+              rescue StandardError => e
+                log.debug e
+              ensure
+                status ||= 'Updates are available'
+              end
+              puts print_footer(empty_status(status, 'major', major, always: !right), right: right)
             elsif start == 0
               puts 'No updates were found'
             end
@@ -357,13 +366,17 @@ module Squared
           end
         end
 
-        def variable_all
+        def variables
           ret = super + VAR_SET
           ret.freeze
         end
 
+        def depend?
+          @depend != false && (!@depend.nil? || outdated?)
+        end
+
         def copy?
-          return true if super || (@copy.is_a?(::Hash) && copy.fetch(:gemdir, nil))
+          return true if super || (@copy.is_a?(::Hash) && copy.fetch(:into, nil))
           return gemdir? if @gemdir
 
           if @version && (val = ENV['GEM_HOME'])
@@ -407,7 +420,7 @@ module Squared
         end
 
         def append_bundle(opts = nil, list = nil)
-          if (val = env('BUNDLE_JOBS')).to_i > 0
+          if (val = option('jobs')).to_i > 0
             @session << "-j#{val}"
           end
           return unless opts && list
@@ -423,16 +436,17 @@ module Squared
 
         def gem_session(*cmd)
           ret = session('gem', *cmd)
-          if (val = env('GEM_CONFIG_FILE'))
+          if (val = option('config-file', ignore: false))
             ret << "--config-file=#{shell_escape(base_path(val).to_s, quote: true)}"
           end
-          ret << '--norc' if env('GEM_NORC')
+          ret << '--norc' if option('norc')
           ret
         end
 
         def bundle_session(*cmd)
           session('bundle', *cmd)
-          append_nocolor
+          append_nocolor option('no-color')
+          @session
         end
 
         def gempath
@@ -443,6 +457,8 @@ module Squared
           @gemdir.exist? && !@gemdir.empty?
         end
       end
+
+      Application.implement Ruby
     end
   end
 end

data/lib/squared/workspace/project.rb

@@ -18,6 +18,3 @@ end
 
 require_relative 'project/base'
 require_relative 'project/git'
-require_relative 'project/node'
-require_relative 'project/python'
-require_relative 'project/ruby'

data/lib/squared/workspace/repo.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
+require 'rexml/document'
+
 module Squared
   module Workspace
     module Repo
       include Common
       include Format
+      include Prompt
       include System
       include Utils
 
       class << self
         def read_manifest(path)
-          require 'rexml/document'
           return unless (file = path.join('.repo/manifest.xml')).exist?
 
           doc = REXML::Document.new(file.read)
@@ -22,6 +24,8 @@ module Squared
         end
       end
 
+      attr_reader :manifest_url, :manifest
+
       def repo(url, manifest = 'latest', run: nil, script: nil, dev: nil, prod: nil, ref: @ref, group: @group)
         @home = if (val = env('REPO_HOME'))
                   home = Pathname.new(val)
@@ -59,10 +63,10 @@ module Squared
                               when 'verbose'
                                 @verbose = 1
                                 if script.is_a?(::Array)
-                                  script[0] = "#{script[0]}:verbose"
+                                  script[0] = task_join(script[0], 'verbose')
                                   script
                                 else
-                                  "#{script}:verbose"
+                                  task_join(script, 'verbose')
                                 end
                               when 'silent'
                                 @verbose = false
@@ -114,7 +118,7 @@ module Squared
         kwargs.delete(:parallel) if env('REPO_SYNC', ignore: '0')
 
         branch = env('REPO_MANIFEST') || Repo.read_manifest(root)
-        target = branch || @manifest
+        target = branch || manifest
         stage = nil
         failfast = true
         cmd = []
@@ -140,7 +144,7 @@ module Squared
         status = lambda do |val, alt = nil|
           return 'inactive' unless (ver = branch || alt)
 
-          message(@prefix || '', 'repo', val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail'), ver)
+          message(@prefix, 'repo', val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail'), ver, empty: true)
         end
 
         namespace task_name('repo') do |repo|
@@ -150,12 +154,21 @@ module Squared
             stage ||= 'all'
             repo['sync'].invoke
             @project.select do |_, proj|
-              next unless proj.enabled?(Project::Base.ref)
+              next unless proj.enabled?(proj.workspace.baseref)
 
-              proj.depend if proj.depend?
+              proj.depend(sync: true) if proj.depend?
               proj.build?
             end
-            .each_value { |proj| proj.has?('dev') ? proj.refresh : proj.build }
+            .each_value do |proj|
+              proj.build(sync: true)
+              next unless proj.has?('dev') && proj.copy?
+
+              if (ws = proj.workspace).task_defined?(target = ws.task_name(proj.name, 'copy'))
+                Common::Task.invoke(target, **ws.invokeargs)
+              else
+                proj.copy(sync: true)
+              end
+            end
           end
 
           desc status.("init[manifest?=#{target},{0}]", target)
@@ -163,7 +176,7 @@ module Squared
             parse_opts.(args)
             stage = 'init'
             puts if newline
-            system("repo init -u #{@manifest_url} -m #{args.manifest || target}.xml", chdir: root)
+            system("repo init -u #{manifest_url} -m #{args.manifest || target}.xml", chdir: root)
             repo['all'].invoke
           end
 
@@ -179,7 +192,7 @@ module Squared
             begin
               shell("repo sync #{cmd.join(' ')}", chdir: root, exception: failfast)
             rescue StandardError => e
-              emphasize(e, title: "rake stash #{task_name("repo:#{stage || 'sync'}")}")
+              emphasize(e, title: "rake stash #{task_name(task_join('repo', stage || 'sync'))}")
               raise
             end
           end
@@ -190,7 +203,7 @@ module Squared
         return false unless root.directory?
 
         path = sub_style(root, styles: theme[:inline])
-        @override = confirm(
+        @repo_override = confirm(
           "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation? [y/N] ",
           'N',
           timeout: env('REPO_TIMEOUT', 15, ignore: '0')
@@ -198,7 +211,7 @@ module Squared
       end
 
       def repo?
-        !@manifest_url.nil? && (repo_install? || !!@override)
+        !manifest_url.nil? && (repo_install? || @repo_override == true)
       end
 
       def repo_install?(dir = root, parent: false)

data/lib/squared/workspace/series.rb

@@ -8,22 +8,51 @@ module Squared
       include ::Rake::DSL
       extend Forwardable
 
-      TASK_BASE = %i[build refresh depend outdated doc test copy clean].freeze
-      TASK_ALIAS = {
-        refresh: :build
-      }
-      TASK_KEYS = TASK_BASE.dup
+      TASK_BASE = %i[build depend doc test copy clean]
+      TASK_BATCH = {}
       TASK_EXTEND = {}
-      private_constant :TASK_BASE, :TASK_ALIAS, :TASK_KEYS, :TASK_EXTEND
+      TASK_KEYS = TASK_BASE.dup
+      TASK_ALIAS = {}
+      TASK_NAME = {}
+      private_constant :TASK_BASE, :TASK_BATCH, :TASK_KEYS, :TASK_NAME, :TASK_EXTEND
 
       class << self
         def add(task, obj)
-          TASK_KEYS << task unless TASK_KEYS.include?(task)
+          key_set task
           (TASK_EXTEND[task] ||= []).push(obj)
         end
 
-        def alias(key, task)
-          TASK_ALIAS[key.to_sym] = task.to_sym
+        def batch(ref, obj)
+          if obj.is_a?(::Hash)
+            obj.each do |key, val|
+              key_set key
+              data = TASK_BATCH[key] ||= {}
+              (data[ref] ||= []).concat(val)
+            end
+          elsif (data = TASK_BATCH[obj]) && data.delete(ref) && data.empty?
+            TASK_KEYS.delete(obj)
+          end
+        end
+
+        def alias(ref, obj)
+          if obj.is_a?(::Hash)
+            obj.each { |key, val| (TASK_ALIAS[key] ||= {})[ref] = val }
+          elsif (data = TASK_ALIAS[obj])
+            data.delete(ref)
+          end
+        end
+
+        def rename(key, task)
+          TASK_NAME[key.to_sym] = task.to_sym
+        end
+
+        private
+
+        def key_set(val)
+          return if TASK_KEYS.include?(val)
+
+          TASK_KEYS << val
+          TASK_BASE.delete(val)
         end
       end
 
@@ -45,57 +74,48 @@ module Squared
         TASK_KEYS.each { |key| @data[key] = [] }
       end
 
-      def __set__(key)
-        @data[key.to_sym] ||= []
-      end
-
-      def __populate__(proj)
-        return unless @session
-
+      def populate(proj)
         group, parent, id = @session.values
-        ws = proj.workspace
-        ref = Project::Base.ref
         @data.each do |key, items|
-          task = "#{proj.name}:#{key}"
-          unless (base = include?(key)) ? proj.has?(key, ref) : ws.task_extend?(proj, key)
-            next if (base && !proj.ref?(ref)) || (alt = TASK_ALIAS[key]).nil?
-
-            task = "#{proj.name}:#{alt}"
-          end
-          next unless ws.task_defined?(task)
+          ws = proj.workspace
+          next if (tasks = ws.task_resolve(proj, key)).empty?
 
           if (g = proj.group)
             id << g
-            (group[:"#{key}:#{g}"] ||= []).push(task)
+            (group[:"#{key}:#{g}"] ||= []).push(*tasks)
           else
-            items << task
+            items.concat(tasks)
+          end
+          if tasks.size > 1 && (data = batch_get(key)) && data.keys.any? { |ref| proj.ref?(ref) }
+            desc ws.task_name(t = ws.task_join(proj.name, key), desc: true)
+            task ws.task_name(t) => tasks
           end
           next unless (b = ws.find_base(proj)) && (name = b.ref.to_s) != g
 
           id << name
-          (parent[:"#{key}:#{name}"] ||= []).push(task)
+          (parent[:"#{key}:#{name}"] ||= []).push(*tasks)
         end
       end
 
-      def __build__(parallel: [], **)
-        group, parent, id = @session.values
-        @data.merge!(parent) if id.uniq.size > 1
-        @data.merge!(group)
+      def build(parallel: [], **)
+        @data.merge!(@session[:parent]) if @session[:id].uniq.size > 1
+        @data.merge!(@session[:group])
         @data.each do |key, items|
           next if items.empty?
 
-          key = @workspace.task_name(name = key.to_s)
-          val = @workspace.task_name(name, desc: true)
+          key = @workspace.task_name(t = name_get(key))
+          val = @workspace.task_name(t, desc: true)
           if items.size > 1
             @multiple << key
-            if parallel.include?(name) || ((ns = @workspace.task_namespace(name)) && parallel.include?(ns))
+            if parallel.include?(t) || ((ns = @workspace.task_namespace(t)) && parallel.include?(ns))
               desc "#{val} (thread)"
               multitask key => items
               @parallel << key
 
+              s = @workspace.task_join(key, 'sync')
               desc "#{val} (sync)"
-              task "#{key}:sync" => items
-              @sync << "#{key}:sync"
+              task s => items
+              @sync << s
               next
             end
           end
@@ -103,19 +123,31 @@ module Squared
           desc val
           task key => items
         end
-        TASK_ALIAS.each_key do |key|
-          suf = ":#{key}"
-          @data[key].clear unless @data[key].any? { |val| val.end_with?(suf) }
-        end
         @multiple += sync
-        @session = nil
+      end
+
+      def name_get(key)
+        (TASK_NAME[key] || key).to_s
+      end
+
+      def batch_get(key)
+        TASK_BATCH[key]
+      end
+
+      def alias_get(key)
+        TASK_ALIAS[key]
       end
 
       def some?(key)
-        @data.key?(key) && !@data[key].empty?
+        return @data.key?(key) && !@data[key].empty? unless (batch = batch_get(key))
+
+        batch.each_value do |items|
+          return true if items.all? { |val| some?(val) || alias_get(val)&.any? { |_, alt| some?(alt) } }
+        end
+        false
       end
 
-      def include?(key)
+      def base?(key)
         TASK_BASE.include?(key)
       end
 
@@ -137,17 +169,13 @@ module Squared
 
       private
 
-      def method_missing(key, *)
-        raise NoMethodError, key unless @data.key?(key)
-
-        @data[key]
-      end
-
       def already_invoked?(list, val)
-        return list.include?(val) && Common::Task.invoked?(val) if val
+        return false unless val && !list.include?(val)
 
-        ::Rake::Task.tasks.any? { |obj| obj.already_invoked && list.include?(obj.name) }
+        ::Rake::Task.tasks.any? { |obj| obj.already_invoked && (val ? val == obj.name : list.include?(obj.name)) }
       end
     end
+
+    Application.impl_series = Series
   end
 end

data/lib/squared/workspace.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'common'
-
 module Squared
   module Workspace
     class << self
@@ -23,7 +21,7 @@ module Squared
         ret = project(name)
         return ret if ret&.path&.directory?
 
-        raise NoMethodError, message('project is not initialized', hint: name)
+        raise NoMethodError, "project is not initialized (#{name})"
       end
 
       def dirpath(val, absolute: true)
@@ -45,6 +43,9 @@ module Squared
   end
 end
 
-require_relative 'workspace/series'
 require_relative 'workspace/application'
+require_relative 'workspace/series'
 require_relative 'workspace/project'
+
+Workspace = Squared::Workspace
+Project = Squared::Workspace::Project

data/lib/squared.rb

@@ -1,14 +1,4 @@
 # frozen_string_literal: true
 
 require_relative 'squared/version'
-require_relative 'squared/workspace'
-
-Workspace = Squared::Workspace
-Project = Squared::Workspace::Project
-
-Workspace::Application.implement(
-  Project::Git,
-  Project::Node,
-  Project::Python,
-  Project::Ruby
-)
+require_relative 'squared/common'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - An Pham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -63,10 +63,12 @@ files:
 - README.md
 - README.ruby.md
 - lib/squared.rb
+- lib/squared/app.rb
 - lib/squared/common.rb
 - lib/squared/common/base.rb
 - lib/squared/common/class.rb
 - lib/squared/common/format.rb
+- lib/squared/common/prompt.rb
 - lib/squared/common/shell.rb
 - lib/squared/common/system.rb
 - lib/squared/common/task.rb