squared 0.6.3 → 0.6.4

data/lib/squared/workspace/series.rb

@@ -11,10 +11,11 @@ module Squared
       TASK_BASE = []
       TASK_BATCH = {}
       TASK_EXTEND = Support.hashlist
+      TASK_METHODS = {}
       TASK_KEYS = []
       TASK_ALIAS = Support.hashobj
       TASK_NAME = {}
-      private_constant :TASK_BASE, :TASK_BATCH, :TASK_EXTEND, :TASK_KEYS, :TASK_ALIAS, :TASK_NAME
+      private_constant :TASK_BASE, :TASK_BATCH, :TASK_EXTEND, :TASK_METHODS, :TASK_KEYS, :TASK_ALIAS, :TASK_NAME
 
       class << self
         def add(task, obj)
@@ -52,6 +53,11 @@ module Squared
           TASK_BASE.concat(obj.tasks.reject { |val| TASK_KEYS.include?(val) })
         end
 
+        def extend_set(obj)
+          obj.tasks&.each { |task| add(task, obj) }
+          TASK_METHODS[obj] = obj.instance_methods(false)
+        end
+
         private
 
         def key_set(val)
@@ -64,7 +70,8 @@ module Squared
 
       attr_reader :sync, :multiple, :parallel
 
-      def_delegators :@data, :[], :each, :each_key, :keys, :key?, :fetch, :update, :merge!, :to_a, :to_s, :inspect
+      def_delegators :@data, :[], :each, :each_key, :keys, :key?, :include?, :fetch, :update, :merge!, :any?, :none?,
+                     :delete, :delete_if, :find, :find_all, :to_a, :to_s, :inspect
       def_delegators :@workspace, :task_desc, :task_name, :task_namespace, :task_join, :format_desc
 
       def initialize(workspace, exclude: [])
@@ -184,12 +191,14 @@ module Squared
       end
 
       def extend?(obj, key)
-        return false unless (items = TASK_EXTEND[key]) && !(items = items.select { |kind| obj.is_a?(kind) }).empty?
+        return false unless (items = TASK_EXTEND[key])
 
-        meth = :"#{key}?"
         ret = false
         items.each do |kind|
-          if kind.instance_methods.include?(meth)
+          next unless obj.is_a?(kind)
+
+          meth = :"#{key}?"
+          if TASK_METHODS[kind].include?(meth)
             out = obj.__send__(meth)
             return true if out == 1
             return out if obj.ref?(kind.ref)
@@ -201,7 +210,9 @@ module Squared
       end
 
       def batch?(obj, key)
-        (data = batch_get(key)) ? data.keys.any? { |ref| obj.ref?(ref) } : false
+        return false unless (data = batch_get(key))
+
+        data.keys.any? { |ref| obj.ref?(ref) }
       end
 
       def chain?(val)

data/lib/squared/workspace.rb

@@ -5,12 +5,14 @@ module Squared
     class << self
       include Common
 
-      def resolve(*args)
-        ret = args.map! do |id|
+      def resolve(*args, base: '..')
+        values = __get__(:project).values
+        ret = args.map do |id|
           if id.is_a?(Symbol)
             project id
           else
-            __get__(:project).find { |_, val| File.expand_path(val.path) == File.expand_path(id, __dir__) }
+            values.find { |proj| proj.name == id } || values.find { |proj| proj.project == id } ||
+              values.find { |proj| proj.path.to_s == File.expand_path(id, base) }
           end
         end
         ret.size == 1 ? ret.first : ret

metadata

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