squared 0.2.12 → 0.2.14

data/lib/squared/common/base.rb

@@ -84,7 +84,7 @@ module Squared
       PATH.freeze
       ARG.freeze
       VAR.each_value(&:freeze)
-      VAR[:theme].each_value(&:freeze)
+      VAR[:theme].each_value { |val| val.freeze.each_value(&:freeze) }
       VAR.freeze
     end
 

data/lib/squared/common/format.rb

@@ -127,11 +127,11 @@ module Squared
       def apply_style(data, key, args, empty: true)
         return if data.is_a?(::Symbol) && (data = __get__(:theme)[data]).nil?
 
-        set = ->(k, v) { data[k] = check_style(v, empty: empty) }
+        set = ->(k, v) { data[k.to_sym] = check_style(v, empty: empty) }
         if key.is_a?(::Hash)
           key.each { |k, v| set.(k, v || args) }
         else
-          set.(key.to_sym, args)
+          set.(key, args)
         end
       end
 

data/lib/squared/common/system.rb

@@ -24,7 +24,7 @@ module Squared
         else
           return Kernel.send(name, *args, **kwargs)
         end
-        return ret if ret || !e
+        return ret unless e && !ret && name == :system
 
         raise $?.to_s
       end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -589,9 +589,14 @@ module Squared
       private
 
       def __build__(default: nil, **)
-        return unless default && task_defined?(out = task_name(default))
-
-        task Rake.application.default_task_name => out
+        unless task_defined?('squared:version')
+          task 'squared:version' do
+            puts Squared::VERSION
+          end
+        end
+        if default && task_defined?(out = task_name(default))
+          task Rake.application.default_task_name => out
+        end
       end
 
       def puts(*args)
@@ -627,20 +632,19 @@ module Squared
       end
 
       def data_get(*args, group: nil, ref: nil, target: nil)
-        if group
-          target[: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 = target[:ref][key])
+        if group && (ret = target[:group][group.to_sym])
+          ret
+        elsif ref
+          if ref.is_a?(Enumerable)
+            ref.each do |key|
+              next unless (ret = target[:ref][key])
 
-            return ret if args.empty? || args.any? { |val| ret.key?(val) }
+              return ret if args.empty? || args.any? { |val| ret.key?(val) }
+            end
+            nil
+          else
+            target[:ref][ref]
           end
-          nil
-        elsif ref
-          target[:ref][ref]
         end
       end
 

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

@@ -15,7 +15,7 @@ module Squared
         include Rake::DSL
 
         VAR_SET = %i[parent global envname dependfile theme run script env pass].freeze
-        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?\b/.freeze
+        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?[-.]?(\S+)?\b/.freeze
         private_constant :VAR_SET, :SEM_VER
 
         class << self
@@ -245,7 +245,7 @@ module Squared
                 flags.each do |flag|
                   case action
                   when 'graph'
-                    next unless graph?
+                    break unless graph?
 
                     check = lambda do |args|
                       next args if (args = args.to_a).empty?
@@ -745,7 +745,7 @@ module Squared
           done
         end
 
-        def graph_collect(target, start = [], data: {})
+        def graph_collect(target, start = [], data: {}, root: [])
           deps = []
           (start.empty? ? target.instance_variable_get(:@graph) : start)&.each do |val|
             if (obj = workspace.find(name: val))
@@ -756,14 +756,19 @@ module Squared
               items = workspace.find(group: val, ref: val.to_sym)
             end
             items.each do |proj|
-              graph_collect(proj, data: data) if proj.graph? && !data.key?(proj.name)
-              next if (objs = data.fetch(proj.name, [])).include?(target)
+              name = proj.name
+              if proj.graph? && !data.key?(name) && !root.include?(name)
+                graph_collect(proj, data: data, root: root + [name, target.name])
+              end
+              next if (objs = data.fetch(name, [])).include?(target)
 
               deps << proj
-              deps += objs
+              deps.concat(objs)
             end
           end
-          data[target.name] = deps.uniq.reject { |proj| proj == target }
+          deps.uniq!
+          deps.delete(target)
+          data[target.name] = deps
           data
         end
 
@@ -1076,6 +1081,29 @@ module Squared
           fill ? semver(ret) : ret
         end
 
+        def semcmp(val, other)
+          return 0 if val == other
+
+          a, b = [val, other].map! { |ver| ver.scan(SEM_VER) }
+          return -1 if b.empty?
+          return 1 if a.empty?
+
+          a, b = [a.first, b.first].map! do |c|
+            begin
+              d = Integer(c[5]).to_s
+            rescue StandardError
+              d = c[5] ? '-1' : '0'
+            end
+            [c[0], c[2], c[4] || '0', d]
+          end
+          a.each_with_index do |c, index|
+            next if c == (d = b[index])
+
+            return c.to_i < d.to_i ? 1 : -1
+          end
+          0
+        end
+
         def indexitem(val)
           [$1.to_i, $2 && $2[1..-1]] if val =~ /\A#{Regexp.escape(indexchar)}(\d+)(:.+)?\z/
         end

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

@@ -512,15 +512,18 @@ module Squared
             when :major
               if seg[0] != '0' || seg[2].nil?
                 seg[0] = seg[0].succ
+                seg[2] = '0'
               else
                 seg[2] = seg[2].succ
               end
+              seg[4] = '0'
             when :minor
               if seg[0] == '0'
                 seg[4] &&= seg[4].succ
               else
                 seg[2] = seg[2].succ
               end
+              seg[4] = '0'
             when :patch
               seg[4] &&= seg[4].succ
             end
@@ -690,7 +693,7 @@ module Squared
         def read_packagemanager(key = nil, version: nil, update: false)
           if @pm[:_].nil? || update
             doc = JSON.parse(dependfile.read)
-            @pm[:_] = (val = doc['packageManager']) ? val[0..((val.index('+') || 0) - 1)] : false
+            @pm[:_] = (val = doc['packageManager']) ? val[0, val.index('+') || val.size] : false
             @pm[:name] = doc['name']
             @pm[:scripts] = doc['scripts']
             @pm[:version] = doc['version']
@@ -701,9 +704,11 @@ module Squared
           @pm[:_] = false
           nil
         else
-          return @pm[key] if key
-
-          !(ret = @pm[:_]) || (version && ret[(ret.index('@') + 1)..-1] < version) ? nil : ret
+          if key
+            @pm[key]
+          elsif (ret = @pm[:_]) && !(version && semcmp(ret[(ret.index('@') + 1)..-1], version) == 1)
+            ret
+          end
         end
 
         def read_install

data/squared.gemspec

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require_relative "lib/squared/version"
+version = File.read(File.join(__dir__, "lib/squared/version.rb"))[/\bVERSION = '(.+)'$/, 1]
 
 Gem::Specification.new do |spec|
   spec.name          = "squared"
-  spec.version       = Squared::VERSION
+  spec.version       = version
   spec.authors       = ["An Pham"]
   spec.email         = ["anpham6@gmail.com"]
 
   spec.summary       = %q{Rake task generator for managing multi-language workspaces.}
   spec.description   = %q{Rake task generator for managing multi-language workspaces.}
-  spec.homepage      = "https://github.com/anpham6/squared"
+  spec.homepage      = "https://github.com/anpham6/squared-ruby"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
   spec.licenses      = ["BSD-3-Clause"]
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.metadata["documentation_uri"] = "https://squared.readthedocs.io"
 
   spec.files         = Dir["lib/**/*"] +
-                       %w[CHANGELOG.md LICENSE README.md README.ruby.md squared.gemspec]
+                       %w[CHANGELOG.md LICENSE README.md squared.gemspec]
   spec.bindir        = "exe"
   spec.executables   = []
   spec.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.14
 platform: ruby
 authors:
 - An Pham
@@ -75,7 +75,6 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- README.ruby.md
 - lib/squared.rb
 - lib/squared/app.rb
 - lib/squared/common.rb
@@ -99,12 +98,12 @@ files:
 - lib/squared/workspace/repo.rb
 - lib/squared/workspace/series.rb
 - squared.gemspec
-homepage: https://github.com/anpham6/squared
+homepage: https://github.com/anpham6/squared-ruby
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/anpham6/squared
-  source_code_uri: https://github.com/anpham6/squared
+  homepage_uri: https://github.com/anpham6/squared-ruby
+  source_code_uri: https://github.com/anpham6/squared-ruby
   documentation_uri: https://squared.readthedocs.io
 rdoc_options: []
 require_paths:
@@ -120,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []

data/README.ruby.md

@@ -1,384 +0,0 @@
-# squared 0.2
-
-* [source](https://github.com/anpham6/squared)
-* [manifest](https://github.com/anpham6/squared-repo)
-* [docs](https://squared.readthedocs.io)
-
-## Version Compatibility
-
-| Date       | squared |    Min |    Max |
-| :--------: | ------: | -----: | -----: |
-| 2024-12-07 |   0.1.0 |  2.4.0 |  3.3.6 |
-| 2025-01-07 |   0.2.0 |  2.4.0 |  3.4.0 |
-
-The range chart indicates the latest Ruby tested against at the time of release.
-
-## Installation
-
-```sh
-gem install squared
-```
-
-### Optional
-
-* [Repo](https://source.android.com/docs/setup/reference/repo)
-* Python 3.6
-* Not compatible with Windows
-
-```sh
-mkdir -p ~/.bin
-PATH="${HOME}/.bin:${PATH}"
-curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
-chmod a+rx ~/.bin/repo
-```
-
-## Example - Rakefile
-
-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"
-
-require "squared/workspace"
-require "squared/workspace/repo"                     # Optional
-require "squared/workspace/project/node"             #
-require "squared/workspace/project/python"           #
-require "squared/workspace/project/ruby"             #
-# OR
-require "squared/app"                                # All workspace related modules
-
-# NODE_ENV  = production
-
-# REPO_ROOT = /workspaces                            #
-# REPO_HOME = /workspaces/squared                    # Dir.pwd
-# rake      = /workspaces/squared/Rakefile           # main?
-# OR
-# REPO_ROOT = /workspaces                            # Dir.pwd
-# rake      = /workspaces/Rakefile                   #
-# REPO_HOME = /workspaces/squared                    # main: "squared"
-
-# pathname  = /workspaces/pathname
-# optparse  = /workspaces/optparse
-# log       = /workspaces/logger
-# emc       = /workspaces/e-mc
-# pir       = /workspaces/pi-r
-# squared   = /workspaces/squared
-# cli       = /workspaces/squared/publish/sqd-cli
-# sqd-serve = /workspaces/squared/publish/sqd-serve
-# sqd       = /workspaces/squared/sqd
-
-Workspace::Application
-  .new(Dir.pwd, main: "squared") # Dir.pwd? (main? is implicitly basename)
-  .banner("group", "project", styles: ["yellow", "black"], border: "bold") # name | project | path | ref | group? | parent? | version?
-  .repo("https://github.com/anpham6/squared-repo", "nightly", script: ["build:dev", "build:prod"], ref: :node) # Repo (optional)
-  .run("rake install", ref: :ruby)
-  .depend(false, group: "default")
-  .clean("rake clean", group: "default")
-  .clean(["build/"], group: "app")
-  .log({ file: "tmp/%Y-%m-%d.log", level: "debug" }, group: "app")
-  .add("pathname", run: "rake compile", copy: "rake install", test: "rake test", group: "default", env: { # Ruby (with C extensions)
-    "CFLAGS" => "-fPIC -O1"
-  })
-  .add("optparse", doc: "rake rdoc", group: "default") # Uses bundler/gem_tasks (without C extensions)
-  .add("logger", copy: { from: "lib", glob: "**/*.rb", into: "~/.rvm/gems/ruby-3.4.0/gems/logger-1.6.1" }, clean: ["tmp/"]) # autodetect: true
-  .add("e-mc", "emc", copy: { from: "publish", scope: "@e-mc", also: [:pir, "squared-express/"] }, ref: :node) # Node
-  .add("pi-r", "pir", copy: { from: "publish", scope: "@pi-r" }, clean: ["publish/**/*.js", "tmp/"]) # Trailing slash required for directories
-  .add("squared", script: ["build:stage1", "build:stage2"], group: "app") do # Copy target (main)
-    add("publish/sqd-cli", "cli", exclude: [:git]) # rake cli:build
-    add("publish/sqd-serve")                       # rake sqd-serve:build
-    add("publish/sqd-admin", group: "sqd", exclude: [:base])
-    # OR
-    with(exclude: [:base]) { add("publish/*", "packages") } # rake packages:sqd-serve:build
-    # OR
-    add(["publish/sqd-cli", "publish/sqd-serve", "publish/sqd-admin"], true, exclude: [:base]) # rake squared:sqd-serve:build
-  end
-  .add("squared/sqd", exclude: :git, pass: [:node, 'checkout', 'bump']) do # Skip initialize(:node) + squared:checkout:* + squared:bump:*
-    variable_set :script, "build:sqd"   # Override detection
-    variable_set :depend, false
-    variable_set :clean, ["build/sqd/"]
-  end
-  .style("banner", 255.255) # 256 colors (fg | fg.bg | -0.bg)
-  .build(default: "build", parallel: ["pull", "fetch", "rebase", "copy", "clean", /^outdated:/]) do |workspace|
-    workspace
-      .enable_aixterm
-      .style({
-        banner: ["bright_cyan", "bold", "bright_black!"],
-        border: "bright_white"
-      })
-  end
-
-# default   = /workspaces/ruby/*
-# pathname  = /workspaces/ruby/pathname
-# optparse  = /workspaces/ruby/optparse
-# logger    = /workspaces/ruby/logger
-# android   = /workspaces/android-docs
-# chrome    = /workspaces/chrome-docs
-
-Workspace::Application
-  .new(ENV["SQUARED_HOME"], prefix: "rb", common: false)        # Local styles
-  .group("ruby", "default", run: "rake build", copy: "rake install", clean: "rake clean", ref: :ruby, override: {
-    pathname: {
-      run: "rake compile"                                       # rake rb:pathname:build
-    }
-  })
-  .with(:python) do                                             # ref=Symbol | group=String
-    banner([:name, ": ", :version], "path")                     # chrome-docs: 0.1.0 | /workspaces/chrome-docs
-    doc("make html")                                            # rake rb:doc:python
-    run(false)                                                  # rake rb:build:python (disabled)
-    exclude(%i[base git])                                       # Project::Git.ref (superclass)
-    add("android-docs", "android")                              # rake rb:android:doc
-    add("chrome-docs", "chrome")                                # rake rb:chrome:doc
-  end
-  .style("inline", "bold")
-  .build
-```
-
-**NOTE**: The use of "**ref**" (class name) is only necessary when initializing an empty directory (e.g. *rake repo:init*).
-
-### Clone
-
-The task is only active when the project directory is empty or does not exist.
-
-```ruby
-Workspace::Application
-  .new(main: "squared")
-  .git(
-    "emc": "https://github.com/anpham6/e-mc",                    # rake emc:clone
-    "pir": {                                                     # rake pir:clone
-      uri: "https://github.com/anpham6/pi-r",                    #
-      options: {                                                 #
-        "origin": "github",                                      # --origin='github'
-        "recurse-submodules": false,                             # --no-recurse-submodules
-        "shallow-exclude": ["v0.0.1", "v0.0.2"]                  # --shallow-exclude='v0.0.1' --shallow-exclude='v0.0.2'
-      }
-    }
-  )
-  .git("squared", "/path/to/squared", options: { local: true })  # Relative paths resolve from workspace root
-  .git(
-    {
-      emc: { uri: "e-mc", options: { "depth": 2 } },             # https://github.com/anpham6/e-mc
-      pir: "pi-r"                                                # Maps task alias to repository folder
-    },
-    base: "https://github.com/anpham6",                          # Required
-    repo: ["squared", "android-docs", "chrome-docs"],            # https://github.com/anpham6/squared
-    options: {                                                   # Only "repo"
-      "depth": 1,
-      "quiet": true
-    }
-  )
-  .with(:node) do                                                # rake clone:node
-    add("e-mc", "emc")                                           # https://github.com/anpham6/e-mc
-    add("pi-r", "pir")                                           # https://github.com/anpham6/pi-r
-    add("squared")                                               # https://github.com/anpham6/squared
-  end
-  .with(:python) do                                              # rake clone:python
-    add("android-docs")
-    add("chrome-docs")
-  end
-  .git("https://github.com/anpham6")                             # Uses already defined root projects
-  .git("https://github.com/anpham6", ["emc", "pir"])             # Targets any defined project
-  .build(parallel: ["clone"])                                    # rake clone + rake clone:sync
-```
-
-### Graph
-
-```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"], on: {                               # Overrides "git"
-      first: proc { puts "1" },
-      last: proc { puts "2" }
-    })
-    add("e-mc", "emc") do
-      first("build", "emc:clean", "emc:depend")                  # rake emc:clean; rake emc:depend; rake emc:build; puts "123";
-      last("build", out: "123") { |out: nil| puts out }          #
-      error("build") { |err: nil| log.debug err }                #
-    end
-    add("pi-r", "pir", graph: "emc", first: {
-      build: proc { puts self.name }                             # puts "pir"
-    })
-    add("squared-express", "express", graph: "pir")
-    add("squared", graph: ["chrome", "express"]) do
-      first("git:ls-files") { puts path }
-      last("git:ls-files") { puts workspace.root }
-    end
-  end
-  .with(:ruby) do
-    add("pathname")
-    add("fileutils", graph: "pathname")
-    add("optparse")
-    add("rake", graph: ["fileutils", "optparse"])
-    banner(command: false)                                       # Always hide banner
-  end
-  .build
-```
-
-```sh
-rake pir:graph      # emc + pir
-rake express:graph  # emc + pir + express
-rake chrome:graph   # android + chrome
-rake graph:python   # same
-rake squared:graph  # android + chrome + emc + pir + express + squared
-rake graph:node     # same
-rake rake:graph     # pathname + fileutils + optparse + rake
-rake graph:ruby     # same
-rake graph          # graph:node + graph:ruby
-```
-
-### Batch
-
-```ruby
-Workspace::Series.batch(:ruby, :node, {
-  stage: %i[graph test],
-  reset: %i[stash pull]
-})
-```
-
-### Rename
-
-```ruby
-Workspace::Series.rename("depend", "install")
-```
-
-## Usage
-
-```sh
-rake -T               # List tasks
-rake                  # rake status (usually "build")
-
-# GIT_OPTIONS=rebase
-rake pull             # All except "default" + "app"
-rake pull:ruby        # pathname + optparse + logger
-rake pull:default     # pathname + optparse
-rake pull:app         # squared
-rake pull:node        # emc + pir + squared
-
-rake build            # All except "android"
-rake doc              # optparse + android
-rake depend           # All except "default"
-
-rake build:ruby       # rake compile + rake install + rake install
-
-rake clean            # All except "default" + "app"
-rake clean:ruby       # rake clean + rake clean + ["tmp/"]
-rake clean:default    # rake clean + rake clean + skip
-rake clean:app        # none + skip + ["build/"]
-rake clean:node       # none + ["publish/**/*.js", "tmp/"] + ["build/"]
-
-rake squared:run[#]   # List scripts (node)
-rake squared:rake[#]  # List tasks (ruby)
-```
-
-```sh
-rake build:app                   # squared + cli + sqd-serve
-rake squared:build:workspace     # cli + sqd-serve
-rake pull:sqd                    # sqd-admin
-rake squared:pull:workspace      # sqd-serve + sqd-admin
-rake squared:outdated:workspace  # cli + sqd-serve + sqd-admin
-```
-
-## Methods
-
-Task:
-
-* run
-* depend
-* graph
-* test
-* doc
-* clean
-
-Non-task:
-
-* log
-* exclude
-
-## Styles
-
-* banner
-* border
-* header
-* active
-* inline
-* current
-* major
-* red
-* yellow
-* green
-
-## Environment
-
-### Path
-
-All project executable programs can have their binary path set to a non-global alias.
-
-```ruby
-Common::PATH.merge!({
-  GIT: '/usr/bin/git',
-  GEM: '~/.rvm/rubies/ruby-3.4.0/bin/gem',
-  BUNDLE: '~/.rvm/gems/ruby-3.4.0/bin/bundle',
-  RAKE: '~/.rvm/gems/ruby-3.4.0/bin/rake',
-  NPM: '/opt/node/v22.0.0/bin/npm',
-  PYTHON: "#{ENV['PYTHONPATH']}/bin/python"
-})
-```
-
-### Build
-
-```ruby
-# :env                                         :run           :opts
-# LD_LIBRARY_PATH="path/to/lib" CFLAGS="-Wall" gcc a.c -o a.o -c
-BUILD_${NAME}      # gcc a.c -o a.o
-BUILD_${NAME}_OPTS # -c
-BUILD_${NAME}_ENV  # {"LD_LIBRARY_PATH":"path/to/lib","CFLAGS":"-Wall"} (hash/json)
-
-# :env                                       :opts                               :script
-# NODE_ENV="production" NO_COLOR="1" npm run --loglevel=error --workspaces=false build:dev
-BUILD_${NAME}      # build:dev
-BUILD_${NAME}_OPTS # --loglevel=error --workspaces=false
-BUILD_${NAME}_ENV  # {"NODE_ENV":"production","NO_COLOR":"1"} (hash/json)
-BUILD_${NAME}_DEV  # pattern,0,1 (:dev)
-BUILD_${NAME}_PROD # pattern,0,1 (:prod)
-
-BUILD_${NAME}=0    # skip project
-```
-
-These options also support the project specific suffix `${NAME}`. (e.g. LOG_FILE_SQUARED)
-
-### Logger
-
-```ruby
-LOG_FILE           # %Y-%m-%d.log
-# OR
-LOG_AUTO           # year,y,month,m,day,d,1
-# Optional
-LOG_DIR            # exist?
-LOG_LEVEL          # See gem "logger"
-LOG_COLUMNS        # terminal width (default: 80)
-```
-
-### Repo
-
-```ruby
-REPO_ROOT          # parent dir
-REPO_HOME          # project dir (main)
-REPO_BUILD         # run,script
-REPO_GROUP         # string
-REPO_REF           # e.g. ruby,node
-REPO_DEV           # pattern,0,1
-REPO_PROD          # pattern,0,1
-REPO_WARN          # 0,1
-REPO_SYNC          # 0,1
-REPO_MANIFEST      # e.g. latest,nightly,prod
-REPO_TIMEOUT       # confirm dialog (seconds)
-```
-
-## LICENSE
-
-BSD 3-Clause