squared 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1aedaf9ac684379d28ad4e69449ada34e1e04a1b5241607e29c1142b8ad759d
-  data.tar.gz: 3d13f6d09a48cf2e394ec4497e5c838d69f4eb7cde83df4811059c0e743e029c
+  metadata.gz: fe89fb72998e6b7f728add465bb1a56a43d235949b335b18ac75a03899d5a01c
+  data.tar.gz: 36b8255d2d4a0b8e9574d81191b469b4a8258dddd33c8ad9146c9c78c71d3a23
 SHA512:
-  metadata.gz: 16928495ed31d6e0ea9876ff0ce6aef9366e98324a96bceffe99e3d7b60ee0eabc863b8846443947342164166047476d68eab992102dc7143ace991fad3b7575
-  data.tar.gz: 151c60e043f2129f0d84bf04a36531d9131e5a2abcec244311d22e03b23b2b4810b1d24e14663724acf3b25d2a5f3bd166577a294f419a427a0602db9bddabe1
+  metadata.gz: 85d16ee391ec6668b1f658940c1f1c945c5b2389585ba0283b98d605f74329d715f890b6b8373eace007fe157a594b85ea7457f6175f222d890b30dee59253ef
+  data.tar.gz: f4a9f773d117a6aea52238c05ae4e3eefdedd3b18bf2ecf5955e8b4dc889193fe72efd35a40f3579006fecfe62b8c09e4579f7ac5bbb1e10b745bf5a95e7d9d7

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [0.2.6] - 2025-03-06
+
+### Fixed
+
+- Git rebase did not include flag with pull command.
+
+## [0.2.5] - 2025-02-25
+
+### Fixed
+
+- See `0.1.5`.
+
+## [0.1.5] - 2025-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.2.4] - 2025-02-12
 
 ### Fixed
@@ -11,8 +33,16 @@
 
 ### Fixed
 
- - Project hash options duplicated dash prefix.
- - Pip upgrade did not append package names.
+- Project hash options duplicated dash prefix.
+
+## [0.1.4] - 2025-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.2.2] - 2025-01-19
 
@@ -133,7 +163,7 @@
 - Workspace did not check base project for Windows filename.
 - Regexp for SemVer did not recognize package names.
 
-## [0.1.1] - 2025-12-14
+## [0.1.1] - 2024-12-14
 
 ### Added
 
@@ -183,11 +213,15 @@
 
 - Changelog was created.
 
+[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
 [0.2.4]: https://github.com/anpham6/squared/releases/tag/v0.2.4-ruby
 [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
+[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/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.2.4'
+  VERSION = '0.2.6'
 end

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

@@ -199,14 +199,14 @@ 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
               data = JSON.parse(val)
               raise_error('invalid JSON object', val, hint: "#{prefix}_ENV") unless data.is_a?(Hash)
             rescue StandardError => e
-              log.warn e
+              log&.warn e
             else
               @output[2] = data
             end
@@ -297,7 +297,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
@@ -411,17 +411,17 @@ module Squared
               val = val.to_s
               path = basepath(val)
               if path.directory? && val =~ %r{[\\/]\z}
-                log.warn "rm -rf #{path}"
+                log&.warn "rm -rf #{path}"
                 path.rmtree(verbose: true)
               else
-                log.warn "rm #{path}"
+                log&.warn "rm #{path}"
                 (val.include?('*') ? Dir[path] : [path]).each do |file|
                   next unless File.file?(file)
 
                   begin
                     File.delete(file)
                   rescue StandardError => e
-                    log.error e
+                    log&.error e
                   end
                 end
               end
@@ -500,7 +500,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
 
@@ -624,11 +624,11 @@ module Squared
 
         def run(cmd = @session, var = nil, exception: @exception, sync: true, banner: true, chdir: path, from: nil, **)
           cmd = session_done(cmd)
-          log.info cmd
+          log&.info cmd
           on :first, from if from
           begin
             if cmd.match?(/\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
@@ -636,7 +636,7 @@ module Squared
               shell(*args, chdir: chdir, exception: exception)
             end
           rescue StandardError => e
-            log.error e
+            log&.error e
             ret = on(:error, from, e) if from
             raise unless ret == true
           else
@@ -1119,7 +1119,7 @@ module Squared
                 Dir.chdir(pwd)
               end
             rescue StandardError => e
-              log.error e
+              log&.error e
               ret = on(:error, from, e) if from
               raise if exception && ret != true
             else

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

@@ -439,7 +439,7 @@ module Squared
         end
 
         def pull(flag = nil, sync: invoked_sync?('pull', flag), remote: nil, opts: [])
-          cmd = git_session 'pull'
+          cmd = git_session 'pull', flag && "--#{flag}"
           if (val = option('rebase', ignore: false))
             cmd << case val
                    when '0'
@@ -934,7 +934,7 @@ module Squared
             banner &&= cmd.temp { |val| val.start_with?('--work-tree') || val.start_with?('--git-dir') }
           end
           cmd = session_done(cmd)
-          log.info cmd
+          log&.info cmd
           on :first, from if from
           banner = if banner
                      format_banner((banner.is_a?(String) ? banner : cmd).gsub(File.join(path, ''), ''), banner: true)
@@ -970,7 +970,7 @@ module Squared
               end
             end
           rescue StandardError => e
-            log.error e
+            log&.error e
             ret = on(:error, from, e) if from
             raise if exception && ret != true
 
@@ -989,7 +989,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

@@ -152,8 +152,8 @@ module Squared
           end
         end
 
-        def copy(from: 'build', into: 'node_modules', workspace: false, include: nil, exclude: nil, scope: nil,
-                 also: nil, create: nil, link: false, force: false, override: false)
+        def copy(from: 'build', into: 'node_modules', workspace: false, scope: nil,
+                 also: nil, create: nil, link: false, force: false, override: false, **kwargs)
           return if @copy == false
 
           if @copy && !override
@@ -163,12 +163,15 @@ module Squared
             into = @copy[:into] if @copy.key?(:into)
             workspace = @copy[:workspace] if @copy.key?(:workspace)
             link = @copy[:link] if @copy.key?(:link)
-            force = @copy[:force] if @copy.key?(:link)
+            force = @copy[:force] if @copy.key?(:force)
             glob = @copy[:include]
             exclude = @copy[:exclude]
             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/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.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-03-06 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