squared 0.6.2 → 0.6.4

data/lib/squared/workspace/application.rb

@@ -3,6 +3,7 @@
 module Squared
   module Workspace
     class Application
+      include Enumerable
       include Common::Format
       include Utils
       include Support::Variables
@@ -23,7 +24,7 @@ module Squared
               impl_series.base_set(obj)
             else
               kind_project.unshift(obj)
-              obj.tasks&.each { |task| impl_series.add(task, obj) }
+              impl_series.extend_set(obj)
             end
             if (args = obj.batchargs)
               impl_series.batch(*args)
@@ -49,10 +50,31 @@ module Squared
           @task_exclude.merge(args.map!(&:to_sym))
         end
 
-        def series_wrap(app)
+        def register(app)
+          @session << app
           impl_series.new(app, exclude: @task_exclude.to_a)
         end
 
+        def load_ref(path, gem: nil)
+          if gem
+            unless @gemsdir
+              IO.popen('bundle env').each do |val|
+                next unless val =~ /^\s+Gem Home\s+(.+)$/
+
+                @gemsdir = File.join($1, 'gems')
+                break
+              end
+            end
+            dir = if gem.match?(/-\d+(?:\.|$)/)
+                    gem
+                  else
+                    Dir.glob("#{gem}-*", base: @gemsdir).pop
+                  end
+            path = File.join(@gemsdir, dir, path) if dir
+          end
+          @load_project.unshift(path.cleanpath.to_s) if (path = Pathname.new(path)).absolute? && path.exist?
+        end
+
         def baseref
           impl_project.ref
         end
@@ -61,11 +83,15 @@ module Squared
           super[/[^:]+\z/, 0]
         end
 
-        attr_reader :kind_project
+        alias series_wrap register
+
+        attr_reader :kind_project, :load_project, :session
         attr_accessor :impl_series, :impl_project, :attr_banner
       end
 
       @kind_project = []
+      @load_project = [File.expand_path('project', __dir__)]
+      @session = []
       @task_exclude = Set.new
 
       attr_reader :root, :home, :main, :prefix, :theme, :series, :closed
@@ -84,7 +110,7 @@ module Squared
         @home.mkpath rescue nil
         @root = @home.parent
         @prefix = prefix
-        @series = Application.series_wrap(self)
+        @series = Application.register(self)
         @project = {}
         @kind = hashlist
         @extensions = []
@@ -138,6 +164,12 @@ module Squared
         puts bord, msg, bord
       end
 
+      def each(&blk)
+        return to_enum(:each) unless block_given?
+
+        @project.each_value(&blk)
+      end
+
       def build(parallel: [], pass: nil, **kwargs)
         return self unless enabled? && !@closed
 
@@ -148,7 +180,8 @@ module Squared
                               parallel.reject { |val| kwargs[:pattern] << val if val.is_a?(Regexp) }.map!(&:to_s)
                             end
         @pass[:pattern].concat(pass.map { |val| val.is_a?(Regexp) ? val : val.to_s }) if pass
-        @project.each_value do |proj|
+        series.reset
+        each do |proj|
           if proj.enabled?
             proj.populate(series.keys.dup, **kwargs)
           elsif proj.enabled?(base: false)
@@ -330,11 +363,12 @@ module Squared
           name = task_name "#{project}-#{index}"
         end
         proj = ((if !ref.is_a?(Class)
+                   require_project ref
                    Application.find(ref, path: path)
                  elsif ref < Project::Base
                    ref
                  end) || @kind[name]&.last || Project::Base).new(self, path, name, **kwargs)
-        proj.__send__(:index_set, @project.size)
+        proj.__send__(:index_set, size)
         @project[name] = proj
         __get__(:project)[name] = proj unless kwargs[:private]
         proj.instance_eval(&blk) if block_given?
@@ -348,11 +382,11 @@ module Squared
           basename = dir.basename.to_s
           [dir, basename, override[basename.to_sym]]
         end
-          .each do |dir, basename, opts|
-            args = kwargs.dup
-            args.update(opts) if opts
-            add(dir, basename, group: val, **args, &blk)
-          end
+        .each do |dir, basename, opts|
+          args = kwargs.dup
+          args.update(opts) if opts
+          add(dir, basename, group: val, **args, &blk)
+        end
         self
       end
 
@@ -406,18 +440,21 @@ module Squared
       end
 
       def find(path = nil, name: nil, group: nil, ref: nil, &blk)
-        ret = group ? @project.select { |_, item| item.group == group }.map(&:last) : []
+        return @project.values.find(&blk) if block_given? && !path && !name && !group && !ref
+
+        ret = group ? select { |item| item.group == group } : []
         if path.is_a?(Symbol)
           ref ||= path
           path = nil
         end
         if ret.empty?
-          ret = @project.select { |_, item| item.ref?(ref) }.map(&:last) if ref
+          ret = select { |item| item.ref?(ref) } if ref
           if ret.empty? && (path || name)
             path &&= rootpath path
             name &&= name.to_s
-            proj = @project.find { |_, item| (path && item.path == path) || (name && item.name == name) }&.last
-            ret << proj if proj
+            if (proj = find { |item| (path && item.path == path) || (name && item.name == name) })
+              ret << proj
+            end
           end
         end
         return (group || ref ? ret : ret.first) unless block_given?
@@ -453,7 +490,7 @@ module Squared
         if @describe
           val = name || task_join(*args)
           found = false
-          replace = lambda do |data, out|
+          sub = lambda do |data, out|
             index = data.size
             data.to_a.reverse_each { |group| out.sub!("%#{index -= 1}", group) }
             out
@@ -461,7 +498,7 @@ module Squared
           @describe[:replace].each do |pat, tmpl|
             next unless val =~ pat
 
-            val = replace.call($~, tmpl.dup)
+            val = sub.call($~, tmpl.dup)
             found = true
           end
           if (out = @describe[:alias][val])
@@ -471,7 +508,7 @@ module Squared
             @describe[:pattern].each do |key, pat|
               next unless val =~ pat
 
-              val = replace.call($~, key.dup)
+              val = sub.call($~, key.dup)
               found = true
               break
             end
@@ -579,7 +616,7 @@ module Squared
       end
 
       def enabled?
-        !@extensions.empty? || @project.values.any? { |proj| proj.enabled?(base: false) }
+        !@extensions.empty? || any? { |proj| proj.enabled?(base: false) }
       end
 
       def task_base?(key)
@@ -591,7 +628,7 @@ module Squared
       end
 
       def task_include?(obj, key, ref = nil)
-        return false if @series.exclude?(key)
+        return false if series.exclude?(key)
 
         task_base?(key) ? obj.has?(key, ref || baseref) : task_extend?(obj, key)
       end
@@ -726,7 +763,7 @@ module Squared
                   a = data.after
                   b = data.before
                   level.each_with_index do |tasks, k|
-                    with = lambda do |n|
+                    ac = lambda do |n|
                       tasks.insert(n, *data.action)
                       sync << tasks
                       data.action.clear
@@ -735,14 +772,14 @@ module Squared
                       index = k if w && has.call(w, v1)
                       if a && has.call(a, v1)
                         if index
-                          with.call(l.succ)
+                          ac.call(l.succ)
                           throw :found
                         else
                           index = k.succ
                         end
                       elsif b && has.call(b, v1)
                         if index
-                          with.call(l)
+                          ac.call(l)
                           throw :found
                         else
                           index = k.pred
@@ -751,10 +788,10 @@ module Squared
                         if a || b
                           tasks.each_with_index do |v2, m|
                             if a && has.call(a, v2)
-                              with.call(m.succ)
+                              ac.call(m.succ)
                               throw :found
                             elsif b && has.call(b, v2)
-                              with.call(m)
+                              ac.call(m)
                               throw :found
                             end
                           end
@@ -865,6 +902,18 @@ module Squared
         end
       end
 
+      def require_project(ref)
+        return unless ref.is_a?(Symbol) && Application.kind_project.none? { |proj| proj.ref == ref }
+
+        name = ref.to_s
+        Application.load_project.each do |val|
+          next unless File.exist?("#{rb = File.join(val, name)}.rb")
+
+          require_relative rb
+          break
+        end
+      end
+
       def root?(path, pass: [])
         return false unless path.directory?