squared 0.7.5 → 0.7.7

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

@@ -8,7 +8,7 @@ module Squared
         GEMNAME = /\A[A-Za-z\d][A-Za-z\d_.-]*\z/.freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_RUBY = {
-          ruby: %w[0=im? a c C=pm e=q E=bm F=qm i=bm? I=pm l n p r=bm s S w W=bm? x=pm? d|debug jit rjit verbose
+          ruby: %w[a c l n p s S w 0=im? C=pm e=q E=bm F=qm i=bm? I=pm r=bm W=bm? x=pm? d|debug jit rjit verbose
                    y|yydebug backtrace-limit=i crash-report=q disable=q dump=q enable=q encoding=b external-encoding=b
                    internal-encoding=b parser=b].freeze,
           rake: %w[A|all B|build-all comments n|dry-run m|multitask P|prereqs q|quiet X|no-deprecation-warnings
@@ -16,14 +16,14 @@ module Squared
                    D|describe=q? e|execute=q E|execute-continue=q p|execute-print=q f|rakefile=p job-stats=b? j|jobs=i?
                    I|libdir=p R|rakelib=p rakelibdir=p r|require=b suppress-backtrace=q T|tasks=q? t|trace=b?
                    W|where=q?].freeze,
-          irb: %w[d f U w E=b I=p r=bm W=im? autocomplete colorize echo echo-on-assignment extra-doc-dir inf-ruby-mode
+          irb: %w[d f U w E=b I=pm r=bm W=im? autocomplete colorize echo echo-on-assignment extra-doc-dir inf-ruby-mode
                   inspect multiline no-pager noautocomplete nocolorize noecho noecho-on-assignment noinspect
                   nomultiline noprompt noscript nosingleline noverbose regexp-completor sample-book-mode script
                   simple-prompt single-irb singleline tracer truncate-echo-on-assignment type-completor verbose
                   back-trace-limit=i context-mode=i prompt=b prompt-mode=b].freeze,
           rdbg: %w[no-color no-rc no-sigint-hook c|command n|nonstop stop-at-load cookie=q e=q host=q x|init-script=p
                    O|open=q? port=i port-range=b session-name=q sock-path=q util=q].freeze,
-          rbs: %w[I=pm r=bm no-stdlib no-collection collection=p log-level=b log-output=p repo=p].freeze,
+          rbs: %w[I=pm r=bm no-collection no-stdlib collection=p log-level=b log-output=p repo=p].freeze,
           rubocop: %w[D P r=bm auto-gen-config a|autocorrect A|autocorrect-all d|debug disable-pending-cops
                       display-only-correctable display-only-fail-level-offenses display-only-failed
                       display-only-safe-correctable S|display-style-guide display-time editor-mode enable-pending-cops
@@ -34,8 +34,8 @@ module Squared
                       start-server stderr stop-server C|cache=b cache-root=p config=p exclude-limit=i fail-level=b
                       f|format=b except=q only=q o|out=p plugin=p require=p show-cops=q show-docs-url=q
                       s|stdin=p].freeze,
-          pry: %w[f I=pm no-color no-history no-multiline no-pager no-plugins simple-prompt c|context=q
-                  d|disable-plugin=q e=q gem=b r|require=bm s|select-plugin=q].freeze,
+          pry: %w[f e=q I=pm no-color no-history no-multiline no-pager no-plugins simple-prompt c|context=q
+                  d|disable-plugin=q gem=b r|require=bm s|select-plugin=q].freeze,
           no: {
             rubocop: %w[auto-gen-enforced-style auto-gen-only-exclude auto-gen-timestamp color display-cop-names
                         offense-counts parallel server].freeze
@@ -69,7 +69,7 @@ module Squared
           plugin: %w[source=q version=q].freeze,
           plugin_uninstall: %w[all].freeze,
           show: %w[paths].freeze,
-          update: %w[all conservativepre ruby strict bundler=b? g|group=q source=q].freeze,
+          update: %w[all conservative pre ruby strict bundler=b? g|group=q source=q].freeze,
           v3: {
             binstubs: %w[all].freeze,
             cache: %w[all frozen no-prune].freeze,
@@ -212,7 +212,8 @@ module Squared
         attr_reader :gemdir
         attr_accessor :autodetect
 
-        def initialize(*, autodetect: false, steep: 'Steepfile', rubocop: '.rubocop.yml', asdf: 'ruby', **kwargs)
+        def initialize(*, autodetect: false, exec: false, steep: 'Steepfile', rubocop: '.rubocop.yml', asdf: 'ruby',
+                       **kwargs)
           super
           if @pass.include?(Ruby.ref)
             initialize_ref Ruby.ref
@@ -225,6 +226,7 @@ module Squared
           serve_set kwargs[:serve]
           gemfile_set kwargs[:gemspec]
           self.autodetect = autodetect
+          @bundle = { exec: exec.is_a?(String) ? basepath!(exec) : false }
           @steepfile = basepath! steep if steep
           @rubocopfile = Pathname.new(rubocop).realpath rescue basepath!(Dir.home, '.rubocop.yml') if rubocop
           @rubygems = kwargs.fetch(:rubygems, 0)
@@ -297,7 +299,7 @@ module Squared
                           queue.call
                           if (item = tasks[n.pred])
                             cmd = [pre, item.first].compact.join(' ')
-                          elsif exception
+                          elsif exception?
                             indexerror n, tasks
                           else
                             log.warn "rake task #{n} of #{tasks.size}".subhint('out of range')
@@ -602,8 +604,8 @@ module Squared
                           end
                           pwd_set do
                             out = []
-                            tool = args.name || (args.local && !SEM_VER.match?(args.local) ? args.local : 'ruby')
-                            trim = ->(s) { s[/^\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/^([a-z]+)-/i, '\1 ') }
+                            tool = args.name || (s && !SEM_VER.match?(s) ? s : 'ruby')
+                            trim = ->(val) { val =~ /^\D+\d+\.\d+(?:\.\S+)?/ ? $&.sub(/^([a-z]+)-/i, '\1 ') : val }
                             vm, bin = vmname(bin: true)
                             out << trim.call(case vm
                                              when 'rvm'
@@ -689,10 +691,16 @@ module Squared
                                                    .lines
                                                    .map { |line| line.sub(/#.*$/, '').strip }
                                                    .reject(&:empty?)
+                                                   .yield_self do |data|
+                                                     target = data.find { |line| line.include?(tool) }
+                                                     target ? [target] : data
+                                                   end
                                                    .join(', ')
                                              end
                                       append.call(file, hint)
-                                      throw :found if hint&.include?(out.first[/^(?:j|truffle)?ruby ([\d.]+)/, 1])
+                                      if hint&.include?(out.first[/^(?:(?:j|truffle)?ruby|#{tool}) ([\d.]+)/, 1])
+                                        throw :found
+                                      end
                                     rescue
                                       nil
                                     end
@@ -1617,8 +1625,8 @@ module Squared
 
         def rubocop(*args, sync: true, banner: verbose?, with: nil, pass: PASS_RUBY[:rubocop], **kwargs)
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          op = OptionPartition.new(opts, OPT_RUBY[:rubocop], session('rubocop'), project: self, strict: strict?,
-                                                                                 no: OPT_RUBY[:no][:rubocop])
+          op = OptionPartition.new(opts, OPT_RUBY[:rubocop], session(*bundle_args('rubocop')),
+                                   project: self, strict: strict?, no: OPT_RUBY[:no][:rubocop])
           if @rubocopfile && !op.arg?('c', 'config') && !rootpath('.rubocop.yml', ascend: true).exist?
             op.add_path(@rubocopfile, option: 'c')
           end
@@ -1639,6 +1647,9 @@ module Squared
 
         def serve(root, *, bind: nil, port: 3000, **kwargs)
           require 'webrick'
+        rescue LoadError => e
+          print_error(e, pass: true)
+        else
           config = kwargs.merge({ DocumentRoot: root })
           config[:BindAddress] = bind if bind
           config[:Port] = port if port
@@ -1650,7 +1661,7 @@ module Squared
         end
 
         def vmname(bin: false)
-          order = { 'rbenv' => -1, 'rvm' => -1, 'chruby' => -1, 'mise' => -1 }
+          order = { 'rbenv' => -1, 'rvm' => -1, 'chruby' => -1, 'asdf' => -1, 'mise' => -1 }
           ENV.fetch('PATH', '').split(':').each_with_index do |val, index|
             order.each_key do |key|
               next unless val.match?(%r{[/.]#{key}/})
@@ -1659,36 +1670,40 @@ module Squared
               break
             end
           end
+          items = [
+            "#{ENV.fetch('RBENV_ROOT', '$HOME/.rbenv')}/bin/rbenv",
+            '$HOME/.rvm/bin/rvm',
+            '$HOME/.local/bin/mise',
+            '/usr/bin/rbenv',
+            '/usr/bin/mise',
+            '/usr/local/rvm/bin/rvm',
+            '/usr/share/rvm/bin/rvm',
+            '/usr/local/share/chruby/chruby.sh'
+          ]
           if @asdf
-            [File.join(ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf'), "installs/#{@asdf.first}")]
-          else
-            [
-              "#{ENV.fetch('RBENV_ROOT', '$HOME/.rbenv')}/bin/rbenv",
-              '$HOME/.rvm/bin/rvm',
-              '$HOME/.local/bin/mise',
-              '/usr/bin/rbenv',
-              '/usr/bin/mise',
-              '/usr/local/rvm/bin/rvm',
-              '/usr/share/rvm/bin/rvm',
-              '/usr/local/share/chruby/chruby.sh'
-            ]
-            .sort do |a, b|
-              c = -1
-              d = -1
-              order.each do |key, val|
-                pat = %r{/\.?#{key}}
-                c = val if a.match?(pat)
-                d = val if b.match?(pat)
-              end
-              if c == d
-                0
-              elsif c == -1
-                1
-              elsif d == -1
-                -1
-              else
-                c < d ? -1 : 1
-              end
+            dir = File.join(ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf'), "installs/#{@asdf.first}")
+            if @@asdf.version == 16
+              items = [dir]
+            else
+              items << dir
+            end
+          end
+          items.sort do |a, b|
+            c = -1
+            d = -1
+            order.each do |key, val|
+              pat = %r{/\.?#{key}}
+              c = val if a.match?(pat)
+              d = val if b.match?(pat)
+            end
+            if c == d
+              0
+            elsif c == -1
+              1
+            elsif d == -1
+              -1
+            else
+              c < d ? -1 : 1
             end
           end
           .each do |val|
@@ -1811,8 +1826,8 @@ module Squared
         private
 
         def run_repl(*args, opts:, banner:, from:, delim: true, **kwargs)
-          op = OptionPartition.new(opts, OPT_RUBY[from], session(from), project: self, strict: strict?,
-                                                                        first: [/\.rb$/])
+          op = OptionPartition.new(opts, OPT_RUBY[from], session(*bundle_args(from)), project: self, strict: strict?,
+                                                                                      first: [/\.rb$/])
           r = []
           r << 'bundler/setup' if !op.arg?('r') && bundle_load
           r.concat(Array(kwargs[:name])) if kwargs[:name]
@@ -1839,14 +1854,15 @@ module Squared
         end
 
         def rake_session(*cmd, **kwargs)
-          session('rake', *preopts, *cmd, **kwargs)
+          session(*bundle_args('rake'), *preopts, *cmd, **kwargs)
         end
 
         def rbs_session(*cmd, opts: nil)
-          return session('rbs', *cmd) unless opts
+          args = bundle_args 'rbs'
+          return session(*args, *cmd) unless opts
 
           op = OptionPartition.new(opts, OPT_RUBY[:rbs], project: self, strict: strict?)
-          [session('rbs', *op.to_a, *cmd), op.extras]
+          [session(*args, *op.to_a, *cmd), op.extras]
         end
 
         def gem_output(*cmd, **kwargs)
@@ -1862,7 +1878,15 @@ module Squared
         end
 
         def rake_output(*cmd, **kwargs)
-          session_output('rake', *cmd, **kwargs)
+          session_output(*bundle_args('rake'), *cmd, **kwargs)
+        end
+
+        def bundle_args(*args)
+          if (val = @bundle[:exec])
+            args.unshift(quote_option('gemfile', val)) unless val == true
+            args.unshift('bundle', 'exec')
+          end
+          args
         end
 
         def bundle_load

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

@@ -21,7 +21,7 @@ module Squared
             include Prompt
 
             def append(target, *args, delim: false, escape: false, quote: true, strip: nil, force: true, double: false,
-                       filter: nil, pass: nil, **)
+                       filter: nil, pass: nil, preserve: true, **)
               return if (ret = args.flatten(1)).empty?
 
               target << '--' if delim && !target.include?('--')
@@ -52,7 +52,7 @@ module Squared
                 if !(pa = val.is_a?(Pathname)) && escape
                   shell_escape(val, quote: quote, double: double)
                 elsif quote || pa
-                  shell_quote(val, force: force, double: double)
+                  shell_quote(val, force: force, double: double, preserve: preserve)
                 else
                   val
                 end
@@ -395,10 +395,10 @@ module Squared
             self
           end
 
-          def append(*args, clear: false, **kwargs, &blk)
+          def append(*args, clear: false, preserve: '"', **kwargs, &blk)
             args = clear ? extras.dup.tap { extras.clear } : extras if args.empty?
             pass = kwargs[:pass] ||= []
-            OptionPartition.append(target, *args, **kwargs, &blk)
+            OptionPartition.append(target, *args, preserve: preserve, **kwargs, &blk)
             errors.concat(pass)
             self
           end

data/lib/squared/workspace/repo.rb

@@ -219,7 +219,7 @@ module Squared
                   opts << "--#{val}"
                 when /^(fetch-)?submodules$/
                   opts << '--fetch-submodules' if repo_submodules?(true, **envargs)
-                when /^(fail-)?fail$/
+                when /^(fail-)?fast$/
                   opts << '--fail-fast'
                 when /^no-(manifest-)?update$/
                   opts << '--no-manifest-update'
@@ -227,7 +227,9 @@ module Squared
                   opts << '--auto-gc'
                 end
               end
-              opts << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}" unless opts.any?(/^--?j(obs)?$/)
+              if (jobs = ENV['REPO_JOBS']) || opts.none?(/^--?j(obs)?$/)
+                opts << "-j#{jobs || Rake::CpuCounter.count}"
+              end
               opts << '--fetch-submodules' if repo_submodules?(**envargs)
               begin
                 repo_run('sync', opts, exception: opts.include?('--fail-fast'), options: stage != 'init')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.7
 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: 4.0.6
+rubygems_version: 4.0.14
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []