squared 0.0.12 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d9e8c772c9f4d0ce5c54dbeb1b9583d2e477f155036faf34cfc547659c34ec4
-  data.tar.gz: 87de412a78c0071eabd4b26713cbf84978a92fca6ea1a6dfe18653ddf22c90ee
+  metadata.gz: e2fd23c5964fe7c987966b8d237b569883b2dae5b70d9c120a924e2cc0227873
+  data.tar.gz: 8ef09d80e13c53fda678aa6a7194e33abf04728fb9d1c17739a5dc6c814e3b03
 SHA512:
-  metadata.gz: '08475f426b15c41dab20fbead5d7c1ead70f5d80384e0a0772cbe7b101512a4402a1bb1231b2550f7da16aac2796f8411f6a6e3e570ae728d59b03f88fea5960'
-  data.tar.gz: 5c0334640b20dda82641925cd94b41d76be4cd4e603355fef593a5cd69731ac926febab67f3ffa494267291ec9d89efba2f8a9ac4dde978ab2814a0f8a481a67
+  metadata.gz: c41b98512dfc370a056716c3af2a599321b6113fa4883ab1f9c6b1418332f6b973560ce2cb1550c3813521eaa326150371ef3e60906cb694d6a6fd41ac1e0f05
+  data.tar.gz: cedbdcb188a6fb4a8407fc36836ffbeb4b93893217cec168d291845ce9a4f3f4dede9936022b8c950efa48ec21e2f93d013dc7e6fa929397ac80df7d6e3b099a

data/CHANGELOG.md

@@ -0,0 +1,55 @@
+# 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
+
+- Git command show was implemented.
+- Projects can run arbitrarily ordered graphs.
+- Repo can be installed from a nested directory without a Rakefile.
+- Python interpreter can be set using ENV option PIP_PYTHON.
+- Node workspaces can be copied by registry package name.
+
+### Changed
+
+- Parallel tasks support using Regexp patterns.
+- Project copy globs were renamed include and exclude.
+
+### Fixed
+
+- Project workspaces did not detect for a valid directory.
+- Git pull did not display colors for diff bar chart.
+- Git commit did not fetch latest refs before submitting.
+
+## [0.0.12] - 2024-12-1
+
+### Added
+
+- 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
 
@@ -129,10 +129,17 @@ REPO_ROOT=/tmp/123 NODE_INSTALL=pnpm repo:init
 ```sh
 # NODE_TAG=latest
 # RUBY_VERSION=2.4.0-3.3.0
+# MANIFEST=nightly,staging,prod,android
 # BUILD={dev,prod}
 # DEV={0,1,local}
-# DOCS=1
+# DOCS=any
+# PIPE_FAIL={0,1}
 docker build -t squared --build-arg MANIFEST=prod --build-arg SQUARED=prod .
+docker build -t node --build-arg NODE_TAG=20 --build-arg NODE_INSTALL=pnpm -f Dockerfile.slim . # no docs
+# OR
+# RUBY_TAG=latest
+# NODE_VERSION=22.x
+docker build -t ruby --build-arg RUBY_TAG=3.0 --build-arg NODE_VERSION=20.x --build-arg PIPE_FAIL=0 -f Dockerfile.ruby .
 
 # Express
 docker run -it --name express --rm -p 127.0.0.1:80:80 \

data/README.ruby.md

@@ -20,6 +20,7 @@ gem install squared
 
 * [Repo](https://source.android.com/docs/setup/reference/repo)
 * Python 3.6
+* Not compatible with Windows
 
 ```sh
 mkdir -p ~/.bin
@@ -30,7 +31,7 @@ chmod a+rx ~/.bin/repo
 
 ## Example - Rakefile
 
-Projects from any accessible folder can be added either relative to `REPO_ROOT` or absolutely. The same Rakefile can also manage other similarly cloned repositories remotely by setting the `REPO_ROOT` environment variable to the location. Missing projects will simply be excluded from the task runner.
+Projects from any accessible folder can be added relative to the parent directory (e.g. *REPO_ROOT*) or absolutely. The same Rakefile can also manage other similarly cloned `Repo` repositories remotely by setting the `REPO_ROOT` environment variable to the location. Missing projects will simply be excluded from the task runner.
 
 ```ruby
 require "squared"
@@ -45,7 +46,7 @@ require "squared/app"                      # All workspace related modules
 
 # NODE_ENV  = production
 # REPO_ROOT = /workspaces
-# REPO_HOME = /workspaces/squared (Dir.pwd)
+# REPO_HOME = /workspaces/squared
 # rake      = /workspaces/squared/Rakefile
 # pathname  = /workspaces/pathname
 # optparse  = /workspaces/optparse
@@ -88,7 +89,7 @@ Workspace::Application
     variable_set :clean, ["build/sqd/"]
   end
   .style("banner", 255.255) # 256 colors (fg | fg.bg | -0.bg)
-  .build(default: "status", parallel: ["pull", "fetch", "rebase", "copy", "clean", "outdated:ruby"]) do |workspace|
+  .build(default: "build", parallel: ["pull", "fetch", "rebase", "copy", "clean", /^outdated:/]) do |workspace|
     workspace
       .enable_aixterm
       .style({
@@ -130,12 +131,13 @@ Workspace::Application
 ```ruby
 Workspace::Application
   .new(main: "squared")
+  .graph(["depend"], ref: :git) # Optional
   .with(:python) do
     add("android-docs", "android")
     add("chrome-docs", "chrome", graph: "android")
   end
   .with(:node) do
-    graph(["build", "copy"]) # Optional
+    graph(["build", "copy"]) # Overrides "git"
     add("e-mc", "emc")
     add("pi-r", "pir", graph: "emc")
     add("squared-express", "express", graph: "pir")

data/lib/squared/common/class.rb

@@ -15,7 +15,7 @@ module Squared
       def_delegators :@data, :+, :each, :each_with_index, :entries, :to_a, :include?
 
       def initialize(data = [])
-        @data = ::Set.new(data)
+        @data = Set.new(data)
       end
 
       def add(val)
@@ -29,7 +29,7 @@ module Squared
       alias inspect to_s
     end
 
-    class JoinSet < ::Set
+    class JoinSet < Set
       def self.to_s
         super.match(/[^:]+$/)[0]
       end

data/lib/squared/common/format.rb

@@ -94,7 +94,7 @@ module Squared
         ret = wrap.(ret, code) unless code.empty?
         return ret unless data
 
-        out = +''
+        out = ''.dup
         data.to_a.each_with_index do |group, i|
           next if i == 0
 

data/lib/squared/common/system.rb

@@ -20,17 +20,21 @@ module Squared
         end
       end
 
-      def copy_d(src, dest, glob: ['**/*'], create: false, verbose: true)
+      def copy_d(src, dest, glob: ['**/*'], pass: nil, create: false, verbose: true)
         src = ::Pathname.new(src)
         dest = ::Pathname.new(dest)
-        raise "#{dest} (not found)" if !create && !dest.exist?
+        raise "#{dest} (not found)" if !create && !dest.parent.exist?
 
         subdir = []
         files = 0
         dest.mkpath if create
+        if pass
+          exclude = []
+          (pass.is_a?(::Array) ? pass : [pass]).each { |val| exclude += ::Dir.glob(src.join(val)) }
+        end
         (glob.is_a?(::Array) ? glob : [glob]).each do |val|
           ::Dir.glob(src.join(val)) do |path|
-            next if (path = ::Pathname.new(path)).directory?
+            next if exclude&.include?(path) || (path = ::Pathname.new(path)).directory?
 
             target = dest.join(path.relative_path_from(src))
             dir = target.dirname

data/lib/squared/common/utils.rb

@@ -27,8 +27,12 @@ module Squared
         end
       end
 
-      def task_invoked?(name)
-        ::Rake::Task.tasks.any? { |obj| obj.already_invoked && obj.name == name }
+      def task_invoked?(*args)
+        ::Rake::Task.tasks.any? do |obj|
+          next unless obj.already_invoked
+
+          args.any? { |val| val.is_a?(::Regexp) ? val.match?(obj.name) : val == obj.name }
+        end
       end
 
       def env(key, default = nil, suffix: @envname, equals: nil, ignore: nil)

data/lib/squared/config.rb

@@ -9,7 +9,7 @@ module Squared
     class Viewer
       include Common::Format
       include Utils
-      include ::Rake::DSL
+      include Rake::DSL
 
       def self.to_s
         super.match(/[^:]+$/)[0]
@@ -51,7 +51,7 @@ module Squared
                       ['path not found', realpath]
                     else
                       @required = true
-                      project ? [project, 'not found'] : %w[name missing]
+                      project ? [project, 'not found'] : ['name', 'missing']
                     end
         warn log_message(:warn, msg, subject: self.class, hint: hint)
       end
@@ -63,18 +63,18 @@ module Squared
           view = @command && @command != name ? @command : 'view'
           params = ->(args) { exist? ? [realpath, [args.keys] + args.extras] : [args.keys, args.extras] }
           namespace view do
-            if @mime['json'] && (exist? || !::Rake::Task.task_defined?("#{ns}:#{view}:json"))
+            if @mime['json'] && (exist? || !Rake::Task.task_defined?("#{ns}:#{view}:json"))
               desc format_desc(view, 'json')
               task 'json', [:keys] do |_, args|
                 read_keys(JSON, 'json', *params.(args))
               end
             end
 
-            if @mime['yaml'] && (exist? || !::Rake::Task.task_defined?("#{ns}:#{view}:yaml"))
+            if @mime['yaml'] && (exist? || !Rake::Task.task_defined?("#{ns}:#{view}:yaml"))
               desc format_desc(view, 'yaml', 'yml')
               task 'yaml', [:keys] do |_, args|
                 require 'yaml'
-                read_keys(YAML, 'yaml', *params.(args), ext: %w[yml yaml])
+                read_keys(YAML, 'yaml', *params.(args), ext: ['yml', 'yaml'])
               end
             end
           end
@@ -120,7 +120,7 @@ module Squared
       def also(path, type = nil, name: nil, gem: nil, parse: nil, opts: {})
         return self if @mime.frozen? || !(file = basepath(path)).exist?
 
-        ext = mime_type(file)
+        ext = mimetype(file)
         type = type&.to_s || ext
         unless parse
           case type
@@ -140,6 +140,12 @@ module Squared
         self
       end
 
+      def enabled?
+        return File.exist?(realpath) if exist?
+
+        !@required || !!project&.enabled?
+      end
+
       def extensions
         exist? ? [@ext.sub('.', '')] : @mime.keys
       end
@@ -154,12 +160,6 @@ module Squared
         "#<#{self.class}: #{name} => #{exist? ? realpath : "#{main} {#{extensions.join(', ')}}"}>"
       end
 
-      def enabled?
-        return File.exist?(realpath) if exist?
-
-        !@required || !!project&.enabled?
-      end
-
       private
 
       def puts(*args)
@@ -167,7 +167,7 @@ module Squared
       end
 
       def read_keys(reader, type, file, keys, ext: [type])
-        if file && (mime = mime_type(file)) && basepath(file).exist?
+        if file && (mime = mimetype(file)) && basepath(file).exist?
           raise_error(file, mime, hint: 'invalid') unless ext.include?(mime)
         else
           if ext.include?(mime)
@@ -227,7 +227,7 @@ module Squared
             if val.nil?
               val = data
               items.each do |name|
-                raise name unless val.is_a?(::Hash) && val.key?(name)
+                raise name unless val.is_a?(Hash) && val.key?(name)
 
                 val = val[name]
               end
@@ -256,15 +256,28 @@ module Squared
         end
       end
 
-      def basepath(file)
-        project ? project.basepath(file) : Pathname.new(file).realdirpath
-      end
-
       def task_name(val)
         @prefix ? "#{@prefix}:#{val}" : val.to_s
       end
 
-      def mime_type(file)
+      def format_desc(command, *ext, exist: exist?)
+        val = "#{ext.first}[#{exist ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
+        message(@prefix, *name.split(':'), command, val, empty: true)
+      end
+
+      def exist?
+        !@ext.empty? && (!@required || !project.nil?)
+      end
+
+      def warning?
+        project ? project.workspace.warning : true
+      end
+
+      def stdin?
+        pipe == 0
+      end
+
+      def mimetype(file)
         case (ret = File.extname(file).sub('.', '').downcase)
         when 'yml'
           'yaml'
@@ -277,25 +290,12 @@ module Squared
         end
       end
 
-      def format_desc(command, *ext, exist: exist?)
-        val = "#{ext.first}[#{exist ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
-        message(@prefix, *name.split(':'), command, val, empty: true)
-      end
-
       def realpath
         basepath(file = main + @ext).to_s rescue file
       end
 
-      def exist?
-        !@ext.empty? && (!@required || !project.nil?)
-      end
-
-      def warning?
-        project ? project.workspace.warning : true
-      end
-
-      def stdin?
-        pipe == 0
+      def basepath(file)
+        project ? project.basepath(file) : Pathname.new(file).realdirpath
       end
     end
   end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -5,7 +5,7 @@ module Squared
     class Application
       include Common::Format
       include Utils
-      include ::Rake::DSL
+      include Rake::DSL
 
       SCRIPT_OBJ = {
         run: nil,
@@ -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
@@ -71,12 +78,12 @@ module Squared
         @extensions = []
         @pipe = env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
         @exception = env_bool(exception)
-        @verbose = env_bool(verbose, verbose.nil? || verbose.is_a?(::String) ? @pipe != 0 : verbose)
+        @verbose = env_bool(verbose, verbose.nil? || verbose.is_a?(String) ? @pipe != 0 : verbose)
         @warning = @verbose != false
         @closed = false
         if common
           @theme = __get__(:theme)[:workspace]
-          ARG[:COLOR] = false if @pipe == 0 || @pipe.is_a?(::Pathname)
+          ARG[:COLOR] = false if @pipe == 0 || @pipe.is_a?(Pathname)
         else
           @theme = {}
         end
@@ -95,7 +102,7 @@ module Squared
 
       def initialize_session
         @envname = @main.gsub(/[^\w]+/, '_').upcase.freeze
-        return unless @pipe.is_a?(::Pathname)
+        return unless @pipe.is_a?(Pathname)
 
         bord = '#' * Project.line_width
         puts bord, format('Session started on %s by %s', Time.now.to_s, @main), bord
@@ -104,7 +111,13 @@ module Squared
       def build(parallel: [], **kwargs)
         return self unless enabled? && !@closed
 
-        kwargs[:parallel] = parallel.map(&:to_s)
+        if kwargs[:pattern].is_a?(Array)
+          kwargs[:parallel] = parallel.map(&:to_s)
+        else
+          kwargs[:pattern] = []
+          kwargs[:parallel] = parallel.reject { |val| val.is_a?(Regexp) && (kwargs[:pattern] << val) }
+                                      .map(&:to_s)
+        end
         @project.each_value do |proj|
           next unless proj.enabled?
 
@@ -131,9 +144,9 @@ module Squared
         kind = val.first
         val = kind if val.size == 1
         case kind
-        when ::String
+        when String
           @group = val
-        when ::Symbol
+        when Symbol
           @ref = val
         else
           raise_error('group{Symbol} | ref{String}', hint: 'missing') if block_given?
@@ -182,14 +195,14 @@ module Squared
       def banner(*args, command: true, styles: nil, border: nil, group: @group, ref: @ref)
         data = { command: command, order: [], styles: check_style(styles, empty: false), border: check_style(border) }
         args.each do |meth|
-          if meth.is_a?(::Array)
+          if meth.is_a?(Array)
             found = false
             meth = meth.select do |val|
               case val
-              when ::Symbol
+              when Symbol
                 found = true
                 Application.attr_banner.include?(val)
-              when ::String
+              when String
                 true
               else
                 false
@@ -227,10 +240,10 @@ module Squared
         ref = if kwargs.key?(:ref)
                 kwargs = kwargs.dup unless @withargs
                 kwargs.delete(:ref)
-              elsif @ref.is_a?(::Symbol)
+              elsif @ref.is_a?(Symbol)
                 @ref
               end
-        if @group.is_a?(::String) && !kwargs.key?(:group)
+        if @group.is_a?(String) && !kwargs.key?(:group)
           kwargs = kwargs.dup unless @withargs
           kwargs[:group] = @group
         end
@@ -242,7 +255,7 @@ module Squared
           index += 1
           name = "#{project}-#{index}"
         end
-        proj = ((if !ref.is_a?(::Class)
+        proj = ((if !ref.is_a?(Class)
                    Application.find(ref, path: path)
                  elsif ref < Project::Base
                    ref
@@ -359,18 +372,33 @@ module Squared
         ret
       end
 
+      def task_sync(key)
+        key = task_name(key)
+        task_defined?(ret = task_join(key, 'sync')) ? ret : key
+      end
+
       def script_find(*args)
         args.reverse_each do |val|
-          next unless val && (ret = val.is_a?(::Symbol) ? @script[:ref!][val] : @script[:group!][val.to_sym])
+          next unless val && (ret = val.is_a?(Symbol) ? @script[:ref!][val] : @script[:group!][val.to_sym])
 
           return ret
         end
         @script[:ref!][:_] || SCRIPT_OBJ
       end
 
-      def script_get(group: nil, ref: nil)
+      def script_get(*args, group: nil, ref: nil)
         if group
           @script[:group][group.to_sym]
+        elsif ref.is_a?(Array)
+          ref = ref.each
+        end
+        if ref.instance_of?(Enumerator)
+          ref.each do |key|
+            next unless (ret = @script[:ref][key])
+
+            return ret if args.empty? || args.any? { |val| ret.key?(val) }
+          end
+          nil
         elsif ref
           @script[:ref][ref]
         end
@@ -384,14 +412,6 @@ module Squared
         @banner[:ref][:_]
       end
 
-      def to_s
-        (home? ? home : root).to_s
-      end
-
-      def inspect
-        "#<#{self.class}: #{main} => #{self}>"
-      end
-
       def enabled?
         !@extensions.empty? || @project.values.any?(&:enabled?)
       end
@@ -409,7 +429,7 @@ module Squared
       end
 
       def task_defined?(*key)
-        ::Rake::Task.task_defined?(key.size == 1 ? key.first : task_join(*key))
+        Rake::Task.task_defined?(key.size == 1 ? key.first : task_join(*key))
       end
 
       def dev?(**kwargs)
@@ -432,6 +452,10 @@ module Squared
         home.join(*args)
       end
 
+      def pwd
+        Pathname.new(Rake.application.original_dir)
+      end
+
       def baseref
         Application.baseref
       end
@@ -440,14 +464,22 @@ module Squared
         { exception: exception, warning: warning }
       end
 
+      def to_s
+        (home? ? home : root).to_s
+      end
+
+      def inspect
+        "#<#{self.class}: #{main} => #{self}>"
+      end
+
       public :task_join
 
       private
 
       def __build__(default: nil, **)
-        if default && task_defined?(t = task_name(default)) && !task_defined?(n = ::Rake.application.default_task_name)
-          task n => t
-        end
+        return unless default && task_defined?(out = task_name(default))
+
+        task Rake.application.default_task_name => out
       end
 
       def puts(*args)
@@ -477,10 +509,6 @@ module Squared
         end
       end
 
-      def script_obj
-        SCRIPT_OBJ.dup
-      end
-
       def script?(state, target: nil, pat: nil, group: nil, ref: baseref, global: false)
         data = script_find(ref, group)
         if global
@@ -489,7 +517,11 @@ module Squared
         end
         return false if state == :prod && data[:dev] == true && data[:global]
 
-        target && pat.is_a?(::Regexp) ? as_a(target).any? { |val| pat.match?(val) } : pat == true
+        target && pat.is_a?(Regexp) ? as_a(target).any? { |val| pat.match?(val) } : pat == true
+      end
+
+      def scriptobj
+        SCRIPT_OBJ.dup
       end
     end
   end