squared 0.8.6 → 0.9.0.pre1

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)
@@ -219,13 +220,12 @@ module Squared
           end
 
           attr_reader :target, :extras, :found, :errors, :values, :project, :path, :sep
-          attr_accessor :stdout
 
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
                          :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
@@ -242,16 +242,14 @@ module Squared
             @sep = sep
             @errors = []
             @found = []
-            @stdout = false
             parse(list, opts, **kwargs, &blk)
           end
 
           def parse(list, opts = extras, no: nil, single: nil, args: false, multiple: nil, first: nil, underscore: nil,
-                    explicit: false, bool: %w[true false], auto: [], stdin: false, &blk)
+                    explicit: false, bool: %w[true false], stdin: false, &blk)
             @extras = []
             @values = []
             bare = []
-            auto = auto.flat_map { |val| val.split('|', 2) }
             e = []
             b = []
             m = []
@@ -272,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
@@ -321,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)
 
@@ -330,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
@@ -353,7 +351,6 @@ module Squared
               tr = ->(a) { a.map { |val| val.tr('-', '_') } }
               @values.concat(tr.call(@values))
               bare.concat(tr.call(bare))
-              auto.concat(tr.call(auto))
               e.concat(tr.call(e))
               b.concat(tr.call(b))
               m.concat(tr.call(m))
@@ -367,7 +364,6 @@ module Squared
               ml.concat(tr.call(ml))
               no.concat(tr.call(no))
             end
-            bare.concat(auto)
             if target.is_a?(JoinSet)
               target.multiple = multiple if multiple
               target.multiple = ml.map { |val| val.size == 1 ? "-#{val}" : "--#{val}" }
@@ -400,12 +396,8 @@ module Squared
                   add "#{sw[opt]}#{opt}"
                 else
                   add(opt.size == 1 ? "-#{opt}" : "--#{opt}")
-                  if auto.include?(opt)
-                    @stdout = true
-                    break
-                  end
                 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|
@@ -463,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
@@ -621,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
@@ -830,10 +822,6 @@ module Squared
             end
           end
 
-          def style?(*args)
-            !stdout && args.none?(&:!)
-          end
-
           def uniq!(list)
             list = uniq list
             return if list.empty?

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.6
+  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,14 +135,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.20
+rubygems_version: 4.0.21
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []