squared 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7942c4e6f2ca9177fbca4e9a5400982c4a6c5431c04e3f4ed2c80f8d47408cf8
-  data.tar.gz: 8bf51312a2ecbe75a54c1d584a336fb4729b89db9be305259a8fc076bc7b7488
+  metadata.gz: a3ad5f0881e8642ae1d57fccbba6a1fdc3ff555b6efcd7eb2989a5675ff5bcd3
+  data.tar.gz: 426a514ca02ddf64fa2009ad165d0bf9e0053905c58643c7398e7c1d17630fcc
 SHA512:
-  metadata.gz: d3156775e41dd2eaba6609631b37111d4d52f979ec7f14f456f0e05b3d43b481a0880fdf2552ba557d4e70594af541fec4564e990b701b11146c3dfd5f25ef92
-  data.tar.gz: 9b63ad8b38308c35557961061c5e89fd787bd0b7db094443464aa8f27e3eee661fc3031d297556e896f9cc9404df7a327e5b198ae6f81fe45b5f22b579bb7756
+  metadata.gz: af9e72989be1dbbf614f8c7dd5989a0081775e4433ad280a4bae600660e56bd1ba20aa6a3f33ad367b349a209227be5b823c4e496367533260c1a86ae3a6dd6c
+  data.tar.gz: d0dd6f39e8b8f8834768c93ab26718618d0d0023f99a242321f6925bee9fcc782ebbfd86a698bdcebe17fb1deb763c79d46d77001d55a13b24ddc391beb0a3c8

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # 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
@@ -88,6 +98,7 @@
 
 - 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

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.4'
+  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
@@ -380,7 +380,7 @@ module Squared
               val = val.to_s
               path = basepath(val)
               if path.directory? && val =~ %r{[\\/]$}
-                log.warn "rm -rf #{path}"
+                log&.warn "rm -rf #{path}"
                 path.rmtree
               else
                 files = val.include?('*') ? Dir[path] : [path]
@@ -390,7 +390,7 @@ module Squared
                   begin
                     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

@@ -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/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.4
+  version: 0.1.5
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-02-05 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
@@ -106,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []