squared 0.4.36 → 0.5.0

data/lib/squared/workspace/repo.rb

@@ -57,10 +57,10 @@ module Squared
                               when 'verbose'
                                 @verbose = 1
                                 if script.is_a?(Array)
-                                  script[0] = task_join(script[0], 'verbose')
+                                  script[0] = task_join script[0], 'verbose'
                                   script
                                 else
-                                  task_join(script, 'verbose')
+                                  task_join script, 'verbose'
                                 end
                               when 'silent'
                                 @verbose = false
@@ -81,8 +81,8 @@ module Squared
             data[:run] = run
           end
           data[:global] = true
-          data[:dev] = env_match('REPO_DEV', dev)
-          data[:prod] = env_match('REPO_PROD', prod)
+          data[:dev] = env_match 'REPO_DEV', dev
+          data[:prod] = env_match 'REPO_PROD', prod
           if (val = env('REPO_GROUP'))
             script_set(data, group: val.split(','))
             found = true
@@ -113,39 +113,56 @@ module Squared
       def __repo__(**kwargs)
         kwargs.delete(:parallel) if env('REPO_SYNC', ignore: '0')
 
-        namespace task_name('repo') do |ns|
-          path = ns.scope.path
+        namespace(name = task_name('repo')) do |repo|
           branch = env('REPO_MANIFEST') || Repo.read_manifest(root)
           target = branch || manifest
           stage = nil
-          opts = %w[force rebase detach submodules fail no-update gc]
+          failfast = true
+          cmd = []
+          newline = ARGV.index { |val| val.start_with?('repo:') }.to_i > 0
+          parse_opts = lambda do |args|
+            args.to_a.each do |val|
+              case val
+              when 'no-fail'
+                failfast = false
+              when 'force'
+                cmd << '--force-checkout'
+              when 'rebase'
+                cmd << '--rebase'
+              when 'detach'
+                cmd << '--detach'
+              when 'gc'
+                cmd << '--auto-gc'
+              when 'no-update'
+                cmd << '--no-manifest-update'
+              end
+            end
+          end
           desc = lambda do |val, alt = nil|
             if (ver = branch || alt)
-              val = val.sub('{0}', "opts*=#{opts.join(',')}")
-              task_desc(path, val, ver)
+              val = val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail')
+              task_desc(task_name('repo'), val, ver)
             else
               task_desc 'inactive'
             end
           end
 
           desc.call('all[{0}]')
-          task 'all' do |_, args|
+          task 'all', [:opts] do |_, args|
+            parse_opts.call(args)
             stage ||= 'all'
-            ns['sync'].invoke(*args.to_a)
-            next if (n = env('REPO_STAGE')) == '1'
+            repo['sync'].invoke
+            next if env('REPO_DRYRUN', equals: '2')
 
             @project.select do |_, proj|
-              next unless proj.enabled?(proj.workspace.baseref) && proj.global
+              next unless proj.enabled?(proj.workspace.baseref)
 
               proj.depend(sync: true) if proj.depend?
-              next if n == '2'
-
-              proj.build?
+              proj.build? unless env('REPO_DRYRUN', ignore: '0')
             end
             .each_value do |proj|
               proj.build(sync: true)
-              next if n == '3'
-              next unless proj.copy? && (proj.dev? || n == '4')
+              next unless proj.dev? && proj.copy?
 
               if (ws = proj.workspace).task_defined?(target = task_join(proj.name, 'copy'))
                 task_invoke(target, **ws.invokeargs)
@@ -155,71 +172,39 @@ module Squared
             end
           end
 
-          desc.call("init[manifest?=#{target},groups?,{0}]", target)
-          task 'init' do |_, args|
-            args = args.to_a
-            u = env('REPO_GIT') || manifest_url
-            m = args.first && !opts.include?(args.first) ? args.shift : target
-            g = args.first && !opts.include?(args.first) ? args.shift : nil
-            g = case (val = env('REPO_GROUPS'))
-                when '', NilClass
-                  g
-                when '0', 'false'
-                  nil
-                else
-                  val
-                end
+          desc.call("init[manifest?=#{target},{0}]", target)
+          task 'init', [:manifest, :opts] do |_, args|
+            parse_opts.call(args)
             stage = 'init'
-            opts = repo_opts "-u #{u}", "-m #{m}.xml"
-            opts << "-g #{g}" if g
-            opts << '--submodules' if repo_submodules?(args.include?('submodules'))
-            repo_run "#{repo_bin} init #{opts.uniq.join(' ')}"
-            next if env('REPO_STAGE', equals: '0')
-
-            ns['all'].invoke(*args)
+            puts if newline
+            system("repo init -u #{env('REPO_URL') || manifest_url} -m #{args.manifest || target}.xml", chdir: root)
+            repo['all'].invoke
           end
 
           desc.call('sync[{0}]')
-          task 'sync' do |t, args|
-            opts = if stage == 'init'
-                     []
-                   else
-                     raise_error 'repo not initialized' unless branch
-                     repo_opts
-                   end
-            args.to_a.each do |val|
-              case val
-              when 'force'
-                opts << '--force-checkout'
-              when 'rebase', 'detach'
-                opts << "--#{val}"
-              when 'submodules'
-                opts << '--fetch-submodules' if repo_submodules?(true)
-              when 'fail'
-                opts << '--fail-fast'
-              when 'no-update'
-                opts << '--no-manifest-update'
-              when 'gc'
-                opts << '--auto-gc'
-              end
+          task 'sync', [:opts] do |_, args|
+            unless branch || stage == 'init'
+              raise_error('repo not initialized', hint: task_name('repo:init'), kind: LoadError)
             end
-            opts << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}" unless opts.grep(/^--?j(?:obs)?/).empty?
-            opts << '--fetch-submodules' if repo_submodules?
+            parse_opts.call(args)
+            cmd << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}"
+            cmd << '--fail-fast' if failfast
+            puts if newline && stage != 'init'
             begin
-              repo_run("#{repo_bin} sync #{opts.uniq.join(' ')}", exception: opts.include?('--fail-fast'))
+              Common::System.shell("repo sync #{cmd.join(' ')}", chdir: root, exception: failfast)
             rescue Errno::ENOENT => e
               emphasize(e, title: root)
               raise
             rescue StandardError => e
-              emphasize(e, title: "rake stash #{t.name}")
+              emphasize(e, title: "rake stash #{task_name(task_join('repo', stage || 'sync'))}")
               raise
             end
           end
 
-          series.sync.push(
-            task_join(path, 'all'),
-            task_join(path, 'init'),
-            task_join(path, 'sync')
+          series.sync.append(
+            task_join(name, 'all'),
+            task_join(name, 'init'),
+            task_join(name, 'sync')
           )
         end
       end
@@ -228,41 +213,15 @@ module Squared
         return false unless root.directory?
 
         path = sub_style(root, styles: theme[:inline])
-        timeout = env('REPO_TIMEOUT').to_i
-        timeout = 15 unless timeout > 0
         @repo_override = Common::Prompt.confirm(
-          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation? [y/N] ", 'N', timeout: timeout
+          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation? [y/N] ",
+          'N',
+          timeout: env('REPO_TIMEOUT', 15, ignore: '0')
         )
       end
 
-      def repo_run(cmd, exception: false)
-        puts log_message(Logger::INFO, cmd, subject: main, hint: root) if verbose
-        Common::System.shell(cmd, chdir: root, exception: exception)
-      end
-
-      def repo_bin
-        Common::Shell.shell_bin('repo')
-      end
-
-      def repo_opts(*args)
-        return args unless (n = ARGV.index('--'))
-
-        ARGV[(n + 1)..-1].concat(args)
-      end
-
       def repo?
-        return false unless manifest_url && !windows?
-
-        repo_install? || @repo_override == true
-      end
-
-      def repo_submodules?(val = false)
-        case (s = env('REPO_SUBMODULES'))
-        when '0', 'false'
-          false
-        else
-          s ? true : val
-        end
+        !manifest_url.nil? && (repo_install? || @repo_override == true)
       end
 
       def repo_install?(dir = root, parent: false)

data/lib/squared/workspace/series.rb

@@ -10,16 +10,16 @@ module Squared
 
       TASK_BASE = []
       TASK_BATCH = {}
-      TASK_EXTEND = Support.hashlist
+      TASK_EXTEND = {}
       TASK_KEYS = []
-      TASK_ALIAS = Support.hashobj
+      TASK_ALIAS = {}
       TASK_NAME = {}
       private_constant :TASK_BASE, :TASK_BATCH, :TASK_EXTEND, :TASK_KEYS, :TASK_ALIAS, :TASK_NAME
 
       class << self
         def add(task, obj)
           key_set task
-          TASK_EXTEND[task] << obj
+          (TASK_EXTEND[task] ||= []) << obj
         end
 
         def batch(*args, obj)
@@ -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?
+            obj.each { |key, val| (TASK_ALIAS[key] ||= {})[ref] = val }
+          else
+            TASK_ALIAS[obj]&.delete(ref)
           end
         end
 
@@ -53,7 +49,11 @@ module Squared
 
         def base_set(obj)
           TASK_BASE.clear
-          TASK_BASE.concat(obj.tasks.reject { |val| TASK_KEYS.include?(val) })
+                   .concat((if TASK_KEYS.empty?
+                              obj.tasks
+                            else
+                              obj.tasks.reject { |val| TASK_KEYS.include?(val) }
+                            end).freeze)
         end
 
         private
@@ -68,7 +68,7 @@ module Squared
 
       attr_reader :sync, :multiple, :parallel
 
-      def_delegators :@data, :[], :each, :each_key, :keys, :fetch, :to_a, :to_s, :inspect, :merge!, :key?
+      def_delegators :@data, :[], :each, :each_key, :keys, :key?, :fetch, :update, :merge!, :to_a, :to_s, :inspect
       def_delegators :@workspace, :task_desc, :task_name, :task_namespace, :task_join, :format_desc
 
       def initialize(workspace, exclude: [])
@@ -79,8 +79,8 @@ module Squared
         @chain = {}
         @exclude = exclude.freeze
         @session = {
-          group: Support.hashlist,
-          parent: Support.hashlist,
+          group: {},
+          parent: {},
           id: []
         }
         @data = {}
@@ -95,7 +95,7 @@ module Squared
 
           if (g = proj.group)
             id << g
-            group[:"#{key}:#{g}"].concat(tasks)
+            (group[:"#{key}:#{g}"] ||= []).concat(tasks)
           else
             items.concat(tasks)
           end
@@ -106,35 +106,35 @@ module Squared
           next unless (b = ws.find_base(proj)) && (n = b.ref.to_s) != g
 
           id << n
-          parent[:"#{key}:#{n}"].concat(tasks)
+          (parent[:"#{key}:#{n}"] ||= []).concat(tasks)
         end
       end
 
       def build(parallel: [], pattern: [], **)
         subcheck = ->(val) { (ns = task_namespace(val)) && parallel.include?(ns) }
-        @data.merge!(@session[:parent]) if @session[:id].uniq.size > 1
-        @data.merge!(@session[:group])
+        @data.update(@session[:parent]) if @session[:id].uniq.size > 1
+        @data.update(@session[:group])
         @data.each do |key, items|
           next if exclude?(key, true) || @workspace.task_exclude?(t = name_get(key))
 
           key = task_name t
-          val = format_desc(key, out: true)
+          title = format_desc(key, out: true)
           if items.size > 1
             @multiple << key
             if parallel.include?(t) || pattern.any? { |pat| t.match?(pat) } || subcheck.call(t)
-              task_desc("#{val} (thread)", name: key)
+              task_desc("#{title} (thread)", name: key) if title
               multitask key => items
               @parallel << key
 
-              s = task_join(key, 'sync')
-              task_desc("#{val} (sync)", name: s)
+              s = task_join key, 'sync'
+              task_desc("#{title} (sync)", name: s) if title
               task s => items
               @sync << s
               next
             end
           end
 
-          task_desc(val, name: key)
+          task_desc(title, name: key) if title
           task key => items
         end
         @multiple.concat(sync)
@@ -169,8 +169,6 @@ module Squared
       end
 
       def alias_get(key)
-        return unless TASK_ALIAS.key?(key)
-
         TASK_ALIAS[key]
       end
 
@@ -188,14 +186,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)
@@ -214,43 +210,41 @@ module Squared
 
       def chain?(val)
         @chain.each_value do |tasks|
-          tasks.flatten(1).each do |name|
-            next unless (task = invoked_get(name))
+          tasks.flatten(1).each do |task|
+            next unless Rake::Task[task].already_invoked
 
-            return true if name == val || task.prerequisites.any? { |pr| pr == val && Rake::Task[pr].already_invoked }
+            if val == task || Rake::Task[task].prerequisites.any? { |pr| pr == val && Rake::Task[val].already_invoked }
+              return true
+            end
           end
         end
         false
       end
 
       def multiple?(val = nil)
-        already_invoked? multiple, val
+        already_invoked?(multiple, val)
       end
 
       def sync?(val = nil)
-        already_invoked? sync, val
+        already_invoked?(sync, val)
       end
 
       def parallel?(val = nil)
-        already_invoked? parallel, val
+        already_invoked?(parallel, val)
       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
 
-      def invoked_get(name)
-        return unless Rake::Task.task_defined?(name) && (ret = Rake::Task[name]).already_invoked
-
-        ret
-      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) && Rake::Task[val].already_invoked
+        else
+          Rake::Task.tasks.any? { |obj| obj.already_invoked && list.include?(obj.name) }
+        end
       end
     end
 

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

@@ -3,8 +3,9 @@
 module Squared
   module Workspace
     module Support
-      RunData = Struct.new('RunData', :run, :block)
-      ChainData = Struct.new('ChainData', :action, :step, :with, :before, :after, :sync)
+      RunData = Struct.new(:run, :block)
+      ChainData = Struct.new(:action, :step, :with, :before, :after, :sync)
+      BannerData = Struct.new(:command, :order, :styles, :border)
     end
   end
 end

data/lib/squared/workspace/support.rb

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

data/lib/squared/workspace.rb

@@ -5,14 +5,12 @@ module Squared
     class << self
       include Common
 
-      def resolve(*args, base: '..')
-        values = __get__(:project).values
+      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

data/squared.gemspec

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-version = File.read(File.join(__dir__, "lib/squared/version.rb"))[/\bVERSION = '(.+)'$/, 1]
+require_relative "lib/squared/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "squared"
-  spec.version       = version
+  spec.version       = Squared::VERSION
   spec.authors       = ["An Pham"]
   spec.email         = ["anpham6@gmail.com"]
 
   spec.summary       = %q{Rake task generator for managing multi-language workspaces.}
   spec.description   = %q{Rake task generator for managing multi-language workspaces.}
-  spec.homepage      = "https://github.com/anpham6/squared-ruby"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.homepage      = "https://github.com/anpham6/squared"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
   spec.licenses      = ["BSD-3-Clause"]
 
   spec.metadata["homepage_uri"] = spec.homepage
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.metadata["documentation_uri"] = "https://squared.readthedocs.io"
 
   spec.files         = Dir["lib/**/*"] +
-                       %w[CHANGELOG.md LICENSE README.md squared.gemspec]
+                       %w[CHANGELOG.md LICENSE README.md README.ruby.md squared.gemspec]
   spec.bindir        = "exe"
   spec.executables   = []
   spec.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.36
+  version: 0.5.0
 platform: ruby
 authors:
 - An Pham
@@ -75,11 +75,11 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- README.ruby.md
 - lib/squared.rb
 - lib/squared/app.rb
 - lib/squared/common.rb
 - lib/squared/common/base.rb
-- lib/squared/common/class.rb
 - lib/squared/common/format.rb
 - lib/squared/common/prompt.rb
 - lib/squared/common/shell.rb
@@ -101,15 +101,14 @@ files:
 - lib/squared/workspace/repo.rb
 - lib/squared/workspace/series.rb
 - lib/squared/workspace/support.rb
-- lib/squared/workspace/support/base.rb
 - lib/squared/workspace/support/data.rb
 - squared.gemspec
-homepage: https://github.com/anpham6/squared-ruby
+homepage: https://github.com/anpham6/squared
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/anpham6/squared-ruby
-  source_code_uri: https://github.com/anpham6/squared-ruby
+  homepage_uri: https://github.com/anpham6/squared
+  source_code_uri: https://github.com/anpham6/squared
   documentation_uri: https://squared.readthedocs.io
 rdoc_options: []
 require_paths:
@@ -118,14 +117,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []