squared 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c53d370d6535fd30824fafd72a2f68fd7db161600d2740fd643f270d68d6f6
-  data.tar.gz: 26b8eb9e45b508923bacce4bc06502d3031fc7a8b9c844dfd02775a86191ec3c
+  metadata.gz: 3bc7bf1e798295581f3dcbd052d367f159a91bff55bc4bbcbe3862a6d4c39739
+  data.tar.gz: '03919adb276a1ed4b25b217776e28d4525c90e4ffe5af508b883d3480f4fbf23'
 SHA512:
-  metadata.gz: f32e8ae4585c328c298791628eca4e18e00ac2818bee7aa9c5e1f1f680fd6b60f0a59cc1fd1b4313794d1d7d926dfc195762cf9912e83034d553d248f90f8743
-  data.tar.gz: '091805806ce97b61bf45f6df58bf5232ce75f65e0d1bcbcdffb0aed949e3e38200b5ea8d9bd600e9c2150e24296af2faf2ac3a99312ec290112bf55770ea38a7'
+  metadata.gz: 4ad94be493ad60c59ed738d59884bbfd815cddd8ddbe31ad6be4fd6f0e7ddf70b6b7bd6b70d65ab4b14caa99d1480f7cb985f02d39351d5a4554f6f6a91cb6a3
+  data.tar.gz: 98783c78e94aa41d5f331110129f329cfe2c80e87e008a8d453cc0f4851701cc538524b7fe924ae19e58689641a9be2b131e354386566ee4344b7b831539cd42

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.2.3] - 2025-02-05
+
+### Fixed
+
+ - Project hash options duplicated dash prefix.
+ - Pip upgrade did not append package names.
+
 ## [0.2.2] - 2025-01-19
 
 ### Fixed
@@ -169,6 +176,7 @@
 
 - Changelog was created.
 
+[0.2.3]: https://github.com/anpham6/squared/releases/tag/v0.2.3-ruby
 [0.2.2]: https://github.com/anpham6/squared/releases/tag/v0.2.2-ruby
 [0.2.1]: https://github.com/anpham6/squared/releases/tag/v0.2.1-ruby
 [0.2.0]: https://github.com/anpham6/squared/releases/tag/v0.2.0-ruby

data/README.ruby.md

@@ -335,16 +335,16 @@ Common::PATH.merge!({
 # :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_OPTS_${NAME} # -c
-BUILD_ENV_${NAME}  # {"LD_LIBRARY_PATH":"path/to/lib","CFLAGS":"-Wall"} (hash/json)
+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_OPTS_${NAME} # --loglevel=error --workspaces=false
-BUILD_ENV_${NAME}  # {"NODE_ENV":"production","NO_COLOR":"1"} (hash/json)
-BUILD_DEV_${NAME}  # pattern,0,1 (:dev)
-BUILD_PROD_${NAME} # pattern,0,1 (:prod)
+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
 ```

data/lib/squared/common/shell.rb

@@ -40,7 +40,12 @@ module Squared
       end
 
       def shell_option(flag, val = nil, escape: true, quote: true)
-        a, b = flag.size == 1 ? ['-', ' '] : ['--', '=']
+        flag = flag.to_s
+        if flag[0] == '-'
+          b = flag[1] == '-' ? '=' : ' '
+        else
+          a, b = flag.size == 1 ? ['-', ' '] : ['--', '=']
+        end
         "#{a}#{flag}#{if val
                         "#{b}#{if escape
                                  shell_escape(val, quote: quote)

data/lib/squared/version.rb

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

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

@@ -992,21 +992,17 @@ module Squared
         def append_hash(opts, target: @session)
           out = target.to_s
           opts.each do |key, val|
-            key = key.to_s
-            key = shell_option(key) unless key[0] == '-'
-            next if out =~ Regexp.new(" #{key}(?: |=|$)")
+            next if out =~ / #{Regexp.escape(shell_option(key))}(?: |=|$)/
 
             case val
-            when String
-              append_repeat(key, [val], target: target)
             when Array
               append_repeat(key, val, target: target)
             when Numeric
-              target << (key + (key.start_with?('--') ? '=' : '') + val.to_s)
+              target << basic_option(key, val)
             when false
-              target << key.sub(/^--(?!no-)/, '--no-')
+              target << shell_option(key).sub(/^--(?!no-)/, '--no-')
             else
-              target << key
+              target << shell_option(key, val.is_a?(String) ? val : nil)
             end
           end
         end

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

@@ -4,11 +4,11 @@ module Squared
   module Workspace
     module Project
       class Python < Git
-        REQUIREMENTS = %w[requirements.txt pyproject.toml setup.py].freeze
+        REQUIREMENTS = %w[requirements.txt pyproject.toml].freeze
         OPT_INSTALL = %w[I U break-system-packages check-build-dependencies compile dry-run force-reinstall
                          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 upgrade
-                         use-pep517 user abi=s config-settings=s c=s constraint=s e=s editable=s extra-index-url=s
+                         use-pep517 user abi=s config-settings=s c=s constraint=s e=s? editable=s? extra-index-url=s
                          f=s find-links=s global-option=s implementation=s i=s index-url=s no-binary=s only-binary=s
                          platform=s prefix=s progress-bar=s python-version=s report=s r=s requirement=s
                          root-user-action=s root=s src=s t=s target=s upgrade-strategy=s].freeze
@@ -37,7 +37,7 @@ module Squared
           def config?(val)
             return false unless (val = as_path(val))
 
-            REQUIREMENTS.any? { |file| val.join(file).exist? }
+            (REQUIREMENTS + ['setup.py']).any? { |file| val.join(file).exist? }
           end
         end
 
@@ -79,7 +79,7 @@ module Squared
                                                                                    when :target
                                                                                      'dir'
                                                                                    when :upgrade
-                                                                                     'strategy'
+                                                                                     'strategy?,packages+'
                                                                                    end)
                     end
                     case flag
@@ -104,47 +104,32 @@ module Squared
           if @depend && !flag
             super
           elsif outdated?
-            case (type = dependtype)
-            when 1, 2
-              cmd = pip_session 'install'
-              case flag
-              when :user
-                cmd << '--user'
-              when :upgrade
-                cmd << '--upgrade'
-                case param
-                when 'eager', 'only-if-needed'
-                  cmd << basic_option('upgrade-strategy', param)
-                else
-                  opts << param
-                end
-              when :force
-                cmd << '--force-reinstall'
-              when :target
-                cmd << quote_option('target', basepath(param))
+            cmd = pip_session 'install'
+            case flag
+            when :user
+              cmd << '--user'
+            when :upgrade
+              cmd << '--upgrade'
+              case param
+              when 'eager', 'only-if-needed'
+                cmd << basic_option('upgrade-strategy', param)
               else
-                append_global
+                opts << param
               end
-              append_pip opts if flag
-              if type == 2
+            when :force
+              cmd << '--force-reinstall'
+            when :target
+              cmd << quote_option('target', basepath(param))
+            else
+              append_global
+            end
+            append_pip flag, opts if flag
+            unless flag == :upgrade
+              if dependtype == 2 || cmd.find { |val| val =~ /^(?:-e|--editable)$/ }
                 cmd << '.'
-              elsif !cmd.find { |val| val =~ /^(?:-r|--requirement)/ }
+              elsif !cmd.find { |val| val =~ /^(?:-r|--requirement|-e|--editable)/ }
                 cmd << '-r requirements.txt'
               end
-            when 3
-              cmd = python_session 'setup.py', 'install'
-              case flag
-              when :user
-                cmd << '--user'
-              when :target
-                cmd << quote_option('build-base', basepath(dir))
-              end
-              if option('user')
-                cmd << '--user'
-              else
-                append_first(%w[home prefix], equals: true, escape: false, quote: true, ignore: false)
-              end
-              cmd.delete('--user') if workspace.windows?
             end
             run(from: :depend, sync: sync)
           end
@@ -256,12 +241,12 @@ module Squared
           session('python', *cmd)
         end
 
-        def append_pip(opts, list = nil, target: @session)
+        def append_pip(flag, opts, target: @session)
           append_nocolor(target: target)
           return if opts.empty?
 
           out = []
-          opts, pat = option_partition(opts, list || (OPT_INSTALL + OPT_GENERAL), target: target)
+          opts, pat = option_partition(opts, OPT_INSTALL + OPT_GENERAL, target: target)
           opts.each do |opt|
             if opt =~ /^(v+|q+)$/
               cmd << "-#{$1}"
@@ -272,7 +257,7 @@ module Squared
                 target << quote_option($1, basepath($2))
               when 'e', 'editable'
                 val = $2
-                target << quote_option($1, val =~ %r{^[a-z]+\+[a-z]+://} ? val : basepath(val))
+                target << quote_option($1, val =~ %r{^[a-z]+(?:\+[a-z]+)?://}i ? val : basepath(val))
               when 'proxy', 'config-settings', 'global-option', 'extra-index-url',
                    'f', 'find-links', 'i', 'index-url'
                 target << quote_option($1, $2)
@@ -285,7 +270,11 @@ module Squared
               out << opt
             end
           end
-          option_clear(out, target: target)
+          if flag == :upgrade
+            append_value(out, delim: true)
+          else
+            option_clear(out, target: target)
+          end
         end
 
         def append_global

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-01-19 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []