squared 0.5.3 → 0.5.4

data/lib/squared/workspace/repo.rb

@@ -113,35 +113,17 @@ module Squared
       def __repo__(**kwargs)
         kwargs.delete(:parallel) if env('REPO_SYNC', ignore: '0')
 
-        namespace(name = task_name('repo')) do |repo|
+        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
-          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
+          newline = ARGV.any?(/^repo:/)
           desc = lambda do |val, alt = nil|
             if (ver = branch || alt)
-              val = val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail')
-              task_desc(task_name('repo'), val, ver)
+              val = val.sub('{0}', 'opts*=force,rebase,detach,fail,no-update,gc')
+              task_desc(path, val, ver)
             else
               task_desc 'inactive'
             end
@@ -149,20 +131,22 @@ module Squared
 
           desc.call('all[{0}]')
           task 'all', [:opts] do |_, args|
-            parse_opts.call(args)
+            cmd ||= repo_opts args
             stage ||= 'all'
-            repo['sync'].invoke
-            next if env('REPO_DRYRUN', equals: '2')
+            ns['sync'].invoke
+            next if env('REPO_STAGE', equals: '1')
 
             @project.select do |_, proj|
               next unless proj.enabled?(proj.workspace.baseref)
 
               proj.depend(sync: true) if proj.depend?
-              proj.build? unless env('REPO_DRYRUN', ignore: '0')
+              next if env('REPO_STAGE', equals: '2')
+
+              proj.build?
             end
             .each_value do |proj|
               proj.build(sync: true)
-              next unless proj.dev? && proj.copy?
+              next unless proj.dev? && proj.copy? && !env('REPO_STAGE', equals: '3')
 
               if (ws = proj.workspace).task_defined?(target = task_join(proj.name, 'copy'))
                 task_invoke(target, **ws.invokeargs)
@@ -174,38 +158,37 @@ module Squared
 
           desc.call("init[manifest?=#{target},{0}]", target)
           task 'init', [:manifest, :opts] do |_, args|
-            parse_opts.call(args)
+            cmd = repo_opts args
             stage = 'init'
             puts if newline
             Common::System.shell("repo init -u #{env('REPO_URL') || manifest_url} -m #{args.manifest || target}.xml",
                                  chdir: root)
-            repo['all'].invoke
+            next if env('REPO_STAGE', equals: '0')
+
+            ns['all'].invoke
           end
 
           desc.call('sync[{0}]')
-          task 'sync', [:opts] do |_, args|
-            unless branch || stage == 'init'
-              raise_error('repo not initialized', hint: task_name('repo:init'), kind: LoadError)
-            end
-            parse_opts.call(args)
+          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)}"
-            cmd << '--fail-fast' if failfast
-            puts if newline && stage != 'init'
+            puts unless !newline || stage == 'init'
             begin
-              Common::System.shell("repo sync #{cmd.join(' ')}", chdir: root, exception: failfast)
+              Common::System.shell("repo sync #{cmd.join(' ')}", chdir: root, exception: cmd.include?('--fail-fast'))
             rescue Errno::ENOENT => e
               emphasize(e, title: root)
               raise
             rescue StandardError => e
-              emphasize(e, title: "rake stash #{task_name(task_join('repo', stage || 'sync'))}")
+              emphasize(e, title: "rake stash #{t.name}")
               raise
             end
           end
 
           series.sync.append(
-            task_join(name, 'all'),
-            task_join(name, 'init'),
-            task_join(name, 'sync')
+            task_join(path, 'all'),
+            task_join(path, 'init'),
+            task_join(path, 'sync')
           )
         end
       end
@@ -221,6 +204,27 @@ 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
+      end
+
       def repo?
         !manifest_url.nil? && (repo_install? || @repo_override == true)
       end

metadata

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