squared 0.4.17 → 0.4.19

data/lib/squared/workspace/project/ruby.rb

@@ -25,8 +25,8 @@ module Squared
           common: %w[no-color V|verbose retry=i].freeze,
           install: %w[frozen no-cache no-prune system binstubs=p? path=p standalone=q? target-rbconfig=p trust-policy=b
                       with=q without=q].freeze,
-          install_base: %w[full-index quiet retry gemfile=p j|jobs=i].freeze,
-          update: %w[conservative local pre redownload ruby strict bundler=b? g|group=q source=b].freeze,
+          install_base: %w[force full-index quiet redownload retry gemfile=p j|jobs=i].freeze,
+          update: %w[conservative local pre ruby strict bundler=b? g|group=q source=b].freeze,
           outdated: %w[filter-major filter-minor filter-patch groups local parseable pre only-explicit strict
                        update-strict g|group=q source=b].freeze,
           exec: %w[gemfile=p].freeze,
@@ -102,7 +102,13 @@ module Squared
           end
           dependfile_set GEMFILE
           @autodetect = autodetect
-          @gemfile = path + gemspec if gemspec
+          @gemfile = if gemspec == false
+                       false
+                     elsif gemspec
+                       path + (gemspec.include?('.') ? gemspec : "#{gemspec}.gemspec")
+                     elsif (gemspec = path + "#{name}.gemspec").exist? || (gemspec = path + "#{project}.gemspec").exist?
+                       gemspec
+                     end
           return if !@output[0].nil? || !@copy.nil? || version || @autodetect || !rakefile
 
           begin
@@ -140,21 +146,21 @@ module Squared
                   format_desc action, nil, "task+,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
                     if args.command == '#'
-                      format_list(read_rakefile, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile,
-                                                                                 each: ->(val) { val[0] + val[1].to_s })
+                      format_list(raketasks, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile,
+                                                                             each: ->(val) { val[0] + val[1].to_s })
                     else
                       args, opts = args.to_a.partition { |val| indexitem(val) }
                       if args.empty?
                         rake(opts: opts)
                       else
-                        list = read_rakefile
+                        tasks = raketasks
                         while (n, pre = indexitem(args.shift))
-                          if (item = list[n - 1])
+                          if (item = tasks[n - 1])
                             cmd = pre ? "#{pre} #{item.first}" : item.first
                           elsif exception
-                            indexerror n, list
+                            indexerror n, tasks
                           else
-                            log.warn "rake task #{n} of #{list.size} (out of range)"
+                            log.warn "rake task #{n} of #{tasks.size} (out of range)"
                             next
                           end
                           if opts.empty?
@@ -177,7 +183,8 @@ module Squared
                 else
                   format_desc(action, nil, 'opts*', before: case action
                                                             when 'cache', 'check' then nil
-                                                            else 'command+' end)
+                                                            else 'command+'
+                                                            end)
                   task action do |_, args|
                     bundle(action, *args.to_a)
                   end
@@ -426,14 +433,23 @@ module Squared
 
         def install(flag, opts = [])
           bundle_session 'install', "--#{flag}"
-          append_bundle opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:install] + OPT_BUNDLE[:common]
+          op = append_bundle opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:install] + OPT_BUNDLE[:common]
+          if op.arg?('force')
+            op.delete('--force')
+            if flag != :redownload
+              op << '--redownload'
+            elsif (lock = basepath('Gemfile.lock')).exist?
+              config = basepath('.bundle', 'config')
+              lock.delete unless config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
+            end
+          end
           run_rb(from: :install)
         end
 
         def update(flag, opts = [])
           bundle_session 'update', "--#{flag}"
           append_bundle(opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common],
-                        append: flag == :all ? nil : /\A\w+=/)
+                        append: flag == :all ? nil : /\A[a-z-]+=/)
           run_rb(from: :update)
         end
 
@@ -815,14 +831,11 @@ module Squared
         def gemspec
           return @gemspec unless @gemspec.nil?
 
-          begin
-            if (file = gemfile)
-              @gemspec = Gem::Specification.load(file.to_s)
-            end
-          rescue StandardError => e
-            log.debug e
-          end
-          @gemspec ||= false
+          @gemspec = if (file = gemfile)
+                       Gem::Specification.load(file.to_s) rescue false
+                     else
+                       false
+                     end
         end
 
         def gemname
@@ -938,6 +951,7 @@ module Squared
           else
             op.clear
           end
+          op
         end
 
         def ruby_session(*cmd, **kwargs)
@@ -979,27 +993,10 @@ module Squared
           session_output('rake', *cmd, **kwargs)
         end
 
-        def read_rakefile
-          @read_rakefile ||= [].tap do |ret|
-            opt = rakepwd
-            pwd_set(pass: !opt.nil?) do
-              IO.popen(rake_output(opt, '-AT').to_s).each do |line|
-                next unless line =~ /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/
-
-                ret << [$1, $2]
-              end
-            end
-          end
-        end
-
         def preopts
           verbosetype > 1 && !session_arg?('quiet') ? ['--verbose'] : []
         end
 
-        def gemdir?
-          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
-        end
-
         def variables
           (super + %i[version autodetect]).freeze
         end
@@ -1017,6 +1014,19 @@ module Squared
           quote_option 'C', path
         end
 
+        def raketasks
+          @raketasks ||= [].tap do |ret|
+            opt = rakepwd
+            pwd_set(pass: !opt.nil?) do
+              IO.popen(rake_output(opt, '-AT').to_s).each do |line|
+                next unless line =~ /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/
+
+                ret << [$1, $2]
+              end
+            end
+          end
+        end
+
         def gempwd
           return unless !pwd? && semgte?(Gem::VERSION, '3.4.2')
 
@@ -1044,6 +1054,12 @@ module Squared
         def gempath(val = version)
           File.join('gems', "#{gemname}-#{val}")
         end
+
+        def gemdir?
+          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
+        end
+
+        alias read_rakefile raketasks
       end
 
       Application.implement Ruby

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

@@ -10,15 +10,22 @@ module Squared
           include Common::Shell
           extend Forwardable
 
+          OPT_VALUE = /\A([^=]+)=(.+)\z/
+          private_constant :OPT_VALUE
+
           class << self
             include Common::Format
             include Shell
             include Prompt
 
-            def append(target, *args, delim: false, escape: false, quote: true, **)
+            def append(target, *args, delim: false, escape: false, quote: true, strip: nil, **)
               return if (ret = args.flatten).empty?
 
               target << '--' if delim && !target.include?('--')
+              if strip
+                pat, s = Array(strip)
+                ret.map! { |val| val.gsub(pat, s || '') }
+              end
               ret.map! { |val| escape ? shell_escape(val, quote: quote) : shell_quote(val) } if escape || quote
               if target.is_a?(Set)
                 target.merge(ret)
@@ -31,7 +38,7 @@ module Squared
             def clear(target, opts, pass: true, styles: nil, **kwargs)
               return if opts.empty?
 
-              kwargs[:subject] ||= stripext(target.first)
+              kwargs[:subject] ||= stripext target.first
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
               warn log_message(Logger::WARN, opts.join(', '), pass: true, **kwargs)
@@ -57,10 +64,10 @@ module Squared
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               unless s.empty?
-                s.map! { |val| Regexp.escape(shell_option(val)) }
+                s.map! { |val| Regexp.escape(val.start_with?('-') ? val : shell_option(val)) }
                 r << /\A(?:#{s.join('|')})#{value ? '[ =].' : '(?: |=|\z)'}/
               end
-              target.any? { |opt| r.any? { |val| opt&.match?(val) } }
+              Array(target).compact.any? { |val| r.any? { |pat| pat.match?(val.to_s) } }
             end
 
             def pattern?(val)
@@ -73,13 +80,13 @@ module Squared
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
                          :merge, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
           def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :last, :shift, :unshift,
-                         :pop, :push, :index, :delete_at, :join, :map, :map!, :select, :reject, :size
+                         :pop, :push, :concat, :index, :delete_at, :join, :map, :map!, :select, :select!, :reject, :size
 
           def_delegator :@extras, :delete, :remove
           def_delegator :@extras, :delete_if, :remove_if
 
           def initialize(opts, list, target = Set.new, project: nil, path: nil, **kwargs, &blk)
-            @target = target.is_a?(Set) ? target : Set.new(target)
+            @target = target.is_a?(Set) ? target : target.to_set
             @project = project
             @path = path || project&.path
             @errors = []
@@ -163,7 +170,7 @@ module Squared
               elsif opt.start_with?('no-') && no.include?(name = opt[3..-1])
                 add "--no-#{name}"
               else
-                if opt =~ /\A([^=]+)=(.+)\z/
+                if opt =~ OPT_VALUE
                   key = $1
                   val = $2
                   merge = m.include?(key)
@@ -208,6 +215,22 @@ module Squared
             self
           end
 
+          def uniq(list)
+            items = map { |val| nameonly(val) }
+            list.reject do |val|
+              next true if items.include?(s = nameonly(val))
+
+              pat = /\A#{s = fill_option(s)}(?:#{s.start_with?('--') ? '[= ]' : '.*'}|\z)/
+              any? { |opt| opt.match?(pat) }
+            end
+          end
+
+          def uniq!(list)
+            n = size
+            concat uniq(list)
+            extras if size > n
+          end
+
           def clear(opts = nil, errors: false, **kwargs)
             styles = project.theme[:inline] if project
             if !opts
@@ -274,7 +297,7 @@ module Squared
             unless found.empty?
               add '--' if delim
               extras.clear
-              extras.concat(other)
+              concat other
               if path
                 found.each { |val| add_path(val) }
               else
@@ -290,9 +313,33 @@ module Squared
             self
           end
 
+          def append?(key, val = nil, type: nil, force: false, **kwargs)
+            return false unless force || !arg?(key)
+
+            val = yield self if block_given?
+            return false unless val
+
+            type ||= :quote if kwargs.empty?
+            add case type
+                when :quote
+                  quote_option(key, val)
+                when :basic
+                  basic_option(key, val)
+                else
+                  shell_option(key, val, **kwargs)
+                end
+            true
+          end
+
           def arg?(*args, **kwargs)
             OptionPartition.arg?(target, *args, **kwargs)
           end
+
+          private
+
+          def nameonly(val)
+            val[OPT_VALUE, 1] || val
+          end
         end
       end
     end

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
-          newline = ARGV.index { |val| val.start_with?('repo:') }.to_i > 0
+          opts = %w[force rebase detach submodules fail no-update gc]
+          newline = !ARGV.grep(/^repo:/).empty?
           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.grep(/^--?j(?:obs)?/).empty?
+            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.4.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.4.17
+  version: 0.4.19
 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
@@ -105,12 +104,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: