squared 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a3f9923041ce7530aea68d4f1988908a52262254841860cb48800978faf777a
-  data.tar.gz: 331352c83df0aa4e8b6f410a094f8b9c3e78a0f1a6624c820936333055786240
+  metadata.gz: 91dfb7530ecdb1ab70461ab8bbbf894e706ea6f78b5e9ada99c930d0819e9ec9
+  data.tar.gz: 82591aa893baf80057a3193e95763b8ce98c13593de54dffd00e31f0c27a3bf8
 SHA512:
-  metadata.gz: 7b3c510c77ca4761e6e5cc0c27498b32df7fa9f8be94d2560934ad3f436774c0860a6de7fac24de70d4b4ee04b163b587c544261326c34deacc291e7478bdfd4
-  data.tar.gz: 734bc751eb03ae220ec4a494e266353f3d8b30382ebc59afcc8271a613d3102b403e912884e938f861bc6b0edab366140a0040b4e44d9d1b48c403a18ea6e85f
+  metadata.gz: ce78218f60162cda536062dc37e5f27f30b5cd25e1afcac502c3519085988594c01ea149b47ecd536373ba2f4312162d468915fd6792f27f15d1d301bf2e03eb
+  data.tar.gz: b0b6cec02ec4c531ddbabfa4ff1f3f8a87cf4592dd48fd86b74a8ac3787c602df165b0526cd69af8c585c221dcace1bcfc606a1bc511e3722f1e1b9cd1161e17

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [0.5.17] - 2025-11-22
+
+### Fixed
+
+- See `0.4.31`.
+
+## [0.4.31] - 2025-11-22
+
+### Changed
+
+- Project base attribute project was converted into an accessor.
+- Ruby command flag is given precedence to a program file.
+
+### Fixed
+
+- Repo application tasks are not created on Windows.
+- Repo module used conflicting REPO_URL with Repo application.
+- Project task outdated did not check pass and only exclusions.
+- Workspace static method resolve did nothing when given a String.
+- Project base run command types did not include Struct.
+- Project change directory context did not always restore when raised.
+- Ruby file method attributes did not always return nil.
+- JoinSet with a delimiter did not report correct size.
+
 ## [0.5.16] - 2025-11-14
 
 ### Fixed
@@ -1247,6 +1271,7 @@
 
 - Changelog was created.
 
+[0.5.17]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.17
 [0.5.16]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.16
 [0.5.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.15
 [0.5.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.14
@@ -1264,6 +1289,7 @@
 [0.5.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.2-ruby
 [0.5.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.1-ruby
 [0.5.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.0-ruby
+[0.4.31]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.31
 [0.4.30]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.30
 [0.4.29]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.29
 [0.4.28]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.28

data/README.md

@@ -23,23 +23,9 @@ The range chart indicates the latest Ruby tested against at the time of release.
 gem install squared
 ```
 
-### Optional
-
-* [Repo](https://source.android.com/docs/setup/reference/repo)
-* https://github.com/anpham6/squared-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.
+Projects from any accessible folder can be added relative to the parent directory or absolutely. Missing projects will simply be excluded from the task runner.
 
 ```ruby
 require "squared"
@@ -55,14 +41,6 @@ require "squared/app"                                # All workspace related mod
 
 # 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
@@ -77,7 +55,6 @@ require "squared/app"                                # All workspace related mod
 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")
@@ -730,7 +707,37 @@ Workspace::Application
 
 ### Repo
 
-These global options also can target the application main suffix `${NAME}`. (e.g. REPO_ROOT_SQUARED)
+* [Repo](https://source.android.com/docs/setup/reference/repo)
+* https://github.com/anpham6/squared-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
+```
+
+```ruby
+# 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"
+
+Workspace::Application
+  .new(main: "squared")
+  .repo("https://github.com/anpham6/squared-repo", "nightly", script: ["build:dev", "prod"], ref: :node)
+  .add("squared", script: ["build:stage1", "build:stage2"])
+  .build
+```
+
+These global options also can target the application main suffix `${NAME}`. (e.g. *REPO_ROOT_SQUARED*)
 
 ```sh
 REPO_ROOT            # parent dir
@@ -742,7 +749,7 @@ REPO_DEV             # pattern,0,1
 REPO_PROD            # pattern,0,1
 REPO_WARN            # 0,1
 REPO_SYNC            # 0,1
-REPO_URL             # manifest repository
+REPO_GIT             # manifest repository
 REPO_MANIFEST        # e.g. latest,nightly,prod
 REPO_GROUPS          # e.g. base,prod,docs
 REPO_STAGE           # 0,1,2,3,4
@@ -750,6 +757,8 @@ REPO_SUBMODULLES     # 0,1
 REPO_TIMEOUT         # confirm dialog (seconds)
 ```
 
+Other similarly cloned `Repo` repositories can be managed remotely by setting the `REPO_ROOT` environment variable to the location.
+
 ## LICENSE
 
 BSD 3-Clause

data/lib/squared/common/format.rb

@@ -67,6 +67,7 @@ module Squared
         end
         wrap = ->(s, n) { "\x1B[#{n.join(';')}m#{s}\x1B[0m" }
         code = []
+        args.clear if args.size == 1 && args.first.nil?
         args.concat(Array(styles)).flatten.each_with_index do |type, i|
           next unless type
 
@@ -180,19 +181,20 @@ module Squared
         args = args.map(&:to_s)
         if level.is_a?(::Numeric)
           if append && respond_to?(:log)
-            (log rescue nil).tap do |ref|
-              ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(::Logger)
-            end
+            ref = log rescue nil
+            ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(::Logger)
           end
-          return false if !pass && level < ARG[:LEVEL]
+          return false unless pass || level >= ARG[:LEVEL]
         end
-        if (args.size > 1 && !hint) || hint == false
+        if hint.nil? ? args.size > 1 : !hint
           title = log_title(level, color: false)
           sub = [pat: /\A(#{Regexp.escape(title)})(.*)\z/m, styles: __get__(:theme)[:logger][log_sym(level)]] if color
           emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub, pipe: -1)
         else
           msg = [log_title(level, color: color)]
-          msg << (color ? sub_style(subject.to_s, styles: (@theme && @theme[:subject]) || :bold) : subject) if subject
+          if subject
+            msg << (color ? sub_style(subject.to_s, (@theme.is_a?(::Hash) && @theme[:subject]) || :bold) : subject)
+          end
           msg << args.shift if msg.size == 1
           message(msg.join(' '), *args, hint: hint)
         end

data/lib/squared/common/shell.rb

@@ -80,7 +80,11 @@ module Squared
         end
         sep = unless flag.empty?
                 if flag[0] == '-'
-                  flag[1] == '-' ? '=' : ' '
+                  if flag[1] == '-'
+                    '='
+                  else
+                    merge ? '' : ' '
+                  end
                 elsif flag.size == 1
                   pre = '-'
                   merge ? '' : ' '

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -497,7 +497,7 @@ module Squared
         if (base = task_base?(key))
           tasks << key if obj.has?(key, baseref)
         elsif (batch = series.batch_get(key))
-          obj.allref.each do |ref|
+          obj.allref do |ref|
             next unless obj.has?(key, ref) && (data = batch[ref])
 
             data.each do |val|
@@ -516,7 +516,7 @@ module Squared
         if tasks.empty?
           return [] if (base && !obj.ref?(baseref)) || !(data = series.alias_get(key))
 
-          obj.allref.each do |ref|
+          obj.allref do |ref|
             next unless obj.has?(key, ref) && (alt = data[ref])
 
             ret = task_resolve obj, alt

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

@@ -80,9 +80,9 @@ module Squared
           'asdf' => %i[set exec current]
         })
 
-        attr_reader :name, :project, :workspace, :path, :theme, :group, :parent, :dependfile,
+        attr_reader :name, :workspace, :path, :theme, :group, :parent, :dependfile,
                     :exception, :pipe, :verbose
-        attr_accessor :global
+        attr_accessor :global, :project
 
         def initialize(workspace, path, name, *, group: nil, first: {}, last: {}, error: {}, common: ARG[:COMMON],
                        **kwargs)
@@ -1075,8 +1075,8 @@ module Squared
           @log = Logger.new(enabled? ? @log.first : nil, **@log.last)
         end
 
-        def allref
-          @ref.reverse_each
+        def allref(&blk)
+          @ref.reverse_each(&blk)
         end
 
         def basepath(*args)
@@ -1090,7 +1090,7 @@ module Squared
           path.parent.ascend.each do |dir|
             target = dir.join(*args)
             return target if target.exist?
-            break if (ascend && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
+            break if (ascend.is_a?(String) && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
           end
           ret
         end
@@ -1356,7 +1356,9 @@ module Squared
         end
 
         def print_error(*args, loglevel: Logger::WARN, **kwargs)
-          warn log_message(loglevel, *args, **kwargs) if warning?
+          return unless warning?
+
+          warn log_message(loglevel, *args, **kwargs)
         end
 
         def print_item(*val, series: true)
@@ -1509,8 +1511,8 @@ module Squared
           "#{msg}#{!always && (!obj || obj == 0 || obj.to_s.empty?) ? '' : message(hint: message(title, obj.to_s))}"
         end
 
-        def append_repeat(flag, opts, target: @session)
-          opts.each { |val| target << shell_option(flag, val) }
+        def append_repeat(flag, opts, target: @session, **kwargs)
+          opts.each { |val| target << shell_option(flag, val, **kwargs) }
         end
 
         def append_hash(data, target: @session || [], build: false)
@@ -1536,6 +1538,8 @@ module Squared
               target << basic_option(key, val)
             when FalseClass
               target << shell_option(key).sub(/^--(?!no-)/, '--no-')
+            when Pathname
+              target << shell_option(key, val, escape: false)
             else
               target << shell_option(key, val.is_a?(String) ? val : nil)
             end
@@ -1594,18 +1598,18 @@ module Squared
           return if list.empty?
 
           kwargs[:ignore] = false if no && !kwargs.key?(:ignore)
-          [].tap do |ret|
-            list.flatten.each do |flag|
-              next unless (val = option(flag, target: target, **kwargs))
+          ret = []
+          list.flatten.each do |flag|
+            next unless (val = option(flag, target: target, **kwargs))
 
-              if no && val == '0'
-                flag = "no-#{flag}"
-                val = nil
-              end
-              ret << shell_option(flag, equals ? val : nil, escape: escape, quote: quote, force: force)
+            if no && val == '0'
+              flag = "no-#{flag}"
+              val = nil
             end
-            ret.each { |val| target << val } unless ret.empty?
+            ret << shell_option(flag, equals ? val : nil, escape: escape, quote: quote, force: force)
           end
+          ret.each { |val| target << val } unless ret.empty?
+          ret
         end
 
         def append_nocolor(target: @session)
@@ -1653,9 +1657,9 @@ module Squared
         end
 
         def collect_hash(data, pass: [])
-          [].tap do |ret|
-            data.each { |key, val| ret.concat(val) unless pass.include?(key) }
-          end
+          ret = []
+          data.each { |key, val| ret.concat(val) unless pass.include?(key) }
+          ret
         end
 
         def parse_json(val, kind: Hash, hint: nil)
@@ -1908,16 +1912,15 @@ module Squared
         end
 
         def pwd_set(pass: false, dryrun: false, from: nil)
-          pwd = Dir.pwd
-          return yield if (path.to_s == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
+          return yield if (path.to_s == Dir.pwd || pass == true) && (workspace.mri? || !workspace.windows?)
 
-          Dir.chdir path
-          ret = yield
-          Dir.chdir pwd
+          pwd = Dir.pwd
+          Dir.chdir(path)
+          yield
         rescue StandardError => e
           on_error(e, from, dryrun: dryrun)
-        else
-          ret
+        ensure
+          Dir.chdir(pwd) if pwd
         end
 
         def run_set(cmd, val = nil, opts: nil, **)
@@ -2097,7 +2100,7 @@ module Squared
 
         def runnable?(val)
           case val
-          when String, Enumerable, Proc, Method
+          when String, Enumerable, Proc, Method, Struct
             true
           else
             false
@@ -2159,14 +2162,9 @@ module Squared
         end
 
         def has_value?(data, other)
-          case data
-          when Hash
-            other.is_a?(Enumerable) ? other.any? { |obj| data.value?(obj) } : data.value?(other)
-          when Enumerable
-            other.is_a?(Enumerable) ? other.any? { |obj| data.include?(obj) } : data.include?(other)
-          else
-            false
-          end
+          return false unless data.is_a?(Enumerable)
+
+          other.is_a?(Enumerable) ? other.any? { |obj,| data.include?(obj) } : data.include?(other)
         end
 
         def variables

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

@@ -134,7 +134,7 @@ module Squared
         File.write(@revfile, JSON.pretty_generate(@revdoc))
       rescue StandardError => e
         log&.debug e
-        warn log_message(Logger::WARN, e, pass: true) if warning?
+        warn log_message(Logger::WARN, e, pass: true) if warning
       ensure
         @revlock = false
       end
@@ -1494,7 +1494,8 @@ module Squared
           case flag
           when :commit, :'no-commit'
             op = OptionPartition.new(opts, OPT_GIT[:merge], cmd, project: self, no: OPT_GIT[:no][:merge])
-            op << "--#{flag}" << '--'
+            op << "--#{flag}"
+            op.delim
             if branch
               op << branch
               op.clear(pass: false)
@@ -1699,7 +1700,7 @@ module Squared
           cmd, opts = git_session('rev-parse', opts: opts)
           case flag
           when :commit
-            cmd << ((n = size.to_i) > 0 ? basic_option('short', [n, 5].max) : '--verify')
+            cmd << (size.to_i.zero? ? '--verify' : basic_option('short', [size.to_i, 5].max))
             append_commit(ref, head: true)
           when :branch
             cmd << '--abbrev-ref'
@@ -1748,7 +1749,7 @@ module Squared
           case flag
           when :blame
             raise_error 'no file found' unless (n = op.index { |s| basepath(s).file? })
-            op << '--' << shell_quote(basepath(op.delete_at(n)))
+            op.delim << shell_quote(basepath(op.delete_at(n)))
             op.clear
           when :revert
             if VAL_GIT[:rebase][:send].any? { |val| op.arg?(val) }
@@ -1763,12 +1764,11 @@ module Squared
               grep, list = op.partition { |val| OptionPartition.pattern?(val) }
               unless grep.empty? && !list.empty?
                 grep.map! { |val| Regexp.new(val[1..-2]) }
-                files = [].tap do |out|
-                  status_data.each do |a, b|
-                    next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
+                files = []
+                status_data.each do |a, b|
+                  next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
 
-                    out << "#{sub_style(b, styles: color(:red))} #{a}"
-                  end
+                  files << "#{sub_style(b, styles: color(:red))} #{a}"
                 end
                 unless files.empty?
                   files = choice_index('Select files', files, multiple: true, force: true, trim: /^\S+\s/,
@@ -1924,7 +1924,7 @@ module Squared
           end
           args = []
           args << quote_option('sort', sort) if sort
-          args << shell_option('count', env('GIT_COUNT', ARG[:CHOICE])) if count
+          args << basic_option('count', env('GIT_COUNT', ARG[:CHOICE])) if count
           choice_index(msg, foreachref(type, *args, format: format), trim: trim, **kwargs)
         end
 
@@ -1957,13 +1957,13 @@ module Squared
         end
 
         def status_data(*args)
-          [].tap do |ret|
-            git_spawn('status -z -uall', *args).split("\x0").each do |line|
-              next unless line =~ /^(.)(.) (.+)$/
+          ret = []
+          git_spawn('status -z -uall', *args).split("\x0").each do |line|
+            next unless line =~ /^(.)(.) (.+)$/
 
-              ret << [$3, $2, $1]
-            end
+            ret << [$3, $2, $1]
           end
+          ret
         end
 
         def append_pull(opts, list, target: @session, flag: nil, no: nil, remote: nil, from: nil)
@@ -2038,7 +2038,9 @@ module Squared
 
         def append_message(val = nil, target: @session)
           val = messageopt if val.to_s.empty?
-          target << quote_option('message', val) if val
+          return unless val
+
+          target << quote_option('message', val)
         end
 
         def append_head(val = nil, target: @session)

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

@@ -160,7 +160,8 @@ module Squared
                           elsif exception
                             indexerror n, list
                           else
-                            next log.warn "run script #{n} of #{list.size} (out of range)"
+                            log.warn "run script #{n} of #{list.size} (out of range)"
+                            next
                           end
                         else
                           opts << val
@@ -198,11 +199,11 @@ module Squared
                       if op.empty?
                         op << package
                         if (args = readline('Enter arguments', force: false))
-                          op << '--' unless pnpm?
+                          op.delim unless pnpm?
                           op << args
                         end
                       else
-                        op << '--' unless pnpm?
+                        op.delim unless pnpm?
                         op << package << op.join(' ')
                       end
                     else
@@ -281,6 +282,8 @@ module Squared
 
         def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, files: nil, workspace: false,
                  link: false, force: false, override: false, sync: invoked_sync?('copy'), **kwargs)
+          return if @copy == false
+
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
@@ -297,8 +300,6 @@ module Squared
             create = @copy[:create] if @copy.key?(:create)
             glob = @copy[:include] if @copy.key?(:include)
             pass = @copy[:exclude] if @copy.key?(:exclude)
-          elsif @copy == false
-            return
           end
           items = []
           if build? && path != @workspace.home && @workspace.home?
@@ -864,7 +865,7 @@ module Squared
         end
 
         def outdated?
-          dependfile.exist?
+          dependfile.exist? && !task_pass?('outdated')
         end
 
         def update?

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

@@ -624,7 +624,7 @@ module Squared
         end
 
         def outdated?
-          dependtype > 0
+          dependtype > 0 && !task_pass?('outdated')
         end
 
         private
@@ -636,7 +636,7 @@ module Squared
         def python_session(*cmd, opts: nil)
           return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
 
-          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: /\A(?:v+|OO)\z/)
+          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: singleopt(:python))
           ret = session('python', *op.to_a, *cmd, path: venv.nil?)
           [ret, op.extras]
         end
@@ -733,7 +733,7 @@ module Squared
                         quote_option('cache-dir', basepath(val))
                       end
           end
-          option('proxy', target: target) { |val| target << shell_option('proxy', val) }
+          option('proxy', target: target) { |val| target << quote_option('proxy', val) }
           option('python', target: target) { |val| target << quote_option('python', basepath(val)) }
           append_nocolor(target: target)
         end
@@ -814,7 +814,7 @@ module Squared
         def singleopt(flag = nil)
           case flag
           when :python
-            /\A(?:v+|q+|b+)\z/
+            /\A(?:v+|q+|b+|V+|O+)\z/
           when :twine
             nil
           else

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

@@ -294,6 +294,8 @@ module Squared
         end
 
         def copy(from: gemlib, into: @gemdir, override: false, **kwargs)
+          return if @copy == false
+
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
@@ -303,8 +305,6 @@ module Squared
             glob = @copy[:include] if @copy.key?(:include)
             pass = @copy[:exclude] if @copy.key?(:exclude)
             into = @copy[:into] if @copy.key?(:into)
-          elsif @copy == false
-            return
           end
           return unless into
 
@@ -468,13 +468,15 @@ module Squared
           case flag
           when :file, :script
             op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, args: true)
-            if file
-              op.unshift(shell_quote(basepath(file)))
-            elsif command
+            if command
               op << quote_option('e', command, option: false)
+            elsif file
+              op.unshift(basepath(file))
+            end
+            unless op.arg?('e')
+              op.push(args) if args
+              op.append(delim: true, escape: false, quote: false) unless op.empty?
             end
-            op.push(args) if args
-            op.append(delim: true, escape: false, quote: false) unless op.empty?
           when :version
             pwd_set do
               out = []
@@ -801,7 +803,7 @@ module Squared
                          else
                            [name[0, n], name[(n + 1)..-1]]
                          end
-              op.adjoin(pre, shell_option('version', ver))
+              op.adjoin(pre, basic_option('version', ver))
                 .clear
             elsif flag == :install
               op.append_any
@@ -809,7 +811,7 @@ module Squared
               op.append
             end
             op.clear(errors: true)
-            op << '--' << readline('Enter command [args]', force: true) if flag == :install && op.remove(':')
+            op.delim << readline('Enter command [args]', force: true) if flag == :install && op.remove(':')
           else
             op.append
           end
@@ -857,7 +859,7 @@ module Squared
           r.each { |val| op << shell_option('r', val, merge: true) }
           Array(path).each { |val| op << quote_option('I', val, merge: true) }
           if args
-            op << '--' << args
+            op.delim << args
             op.clear
           else
             op.append(delim: true)
@@ -866,13 +868,8 @@ module Squared
         end
 
         def gemspec
-          return @gemspec unless @gemspec.nil?
-
-          @gemspec = if gemfile
-                       Gem::Specification.load(gemfile.to_s) rescue false
-                     else
-                       false
-                     end
+          @gemspec = !gemfile.nil? && Gem::Specification.load(gemfile.to_s) rescue false if @gemspec.nil?
+          @gemspec || nil
         end
 
         def gemname
@@ -962,7 +959,7 @@ module Squared
         end
 
         def outdated?
-          dependtype > 0
+          dependtype > 0 && !task_pass?('outdated')
         end
 
         private
@@ -1054,11 +1051,11 @@ module Squared
         end
 
         def rakefile
-          return @rakefile unless @rakefile.nil?
-
-          @rakefile = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }.yield_self do |file|
-            file ? basepath(file) : false
+          if @rakefile.nil?
+            file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }
+            @rakefile = !file.nil? && basepath(file)
           end
+          @rakefile || nil
         end
 
         def rakepwd
@@ -1087,11 +1084,12 @@ module Squared
         end
 
         def gemfile
-          return @gemfile unless @gemfile.nil?
-
-          @gemfile = [project, name].map! { |val| basepath("#{val}.gemspec") }
-                                    .concat(path.glob('*.gemspec'))
-                                    .find(&:exist?) || false
+          if @gemfile.nil?
+            @gemfile = [project, name].map! { |val| basepath("#{val}.gemspec") }
+                                      .concat(path.glob('*.gemspec'))
+                                      .find(&:exist?) || false
+          end
+          @gemfile || nil
         end
 
         def gemlib

data/lib/squared/workspace/project/support/class.rb

@@ -29,15 +29,15 @@ module Squared
                 pat, s = Array(strip)
                 ret.map! { |val| val.is_a?(String) ? val.gsub(pat, s || '') : val }
               end
-              if escape || quote
-                ret.map! do |val|
-                  if opt?(val)
-                    val
-                  elsif escape
-                    shell_escape(val, quote: quote, double: double)
-                  else
-                    shell_quote(val, force: force, double: double)
-                  end
+              ret.map! do |val|
+                next val if opt?(val)
+
+                if quote || val.is_a?(Pathname)
+                  shell_quote(val, force: force, double: double)
+                elsif escape
+                  shell_escape(val, quote: quote, double: double)
+                else
+                  val
                 end
               end
               if target.is_a?(Set)
@@ -431,6 +431,11 @@ module Squared
             self
           end
 
+          def delim
+            add '--'
+            self
+          end
+
           def splice(*exclude, quote: true, delim: true, path: false, pattern: false, &blk)
             found, other = if block_given?
                              partition(&blk)
@@ -632,8 +637,8 @@ module Squared
             extras!(obj) || super
           end
 
-          def add?(obj)
-            extras!(obj) || super
+          def size
+            super + extras.size
           end
 
           def to_a
@@ -641,21 +646,24 @@ module Squared
           end
 
           def to_s
-            pass.join(@delim)
+            to_a.join(@delim)
           end
 
           def to_enum(*args)
-            pass.to_enum(*args)
+            to_a.to_enum(*args)
           end
 
           def to_json(*args)
-            pass.to_json(*args)
+            to_a.to_json(*args)
           end
 
           def to_yaml(*args)
-            pass.to_yaml(*args)
+            to_a.to_yaml(*args)
           end
 
+          alias add :<<
+          alias add? :<<
+
           private
 
           def extras!(obj)

data/lib/squared/workspace/repo.rb

@@ -158,7 +158,7 @@ module Squared
           desc.call("init[manifest?=#{target},groups?,{0}]", target)
           task 'init' do |_, args|
             args = args.to_a
-            u = env('REPO_URL') || manifest_url
+            u = env('REPO_GIT') || manifest_url
             m = args.first && !opts.include?(args.first) ? args.shift : target
             g = args.first && !opts.include?(args.first) ? args.shift : nil
             g = case (val = env('REPO_GROUPS'))
@@ -251,7 +251,7 @@ module Squared
       end
 
       def repo?
-        return false unless manifest_url
+        return false unless manifest_url && !windows?
 
         repo_install? || @repo_override == true
       end

data/lib/squared/workspace.rb

@@ -5,12 +5,14 @@ module Squared
     class << self
       include Common
 
-      def resolve(*args)
+      def resolve(*args, base: '..')
+        values = __get__(:project).values
         ret = args.map do |id|
           if id.is_a?(Symbol)
             project id
           else
-            __get__(:project).find { |_, val| File.expand_path(val.path) == File.expand_path(id, __dir__) }
+            values.find { |proj| proj.name == id } || values.find { |proj| proj.project == id } ||
+              values.find { |proj| proj.path.to_s == File.expand_path(id, base) }
           end
         end
         ret.size == 1 ? ret.first : ret

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - An Pham
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []