squared 0.7.10 → 0.8.0

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)
@@ -157,6 +157,8 @@ module Squared
                   [proj, proj.build? && (script || run), doc && proj.doc?, lint && proj.lint?, test && proj.test?]
                 end
                 .select do |proj, run, doc, lint, test|
+                  next unless proj
+
                   proj.doc(sync: true) if doc
                   proj.build(sync: true) if run
                   next if n.anybits?(4)
@@ -184,7 +186,8 @@ module Squared
               end
               env('REPO_GROUPS', **envargs) do |val|
                 g = case val
-                    when '0', 'false' then nil
+                    when '0', 'false'
+                      nil
                     else
                       val
                     end
@@ -274,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
@@ -307,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
@@ -338,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) }
@@ -209,9 +217,8 @@ module Squared
         already_invoked? parallel, val
       end
 
-      def exclude?(key, fallback = false, empty: nil)
-        fallback = empty unless empty.nil?
-        @exclude.include?(key) || (fallback && (!key?(key) || self[key].empty?))
+      def exclude?(key, empty = false)
+        @exclude.include?(key) || (empty && (!key?(key) || self[key].empty?))
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  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.15
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []