squared 0.8.5 → 0.9.0.pre1

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

@@ -236,10 +236,10 @@ module Squared
             File.foreach(rakefile) do |line|
               next unless line.match?(%r{\brequire\s+(["'])bundler/gem_tasks\1})
 
-              cmd = bundle_output('exec rake').to_s
-              @output[0] = "#{cmd} build"
-              @copy = "#{cmd} install"
-              @clean = "#{cmd} clean" if @clean.nil?
+              cmd = "#{bundle_output('exec rake')} %s"
+              @output[0] = cmd % 'build'
+              @copy = cmd % 'install'
+              @clean = cmd % 'clean' if @clean.nil?
               break
             end
           rescue => e
@@ -329,7 +329,7 @@ module Squared
                     opts = args.to_a
                     cmd = opts.delete('::')
                     if (n = opts.index('c'))
-                      args = opts.slice!(n.succ..-1)
+                      args = opts.slice!(n.succ..)
                     else
                       file = opts.shift
                       args = []
@@ -459,11 +459,13 @@ module Squared
                       when :build, :push, :exec, :update
                         format_desc(action, flag, 'opts*', after: case flag
                                                                   when :exec then 'command,args*'
-                                                                  when :push then 'file/:'
+                                                                  when :push then 'file/:,d/dry-run?'
                                                                   when :update then 'name*'
                                                                   end)
                         task flag do |_, args|
-                          gem(flag, opts: args.to_a, banner: true)
+                          opts = args.to_a
+                          filter = { dryrun: true } if flag == :push && has_value!(opts, 'd', 'dry-run')
+                          gem(flag, opts: opts, banner: true, filter: filter)
                         end
                       when :install, :uninstall, :pristine
                         format_desc(action, flag, 'opts*', after: flag == :pristine ? 'name*|name?@version' : 'name*')
@@ -570,13 +572,18 @@ module Squared
                                       else
                                         %w[## ;]
                                       end
-                          msg = if Prompt.reline.respond_to?(:readmultiline)
-                                  'ruby>'
-                                else
-                                  multiline = Array(multiline)
-                                  'Enter script'
-                                end
-                          command = ENV['RUBY_E'] || readline(msg, force: true, multiline: multiline)
+                          unless (command = ENV['RUBY_E'])
+                            command = if Prompt.reline.respond_to?(:readmultiline)
+                                        require 'ripper'
+                                        readline('ruby>', force: true, multiline: multiline) do |code|
+                                          next if code.strip.empty? || !Ripper.sexp(code)
+
+                                          Array(multiline).any? { |s| code.split.last.match?(/(?<!#{s[-1]})#{s}$/) }
+                                        end
+                                      else
+                                        readline('Enter script', force: true, multiline: Array(multiline))
+                                      end
+                          end
                           ruby(flag, opts: args.to_a, command: command)
                         end
                       when :version
@@ -699,7 +706,7 @@ module Squared
                                                    .lines
                                                    .map { |line| line.sub(/#.*$/, '').strip }
                                                    .reject(&:empty?)
-                                                   .yield_self do |lines|
+                                                   .then do |lines|
                                                      target = lines.find { |line| line.include?(tool) }
                                                      target ? [target] : lines
                                                    end
@@ -786,7 +793,7 @@ module Squared
                                                     when '1', 'true' then nil
                                                     else
                                                       if val.start_with?('~')
-                                                        val = File.join(Dir.home, val == '~' ? '.bundle' : val[1..-1])
+                                                        val = File.join(Dir.home, val == '~' ? '.bundle' : val[1..])
                                                         if prod?
                                                           config_set('binstubs', shell_quote(val), global: true)
                                                           val = nil
@@ -976,8 +983,9 @@ module Squared
             if found > 0
               unless Array(items).empty?
                 gems = if se
-                         choice('Select a package', items.map(&:first),
-                                multiple: true, force: false, index: true, border: true).map { |n| items[n.pred].last }
+                         choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                        border: true, **parse_select)
+                           .map { |n| items[n.pred].last }
                        else
                          items.map(&:last)
                        end
@@ -1211,8 +1219,9 @@ module Squared
               puts 'No updates were found'
             else
               if items
-                update = choice('Select a package', items.map(&:first),
-                                multiple: true, force: false, index: true, border: true).map { |n| items[n.pred].last }
+                update = choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                        border: true, **parse_select)
+                           .map { |n| items[n.pred].last }
               end
               unless Array(update).empty?
                 opts = ['f']
@@ -1296,7 +1305,12 @@ module Squared
 
               op.add_path(file)
             end
-            return run(from: from, interactive: ['Push', 'N', target || gemname]) unless with || !banner
+            if dryrun? || kwargs[:filter]&.fetch(:dryrun, nil)
+              print_item "> #{op}"
+              exit 0
+            elsif !with && banner
+              return run(from: from, interactive: ['Push', 'N', target || gemname])
+            end
           when :exec
             min = if op.arg?('g', 'gem')
                     1
@@ -1365,9 +1379,9 @@ module Squared
               name = op.remove_at(n)
               n = name.index('@')
               pre, ver = if n == 0
-                           [gemname, name[1..-1]]
+                           [gemname, name[1..]]
                          else
-                           [name[0, n], name[n.succ..-1]]
+                           [name[0, n], name[n.succ..]]
                          end
               op.adjoin(pre, quote_option('version', ver))
                 .clear
@@ -1826,10 +1840,7 @@ module Squared
                 set.call(ver, val)
               end
             end
-            if semgte?('2.6')
-              target = RUBY_VERSION.start_with?('2.6') ? RubyVM : $LOAD_PATH
-              parse.call(target.resolve_feature_path(gemname)&.last)
-            end
+            parse.call($LOAD_PATH.resolve_feature_path(gemname)&.last)
             unless gemdir || pwd_set { parse.call(`#{bundle_output('show', gemname)}`) }
               raise Errno::ENOENT, 'gems home'
             end
@@ -2057,7 +2068,7 @@ module Squared
         end
 
         def gemlib
-          @gemlib ||= Set.new(['lib']).yield_self do |lib|
+          @gemlib ||= Set.new(['lib']).then do |lib|
             if (spec = gemspec)
               lib.merge(spec.require_paths || [])
             end

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

@@ -153,7 +153,7 @@ module Squared
             return true if super
             return extras.include?(obj) unless (n = extras.index(@partition))
 
-            extras[0..n].include?(obj)
+            extras[..n].include?(obj)
           end
 
           def multiple?(val)

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

@@ -19,7 +19,6 @@ module Squared
           class << self
             include Common::Format
             include Shell
-            include Prompt
 
             def append(target, *args, delim: false, escape: false, quote: true, strip: nil, double: false, filter: nil,
                        pass: nil, **kwargs)
@@ -82,7 +81,7 @@ module Squared
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
               warn log_warn(opts.join(', '), pass: true, **kwargs)
-              exit 1 unless !strict && (pass || confirm("Run? [#{sub_style(target, styles)}]", 'N'))
+              exit 1 unless !strict && (pass || Common::Prompt.confirm("Run? [#{sub_style(target, styles)}]", 'N'))
             end
 
             def delete_key(target, *args, value: false, reverse: false, count: -1)
@@ -104,7 +103,7 @@ module Squared
                 next if s.empty? || pass == i
 
                 if s == '--'
-                  ret << s << args[i.succ..-1].join(' ')
+                  ret << s << args[i.succ..].join(' ')
                   break
                 end
                 next ret << s unless s.start_with?('-')
@@ -139,7 +138,7 @@ module Squared
                            j = val =~ OPT_VALUE ? $1 : val
                            (out[j] ||= []) << i unless pass.include?(j)
                          end
-                         .map { |item| item[1].size > 1 ? item[1][0..-2] : [] }
+                         .map { |item| item[1].size > 1 ? item[1][..-2] : [] }
                          .reject(&:empty?)
               return if data.empty?
 
@@ -152,12 +151,12 @@ module Squared
               val = val.strip
               return [val, nil, ''] unless (i = val.index('='))
 
-              last = val[i.succ..-1].strip
+              last = val[i.succ..].strip
               if last =~ /\A(["'])(.*)\1\z/m
                 last = $2
                 quote = $1
               end
-              [val[0..i.pred], last, quote || '']
+              [val[...i], last, quote || '']
             end
 
             def parse_arg!(name, val)
@@ -174,7 +173,7 @@ module Squared
               r << matchopts(s, value) unless s.empty?
               a = target.to_a
               if (n = a.index('--'))
-                a = a[0..n]
+                a = a[..n]
               end
               r.any? { |pat| a.any?(pat) }
             end
@@ -193,6 +192,8 @@ module Squared
               false
             end
 
+            alias filter select
+
             private
 
             def matchopt(val, value = false)
@@ -224,7 +225,7 @@ module Squared
                          :merge, :compact, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
           def_delegators :@extras, :empty?, :member?, :each, :each_with_index, :each_with_object, :partition, :dup,
                          :first, :shift, :unshift, :pop, :push, :concat, :index, :join, :detect, :map, :map!, :select,
-                         :select!, :reject, :slice, :slice!, :size
+                         :select!, :filter, :filter!, :reject, :slice, :slice!, :size
 
           def_delegator :@extras, :delete, :remove
           def_delegator :@extras, :delete_at, :remove_at
@@ -269,7 +270,7 @@ module Squared
               x, y = val.split('|', 2)
               if y
                 if (n = val.index('='))
-                  x += val[n..-1]
+                  x += val[n..]
                 end
                 [x, y]
               else
@@ -318,7 +319,7 @@ module Squared
                   bare.concat(mod)
                 when '/'
                   begin
-                    val = val[n.succ..-1]
+                    val = val[n.succ..]
                     pat = eval(val)
                     raise SyntaxError unless pat.is_a?(Regexp)
 
@@ -327,7 +328,7 @@ module Squared
                     warn "#{self.class}: invalid pattern (#{val})"
                   end
                 when '{'
-                  group = val[(n + 2)..-1].chomp!('}')&.split(',')
+                  group = val[(n + 2)..].chomp!('}')&.split(',')
                   if group
                     mod.each { |key| ar[key] = group }
                   else
@@ -396,7 +397,7 @@ module Squared
                 else
                   add(opt.size == 1 ? "-#{opt}" : "--#{opt}")
                 end
-              elsif opt.start_with?(/no[-_]/) && no.include?(s = opt[3..-1])
+              elsif opt.start_with?(/no[-_]/) && no.include?(s = opt[3..])
                 add "--no-#{s}"
               else
                 has = lambda do |list, key|
@@ -454,7 +455,7 @@ module Squared
                     push opt
                   end
                   opt = key unless opt == last
-                elsif has.call(m, key = opt[0]) && opt[1..-1] =~ QUOTE_VALUE
+                elsif has.call(m, key = opt[0]) && opt[1..] =~ QUOTE_VALUE
                   add basic_option(key, $2, double: $1 == '"' || has.call(qq, key), **kwargs, merge: true)
                   opt = key
                 else
@@ -612,7 +613,7 @@ module Squared
               else
                 args.each { |val| remove val }
               end
-              args = temp[0, index] + args + temp[index..-1]
+              args = temp[0, index] + args + temp[index..]
               target.clear
             end
             merge args

data/lib/squared/workspace/repo.rb

@@ -215,8 +215,8 @@ module Squared
                   opts << '--force-checkout'
                 when 'rebase', 'detach'
                   opts << "--#{val}"
-                when /^(fetch-)?submodules$/
-                  opts << '--fetch-submodules' if repo_submodules?(true, **envargs)
+                when /^(recurse-)?submodules$/
+                  opts << '--recurse-submodules' if repo_submodules?(true, **envargs)
                 when /^(fail-)?fast$/
                   opts << '--fail-fast'
                 when /^no-(manifest-)?update$/
@@ -228,7 +228,7 @@ module Squared
               if (jobs = ENV['REPO_JOBS']) || opts.none?(/^--?j(obs)?$/)
                 opts << "-j#{jobs || Rake::CpuCounter.count}"
               end
-              opts << '--fetch-submodules' if repo_submodules?(**envargs)
+              opts << '--recurse-submodules' if repo_submodules?(**envargs)
               begin
                 repo_run('sync', opts, exception: opts.include?('--fail-fast'), options: stage != 'init')
               rescue Errno::ENOENT => e
@@ -262,7 +262,7 @@ module Squared
         return false unless root.directory?
 
         path = sub_style root, theme[:inline]
-        @repo_override = case env('REPO_Y')
+        @repo_override = case __arg__('YES', 'REPO') || env('REPO_Y')
                          when '0', 'false'
                            false
                          when '1', 'true'
@@ -345,7 +345,7 @@ module Squared
       def repo_opts(*args)
         return args unless (n = ARGV.index('--'))
 
-        ARGV[n.succ..-1].concat(args)
+        ARGV[n.succ..].concat(args)
       end
 
       def repo_submodules?(val = false, **kwargs)

data/lib/squared/workspace/series.rb

@@ -9,6 +9,7 @@ module Squared
       extend Forwardable
 
       attr_reader :sync, :multiple, :parallel
+      attr_writer :ref_min
 
       def_delegators :@data, :[], :each, :each_key, :keys, :key?, :include?, :fetch, :update, :merge!, :any?, :none?,
                      :delete, :delete_if, :find, :find_all, :to_a, :to_s, :inspect
@@ -19,6 +20,7 @@ module Squared
         @sync = []
         @multiple = []
         @parallel = []
+        @ref_min = 2
         @chain = {}
         @exclude = exclude.freeze
         @task = Struct::SeriesData.new(workspace.config_get(:rename))
@@ -56,7 +58,7 @@ module Squared
         @session = {
           group: Support.hashlist,
           parent: Support.hashlist,
-          id: []
+          id: Set.new
         }.freeze
       end
 
@@ -85,7 +87,7 @@ module Squared
 
       def build(parallel: [], pattern: [], **)
         subcheck = ->(val) { (ns = task_namespace(val)) && parallel.include?(ns) }
-        update @session[:parent] if @session[:id].uniq.size > 1
+        update @session[:parent] if @session[:id].size >= @ref_min
         update @session[:group]
         each do |key, items|
           next if exclude?(key, empty: true) || @workspace.task_exclude?(t = name_get(key))

data/squared.gemspec

@@ -11,21 +11,23 @@ Gem::Specification.new do |spec|
   spec.summary       = "Rake task generator for managing multi-language workspaces."
   spec.description   = "Rake task generator for managing multi-language workspaces."
   spec.homepage      = "https://github.com/anpham6/squared-ruby"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
   spec.licenses      = ["BSD-3-Clause"]
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["documentation_uri"] = "https://squared.readthedocs.io"
 
-  spec.files         = Dir["lib/**/*"] +
-                       %w[CHANGELOG.md LICENSE README.md squared.gemspec]
   spec.bindir        = "exe"
-  spec.executables   = []
+  spec.executables   = Dir["exe/*"].map { |f| File.basename(f) }
+
+  spec.files         = Dir["exe/*"] + Dir["lib/**/*"] +
+                       %w[CHANGELOG.md LICENSE README.md squared.gemspec]
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rake"
+  spec.add_dependency "optparse"
   spec.add_dependency "logger"
   spec.add_dependency "rexml"
-  spec.add_dependency "readline"
+  spec.add_dependency "reline"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0.pre1
 platform: ruby
 authors:
 - An Pham
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: optparse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: readline
+  name: reline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,13 +82,15 @@ dependencies:
 description: Rake task generator for managing multi-language workspaces.
 email:
 - anpham6@gmail.com
-executables: []
+executables:
+- sqd
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- exe/sqd
 - lib/squared.rb
 - lib/squared/app.rb
 - lib/squared/common.rb
@@ -119,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="