squared 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d23d69be4457a4dfa43c961b405d27f834b915aa7c370b2733d2438dc5792b55
-  data.tar.gz: d070c6ee2417ce81709a5fe6ea881e152d7839b6ef4030f8ab7539b2d7552f8f
+  metadata.gz: c948cc37c50fe20628bd7ca5f1c7d39125b571199f76688a7b58e34a08c8ce2d
+  data.tar.gz: 02abbb0dbf14cca7c0b5dc4ca6af5b08270e5d6a9bab95c23972bbc201b6fca9
 SHA512:
-  metadata.gz: 5c4f6c187e2b5dd2f230e972919f48ed4badd124c7b73df86f28ec77c87027898480c3bf02044a5e3c986334214c82ec1eaeb15b52d8424eeafc720086652ee3
-  data.tar.gz: 1ec9ca0ff06a048e13743759b82c3e070be6a23efcc2fce8b7d5cad82e49a65597538e78780b8fe88937a07cd055f26f7c54c4a2554926d04183707c0b0e79fe
+  metadata.gz: e5590666ce8061dc02a8d2f3c809ee2ccff87f3abe62bccc6d2510adf418a8ab41e323d75e6781b52aab091d8677ec7cd4e3c55b49177f2baf3a814920daad69
+  data.tar.gz: aeb0fd0ba9095f2a97de0977dab5a0f13da4e79ac6972fbda56ab9e022d07d44211bd552624e953aab158745145d054c620972f5f64829d97b58fb47a21e9517

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [0.4.6] - 2025-04-12
+
+### Added
+
+- Python command venv action run was implemented.
+- Program paths can be defined per session using ENV.
+- Python style verbose is supported.
+
+### Changed
+
+- Python dependtype lists setup.cfg before pyproject.toml.
+- Pip install is editable by default.
+
+### Fixed
+
+- Node copy task did not reset revbuild target flags.
+- Python venv init did not locate user-defined program paths.
+- Node update task did not reset revbuild target flags.
+
+## [0.3.8] - 2025-04-12
+
+### Fixed
+
+- Project class did not parse verbose string values.
+
+## [0.2.8] - 2025-04-12
+
+### Fixed
+
+- User-defined program paths were not sanitized for ENV.
+- Project clean task used incompatible rmtree flag.
+- Git branch unset-upstream used undefined variable.
+
 ## [0.4.5] - 2025-04-09
 
 ### Fixed
@@ -457,12 +490,14 @@
 
 - Changelog was created.
 
+[0.4.6]: https://github.com/anpham6/squared/releases/tag/v0.4.6-ruby
 [0.4.5]: https://github.com/anpham6/squared/releases/tag/v0.4.5-ruby
 [0.4.4]: https://github.com/anpham6/squared/releases/tag/v0.4.4-ruby
 [0.4.3]: https://github.com/anpham6/squared/releases/tag/v0.4.3-ruby
 [0.4.2]: https://github.com/anpham6/squared/releases/tag/v0.4.2-ruby
 [0.4.1]: https://github.com/anpham6/squared/releases/tag/v0.4.1-ruby
 [0.4.0]: https://github.com/anpham6/squared/releases/tag/v0.4.0-ruby
+[0.3.8]: https://github.com/anpham6/squared/releases/tag/v0.3.8-ruby
 [0.3.7]: https://github.com/anpham6/squared/releases/tag/v0.3.7-ruby
 [0.3.6]: https://github.com/anpham6/squared/releases/tag/v0.3.6-ruby
 [0.3.5]: https://github.com/anpham6/squared/releases/tag/v0.3.5-ruby
@@ -471,6 +506,7 @@
 [0.3.2]: https://github.com/anpham6/squared/releases/tag/v0.3.2-ruby
 [0.3.1]: https://github.com/anpham6/squared/releases/tag/v0.3.1-ruby
 [0.3.0]: https://github.com/anpham6/squared/releases/tag/v0.3.0-ruby
+[0.2.8]: https://github.com/anpham6/squared/releases/tag/v0.2.8-ruby
 [0.2.7]: https://github.com/anpham6/squared/releases/tag/v0.2.7-ruby
 [0.2.6]: https://github.com/anpham6/squared/releases/tag/v0.2.6-ruby
 [0.2.5]: https://github.com/anpham6/squared/releases/tag/v0.2.5-ruby

data/README.ruby.md

@@ -99,8 +99,8 @@ Workspace::Application
     # OR
     add(["publish/sqd-cli", "publish/sqd-serve"], 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
+  .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
@@ -141,7 +141,7 @@ Workspace::Application
       run: "rake compile"                                # rake rb:pathname:build
     }
   })
-  .with(:python) do                                      # ref=Symbol | group=String
+  .with(:python, editable: false) 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)
@@ -470,8 +470,8 @@ All project executable programs can have their binary path set to a non-global a
 
 ```ruby
 Common::PATH.merge!({
-  GIT: "/usr/bin/git",
-  TAR: "/opt/archivers/tar",
+  GIT: "/usr/bin/git",                         # PATH_GIT=/usr/bin/git
+  TAR: "/opt/archivers/tar",                   # PATH_TAR=/opt/archivers/tar
   UNZIP: "/opt/archivers/unzip",
   GEM: "~/.rvm/gems/ruby-3.4.0/bin/gem",
   BUNDLE: "~/.rvm/gems/ruby-3.4.0/bin/bundle",
@@ -511,6 +511,9 @@ BUILD_${NAME}_VERSION=0.1.0 # publish + detection
 
 BANNER=0                    # hide banner
 BANNER_${NAME}=0            #
+
+REVBUILD_FORCE=1            # Rebuild all targets
+REVBUILD_FORCE_${NAME}=1    # Rebuild project
 ```
 
 ### Graph

data/lib/squared/common/shell.rb

@@ -36,7 +36,7 @@ module Squared
       def shell_quote(val, option: true, force: true, double: false, override: false)
         val = val.to_s
         return val if !force && !val.include?(' ')
-        return val if option && val.match?(/(?:^|\S=|[^=]\s+|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/m)
+        return val if option && val.match?(/(?:\A|\S=|[^=]\s+|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/m)
 
         if double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
           "\"#{val.gsub(/(?<!\\)"/, '\\"')}\""
@@ -76,7 +76,7 @@ module Squared
         ret = Shellwords.split(val)
         return ret if join == false
 
-        ret = ret.map { |opt| shell_escape(opt, quote: quote) } if escape
+        ret.map! { |opt| shell_escape(opt, quote: quote) } if escape
         return ret unless join
 
         ret.join(join.is_a?(::String) ? join : ' ')

data/lib/squared/common/utils.rb

@@ -18,7 +18,7 @@ module Squared
 
         last = val[i + 1..-1].strip
         quote = ''
-        if last =~ /^(["'])(.+)\1$/
+        if last =~ /\A(["'])(.+)\1\z/
           last = $2
           quote = $1
         end

data/lib/squared/config.rb

@@ -188,7 +188,7 @@ module Squared
       def to_s
         realpath if target?
 
-        @mime.keys.map { |ext| "#{main}.#{ext}" }.join(',')
+        @mime.keys.map! { |ext| "#{main}.#{ext}" }.join(',')
       end
 
       def inspect
@@ -291,9 +291,9 @@ module Squared
           pad = [pad, key.size].max
         end
         if stdin?
-          puts out.map(&:last).join("\n")
+          puts out.map!(&:last).join("\n")
         else
-          out.map { |item| "#{item[0].ljust(pad)} : #{item[1]}" }
+          out.map! { |item| "#{item[0].ljust(pad)} : #{item[1]}" }
         end
       end
 

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -310,17 +310,17 @@ module Squared
       end
 
       def group(path, val, override: {}, **kwargs, &blk)
-        rootpath(path).children.map do |dir|
+        rootpath(path).children.map! do |dir|
           next unless dir.directory?
 
           basename = dir.basename.to_s
           [dir, basename, override[basename.to_sym]]
         end
-        .each do |dir, basename, opts|
-          args = kwargs.dup
-          args.merge!(opts) if opts
-          add(dir, basename, group: val, **args, &blk)
-        end
+          .each do |dir, basename, opts|
+            args = kwargs.dup
+            args.merge!(opts) if opts
+            add(dir, basename, group: val, **args, &blk)
+          end
         self
       end
 

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

@@ -70,7 +70,7 @@ module Squared
                     :group, :parent, :dependfile
 
         def initialize(workspace, path, name, *, group: nil, graph: nil, pass: nil, exclude: nil, release: nil,
-                       archive: nil, first: {}, last: {}, error: {}, common: ARG[:COMMON], **kwargs)
+                       archive: nil, verbose: nil, first: {}, last: {}, error: {}, common: ARG[:COMMON], **kwargs)
           @path = path
           @workspace = workspace
           @name = name.to_s.freeze
@@ -97,7 +97,7 @@ module Squared
                      when nil
                        workspace.verbose
                      when String
-                       env_pipe(verbose, workspace.verbose, strict: true, index: true)
+                       env_bool(verbose, workspace.verbose, strict: true, index: true)
                      else
                        verbose
                      end
@@ -395,7 +395,7 @@ module Squared
 
             run_b(@run, sync: sync, from: from) if series?(@run)
             args = @output
-            banner = verbose == 1 if task_invoked?('build', 'build:sync', 'default')
+            banner = verbosity > 0 if task_invoked?('build', 'build:sync', 'default')
           end
           if args.all? { |val| val.is_a?(Array) }
             cmd = []
@@ -493,7 +493,7 @@ module Squared
                 path = basepath(val)
                 if path.directory? && val.match?(%r{[\\/]$})
                   log&.warn "rm -rf #{path}"
-                  path.rmtree(verbose: verbose)
+                  FileUtils.rm_rf(path, verbose: verbose)
                 else
                   log&.warn "rm #{path}"
                   (val.include?('*') ? Dir[path] : [path]).each do |file|
@@ -527,7 +527,7 @@ module Squared
           end
           pass += split_escape(val) if (val = env('GRAPH', suffix: 'PASS'))
           start, neg = start.partition { |name| !name.start_with?('-') }
-          data = graph_collect(self, start, pass: neg.map { |name| name[1..-1] })
+          data = graph_collect(self, start, pass: neg.map! { |name| name[1..-1] })
           unless out
             data[name] << self
             on :first, :graph
@@ -1067,7 +1067,7 @@ module Squared
 
         def session(*cmd, prefix: cmd.first, main: true, path: true, options: true)
           prefix = prefix.to_s.upcase
-          if path && (val = PATH[prefix] || PATH[prefix.to_sym])
+          if path && (val = ENV["PATH_#{prefix}"] || PATH[prefix] || PATH[prefix.to_sym])
             cmd[0] = shell_quote(val, force: false)
           end
           ret = JoinSet.new(cmd.flatten(1))
@@ -1103,6 +1103,7 @@ module Squared
 
         def option(*args, prefix: @session&.first, **kwargs)
           if prefix
+            prefix = File.basename(prefix, File.extname(prefix))
             args.each do |val|
               ret = env("#{prefix}_#{val.gsub(/\W/, '_')}".upcase, **kwargs)
               return ret if ret
@@ -1124,7 +1125,7 @@ module Squared
           i = []
           f = []
           si = []
-          list = list.map do |val|
+          list.map do |val|
             x, y = val.split('|')
             if y
               if (n = val.index('='))
@@ -1135,7 +1136,8 @@ module Squared
               x
             end
           end
-          list.flatten.each do |val|
+          .flatten
+          .each do |val|
             if (n = val.index('='))
               flag = val[0, n]
               case val[n + 1]
@@ -1235,7 +1237,7 @@ module Squared
           n = Project.max_width(lines)
           ch = ' ' * pad
           index = -1
-          out = lines.map do |val|
+          lines.map! do |val|
             index += 1
             val = ch + val.ljust(n - (pad * 2)) + ch
             if styles && (pad == 1 || index == 0)
@@ -1244,8 +1246,7 @@ module Squared
               val
             end
           end
-          out << sub_style(ARG[:BORDER][1] * n, styles: border)
-          out.join("\n")
+          (lines << sub_style(ARG[:BORDER][1] * n, styles: border)).join("\n")
         end
 
         def print_footer(*lines, sub: nil, reverse: false, right: false, **kwargs)
@@ -1414,10 +1415,10 @@ module Squared
           return if (list = list.flatten).empty?
 
           target << '--' if delim && !target.include?('--')
-          list.map do |val|
-            item = escape ? shell_escape(val, quote: quote) : shell_quote(val)
-            target << item
-            item
+          list.map! do |val|
+            ret = escape ? shell_escape(val, quote: quote) : shell_quote(val)
+            target << ret
+            ret
           end
         end
 
@@ -1542,7 +1543,7 @@ module Squared
           return [] if files.empty?
 
           pat = /^#{Regexp.escape(File.join(path, ''))}/
-          files.flatten.map { |val| Pathname.new(val) }.select { |val| projectpath?(val) }.map do |val|
+          files.flatten.map! { |val| Pathname.new(val) }.select { |val| projectpath?(val) }.map! do |val|
             val = val.absolute? ? val.to_s.sub(pat, '') : val.to_s
             val = val[2..-1] if val.start_with?('./')
             val = "#{val}*" if all && val.end_with?('/')
@@ -1592,7 +1593,7 @@ module Squared
         end
 
         def colormap(val)
-          val.compact.map { |s| color(s) }.flatten
+          val.compact.map! { |s| color(s) }.flatten
         end
 
         def epochtime
@@ -1740,7 +1741,7 @@ module Squared
               next if (items = @children.select { |item| item.task_include?(key) }).empty?
 
               ws.task_desc(@desc, action, 'workspace')
-              task task_join(action, 'workspace') => items.map { |item| task_join(item.name, action) }
+              task task_join(action, 'workspace') => items.map! { |item| task_join(item.name, action) }
             end
           end
         end

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

@@ -270,7 +270,7 @@ module Squared
             append_context
           when :bake, :compose
             if (val = option(from == :bake ? 'target' : 'service', ignore: false))
-              ret.merge(split_escape(val).map { |s| shell_escape(s) })
+              ret.merge(split_escape(val).map! { |s| shell_escape(s) })
             end
           end
           ret
@@ -411,7 +411,7 @@ module Squared
               when :rm
                 status = %w[created exited dead]
               end
-              ps = docker_output('ps -a', *status.map { |s| "--filter=\"status=#{s}\"" })
+              ps = docker_output('ps -a', *status.map! { |s| "--filter='status=#{s}'" })
               list_image(flag, ps, no: no, hint: "status: #{status.join(', ')}", from: from) do |img|
                 run(cmd.temp(img), from: from)
               end
@@ -452,7 +452,7 @@ module Squared
               out.each { |val| run(cmd.temp(val), sync: sync, from: from) }
               return
             else
-              list_image(flag, docker_output('image', 'ls -a'), from: from) do |val|
+              list_image(flag, docker_output('image ls -a'), from: from) do |val|
                 image(:rm, opts, sync: sync, id: val)
               end
               return
@@ -660,7 +660,7 @@ module Squared
         end
 
         def tagname(val)
-          val = val.split(':').map { |s| charname(s.sub(/^\W+/, '')) }
+          val = val.split(':').map! { |s| charname(s.sub(/^\W+/, '')) }
           ret = val.join(':')
           ret = val.first if val.size > 1 && ret.size > 128
           ret[0..127]

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

@@ -116,6 +116,9 @@ module Squared
       end
 
       def rev_clear(name)
+        if Dir.exist?(name) && (proj = find(name))
+          name = proj.name
+        end
         rev_write if rev_entry(name, 'revision', val: '', create: false)
       end
 
@@ -519,7 +522,7 @@ module Squared
                       end
                     when :delete
                       format_desc action, flag, '(^~)name+'
-                      task flag, [:name] do |_, args|
+                      task flag do |_, args|
                         refs = param_guard(action, flag, args: args.to_a)
                         branch(flag, refs: refs)
                       end
@@ -686,12 +689,12 @@ module Squared
         end
 
         def depend(*, **)
-          workspace.rev_clear name
+          workspace.rev_clear(name)
           super
         end
 
         def clean(*, **)
-          workspace.rev_clear name
+          workspace.rev_clear(name)
           super
         end
 
@@ -751,10 +754,10 @@ module Squared
 
         def fetch(flag = nil, opts = [], sync: invoked_sync?('fetch', flag), remote: nil)
           cmd, opts = git_session('fetch', opts: opts)
-          cmd << '--all' if !remote && !opts.include?('multiple') && option('all')
-          cmd << '--verbose' if verbose && !opts.include?('quiet')
           append_pull(opts, collect_hash(OPT_GIT[:fetch]), no: collect_hash(OPT_GIT[:no][:fetch]),
                                                            remote: remote, flag: flag)
+          cmd << '--all' if !remote && !session_arg?('multiple') && option('all')
+          cmd << '--verbose' if verbose && !session_arg('quiet')
           source(sync: sync, **threadargs)
         end
 
@@ -872,7 +875,7 @@ module Squared
             args << basic_option('ignore-submodules', flag) if (flag = option('ignore-submodules', prefix: 'git'))
             args << basic_option('ignored', flag) if (flag = option('ignored', prefix: 'git'))
           end
-          if (cur = workspace.rev_entry(name)) && cur['revision'] == sha
+          if (cur = workspace.rev_entry(name)) && cur['revision'] == sha && !env('REVBUILD_FORCE')
             files = status_digest(*args, **kwargs)
             if cur['files'].size == files.size && cur['files'].find { |key, val| files[key] != val }.nil?
               if verbose
@@ -1151,7 +1154,7 @@ module Squared
             return unless ref
 
             if ref.start_with?('^')
-              cmd << '--unset-upstream' << shell_escape(arg[1..-1])
+              cmd << '--unset-upstream' << shell_escape(ref[1..-1])
               target = nil
               stdout = true
             else
@@ -1240,11 +1243,10 @@ module Squared
           case flag
           when :textconv
             cmd << '--textconv'
-            files = files.map { |val| Dir[val] }
-                         .flatten
-                         .select { |val| projectpath?(val) }
-                         .map { |val| shell_quote("HEAD:#{val}") }
-            append_value files
+            append_value(files.map { |val| Dir[val] }
+                              .flatten
+                              .select { |val| projectpath?(val) }
+                              .map! { |val| shell_quote("HEAD:#{val}") })
             source(banner: false)
             return
           when :oneline
@@ -1290,7 +1292,7 @@ module Squared
             args = option_sanitize(opts, OPT_GIT[:rev_parse][flag]).first
             append_value(args, escape: session_arg?('sq-quote'))
           end
-          source(banner: verbose == 1)
+          source(banner: verbosity > 0)
         end
 
         def ls_remote(flag, opts = [], remote: nil)
@@ -1520,8 +1522,8 @@ module Squared
             end
             target.delete('--all')
           elsif target.include?('--multiple')
-            target.merge(out.map { |opt| shell_escape(opt, quote: true) })
-            out.clear
+            target.merge(out.map! { |opt| shell_escape(opt, quote: true) })
+            return
           end
           option_clear(out, target: target, subject: flag.to_s) if flag
         end
@@ -1604,6 +1606,17 @@ module Squared
           target.include?('--quiet') || (target.include?('-q') && target.first == 'git')
         end
 
+        def verbosity
+          case verbose
+          when true
+            0
+          when Numeric
+            verbose
+          else
+            -1
+          end
+        end
+
         def gitpath
           basepath '.git'
         end

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

@@ -238,7 +238,10 @@ module Squared
             return
           end
           items = []
-          items << @workspace.home if build? && path != @workspace.home && @workspace.home?
+          if build? && path != @workspace.home && @workspace.home?
+            items << @workspace.home
+            @workspace.rev_clear(@workspace.find(@workspace.home).name)
+          end
           items += as_a(also) if also
           return if items.empty?
 
@@ -248,11 +251,18 @@ module Squared
             case dir
             when Pathname
               dest = dir
+              @workspace.rev_clear(dest)
             when String
               dest = @workspace.rootpath(dir)
+              @workspace.rev_clear(dest)
             when Symbol
-              dest = @workspace.find(name: dir)&.path
-              log.warn message("copy project :#{dir}", hint: 'not found') unless dest
+              if (proj = @workspace.find(name: dir))
+                @workspace.rev_clear(proj.name)
+                dest = proj.path
+              else
+                log.warn message("copy project :#{dir}", hint: 'not found')
+                dest = nil
+              end
             when Hash
               from = dir[:from] if dir.key?(:from)
               into = dir[:into] if dir.key?(:into)
@@ -265,8 +275,10 @@ module Squared
               glob = dir[:include]
               pass = dir[:exclude]
               dest = items.first unless dest && dest != true
+              @workspace.rev_clear(dest) unless dest == true
             when Project::Base
               dest = dir.path
+              @workspace.rev_clear(dir.name)
             else
               raise_error "copy given: #{dir}"
             end
@@ -318,7 +330,7 @@ module Squared
           if @depend && !flag
             super
           elsif outdated?
-            workspace.rev_clear name
+            workspace.rev_clear(name)
             return update if !flag && env('NODE_UPDATE')
 
             if (yarn = dependtype(:yarn)) > 0
@@ -579,6 +591,7 @@ module Squared
         end
 
         def package(flag, opts = [])
+          workspace.rev_clear(name)
           if (yarn = dependtype(:yarn)) > 0
             cmd = session 'yarn', if flag == :update
                                     flag = yarn == 1 ? 'upgrade' : 'up'

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

@@ -4,9 +4,8 @@ module Squared
   module Workspace
     module Project
       class Python < Git
-        REQUIREMENTS = %w[requirements.txt poetry.lock pyproject.toml setup.cfg].freeze
-        SETUPTOOLS = %w[setup.py pyproject.toml].freeze
-        DIR_PYTHON = (REQUIREMENTS + SETUPTOOLS).freeze
+        DEP_PYTHON = %w[poetry.lock setup.cfg pyproject.toml setup.py requirements.txt].freeze
+        DIR_PYTHON = (DEP_PYTHON + %w[README.rst]).freeze
         OPT_PYTHON = {
           common: %w[b B d E h i I O OO P q s S u v x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
           build: %w[n|no-isolation s|sdist v|verbose w|wheel x|skip-dependency-check C|config-setting=q installer=b
@@ -21,7 +20,7 @@ module Squared
           install: %w[break-system-packages check-build-dependencies compile dry-run force-reinstall I|ignore-installed
                       ignore-requires-python no-build-isolation no-clean no-compile no-deps no-index no-warn-conflicts
                       no-warn-script-location pre prefer-binary require-hashes U|upgrade use-pep517 user abi=b
-                      config-settings=q c|constraint=p e|editable=b? extra-index-url=q f|find-links=q global-option=q
+                      config-settings=q c|constraint=p extra-index-url=q f|find-links=q global-option=q
                       implementation=b i|index-url=q no-binary=q only-binary=q platform=q prefix=p progress-bar=b
                       python-version=q report=p r|requirement=p root=p root-user-action=b src=p t|target=p
                       upgrade-strategy=b].freeze,
@@ -46,8 +45,7 @@ module Squared
                       config-file=p cert=p client-cert=p i|identity=b p|password=q r|repository=b repository-url=q
                       sign-with=b u|username=q].freeze
         }.freeze
-        private_constant :REQUIREMENTS, :SETUPTOOLS, :DIR_PYTHON, :OPT_PYTHON, :OPT_PIP, :OPT_POETRY, :OPT_HATCH,
-                         :OPT_TWINE
+        private_constant :DEP_PYTHON, :DIR_PYTHON, :OPT_PYTHON, :OPT_PIP, :OPT_POETRY, :OPT_HATCH, :OPT_TWINE
 
         class << self
           def populate(*); end
@@ -71,9 +69,9 @@ module Squared
           end
         end
 
-        attr_reader :venv
+        attr_reader :venv, :editable
 
-        def initialize(*, venv: nil, **kwargs)
+        def initialize(*, venv: nil, editable: '.', verbose: nil, **kwargs)
           super
           if @pass.include?(Python.ref)
             initialize_ref Python.ref
@@ -82,13 +80,20 @@ module Squared
             initialize_build(Python.ref, **kwargs)
             initialize_env(**kwargs)
           end
-          @dependindex = REQUIREMENTS.index { |file| basepath(file).exist? }
-          @dependfile = basepath(REQUIREMENTS[@dependindex || 0])
+          @dependindex = DEP_PYTHON.index { |file| basepath(file).exist? }
+          @dependfile = basepath(DEP_PYTHON[@dependindex || 0])
+          @verbose = $1.size if verbose.is_a?(String) && verbose =~ /^(v+)$/
+          @editable = case editable
+                      when '.', Pathname
+                        editable
+                      when String
+                        Pathname.new(editable)
+                      end
           venv_set venv if venv
         end
 
         subtasks({
-          'venv' => %i[create remove show].freeze,
+          'venv' => %i[run create remove show].freeze,
           'pip' => %i[uninstall freeze].freeze,
           'install' => %i[user force upgrade target editable].freeze,
           'build' => %i[python poetry hatch].freeze,
@@ -114,10 +119,10 @@ module Squared
                     if flag == :create
                       format_desc action, flag, 'dir,opts*'
                       task flag, [:dir] do |_, args|
-                        dir = param_guard(action, flag, args: args, key: :dir)
+                        dir = basepath(param_guard(action, flag, args: args, key: :dir))
                         opts = python_session('-m venv', opts: args.extras).last
                         opts = option_sanitize(opts, OPT_PYTHON[:venv]).first
-                        append_value(dir = basepath(dir), delim: true)
+                        append_value(dir, delim: true)
                         option_clear(opts, pass: false)
                         run(exception: true)
                         puts(dir.directory? ? "Success: #{dir}" : 'Failed')
@@ -129,10 +134,17 @@ module Squared
 
                         format_desc action, flag, 'c|reate?,d|epend?'
                         task flag do |_, args|
-                          venv.rmtree(verbose: true)
+                          FileUtils.rm_rf(venv, verbose: true)
                           venv_init if has_value?(%w[c create], args.to_a)
                           depend if has_value?(%w[d depend], args.to_a)
                         end
+                      when :run
+                        format_desc action, flag, 'args+'
+                        task flag do |_, args|
+                          args = param_guard(action, flag, args: args.to_a)
+                          venv_init
+                          run session(*args, path: false)
+                        end
                       when :show
                         format_desc action, flag
                         task flag do
@@ -143,7 +155,7 @@ module Squared
                   when 'pip'
                     case flag
                     when :freeze
-                      format_desc action, flag, 'file?=requirements.txt,opts*'
+                      format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
                       task flag do |_, args|
                         if (file = pip(flag, args.to_a)) && verbose
                           puts File.read(file)
@@ -162,7 +174,7 @@ module Squared
                                                                when :editable
                                                                  'path/url?'
                                                                when :upgrade
-                                                                 'eager?,package+'
+                                                                 'strategy?,package+'
                                                                end)
                     case flag
                     when :editable
@@ -222,10 +234,9 @@ module Squared
             super
           elsif outdated?
             venv_init
-            workspace.rev_clear name
-            if !flag && dependtype == 2
-              cmd = session 'poetry', 'install', '-n'
-              cmd << '--no-ansi' unless verbose
+            workspace.rev_clear(name)
+            if !flag && dependtype == 1
+              cmd = poetry_session 'install', '-n'
               cmd << '--no-root' if option('no-root')
             else
               cmd = pip_session 'install'
@@ -240,16 +251,10 @@ module Squared
                 end
                 append_pip(flag, opts, from: :install)
               else
-                if (val = option('editable', 'e'))
-                  cmd << quote_option('e', editable(val))
-                end
                 append_global
               end
-              if dependtype == 1 && !session_arg?('e', 'editable')
-                cmd << '-r requirements.txt' unless session_arg?('r', 'requirement')
-              elsif !session_arg?('e', 'editable', value: true)
-                cmd << '.'
-              end
+              cmd << "-r #{DEP_PYTHON[4]}" if basepath(DEP_PYTHON[4]).exist? && !session_arg?('r', 'requirement')
+              append_editable
             end
             run(from: :depend, sync: sync)
           end
@@ -333,7 +338,7 @@ module Squared
           out = append_pip(flag, opts, from: :install)
           case flag
           when :editable
-            cmd << quote_option('e', out.shift || '.')
+            cmd << quote_option('e', out.pop || editable || '.')
             option_clear out
           when :upgrade
             cmd << '--upgrade'
@@ -351,7 +356,7 @@ module Squared
             cmd, opts = python_session('-m build', opts: opts)
             list = OPT_PYTHON[:build]
           when :poetry
-            cmd = session 'poetry', 'build'
+            cmd = poetry_session 'build'
             list = OPT_POETRY[:build] + OPT_POETRY[:common]
           when :hatch
             cmd, opts = hatch_session('build', opts: opts)
@@ -388,13 +393,12 @@ module Squared
         end
 
         def publish(flag, opts = [])
-          cmd = session flag
           case flag
           when :poetry
-            cmd << 'publish'
+            poetry_session 'publish'
             list = OPT_POETRY[:publish] + OPT_POETRY[:common]
           when :twine
-            cmd << 'upload'
+            session 'twine', 'upload'
             list = OPT_TWINE[:publish]
           when :hatch
             opts = hatch_session('publish', opts: opts).last
@@ -403,7 +407,7 @@ module Squared
           out = option_sanitize(opts, list, single: flag == :twine ? nil : /^(?:v+|q+)$/).first
           if out.empty?
             dist = basepath.join('dist')
-            raise_error('no source files given', hint: dist) unless dist.directory? && !dist.empty?
+            raise_error('no source files found', hint: dist) unless dist.directory? && !dist.empty?
             out << "#{dist}/*" unless flag == :poetry
           end
           append_value out
@@ -415,11 +419,11 @@ module Squared
           out = append_pip(nil, opts, from: flag)
           case flag
           when :uninstall
-            raise_error('no packages given', subject: name, hint: 'uninstall') if out.empty?
+            raise_error('no packages listed', subject: name, hint: 'uninstall') if out.empty?
             cmd.merge(out)
           when :freeze
             venv_init
-            ret = basepath(out.shift || 'requirements.txt')
+            ret = basepath(out.shift || DEP_PYTHON[4])
             cmd << '>' << shell_quote(ret)
             option_clear out
           end
@@ -431,14 +435,14 @@ module Squared
           case key
           when :dependfile
             req = basepath(*val)
-            if (index = REQUIREMENTS.index(req.basename.to_s))
+            if (index = DEP_PYTHON.index(req.basename.to_s))
               @dependindex = index
               @dependfile = req
             else
               log.warn "variable_set: @#{key}=#{req} (not supported)"
             end
-          when :venv
-            @venv = val.empty? ? nil : basepath(*val)
+          when :venv, :editable
+            instance_variable_set(:"@#{key}", val.empty? ? nil : basepath(*val))
           else
             super
           end
@@ -455,11 +459,11 @@ module Squared
         private
 
         def pip_session(*cmd)
-          session('pip', *cmd, path: venv.nil?)
+          session('pip', *cmd, *preopts, path: venv.nil?)
         end
 
         def python_session(*cmd, opts: nil)
-          return session('python', *cmd, path: venv.nil?) unless opts
+          return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
 
           out = []
           opts = option_sanitize(opts, OPT_PYTHON[:common], target: out, single: /^v+$/).first
@@ -467,8 +471,16 @@ module Squared
           [ret, opts]
         end
 
+        def poetry_session(*cmd)
+          ret = session('poetry', *cmd, *preopts)
+          if (val = option('project', ignore: false))
+            ret << quote_option('project', basepath(val))
+          end
+          ret
+        end
+
         def hatch_session(*cmd, opts: nil)
-          return session('hatch', *cmd, path: venv.nil?) unless opts
+          return session('hatch', *preopts, *cmd, path: venv.nil?) unless opts
 
           out = []
           opts = option_sanitize(opts, OPT_HATCH[:common], target: out, single: /^(?:v+|q+)$/).first
@@ -490,6 +502,7 @@ module Squared
               if opt =~ pat
                 case $1
                 when 'e', 'editable'
+                  out << edit if edit && flag == :editable
                   edit = $2
                 end
               elsif flag == :editable && !edit
@@ -499,7 +512,7 @@ module Squared
               end
             end
             if edit
-              edit = editable(edit)
+              edit = basepath(edit) unless %r{^[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
               if flag == :editable
                 out << edit
               else
@@ -518,6 +531,23 @@ module Squared
           end
         end
 
+        def append_editable
+          return if requirements?
+
+          if (val = option('editable', 'e', ignore: false))
+            session_delete('e', 'editable')
+            case val
+            when '0', 'false'
+              return
+            else
+              val = basepath(val)
+            end
+          elsif session_arg?('e', 'editable') || !(val = editable)
+            return
+          end
+          @session << quote_option('e', val)
+        end
+
         def append_global(target: @session)
           if (val = option('cache-dir'))
             target << case val
@@ -532,12 +562,19 @@ module Squared
           append_nocolor(target: target)
         end
 
-        def editable(val)
-          %r{^[a-z]+(?:\+[a-z]+)?://}i.match?(val) ? val : basepath(val)
+        def preopts(quiet: true)
+          ret = []
+          case verbose
+          when false
+            ret << '--quiet' if quiet
+          when Numeric
+            ret << "-#{'v' * verbose}" if verbose > 0
+          end
+          ret
         end
 
         def variables
-          (super + %i[venv]).freeze
+          (super + %i[venv editable]).freeze
         end
 
         def runenv
@@ -551,7 +588,7 @@ module Squared
         end
 
         def venvbin
-          @venv.join(workspace.windows? ? 'Scripts' : 'bin')
+          @venv&.join(workspace.windows? ? 'Scripts' : 'bin')
         end
 
         def venv_set(val)
@@ -574,10 +611,14 @@ module Squared
           return if !venv || (venvbin.directory? && !venvbin.empty?)
 
           puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'init')
-          cmd = python_session '-m venv', shell_option('prompt', name), '--upgrade-deps', shell_quote(venv)
+          cmd = session 'python', '-m venv', shell_option('prompt', name), '--upgrade-deps', shell_quote(venv)
           run(cmd, false, exception: true, banner: false)
           puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'created')
         end
+
+        def requirements?
+          dependtype == 5
+        end
       end
 
       Application.implement Python

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

@@ -99,7 +99,7 @@ module Squared
             File.foreach(file) do |line|
               next unless line.match?(%r{\brequire\s+(["'])bundler/gem_tasks\1})
 
-              cmd = bundle_output('exec', 'rake').to_s
+              cmd = bundle_output('exec rake').to_s
               @output[0] = "#{cmd} build"
               @copy = "#{cmd} install"
               @clean = "#{cmd} clean" if @clean.nil?
@@ -201,7 +201,7 @@ module Squared
           if @depend
             super
           elsif outdated?
-            workspace.rev_clear name
+            workspace.rev_clear(name)
             cmd = bundle_session 'install'
             if (n = option('jobs')).to_i > 0
               cmd << "-j#{n}"
@@ -375,10 +375,7 @@ module Squared
           cmd = gem_session
           case flag
           when :outdated
-            if (pwd = gempwd)
-              cmd << pwd
-            end
-            cmd << 'outdated'
+            cmd << gempwd << 'outdated'
           when :push
             cmd << 'push' << project
           when :'user-install'
@@ -395,6 +392,7 @@ module Squared
           when :pristine
             first = true
           end
+          cmd.merge(preopts)
           opts, pat = option_sanitize(opts, list, no: no, first: first)
           out = []
           err = []
@@ -538,7 +536,7 @@ module Squared
                  end
           case flag
           when 'exec', 'config'
-            raise_error('no command given', hint: flag) if args.empty?
+            raise_error('no command args', hint: flag) if args.empty?
             cmd.merge(args)
           else
             option_clear args
@@ -590,7 +588,7 @@ module Squared
           if @version
             pwd = gempwd
             pwd_set(pass: !pwd.nil?) do
-              out = `#{gem_output(pwd, 'list', '--local', '-d', project)}`
+              out = `#{gem_output(pwd, 'list --local -d', project)}`
               if out =~ /#{Regexp.escape(project)} \(([^)]+)\)/
                 ver = $1.split(/\s*,\s*/)
                 ver.unshift(@version).uniq!
@@ -653,18 +651,21 @@ module Squared
 
         def gem_session(*cmd, **kwargs)
           ret = session('gem', *cmd, **kwargs)
-          ret << '--no-verbose' unless verbose
-          ret
+          return ret if cmd.empty?
+
+          ret.merge(preopts)
         end
 
         def bundle_session(*cmd, **kwargs)
           ret = session('bundle', *cmd, **kwargs)
+          return ret if cmd.empty?
+
           append_nocolor
-          ret
+          ret.merge(preopts)
         end
 
         def rake_session(*cmd, **kwargs)
-          session('rake', *cmd, **kwargs)
+          session('rake', *preopts, *cmd, **kwargs)
         end
 
         def gem_output(*cmd, **kwargs)
@@ -694,6 +695,10 @@ module Squared
           @rakelist = ret
         end
 
+        def preopts
+          verbosity > 0 && !session_arg?('quiet') ? ['--verbose'] : []
+        end
+
         def gemdir?
           @gemdir.exist? && !@gemdir.empty?
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - An Pham