squared 0.5.4 → 0.5.6

data/lib/squared/workspace/repo.rb

@@ -113,16 +113,16 @@ module Squared
       def __repo__(**kwargs)
         kwargs.delete(:parallel) if env('REPO_SYNC', ignore: '0')
 
-        namespace(task_name('repo')) do |ns|
+        namespace task_name('repo') do |ns|
           path = ns.scope.path
           branch = env('REPO_MANIFEST') || Repo.read_manifest(root)
           target = branch || manifest
-          cmd = nil
           stage = nil
+          opts = %w[force rebase detach submodules fail no-update gc]
           newline = ARGV.any?(/^repo:/)
           desc = lambda do |val, alt = nil|
             if (ver = branch || alt)
-              val = val.sub('{0}', 'opts*=force,rebase,detach,fail,no-update,gc')
+              val = val.sub('{0}', "opts*=#{opts.join(',')}")
               task_desc(path, val, ver)
             else
               task_desc 'inactive'
@@ -130,10 +130,9 @@ module Squared
           end
 
           desc.call('all[{0}]')
-          task 'all', [:opts] do |_, args|
-            cmd ||= repo_opts args
+          task 'all' do |_, args|
             stage ||= 'all'
-            ns['sync'].invoke
+            ns['sync'].invoke(*args.to_a)
             next if env('REPO_STAGE', equals: '1')
 
             @project.select do |_, proj|
@@ -156,26 +155,60 @@ module Squared
             end
           end
 
-          desc.call("init[manifest?=#{target},{0}]", target)
-          task 'init', [:manifest, :opts] do |_, args|
-            cmd = repo_opts args
+          desc.call("init[manifest?=#{target},groups?,{0}]", target)
+          task 'init' do |_, args|
+            args = args.to_a
+            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 = case (val = env('REPO_GROUPS'))
+                when '', NilClass
+                  g
+                when '0', 'false'
+                  nil
+                else
+                  val
+                end
             stage = 'init'
             puts if newline
-            Common::System.shell("repo init -u #{env('REPO_URL') || manifest_url} -m #{args.manifest || target}.xml",
-                                 chdir: root)
+            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
+            ns['all'].invoke(*args)
           end
 
           desc.call('sync[{0}]')
-          task 'sync', [:opts] do |t, args|
-            raise_error 'repo not initialized' unless branch || stage == 'init'
-            cmd ||= repo_opts args
-            cmd << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}"
+          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
+            end
+            opts << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}" unless opts.any?(/^--?j(?:obs)?/)
+            opts << '--fetch-submodules' if repo_submodules?
             puts unless !newline || stage == 'init'
             begin
-              Common::System.shell("repo sync #{cmd.join(' ')}", chdir: root, exception: cmd.include?('--fail-fast'))
+              repo_run("#{repo_bin} sync #{opts.uniq.join(' ')}", exception: opts.include?('--fail-fast'))
             rescue Errno::ENOENT => e
               emphasize(e, title: root)
               raise
@@ -204,31 +237,34 @@ module Squared
         )
       end
 
-      def repo_opts(args)
-        ret = []
-        args.to_a.each do |val|
-          case val
-          when 'force'
-            ret << '--force-checkout'
-          when 'rebase'
-            ret << '--rebase'
-          when 'detach'
-            ret << '--detach'
-          when 'fail'
-            ret << '--fail-fast'
-          when 'no-update'
-            ret << '--no-manifest-update'
-          when 'gc'
-            ret << '--auto-gc'
-          end
-        end
-        ret
+      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?
         !manifest_url.nil? && (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
+      end
+
       def repo_install?(dir = root, parent: false)
         return true if root?(dir, pass: ['.repo']) || dir.join('.repo').directory?
 

data/squared.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   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"
+  spec.homepage      = "https://github.com/anpham6/squared-ruby"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
   spec.licenses      = ["BSD-3-Clause"]
 
@@ -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 README.ruby.md squared.gemspec]
+                       %w[CHANGELOG.md LICENSE README.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.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - An Pham
@@ -75,7 +75,6 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- README.ruby.md
 - lib/squared.rb
 - lib/squared/app.rb
 - lib/squared/common.rb
@@ -104,12 +103,12 @@ files:
 - lib/squared/workspace/support/base.rb
 - lib/squared/workspace/support/data.rb
 - squared.gemspec
-homepage: https://github.com/anpham6/squared
+homepage: https://github.com/anpham6/squared-ruby
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/anpham6/squared
-  source_code_uri: https://github.com/anpham6/squared
+  homepage_uri: https://github.com/anpham6/squared-ruby
+  source_code_uri: https://github.com/anpham6/squared-ruby
   documentation_uri: https://squared.readthedocs.io
 rdoc_options: []
 require_paths:
@@ -125,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []