squared 0.5.20 → 0.6.0

data/lib/squared/workspace/repo.rb

@@ -3,16 +3,6 @@
 module Squared
   module Workspace
     module Repo
-      class << self
-        def read_manifest(path)
-          require 'rexml/document'
-          return unless (file = path + '.repo/manifest.xml').exist?
-
-          doc = REXML::Document.new(file.read)
-          doc.elements['manifest/include'].attributes['name']&.sub('.xml', '')
-        end
-      end
-
       attr_reader :manifest_url, :manifest
 
       def repo(url, manifest = 'latest', run: nil, script: nil, args: nil, dev: nil, prod: nil,
@@ -25,18 +15,18 @@ module Squared
                       @root = nil unless path.directory?
                     elsif !@root.exist?
                       @root.mkpath
-                    elsif !repo_install?
-                      @root = nil unless repo_confirm
+                    elsif !repo_install? && !repo_confirm
+                      @root = nil
                     end
+                    raise_error Errno::EEXIST, path.cleanpath, hint: 'REPO_HOME' unless @root
                   end
-                  raise_error("path invalid: #{val}", hint: 'REPO_HOME') unless @root
                   path.realdirpath
                 elsif (val = env('REPO_ROOT'))
                   @root = Pathname.new(val).realdirpath
                   if !@root.exist?
                     @root.mkpath
-                  elsif !repo_install?(parent: true)
-                    raise_error("path does not exist: #{val}", hint: 'REPO_ROOT') unless repo_confirm
+                  elsif !repo_install?(parent: true) && !repo_confirm
+                    raise_error Errno::EEXIST, @root, hint: 'REPO_ROOT'
                   end
                   @root.join(main).realdirpath
                 elsif repo_install?(parent: true) && (!@home.exist? || @root + main == @home)
@@ -51,9 +41,13 @@ module Squared
         @manifest = manifest
         data = scriptobj
         if repo?
+          sc, ru = env('REPO_BUILD', '').split(',', 2).map!(&:strip)
           if script
-            if (val = env('REPO_BUILD'))
-              data[:script] = case val
+            data[:script] = if sc.to_s.empty?
+                              script
+                            else
+                              data[:env][:script] = true
+                              case sc
                               when 'verbose'
                                 @verbose = 1
                                 if script.is_a?(Array)
@@ -67,20 +61,23 @@ module Squared
                                 @warning = false
                                 script
                               else
-                                val
+                                sc
                               end
-              data[:env] = true
-            else
-              data[:script] = script
-            end
+                            end
             data[:args] = (val = env('REPO_SCRIPT')) ? shell_split(val, join: true) : args
-          elsif (val = env('REPO_BUILD'))
-            data[:run] = val
-            data[:env] = true
+            data[:global][:script] = true
           else
-            data[:run] = run
+            ru ||= sc
+          end
+          if run
+            data[:run] = if ru.to_s.empty?
+                           run
+                         else
+                           data[:env][:run] = true
+                           ru
+                         end
+            data[:global][:run] = true
           end
-          data[:global] = true
           data[:dev] = env_match 'REPO_DEV', dev
           data[:prod] = env_match 'REPO_PROD', prod
           if (val = env('REPO_GROUP'))
@@ -98,9 +95,8 @@ module Squared
           if script
             data[:script] = script
             data[:args] = args
-          else
-            data[:run] = run
           end
+          data[:run] = run if run
           data[:dev] = dev
           data[:prod] = prod
           script_set(data, group: group, ref: ref)
@@ -115,7 +111,7 @@ module Squared
 
         namespace task_name('repo') do |ns|
           path = ns.scope.path
-          branch = env('REPO_MANIFEST') || Repo.read_manifest(root)
+          branch = env('REPO_MANIFEST') || repo_manifest
           target = branch || manifest
           stage = nil
           opts = %w[force rebase detach submodules fail no-update gc]
@@ -132,20 +128,20 @@ module Squared
           task 'all' do |_, args|
             stage ||= 'all'
             ns['sync'].invoke(*args.to_a)
-            next if (n = env('REPO_STAGE')) == '1'
+            next if (stage = env('REPO_STAGE')) == '1'
 
             @project.select do |_, proj|
               next unless proj.enabled?(proj.workspace.baseref) && proj.global
 
               proj.depend(sync: true) if proj.depend?
-              next if n == '2'
+              next if stage == '2'
 
               proj.build?
             end
             .each_value do |proj|
               proj.build(sync: true)
-              next if n == '3'
-              next unless proj.copy? && (proj.dev? || n == '4')
+              next if stage == '3'
+              next unless proj.copy? && (proj.dev? || stage == '4')
 
               if (ws = proj.workspace).task_defined?(target = task_join(proj.name, 'copy'))
                 task_invoke(target, **ws.invokeargs)
@@ -158,9 +154,9 @@ module Squared
           desc.call("init[manifest?=#{target},groups?,{0}]", target)
           task 'init' do |_, args|
             args = args.to_a
-            u = env('REPO_GIT') || manifest_url
+            u = env('REPO_URL') || manifest_url
             m = args.first && !opts.include?(args.first) ? args.shift : target
-            g = args.first && !opts.include?(args.first) ? args.shift : nil
+            g = (args.shift if args.first && !opts.include?(args.first))
             g = case (val = env('REPO_GROUPS'))
                 when '', NilClass
                   g
@@ -224,13 +220,22 @@ module Squared
         end
       end
 
+      def repo_manifest(path = root)
+        return unless (file = path + '.repo/manifest.xml').exist?
+
+        require 'rexml/document'
+        doc = REXML::Document.new(file.read)
+        doc.elements['manifest/include'].attributes['name']&.sub('.xml', '')
+      end
+
       def repo_confirm
         return false unless root.directory?
 
         path = sub_style(root, styles: theme[:inline])
-        @repo_override = Common::Prompt.confirm(
-          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation?", 'N',
-          timeout: env('REPO_TIMEOUT').to_i.yield_self { |n| n > 0 ? n : 15 }
+        @repo_override = env('REPO_Y', equals: '1') || Common::Prompt.confirm(
+          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation?",
+          'N',
+          timeout: env('REPO_TIMEOUT', 15, ignore: '0')
         )
       end
 
@@ -246,13 +251,11 @@ module Squared
       def repo_opts(*args)
         return args unless (n = ARGV.index('--'))
 
-        ARGV[(n + 1)..-1].concat(args)
+        ARGV[n.succ..-1].concat(args)
       end
 
       def repo?
-        return false unless manifest_url && !windows?
-
-        repo_install? || @repo_override == true
+        !manifest_url.nil? && (repo_install? || @repo_override == true)
       end
 
       def repo_submodules?(val = false)

data/lib/squared/workspace/series.rb

@@ -31,19 +31,15 @@ module Squared
             end
           elsif (data = TASK_BATCH[obj])
             args.each { |ref| data.delete(ref) }
-            if data.empty?
-              TASK_KEYS.delete(obj)
-              TASK_BATCH.delete(obj)
-            end
+            TASK_KEYS.delete(obj) if data.empty?
           end
         end
 
         def alias(ref, obj)
           if obj.is_a?(Hash)
             obj.each { |key, val| TASK_ALIAS[key][ref] = val }
-          elsif TASK_ALIAS.key?(obj)
-            TASK_ALIAS[obj].delete(ref)
-            TASK_ALIAS.delete(obj) if TASK_ALIAS[obj].empty?
+          else
+            TASK_ALIAS[obj]&.delete(ref)
           end
         end
 
@@ -169,8 +165,6 @@ module Squared
       end
 
       def alias_get(key)
-        return unless TASK_ALIAS.key?(key)
-
         TASK_ALIAS[key]
       end
 
@@ -188,14 +182,12 @@ module Squared
       end
 
       def extend?(obj, key)
-        return false unless TASK_EXTEND.key?(key)
+        return false unless (items = TASK_EXTEND[key]) && !(items = items.select { |kind| obj.is_a?(kind) }).empty?
 
         meth = :"#{key}?"
         ret = false
-        TASK_EXTEND[key].each do |kind|
-          next unless obj.is_a?(kind)
-
-          if kind.method_defined?(meth)
+        items.each do |kind|
+          if kind.instance_methods.include?(meth)
             out = obj.__send__(meth)
             return true if out == 1
             return out if obj.ref?(kind.ref)
@@ -207,9 +199,7 @@ module Squared
       end
 
       def batch?(obj, key)
-        return false unless (data = batch_get(key))
-
-        data.keys.any? { |ref| obj.ref?(ref) }
+        (data = batch_get(key)) ? data.keys.any? { |ref| obj.ref?(ref) } : false
       end
 
       def chain?(val)
@@ -236,7 +226,7 @@ module Squared
       end
 
       def exclude?(key, empty = false)
-        @exclude.include?(key) || (empty && (!@data.key?(key) || @data[key].empty?))
+        @exclude.include?(key) || (empty && @data[key].empty?)
       end
 
       private
@@ -248,9 +238,11 @@ module Squared
       end
 
       def already_invoked?(list, val)
-        return Rake::Task.tasks.any? { |obj| obj.already_invoked && list.include?(obj.name) } unless val
-
-        list.include?(val) && !invoked_get(val).nil?
+        if val
+          list.include?(val) && !invoked_get(val).nil?
+        else
+          Rake::Task.tasks.any? { |obj| obj.already_invoked && list.include?(obj.name) }
+        end
       end
     end
 

data/lib/squared/workspace/support/base.rb

@@ -3,30 +3,9 @@
 module Squared
   module Workspace
     module Support
-      class << self
-        def hashobj
-          Hash.new { |data, key| data[key] = {} }
-        end
-
-        def hashlist
-          Hash.new { |data, key| data[key] = [] }
-        end
-
-        def hashdup(data, pass: {})
-          ret = {}
-          data.each do |key, val|
-            ret[key] = case val
-                       when Hash
-                         pass[val] ||= hashdup(val, pass: pass)
-                       when Proc, Method
-                         val
-                       else
-                         val.dup
-                       end
-          end
-          ret
-        end
-      end
+      RunData = Struct.new('RunData', :run, :block)
+      ChainData = Struct.new('ChainData', :action, :step, :with, :before, :after, :sync)
+      BannerData = Struct.new('BannerData', :command, :order, :styles, :border)
     end
   end
 end

data/lib/squared/workspace/support/variables.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Squared
+  module Workspace
+    module Support
+      module Variables
+        private
+
+        def hashobj
+          Hash.new { |data, key| data[key] = {} }
+        end
+
+        def hashlist
+          Hash.new { |data, key| data[key] = [] }
+        end
+
+        def hashdup(data, compact: false, freeze: false, target: {}, pass: {})
+          data.each do |key, val|
+            next if val.nil? && compact
+
+            target[key] = case val
+                          when Hash
+                            if pass.key?(val)
+                              pass[val]
+                            else
+                              hashdup(val, compact: compact, freeze: freeze, target: pass[val] = {}, pass: pass)
+                            end
+                          when Enumerable
+                            compact ? val.compact : val.dup
+                          when Proc, Method
+                            val
+                          else
+                            val.dup
+                          end
+            target[key].freeze if freeze && val.frozen?
+          end
+          target
+        end
+      end
+
+      class << Support
+        include Variables
+
+        public(*Variables.private_instance_methods(false))
+      end
+    end
+  end
+end

data/lib/squared/workspace/support.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require_relative 'support/base'
-require_relative 'support/data'
+require_relative 'support/variables'

data/lib/squared/workspace.rb

@@ -5,14 +5,12 @@ module Squared
     class << self
       include Common
 
-      def resolve(*args, base: '..')
-        values = __get__(:project).values
-        ret = args.map do |id|
+      def resolve(*args)
+        ret = args.map! do |id|
           if id.is_a?(Symbol)
             project id
           else
-            values.find { |proj| proj.name == id } || values.find { |proj| proj.project == id } ||
-              values.find { |proj| proj.path.to_s == File.expand_path(id, base) }
+            __get__(:project).find { |_, val| File.expand_path(val.path) == File.expand_path(id, __dir__) }
           end
         end
         ret.size == 1 ? ret.first : ret
@@ -20,7 +18,7 @@ module Squared
 
       def expect(name)
         ret = project name
-        return ret if ret&.path&.directory? && !ret.path.empty?
+        return ret if ret&.path&.directory?
 
         raise NoMethodError, "project is not initialized (#{name})"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.5.20
+  version: 0.6.0
 platform: ruby
 authors:
 - An Pham
@@ -101,7 +101,7 @@ files:
 - lib/squared/workspace/series.rb
 - lib/squared/workspace/support.rb
 - lib/squared/workspace/support/base.rb
-- lib/squared/workspace/support/data.rb
+- lib/squared/workspace/support/variables.rb
 - squared.gemspec
 homepage: https://github.com/anpham6/squared-ruby
 licenses:
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []

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

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Squared
-  module Workspace
-    module Support
-      RunData = Struct.new('RunData', :run, :block)
-      ChainData = Struct.new('ChainData', :action, :step, :with, :before, :after, :sync)
-      BannerData = Struct.new('BannerData', :command, :order, :styles, :border)
-    end
-  end
-end