squared 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fb2101a0fb0c5a8f651bf471b44a5dc3be21c3b87d6e53f708d752b6e8c8ffd
-  data.tar.gz: eb322ca0cab89e5f41f719e06e182120efd96280f88a5f2625f3954331500a19
+  metadata.gz: 7942c4e6f2ca9177fbca4e9a5400982c4a6c5431c04e3f4ed2c80f8d47408cf8
+  data.tar.gz: 8bf51312a2ecbe75a54c1d584a336fb4729b89db9be305259a8fc076bc7b7488
 SHA512:
-  metadata.gz: a6947106acb6d33789f3ae79a84e87c3119b799f556a8570920904338b3955b795578f392860fce83260af5b1c17159ba4c64e9f4eeeaed6b5886e06dfe12a06
-  data.tar.gz: dd9416a0457a2ead233f32c9592b2061e569161d54482d4ab949fd7acb6ceb6139c26329a4fdb6ea1853ab6f840ab145e17f4b58a386bd68eb066c14ea3f85cd
+  metadata.gz: d3156775e41dd2eaba6609631b37111d4d52f979ec7f14f456f0e05b3d43b481a0880fdf2552ba557d4e70594af541fec4564e990b701b11146c3dfd5f25ef92
+  data.tar.gz: 9b63ad8b38308c35557961061c5e89fd787bd0b7db094443464aa8f27e3eee661fc3031d297556e896f9cc9404df7a327e5b198ae6f81fe45b5f22b579bb7756

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [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
+
+- Output lines from IO were missing theme styling.
+- Node did not apply build options when stored as Array.
+- Git commit push did not send origin and branch.
+
 ## [0.1.2] - 2024-12-23
 
 ### Added
@@ -71,6 +88,8 @@
 
 - Changelog was created.
 
+[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
 [0.1.0]: https://github.com/anpham6/squared/releases/tag/v0.1.0-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/format.rb

@@ -170,7 +170,7 @@ module Squared
         args = args.map(&:to_s)
         if args.size > 1
           title = log_title(level, color: false)
-          sub = { pat: /\A(#{title})(.+)\z/m, styles: __get__(:theme)[:logger][log_sym(level)] } if color
+          sub = { pat: /^(#{title})(.+)$/, styles: __get__(:theme)[:logger][log_sym(level)] } if color
           emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub)
         else
           msg = [log_title(level, color: color)]

data/lib/squared/common/shell.rb

@@ -50,7 +50,7 @@ module Squared
       end
 
       def fill_option(val)
-        return "-#{val}" if val.size == 1 || val =~ /\A[a-z]\d+\z/i
+        return "-#{val}" if val =~ /\A[a-z](?:\d*)\z/i
 
         shell_escape(val.start_with?('-') ? val : "--#{val}")
       end

data/lib/squared/version.rb

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

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

@@ -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,19 +376,19 @@ 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
                   end
@@ -1032,7 +1032,7 @@ module Squared
         end
 
         def headerstyle
-          { pat: /\A(\S+)(\s+)\z/, styles: theme[:header] }
+          { pat: /^(\S+)(\s+)$/, styles: theme[:header] }
         end
 
         def scriptargs

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

@@ -261,8 +261,8 @@ module Squared
           append_pull opts, OPT_PULL, flag
           sub = if verbose
                   [
-                    { pat: /\A(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)\z/, styles: :red, index: 4 },
-                    { pat: /\A(.+)(\|\s+\d+\s+)(\++)(-*)(.*)\z/, styles: :green, index: 3 }
+                    { pat: /^(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)$/, styles: :red, index: 4 },
+                    { pat: /^(.+)(\|\s+\d+\s+)(\++)(-*)(.*)$/, styles: :green, index: 3 }
                   ]
                 end
           source(sync: sync, sub: sub, **threadargs)
@@ -315,10 +315,10 @@ module Squared
           end
           ret = write_lines(out, banner: banner, sub: if verbose
                                                         [
-                                                          { pat: /\A(.)([A-Z])(.+)\z/, styles: :red, index: 2 },
-                                                          { pat: /\A([A-Z])(.+)\z/, styles: :green },
-                                                          { pat: /\A(\?\?)(.+)\z/, styles: :red },
-                                                          { pat: /\A(## )(.+)(\.{3})(.+)\z/,
+                                                          { pat: /^(.)([A-Z])(.+)$/, styles: :red, index: 2 },
+                                                          { pat: /^([A-Z])(.+)$/, styles: :green },
+                                                          { pat: /^(\?\?)(.+)$/, styles: :red },
+                                                          { pat: /^(## )(.+)(\.{3})(.+)$/,
                                                             styles: [nil, :green, nil, :red], index: -1 }
                                                         ]
                                                       end)
@@ -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)
@@ -514,7 +514,7 @@ module Squared
           end
           a << pathspec
           b << '--force' if amend
-          b << @origin << @branch
+          b << origin << branch
           puts if pass
           source a.join(' ')
           source cmd
@@ -624,7 +624,7 @@ module Squared
             styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
             styles << :bold if styles.size <= 1
             puts print_footer("#{size} #{size == 1 ? type.sub(/s\z/, '') : type}",
-                              sub: { styles: styles, pat: /\A(\d+)(.+)\z/ })
+                              sub: { pat: /\A(\d+)(.+)\z/, styles: styles })
           else
             puts empty_status("No #{type} were #{action}", 'grep', grep)
           end

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

@@ -508,7 +508,7 @@ module Squared
           append_loglevel
           case opts
           when Enumerable
-            ret += opts.to_a
+            ret.merge(opts.to_a)
           when String
             ret << opts
           else

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("#{@bin} 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,16 +160,19 @@ module Squared
           session('pip', *cmd)
         end
 
-        def append_pip(opts = [], list = [])
+        def append_pip(opts = [], list = [], extra: nil)
           opts.each do |opt|
-            next unless list.include?(opt) || OPT_GENERAL.include?(opt) || (v = opt.match(/^verbose|(v+)$/))
-
-            @session << case opt
-                        when 'venv'
-                          '--require-virtualenv'
-                        else
-                          (v && v[1] ? "-#{v[1]}" : "--#{opt}")
-                        end
+            data = nil
+            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/lib/squared/workspace/project/ruby.rb

@@ -7,9 +7,9 @@ module Squared
         VAR_SET = %i[version autodetect].freeze
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
         RUBY_DIR = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
-        OPT_INSTALL = %w[no-cache force].freeze
-        OPT_UPDATE = %w[redownload local strict conservative group=s].freeze
-        OPT_OUTDATED = %w[local strict pre only-explicit group=s].freeze
+        OPT_INSTALL = %w[system frozen no-cache no-prune].freeze
+        OPT_UPDATE = %w[all redownload conservative local strict group=s].freeze
+        OPT_OUTDATED = %w[pre only-explicit local strict group=s].freeze
         private_constant :VAR_SET, :GEMFILE, :RUBY_DIR, :OPT_INSTALL, :OPT_UPDATE, :OPT_OUTDATED
 
         class << self
@@ -178,7 +178,7 @@ module Squared
               gem_session 'install'
               append_value opts
             when :with, :without
-              gem_session 'install'
+              bundle_session 'install'
               append_repeat flag, opts
             when :redownload, :local, :'prefer-local'
               cmd = bundle_session 'install', "--#{flag}"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - An Pham
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-23 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -93,7 +92,6 @@ metadata:
   homepage_uri: https://github.com/anpham6/squared
   source_code_uri: https://github.com/anpham6/squared
   documentation_uri: https://squared.readthedocs.io
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []