squared 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11c047668befa13733be4f81fbac270909c72be73754f70b464e804c11f8204e
-  data.tar.gz: fac920aa92d55210e48c2f780ea366b58f0c9ed870d524b5bf19eeeeb2628ab1
+  metadata.gz: a3ad5f0881e8642ae1d57fccbba6a1fdc3ff555b6efcd7eb2989a5675ff5bcd3
+  data.tar.gz: 426a514ca02ddf64fa2009ad165d0bf9e0053905c58643c7398e7c1d17630fcc
 SHA512:
-  metadata.gz: 78b3346cbf690fa4ce9a36431eaad0ffb24d464a46700810c19f6938b5e020c94c1ede8709f61e448f75443f3b8c9df8a00877e380e81beb7ce37732dc244289
-  data.tar.gz: ee6b18f73590b38fa91a2f73852cbc6ccc467255bed2c5c540731d565dc43e15b1b6c103866003979518ef416fcb450beb5c58f5f1ad1c20119437d5f795aa84
+  metadata.gz: af9e72989be1dbbf614f8c7dd5989a0081775e4433ad280a4bae600660e56bd1ba20aa6a3f33ad367b349a209227be5b823c4e496367533260c1a86ae3a6dd6c
+  data.tar.gz: d0dd6f39e8b8f8834768c93ab26718618d0d0023f99a242321f6925bee9fcc782ebbfd86a698bdcebe17fb1deb763c79d46d77001d55a13b24ddc391beb0a3c8

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.1.5] - 2024-02-25
+
+### Fixed
+
+- Node copy method ignored include argument when called directly.
+- Logger is not initialized when using only Git base class.
+- Hide warnings about readline during execution.
+- Logger is not initialized when using only base class.
+- Merging ENV build options were double escaped.
+
+## [0.1.4] - 2024-02-05
+
+### Fixed
+
+- Build options with array args were not recognized.
+- Base clean command did not enumerate non-string values.
+- Git command refs did not include ref option.
+- Pip upgrade did not append package names.
+
 ## [0.1.3] - 2024-01-02
 
 ### Fixed
@@ -79,6 +98,8 @@
 
 - Changelog was created.
 
+[0.1.5]: https://github.com/anpham6/squared/releases/tag/v0.1.5-ruby
+[0.1.4]: https://github.com/anpham6/squared/releases/tag/v0.1.4-ruby
 [0.1.3]: https://github.com/anpham6/squared/releases/tag/v0.1.3-ruby
 [0.1.2]: https://github.com/anpham6/squared/releases/tag/v0.1.2-ruby
 [0.1.1]: https://github.com/anpham6/squared/releases/tag/v0.1.1-ruby

data/README.ruby.md

@@ -255,16 +255,16 @@ Non-task:
 # :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

@@ -10,7 +10,7 @@ module Squared
 
       def shell_escape(val, quote: false, force: false)
         if (data = /\A(--?[^= ]+)((=|\s+)(["'])?(.+?)(["'])?)?\z/m.match(val = val.to_s))
-          return val unless data[2]
+          return val if !data[2] || (!data[4] && data[5] =~ /\s/)
 
           join = ->(opt) { data[1] + data[3] + shell_quote(opt) }
           if data[4] == data[6]
@@ -32,8 +32,9 @@ module Squared
         Rake::Win32.windows? ? "\"#{double_quote(val)}\"" : "'#{single_quote(val)}'"
       end
 
-      def shell_split(val, quote: false, join: nil)
-        val = Shellwords.split(val).map { |opt| shell_escape(opt, quote: quote) }
+      def shell_split(val, escape: true, quote: false, join: nil)
+        val = Shellwords.split(val)
+        val = val.map { |opt| shell_escape(opt, quote: quote) } if escape
         return val unless join
 
         val.join(join.is_a?(::String) ? join : ' ')

data/lib/squared/version.rb

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

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

@@ -187,7 +187,7 @@ module Squared
           @prod = env_match("#{pre}_PROD", prod)
           cmd = @output[0]
           unless cmd == false || cmd.is_a?(Array) || (val = env('BUILD', suffix: 'OPTS')).nil?
-            @output[cmd ? 1 : 3] = shell_split(val, join: true)
+            @output[cmd ? 1 : 3] = shell_split(val, escape: false, join: true)
           end
           unless @output[2] == false || (val = env('BUILD', suffix: 'ENV')).nil?
             begin
@@ -195,7 +195,7 @@ module Squared
               raise_error('invalid JSON object', val, hint: "#{prefix}_ENV") unless data.is_a?(Hash)
               @output[2] = data
             rescue StandardError => e
-              log.warn e
+              log&.warn e
             end
           end
           return unless (val = env('BUILD', strict: true))
@@ -291,7 +291,7 @@ module Squared
             if val.directory? && !val.empty?
               true
             else
-              log.warn "workspace \"#{val}\" (#{val.empty? ? 'empty' : 'not found'})"
+              log&.warn "workspace \"#{val}\" (#{val.empty? ? 'empty' : 'not found'})"
               false
             end
           end
@@ -343,7 +343,7 @@ module Squared
             when String
               cmd = "#{cmd} #{opts}"
             when Array
-              cmd = cmd.join(' && ')
+              cmd = as_a(cmd).concat(opts).join(' && ')
             else
               cmd = [cmd, compose(opts, script: false)].compact.join(' ') unless opts == false || !respond_to?(:compose)
             end
@@ -364,11 +364,11 @@ module Squared
         end
 
         def doc(*, sync: invoked_sync?('doc'), **)
-          build(@doc, sync: sync) if @doc
+          build(*as_a(@doc), sync: sync) if @doc
         end
 
         def test(*, sync: invoked_sync?('test'), **)
-          build(@test, sync: sync) if @test
+          build(*as_a(@test), sync: sync) if @test
         end
 
         def clean(*)
@@ -376,21 +376,21 @@ module Squared
           when String
             run_s(@clean, sync: invoked_sync?('clean'))
           when Enumerable
-            as_a(@clean).each do |val|
-              if (val = val.to_s) =~ %r{[\\/]$}
-                dir = Pathname.new(val)
-                dir = basepath(dir) unless dir.absolute?
-                next unless dir.directory?
-
-                log.warn "rm -rf #{dir}"
-                dir.rmtree
+            (@clean.is_a?(Hash) ? @clean.values : as_a(@clean)).each do |val|
+              val = val.to_s
+              path = basepath(val)
+              if path.directory? && val =~ %r{[\\/]$}
+                log&.warn "rm -rf #{path}"
+                path.rmtree
               else
-                files = val.include?('*') ? Dir[basepath(val)] : [basepath(val)]
+                files = val.include?('*') ? Dir[path] : [path]
                 files.each do |file|
+                  next unless File.file?(file)
+
                   begin
-                    File.delete(file) if File.file?(file)
+                    File.delete(file)
                   rescue StandardError => e
-                    log.error e
+                    log&.error e
                   end
                 end
               end
@@ -440,7 +440,7 @@ module Squared
               instance_variable_set :"@#{key}", val.first
             end
           else
-            log.warn "variable_set: @#{key} (private)"
+            log&.warn "variable_set: @#{key} (private)"
           end
         end
 
@@ -548,10 +548,10 @@ module Squared
 
         def run(cmd = @session, var = nil, exception: @exception, sync: true, banner: true, chdir: path, **)
           cmd = session_done(cmd)
-          log.info cmd
+          log&.info cmd
           begin
             if cmd =~ /\A[^:]+:[^:]/ && workspace.task_defined?(cmd)
-              log.warn "ENV was discarded: #{var}" if var
+              log&.warn "ENV was discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
               print_item format_banner(cmd, banner: banner) if sync
@@ -559,7 +559,7 @@ module Squared
               shell(*args, chdir: chdir, exception: exception)
             end
           rescue StandardError => e
-            log.error e
+            log&.error e
             raise
           end
         end

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

@@ -402,7 +402,7 @@ module Squared
         end
 
         def refs(flag, grep: nil)
-          git_session 'ls-remote', " --#{flag}"
+          git_session 'ls-remote', "--#{flag}", '--refs'
           out, banner = source(io: true)
           print_item banner
           ret = write_lines(out, grep: grep)
@@ -410,7 +410,7 @@ module Squared
         end
 
         def files(flag, grep: nil)
-          git_session 'ls-files', " --#{flag}"
+          git_session 'ls-files', "--#{flag}"
           out, banner = source(io: true)
           print_item banner
           ret = write_lines(out, grep: grep)
@@ -552,7 +552,7 @@ module Squared
         def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false, banner: true,
                    sub: nil)
           cmd = session_done(cmd)
-          log.info cmd
+          log&.info cmd
           banner = format_banner(cmd.gsub(File.join(path, ''), ''), banner: banner)
           cmd = cmd.sub(/\Agit\b/, "git --work-tree=#{shell_quote(path)} --git-dir=#{shell_quote(gitpath)}")
           begin
@@ -586,7 +586,7 @@ module Squared
               end
             end
           rescue StandardError => e
-            log.error e
+            log&.error e
             raise if exception
 
             warn log_message(Logger::WARN, e) if warning?
@@ -602,7 +602,7 @@ module Squared
             next if grep && !line.match?(grep)
 
             if loglevel
-              log.add loglevel, line
+              log&.add loglevel, line
             else
               sub&.each { |h| line = sub_style(line, **h) }
               if banner

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

@@ -123,8 +123,8 @@ module Squared
           end
         end
 
-        def copy(from: 'build', into: 'node_modules', workspace: false, include: nil, exclude: nil, scope: nil,
-                 also: nil, create: nil, override: false)
+        def copy(from: 'build', into: 'node_modules', workspace: false, scope: nil,
+                 also: nil, create: nil, override: false, **kwargs)
           return if @copy == false
 
           if @copy && !override
@@ -138,6 +138,9 @@ module Squared
             scope = @copy[:scope]
             also = @copy[:also]
             create = @copy[:create]
+          else
+            glob = kwargs[:include]
+            exclude = kwargs[:exclude]
           end
           items = []
           items << @workspace.home if build? && path != @workspace.home && @workspace.home?

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

@@ -4,7 +4,7 @@ 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_USER = %w[pre dry-run].freeze
         OPT_FORCE = (OPT_USER + ['user']).freeze
         OPT_GENERAL = %w{venv isolated no-cache-dir [v]erbose}.freeze
@@ -29,7 +29,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
 
@@ -98,32 +98,30 @@ module Squared
           if @depend && !flag
             super
           elsif outdated?
-            case (type = dependtype)
-            when 1, 2
-              cmd = pip_session 'install'
-              case flag
-              when :user
-                cmd << '--user'
-                append_pip opts, OPT_USER
-              when :target
-                cmd << shell_option('target', basepath(dir), quote: true)
-                append_pip opts, OPT_USER + ['upgrade']
-                append_eager opts
-              when :upgrade
-                cmd << '--upgrade'
-                append_pip opts, OPT_FORCE
-                append_eager opts
-              when :force
-                cmd << '--force-reinstall'
-                append_pip opts, OPT_FORCE
-              else
-                append_pip
-              end
-              cmd << (type == 1 ? '-r requirements.txt' : '.')
-              run(sync: sync)
-            when 3
-              run_s('python setup.py install', sync: sync)
+            cmd = pip_session 'install'
+            case flag
+            when :user
+              cmd << '--user'
+              append_pip opts, OPT_USER
+            when :target
+              cmd << shell_option('target', basepath(dir), quote: true)
+              append_pip opts, OPT_USER + ['upgrade']
+              append_eager opts
+            when :upgrade
+              cmd << '--upgrade'
+              extra = []
+              append_pip(opts, OPT_FORCE, extra: extra)
+              append_eager opts
+              extra.delete('eager')
+              append_value(extra, delim: true)
+            when :force
+              cmd << '--force-reinstall'
+              append_pip opts, OPT_FORCE
+            else
+              append_pip
             end
+            cmd << (dependtype == 1 ? '-r requirements.txt' : '.') unless flag == :upgrade
+            run(sync: sync)
           end
         end
 
@@ -162,17 +160,19 @@ module Squared
           session('pip', *cmd)
         end
 
-        def append_pip(opts = [], list = [])
+        def append_pip(opts = [], list = [], extra: nil)
           opts.each do |opt|
             data = nil
-            next unless list.include?(opt) || OPT_GENERAL.include?(opt) || (data = opt.match(/^verbose|(v+)$/))
-
-            @session << case opt
-                        when 'venv'
-                          '--require-virtualenv'
-                        else
-                          (data && data[1] ? "-#{data[1]}" : "--#{opt}")
-                        end
+            if list.include?(opt) || OPT_GENERAL.include?(opt) || (data = opt.match(/^verbose|(v+)$/))
+              @session << case opt
+                          when 'venv'
+                            '--require-virtualenv'
+                          else
+                            (data && data[1] ? "-#{data[1]}" : "--#{opt}")
+                          end
+            elsif extra
+              extra << opt
+            end
           end
           val = nil
           @session << shell_option('proxy', val, quote: true) if (val = option('proxy'))

data/squared.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rake"
   spec.add_dependency "logger"
   spec.add_dependency "rexml"
+  spec.add_dependency "readline"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -51,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rake task generator for managing multi-language workspaces.
 email:
 - anpham6@gmail.com