squared 0.7.6 → 0.8.0

data/lib/squared/workspace/project/support/utils.rb

@@ -7,6 +7,15 @@ module Squared
         module Utils
           private
 
+          def symjoin(*args, char: ':')
+            args.flatten.join(char).to_sym
+          end
+
+          def collect_hash(data, pass: [])
+            data = data.reject { |key,| pass.include?(key) } unless pass.empty?
+            data.values.flatten
+          end
+
           def rand_s(size)
             require 'random/formatter'
             Random.new.alphanumeric(size)
@@ -26,7 +35,7 @@ module Squared
             end
           end
 
-          def matchmap(list, prefix = nil)
+          def matchmap(list, prefix: nil)
             list.map do |val|
               next val if val.is_a?(Regexp)
 

data/lib/squared/workspace/repo.rb

@@ -20,7 +20,7 @@ module Squared
                           elsif !repo_install? && !repo_confirm
                             @root = nil
                           end
-                          raise_error Errno::EEXIST, path.cleanpath, hint: 'REPO_HOME' unless @root
+                          raise Errno::EEXIST, message(path.cleanpath, hint: 'REPO_HOME') unless @root
                         end
                         path.realdirpath
                       elsif (val = env('REPO_ROOT'))
@@ -28,7 +28,7 @@ module Squared
                         if !@root.exist?
                           @root.mkpath
                         elsif !repo_install?(parent: true) && !repo_confirm
-                          raise_error Errno::EEXIST, @root, hint: 'REPO_ROOT'
+                          raise Errno::EEXIST, message(@root, hint: 'REPO_ROOT')
                         end
                         @root.join(main).realdirpath
                       elsif repo_install?(parent: true) && (!home.exist? || @root + main == home)
@@ -219,7 +219,7 @@ module Squared
                   opts << "--#{val}"
                 when /^(fetch-)?submodules$/
                   opts << '--fetch-submodules' if repo_submodules?(true, **envargs)
-                when /^(fail-)?fail$/
+                when /^(fail-)?fast$/
                   opts << '--fail-fast'
                 when /^no-(manifest-)?update$/
                   opts << '--no-manifest-update'
@@ -227,7 +227,9 @@ module Squared
                   opts << '--auto-gc'
                 end
               end
-              opts << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}" unless opts.any?(/^--?j(obs)?$/)
+              if (jobs = ENV['REPO_JOBS']) || opts.none?(/^--?j(obs)?$/)
+                opts << "-j#{jobs || Rake::CpuCounter.count}"
+              end
               opts << '--fetch-submodules' if repo_submodules?(**envargs)
               begin
                 repo_run('sync', opts, exception: opts.include?('--fail-fast'), options: stage != 'init')
@@ -275,7 +277,7 @@ module Squared
                          end
       end
 
-      def repo_run(cmd, opts = [], exception: false, options: true, **kwargs)
+      def repo_run(cmd, opts = [], exception: exception?, options: true, **kwargs)
         cmd = [repo_bin, cmd]
         cmd << opts.uniq.join(' ') unless opts.empty?
         env('REPO_OPTIONS', **kwargs) { |val| cmd << val } if options
@@ -308,7 +310,7 @@ module Squared
         r = r.keys
         pass = g.empty? && r.empty?
         select do |proj|
-          next unless proj.enabled?(baseref)
+          next unless proj.enabled?(ref: baseref)
 
           proj.global_set(name)
           i = -1
@@ -339,7 +341,7 @@ module Squared
           task_invoke(name, **proj.workspace.invokeargs)
         end
       rescue => e
-        raise if exception
+        raise if exception?
 
         warn log_warn(e, pass: true) if warning
       end

data/lib/squared/workspace/series.rb

@@ -38,10 +38,18 @@ module Squared
             end
           end
           if (args = obj.batchargs)
-            batch_set(*args)
+            if args.first.is_a?(Hash)
+              batch_set(obj.ref, *args)
+            else
+              batch_set(*args)
+            end
           end
           if (args = obj.aliasargs)
-            alias_set(*args)
+            if args.first.is_a?(Hash)
+              alias_set(obj.ref, *args)
+            else
+              alias_set(*args)
+            end
           end
         end
         workspace.config_get(:batch)&.each { |args| batch_set(*args) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - An Pham
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.11
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []