squared 0.0.12 → 0.1.0

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

@@ -6,7 +6,7 @@ module Squared
       class Python < Git
         REQUIREMENTS = %w[requirements.txt pyproject.toml setup.py].freeze
         OPT_USER = %w[pre dry-run].freeze
-        OPT_FORCE = [*OPT_USER, 'user'].freeze
+        OPT_FORCE = (OPT_USER + ['user']).freeze
         OPT_GENERAL = %w{venv isolated no-cache-dir [v]erbose}.freeze
         private_constant :REQUIREMENTS, :OPT_USER, :OPT_FORCE, :OPT_GENERAL
 
@@ -116,6 +116,8 @@ module Squared
               when :force
                 cmd << '--force-reinstall'
                 append_pip opts, OPT_FORCE
+              else
+                append_pip
               end
               cmd << (type == 1 ? '-r requirements.txt' : '.')
               run(sync: sync)
@@ -127,6 +129,7 @@ module Squared
 
         def outdated(*)
           pip_session 'list', '--outdated'
+          append_pip
           run
         end
 
@@ -159,7 +162,7 @@ module Squared
           session('pip', *cmd)
         end
 
-        def append_pip(opts, list = [])
+        def append_pip(opts = [], list = [])
           opts.each do |opt|
             next unless list.include?(opt) || OPT_GENERAL.include?(opt) || (v = opt.match(/^v+$/))
 
@@ -170,14 +173,13 @@ module Squared
                           (v ? "-#{v[0]}" : "--#{opt}")
                         end
           end
-          @session << '--user' if option('user')
-          @session << '--no-input' if option('no-input')
           if (val = option('proxy', ignore: false))
             @session << "--proxy=#{shell_escape(val, quote: true)}"
           end
-          if (val = option('log', ignore: false))
-            @session << "--log=#{shell_escape(basepath(val), quote: true)}"
-          end
+          @session << "--python=#{shell_escape(basepath(val), quote: true)}" if (val = option('python', ignore: false))
+          @session << "--log=#{shell_escape(basepath(val), quote: true)}" if (val = option('log', ignore: false))
+          @session << '--user' if option('user')
+          @session << '--no-input' if option('no-input')
           append_nocolor option('no-color')
         end
 

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

@@ -6,7 +6,7 @@ module Squared
       class Ruby < Git
         VAR_SET = %i[version autodetect].freeze
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
-        RUBY_DIR = [*GEMFILE, *::Rake::Application::DEFAULT_RAKEFILES, 'README.rdoc'].freeze
+        RUBY_DIR = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_INSTALL = %w[no-cache force].freeze
         OPT_UPDATE = %w[redownload local strict conservative group=s].freeze
         OPT_OUTDATED = %w[local strict pre only-explicit group=s].freeze
@@ -95,7 +95,7 @@ module Squared
                     if args.command == '#'
                       format_list(read_rakefile, 'rake[^N]', 'tasks', grep: args.extras, from: rakefile.to_s,
                                                                       each: ->(val) { val[0] + val[1].to_s })
-                    elsif (data = indexdata(args.command))
+                    elsif (data = indexitem(args.command))
                       n, opts = data
                       list = read_rakefile
                       if (item = list[n - 1])
@@ -206,25 +206,26 @@ module Squared
           end
         end
 
-        def copy(from: 'lib', glob: nil, into: @gemdir, override: false)
+        def copy(from: 'lib', include: nil, exclude: nil, 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)
+            glob = @copy[:include] if @copy.key?(:include)
+            pass = @copy[:exclude] if @copy.key?(:exclude)
             into = @copy[:into] if @copy.key?(:into)
           end
           return unless into
 
           dest = Pathname.new(into).realpath
-          print_item unless @output[0]
+          print_item unless @output[0] || task_invoked?(/^copy(?::#{Ruby.ref}|$)/)
           glob = as_a(glob || '**/*')
           as_a(from).each_with_index do |val, i|
             a = basepath(val)
             b = dest.join(val)
             c = glob[i] || glob[0]
             log.info "cp #{a.join(c)} #{b}"
-            copy_d(a, b, glob: c, verbose: verbose)
+            copy_d(a, b, glob: c, pass: pass, verbose: verbose)
           end
         end
 
@@ -375,7 +376,7 @@ module Squared
         end
 
         def copy?
-          return true if super || (@copy.is_a?(::Hash) && copy.fetch(:into, nil))
+          return true if super || (@copy.is_a?(Hash) && copy.fetch(:into, nil))
           return gemdir? if @gemdir
 
           if @version && (val = ENV['GEM_HOME'])
@@ -414,11 +415,6 @@ module Squared
 
         private
 
-        def variables
-          ret = super + VAR_SET
-          ret.freeze
-        end
-
         def run_rb(sync: true)
           run(sync: sync, banner: !@session.include?('--quiet'))
         end
@@ -465,18 +461,23 @@ module Squared
           @rakelist = ret
         end
 
+        def gemdir?
+          @gemdir.exist? && !@gemdir.empty?
+        end
+
+        def variables
+          ret = super + VAR_SET
+          ret.freeze
+        end
+
         def rakefile
-          file = ::Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }
+          file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }
           basepath(file) if file
         end
 
         def gempath
           File.join('gems', "#{project}-#{@version}")
         end
-
-        def gemdir?
-          @gemdir.exist? && !@gemdir.empty?
-        end
       end
 
       Application.implement Ruby

data/lib/squared/workspace/repo.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rexml/document'
-
 module Squared
   module Workspace
     module Repo
@@ -9,6 +7,7 @@ module Squared
 
       class << self
         def read_manifest(path)
+          require 'rexml/document'
           return unless (file = path.join('.repo/manifest.xml')).exist?
 
           doc = REXML::Document.new(file.read)
@@ -16,7 +15,17 @@ module Squared
         end
 
         def empty?(dir)
-          dir.empty? || (dir.children.size == 1 && dir.join(dir.children.first).to_s == __FILE__)
+          return false unless dir.exist?
+
+          case dir.children.size
+          when 0
+            true
+          when 1
+            file = dir.children.first
+            file.to_s == __FILE__ || (file.directory? && file.basename.to_s == '.repo')
+          else
+            false
+          end
         end
       end
 
@@ -45,20 +54,24 @@ module Squared
                     raise_error('REPO_ROOT', val, hint: 'exist') unless repo_confirm
                   end
                   @root.join(main).realdirpath
+                elsif repo_install?(@home)
+                  @home.join(main)
+                elsif @home != pwd && repo_install?(pwd)
+                  pwd.join(main)
                 else
-                  repo_install?(@home) ? @home.join(main) : @home
+                  @home
                 end
         @root = @home.parent
         @manifest_url = url
         @manifest = manifest
-        data = script_obj
+        data = scriptobj
         if repo?
           if script
             if (val = env('REPO_BUILD'))
               data[:script] = case val
                               when 'verbose'
                                 @verbose = 1
-                                if script.is_a?(::Array)
+                                if script.is_a?(Array)
                                   script[0] = task_join(script[0], 'verbose')
                                   script
                                 else
@@ -162,7 +175,7 @@ module Squared
               if (ws = proj.workspace).task_defined?(target = ws.task_name(task_join(proj.name, 'copy')))
                 task_invoke(target, **ws.invokeargs)
               else
-                proj.copy(sync: true)
+                proj.copy
               end
             end
           end
@@ -182,7 +195,7 @@ module Squared
               raise_error('repo is not initialized', "rake #{task_name('repo:init')}", kind: LoadError)
             end
             parse_opts.(args)
-            cmd << "-j#{ENV.fetch('REPO_JOBS', ::Rake::CpuCounter.count)}"
+            cmd << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}"
             cmd << '--fail-fast' if failfast
             puts if newline && stage != 'init'
             begin
@@ -192,12 +205,13 @@ module Squared
               raise
             end
           end
+
+          series.sync.push(
+            task_join(name, 'all'),
+            task_join(name, 'init'),
+            task_join(name, 'sync')
+          )
         end
-        series.sync.push(
-          task_join(name, 'all'),
-          task_join(name, 'init'),
-          task_join(name, 'sync')
-        )
       end
 
       def repo_confirm
@@ -218,7 +232,7 @@ module Squared
       def repo_install?(dir = root, parent: false)
         return true if Repo.empty?(dir) || dir.join('.repo').directory?
 
-        parent && root.children.none? { |ent| ent.directory? && ent.basename.to_s[0] != '.' && ent.to_s != home.to_s }
+        parent && root.children.none? { |ent| ent.directory? && ent.basename.to_s[0] != '.' && ent != home }
       end
     end
 

data/lib/squared/workspace/series.rb

@@ -5,13 +5,13 @@ require 'forwardable'
 module Squared
   module Workspace
     class Series
-      include ::Rake::DSL
+      include Rake::DSL
       extend Forwardable
 
       TASK_BASE = %i[build depend graph doc test copy clean]
       TASK_BATCH = {}
       TASK_EXTEND = {}
-      TASK_KEYS = TASK_BASE.dup + TASK_BATCH.keys
+      TASK_KEYS = TASK_BASE + TASK_BATCH.keys
       TASK_ALIAS = {}
       TASK_NAME = {}
       private_constant :TASK_BASE, :TASK_BATCH, :TASK_KEYS, :TASK_NAME, :TASK_EXTEND
@@ -19,11 +19,11 @@ module Squared
       class << self
         def add(task, obj)
           key_set task
-          (TASK_EXTEND[task] ||= []).push(obj)
+          (TASK_EXTEND[task] ||= []) << obj
         end
 
         def batch(*args, obj)
-          if obj.is_a?(::Hash)
+          if obj.is_a?(Hash)
             obj.each do |key, val|
               key_set key
               data = TASK_BATCH[key] ||= {}
@@ -36,7 +36,7 @@ module Squared
         end
 
         def alias(ref, obj)
-          if obj.is_a?(::Hash)
+          if obj.is_a?(Hash)
             obj.each { |key, val| (TASK_ALIAS[key] ||= {})[ref] = val }
           else
             TASK_ALIAS[obj]&.delete(ref)
@@ -98,7 +98,8 @@ module Squared
         end
       end
 
-      def build(parallel: [], **)
+      def build(parallel: [], pattern: [], **)
+        subcheck = ->(val) { (ns = @workspace.task_namespace(val)) && parallel.include?(ns) }
         @data.merge!(@session[:parent]) if @session[:id].uniq.size > 1
         @data.merge!(@session[:group])
         @data.each do |key, items|
@@ -108,7 +109,7 @@ module Squared
           val = @workspace.task_name(t, desc: true)
           if items.size > 1
             @multiple << key
-            if parallel.include?(t) || ((ns = @workspace.task_namespace(t)) && parallel.include?(ns))
+            if parallel.include?(t) || pattern.any? { |pat| pat.match?(t) } || subcheck.(t)
               desc "#{val} (thread)"
               multitask key => items
               @parallel << key
@@ -173,7 +174,7 @@ module Squared
       def already_invoked?(list, val)
         return false if val && !list.include?(val)
 
-        ::Rake::Task.tasks.any? { |obj| obj.already_invoked && (val ? val == obj.name : list.include?(obj.name)) }
+        Rake::Task.tasks.any? { |obj| obj.already_invoked && (val ? val == obj.name : list.include?(obj.name)) }
       end
     end
 

data/lib/squared/workspace.rb

@@ -7,10 +7,10 @@ module Squared
 
       def resolve(*args)
         ret = args.map do |id|
-          if id.is_a?(::Symbol)
+          if id.is_a?(Symbol)
             project id
           else
-            id = dirpath(id) 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
@@ -24,12 +24,6 @@ module Squared
         raise NoMethodError, "project is not initialized (#{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 +33,12 @@ module Squared
       def project(name)
         __get__(:project)[name.to_s]
       end
+
+      def dirpath(val, absolute: true)
+        Pathname.new(val).realdirpath
+      rescue StandardError
+        absolute ? Pathname.pwd.join(val) : Pathname.new(val)
+      end
     end
   end
 end

data/squared.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.metadata["documentation_uri"] = "https://squared.readthedocs.io"
 
   spec.files         = Dir["lib/**/*"] +
-                       %w[LICENSE README.md README.ruby.md squared.gemspec]
+                       %w[CHANGELOG.md LICENSE README.md README.ruby.md squared.gemspec]
   spec.bindir        = "exe"
   spec.executables   = []
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - An Pham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-01 00:00:00.000000000 Z
+date: 2024-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - README.ruby.md