squared 0.9.0 → 0.9.2

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

@@ -227,7 +227,7 @@ module Squared
           serve_set kwargs[:serve]
           gemfile_set kwargs[:gemspec]
           self.autodetect = autodetect
-          @bundle = { exec: exec.is_a?(String) ? basepath!(exec) : exec }
+          @bundle = { exec: exec }
           @steepfile = basepath! steep if steep
           rubocop = rootpath('.rubocop.yml', ascend: Dir.home) if rubocop == true
           @rubocopfile = basepath! rubocop if rubocop
@@ -304,7 +304,7 @@ module Squared
                           elsif exception?
                             indexerror n, tasks
                           else
-                            log.warn "rake task #{n} of #{tasks.size}".subhint('out of range')
+                            log.debug "rake task #{n} of #{tasks.size}".subhint('out of range')
                             opts.clear
                             next
                           end
@@ -572,10 +572,10 @@ module Squared
                                       when ';', /^#+$/
                                         args.shift
                                       else
-                                        %w[## ;]
+                                        Prompt.multiline || %w[## ;]
                                       end
                           unless (command = ENV['RUBY_E'])
-                            command = if Prompt.reline.respond_to?(:readmultiline)
+                            command = if Prompt.multiline?
                                         require 'ripper'
                                         readline('ruby>', force: true, multiline: multiline) do |code|
                                           next if code.strip.empty? || !Ripper.sexp(code)
@@ -956,7 +956,7 @@ module Squared
                 end
                 s = '%2d. %s' % [start, line]
                 if ia
-                  unless confirm_semver(s.ljust(col + 4 + line.size - n), type)
+                  unless confirm_semver(s.ljust(col + ARG[:TAB] + line.size - n), type)
                     start += 1
                     next
                   end
@@ -1049,7 +1049,7 @@ module Squared
             if op.arg?('e')
               op.clear
             else
-              op.append(delim: true, escape: kwargs.fetch(:escape, false), quote: kwargs.fetch(:quote, false))
+              op.append(delim: true, context: kwargs)
             end
           end
           print_run(op, banner, **kwargs) unless flag || op.stdout
@@ -1394,10 +1394,10 @@ module Squared
             end
             if flag == :install
               op.append_any(escape: true)
+              op.delim << post if post
             else
               op.append(escape: true)
             end
-            op.delim << post if post
           when :check, :cleanup, :contents, :fetch, :list, :lock, :rdoc
             op.append
           when :dependency, :info, :search
@@ -1601,7 +1601,7 @@ module Squared
 
         def rdbg(*args, banner: verbose?, with: nil, pass: PASS_RUBY[:rdbg], **kwargs)
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          cmd = session 'rdbg'
+          cmd = session(*bundle_args('rdbg'))
           args.each_with_index do |val, i|
             break if val == '--'
             next unless exist?(val, type: 'f')
@@ -1630,7 +1630,7 @@ module Squared
           case flag
           when :prototype
             sig = args.shift
-            y = option('y', ignore: false)
+            y = option('y', 'yes', ignore: false)
             i = 1
             args.map { |val| basepath(val).relative_path_from(path) }.each do |file|
               dir = basepath sig, file.dirname
@@ -1769,7 +1769,7 @@ module Squared
         end
 
         def gemname
-          @gemname ||= ((spec = gemspec) ? spec.name : project)
+          @gemname ||= gemspec&.name || project
         end
 
         def project
@@ -1881,7 +1881,7 @@ module Squared
         end
 
         def ruby_session(*cmd, **kwargs)
-          session('ruby', *preopts, *cmd, **kwargs)
+          session(*bundle_args('ruby'), *preopts, *cmd, **kwargs)
         end
 
         def gem_session(*cmd, **kwargs)
@@ -1899,11 +1899,10 @@ module Squared
         end
 
         def rbs_session(*cmd, opts: nil)
-          args = bundle_args 'rbs'
-          return session(*args, *cmd) unless opts
+          return session(*bundle_args('rbs'), *cmd) unless opts
 
           op = OptionPartition.new(opts, OPT_RUBY[:rbs], project: self, strict: strict?)
-          [session(*args, *op.to_a, *cmd), op.extras]
+          [session(*bundle_args('rbs'), *op.to_a, *cmd), op.extras]
         end
 
         def gem_output(*cmd, **kwargs)
@@ -1911,7 +1910,7 @@ module Squared
         end
 
         def ruby_output(*cmd, **kwargs)
-          session_output('ruby', *cmd, **kwargs)
+          session_output(*bundle_args('ruby'), *cmd, **kwargs)
         end
 
         def bundle_output(*cmd, **kwargs)
@@ -1923,11 +1922,22 @@ module Squared
         end
 
         def bundle_args(*args)
-          if (val = @bundle[:exec])
-            args.unshift(quote_option('gemfile', val)) unless val == true
-            args.unshift('bundle', 'exec')
+          gemfile = ARG[:APP][:ruby_gemfile]
+          val = gemfile.is_a?(Hash) ? gemfile : @bundle[:exec]
+          return args unless gemfile || (val && gemfile != false)
+
+          app = args.first
+          if val.is_a?(Hash)
+            val = val[app.to_s] || val[app.to_sym]
+          elsif app == 'ruby' && !gemfile
+            return args
           end
-          args
+          case val
+          when String, Pathname
+            val = basepath!(val, type: 'f')
+            args.unshift("--gemfile=#{shell_escape(val.relative_path_from(path), quote: true)}") if val
+          end
+          val ? args.unshift('bundle', 'exec') : args
         end
 
         def bundle_load
@@ -2121,7 +2131,7 @@ module Squared
         def serve?
           !Gem::Specification.find_by_name('webrick').nil?
         rescue Gem::MissingSpecError => e
-          log.warn e if @serve
+          log.debug e if @serve
           false
         end
       end

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

@@ -58,10 +58,10 @@ module Squared
               ret.map! do |val|
                 next val if opt?(val)
 
-                if !(pa = val.is_a?(Pathname)) && escape
-                  shell_escape(val, quote: quote, double: double)
-                elsif quote || pa
+                if (quote && !escape) || val.is_a?(Pathname)
                   shell_quote(val, double: double, **kwargs)
+                elsif escape
+                  shell_escape(val, quote: quote, double: double)
                 else
                   val
                 end
@@ -248,7 +248,7 @@ module Squared
           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], auto: [], regexp: {}, enum: {}, stdin: false, &blk)
             @extras = []
             @values = []
             bare = []
@@ -265,8 +265,6 @@ module Squared
             bl = []
             ex = []
             ml = []
-            re = {}
-            ar = {}
             sw = {}
             se = {}
             list.flat_map do |val|
@@ -288,10 +286,10 @@ module Squared
               end
               if (n = val.index('='))
                 flag = val[0, n]
-                enum = flag.split(':')
-                mod = if enum.size > 1
-                        pre = enum.shift
-                        enum.map { |s| "#{pre}:#{s}" }
+                opt = flag.split(':')
+                mod = if opt.size > 1
+                        pre = opt.shift
+                        opt.map { |s| "#{pre}:#{s}" }
                       else
                         [flag]
                       end
@@ -326,14 +324,14 @@ module Squared
                     pat = eval(val)
                     raise SyntaxError unless pat.is_a?(Regexp)
 
-                    mod.each { |key| re[key] = pat }
+                    mod.each { |key| regexp[key] = pat }
                   rescue SyntaxError
                     warn "#{self.class}: invalid pattern (#{val})"
                   end
                 when '{'
                   group = val[(n + 2)..].chomp!('}')&.split(',')
                   if group
-                    mod.each { |key| ar[key] = group }
+                    mod.each { |key| enum[key] = group }
                   else
                     warn "#{self.class}: invalid group (#{val})"
                   end
@@ -440,8 +438,8 @@ module Squared
                     else
                       push opt
                     end
-                  elsif !ar.empty? && has.call(ar.keys, key)
-                    group = get.call(ar)
+                  elsif !enum.empty? && has.call(enum.keys, key)
+                    group = get.call(enum)
                     if group.include?(val)
                       add shell_option(key, val, force: false, **kwargs)
                     elsif @strict
@@ -449,10 +447,10 @@ module Squared
                     else
                       push opt
                     end
-                  elsif !re.empty? && has.call(re.keys, key)
-                    pat = get.call(re)
+                  elsif !regexp.empty? && has.call(regexp.keys, key)
+                    pat = get.call(regexp)
                     if val.match?(pat)
-                      add quote_option(key, val, **kwargs)
+                      add __send__(kwargs[:merge] ? :basic_option : :quote_option, key, val, **kwargs)
                     elsif @strict
                       clear([opt], hint: "match != /#{pat.source}/")
                     else
@@ -489,7 +487,11 @@ module Squared
             self
           end
 
-          def append(*args, clear: false, preserve: '"', **kwargs, &blk)
+          def append(*args, clear: false, preserve: '"', context: nil, **kwargs, &blk)
+            if context
+              kwargs[:escape] = context.fetch(:escape, false) unless kwargs.key?(:escape)
+              kwargs[:quote] = context.fetch(:quote, false) unless kwargs.key?(:quote)
+            end
             args = clear ? extras.dup.tap { extras.clear } : extras if args.empty?
             pass = kwargs[:pass] ||= []
             OptionPartition.append(target, *args, preserve: preserve, **kwargs, &blk)

metadata

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