squared 0.6.5 → 0.6.6

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

@@ -136,7 +136,7 @@ module Squared
           }.freeze
         }.freeze
         PASS_RUBY = {
-          ruby: %w[I disable enable dump r s].freeze,
+          ruby: %w[e I disable enable dump r s].freeze,
           rake: %w[I libdir r require].freeze,
           irb: %w[I r].freeze,
           rbs: %w[I r repo].freeze,
@@ -161,7 +161,7 @@ module Squared
           end
 
           def bannerargs
-            %i[dependfile gemname].freeze
+            %i[dependfile gemname gemdir].freeze
           end
 
           def config?(val)
@@ -182,6 +182,8 @@ module Squared
           'rubocop' => nil
         })
 
+        attr_reader :gemdir
+
         def initialize(*, autodetect: false, gemspec: nil, steep: 'Steepfile', rubocop: '.rubocop.yml', asdf: 'ruby',
                        **kwargs)
           super
@@ -199,8 +201,8 @@ module Squared
                      elsif gemspec
                        basepath(gemspec.include?('.') ? gemspec : "#{gemspec}.gemspec")
                      end
-          @steepfile = basepath! steep
-          @rubocopfile = basepath!(rubocop) || basepath!(Dir.home, '.rubocop.yml')
+          @steepfile = basepath! steep if steep
+          @rubocopfile = Pathname.new(rubocop).realpath rescue basepath!(Dir.home, '.rubocop.yml') if rubocop
           return unless rakefile && @output[0].nil? && @copy.nil? && !version && !@autodetect
 
           begin
@@ -218,6 +220,14 @@ module Squared
           end
         end
 
+        def gemdir=(val)
+          @gemdir = if val.is_a?(Pathname)
+                      val
+                    else
+                      Pathname.new(val).realdirpath rescue nil
+                    end
+        end
+
         def ref
           Ruby.ref
         end
@@ -305,40 +315,41 @@ module Squared
                       format_desc action, key, 'sig?,path*'
                       task key do |_, args|
                         args = args.to_a
-                        list = []
-                        lib.each do |val|
-                          val = File.join(val, '**/*.rb') unless val.include?('*') || val.end_with?('.rb')
-                          list.concat(Dir.glob(val, base: path))
+                        list = lib.flat_map do |val|
+                          val = File.join(val, '**/*.rb') unless val.include?('*') || val.match?(/\.[a-z\d]+$/i)
+                          Dir.glob(val, base: path)
                         end
-                        if args.empty?
-                          files = choice_index('Select files', list, multiple: true, force: true, series: true,
+                        files = if args.empty?
+                                  choice_index('Select files', list, multiple: true, series: true,
                                                                      accept: [accept_y('Generate?')])
-                        else
-                          files = []
-                          args.each do |val|
-                            if val.include?('*')
-                              files.concat(Dir.glob(val, base: path))
-                            elsif !(file = basepath!(val))
-                              print_error(val, hint: 'not found')
-                            elsif file.directory?
-                              files.concat(file.glob('**/*.rb'))
-                            else
-                              files << val
-                            end
-                          end
-                          list.map! { |val| basepath(val).to_s }
-                          files = files.select { |val| list.include?(basepath(val).to_s) }
-                          if files.empty?
-                            print_error('steep', 'no files matched', hint: "#{key}:check")
-                            exit 1
-                          end
-                          files.uniq!
-                        end
+                                else
+                                  list.map! { |val| basepath(val).to_s }
+                                  [].tap do |out|
+                                    ret = []
+                                    args.each do |val|
+                                      if val.include?('*')
+                                        ret.concat(Dir.glob(val, base: path))
+                                      elsif !(file = basepath!(val))
+                                        print_error(val, hint: 'not found')
+                                      elsif file.directory?
+                                        ret.concat(file.glob('**/*.rb'))
+                                      else
+                                        ret << val
+                                      end
+                                    end
+                                    ret = ret.select { |val| list.include?(basepath(val).to_s) }
+                                    if ret.empty?
+                                      print_error('steep', 'no files matched', hint: "#{key}:check")
+                                      exit 1
+                                    end
+                                    out.replace(ret.uniq)
+                                  end
+                                end
                         sig = if (n = sig.index(args.first))
                                 args.shift
                                 sig[n]
                               elsif sig.size > 1
-                                choice_index('Select a sig', sig, force: true, series: true)
+                                choice_index('Select a sig', sig, series: true)
                               else
                                 sig.first
                               end
@@ -356,9 +367,9 @@ module Squared
 
                       !val.include?('*') && !val.end_with?('/')
                     end
-                    if opts.delete(':') || !args.empty?
-                      args << 'lib/' if args.empty?
-                      list = args.map { |val| val.end_with?('/') ? "#{val}**/*.rb" : val }
+                    if opts.delete(':')
+                      args << (Dir.exist?('lib') ? 'lib/' : '**/*.rb') if args.empty?
+                      list = args.map! { |val| val.end_with?('/') || Dir.exist?(val) ? File.join(val, '**/*.rb') : val }
                                  .flat_map { |val| Dir.glob(val, base: path) }
                       args = choice_index('Select files', list, multiple: true)
                     end
@@ -468,7 +479,7 @@ module Squared
                                        else
                                          a, b, c = choice_index('Select a file', Dir.glob(file || '*.rb', base: path),
                                                                 values: (file ? [] : ['Options']).push('Arguments'),
-                                                                force: true, series: true)
+                                                                series: true)
                                          if file
                                            file = a
                                            b
@@ -478,18 +489,18 @@ module Squared
                                            c
                                          end
                                        end)
-                          ruby(*args, flag: flag, opts: opts, file: file)
+                          ruby(flag, *args, opts: opts, file: file)
                         end
                       when :script
                         format_desc action, flag, 'opts*'
                         task flag do |_, args|
                           command = ENV['RUBY_E'] || readline('Enter script', force: true, multiline: %w[## ;])
-                          ruby(flag: flag, opts: args.to_a, command: command)
+                          ruby(flag, opts: args.to_a, command: command)
                         end
                       when :version
                         format_desc action, flag
                         task flag do
-                          ruby(flag: flag)
+                          ruby flag
                         end
                       end
                     end
@@ -506,8 +517,27 @@ module Squared
           elsif outdated?
             workspace.rev_clear(name, sync: sync)
             cmd = bundle_session 'install'
+            option('binstubs') do |val|
+              next if val == '0' || val == 'false'
+
+              run(bundle_output('binstubs --all', case val
+                                                  when '1', 'true'
+                                                    nil
+                                                  else
+                                                    if val.start_with?('~')
+                                                      val = File.join(Dir.home, val == '~' ? '.bundle' : val[1..-1])
+                                                      if prod?
+                                                        config_set('binstubs', shell_quote(val), global: true)
+                                                        val = nil
+                                                      end
+                                                    else
+                                                      val = basepath val
+                                                    end
+                                                    quote_option('path', val) if val
+                                                  end), exception: false, banner: false, series: true)
+            end
             if prod? && !config_get('without')
-              if RUBY_VERSION > '3'
+              if semgte?('3')
                 config_set 'without', 'development'
               else
                 cmd << '--without=development'
@@ -518,7 +548,7 @@ module Squared
           end
         end
 
-        def copy(from: gemlib, into: @gemdir, override: false, **kwargs)
+        def copy(from: gemlib, into: gemdir, override: false, **kwargs)
           return if @copy == false
 
           glob = kwargs[:include]
@@ -564,7 +594,7 @@ module Squared
             end
             OptionPartition.new(opts, bundleopts(:outdated), cmd << "--#{flag}", project: self)
                            .clear
-          elsif (up = option('u', 'update'))
+          elsif (up = option('u', 'update', prefix: 'bundle'))
             flag = case up
                    when 'major', 'minor'
                      up.to_sym
@@ -586,12 +616,11 @@ module Squared
             col = 0
             buffer = []
             out = ->(val) { sync ? puts(val) : buffer << val }
-            IO.popen(cmd.temp('--no-color')).each do |line|
-              line.chomp!
+            IO.popen(cmd.temp('--no-color')).readlines(chomp: true).each do |line|
               if start > 0
                 n = line.size
                 unless stdin?
-                  line = line[0...col] if col > 0
+                  line = line[0, col] if col > 0
                   data = line.scan(SEM_VER)
                   next unless (cur = data.shift) && (lat = data.shift)
 
@@ -720,6 +749,7 @@ module Squared
         end
 
         def ruby(*args, flag: nil, sync: true, banner: verbose?, with: nil, pass: PASS_RUBY[:ruby], **kwargs)
+          flag = args.shift if !flag && args.first.is_a?(Symbol)
           if flag == :version
             pwd_set do
               out = []
@@ -829,30 +859,36 @@ module Squared
             end
             return
           end
-          op = OptionPartition.new(session_opts(with, args: args, kwargs: kwargs, pass: pass), OPT_RUBY[:ruby],
-                                   ruby_session, project: self, args: true)
-          if (val = kwargs[:file])
-            op.unshift(shell_quote(basepath(val)))
-          elsif (val = kwargs[:command])
-            op << quote_option('e', val)
-          end
-          append = lambda do |file|
-            op.concat(args)
-            unless op.empty?
-              op.exist?(add: true) if file
-              op.append(delim: true, escape: false, quote: false)
+          opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
+          op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, multiple: [/^-e/], args: true,
+                                                                        stdin: true)
+          if kwargs[:command]
+            op << quote_option('e', kwargs[:command])
+          elsif kwargs[:file]
+            if op.include?('-')
+              op.add_path(kwargs[:file])
+            else
+              op.unshift(basepath(kwargs[:file]))
             end
           end
-          case flag
-          when :file
-            append.call(false)
-          when :script
-            op.clear
+          op.concat(args)
+          if op.include?('-')
+            op.exist?(add: true)
           else
-            append.call(true)
-            print_run(op, banner, **kwargs)
+            op.append_any { |val| OptionPartition.parse_arg!('e', val) }
+            if op.arg?('e')
+              op.clear
+            else
+              op.append(delim: true, escape: kwargs.fetch(:escape, false), quote: kwargs.fetch(:quote, false))
+            end
           end
-          run_rb(sync: sync, banner: banner, from: flag.is_a?(Symbol) ? :"ruby:#{flag}" : :ruby)
+          from = if flag
+                   :"ruby:#{flag}"
+                 else
+                   print_run(op, banner, **kwargs)
+                   :ruby
+                 end
+          run_rb(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception), from: from)
         end
 
         def gem(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1085,7 +1121,7 @@ module Squared
               file = basepath(if !n && (spec = gemspec)
                                 "#{spec.name}-#{spec.version}.gem"
                               else
-                                choice_index('Select a file', Dir.glob('*.gem', base: path), force: true)
+                                choice_index 'Select a file', Dir.glob('*.gem', base: path)
                               end)
             else
               file = basepath(op.shift.yield_self { |val| val.include?('.') ? val : "#{val}.gem" })
@@ -1144,7 +1180,7 @@ module Squared
                          else
                            [name[0, n], name[n.succ..-1]]
                          end
-              op.adjoin(pre, shell_option('version', ver))
+              op.adjoin(pre, basic_option('version', ver))
                 .clear
             end
             if flag == :install
@@ -1152,7 +1188,7 @@ module Squared
             else
               op.append
             end
-            op << '--' << post if post
+            op.delim << post if post
           when :check, :cleanup, :contents, :fetch, :list, :lock, :rdoc
             op.append
           when :dependency, :info, :search
@@ -1190,7 +1226,7 @@ module Squared
           end
           op.clear(errors: true) if gems
           print_run(op, banner, **kwargs)
-          run_rb(sync: sync, banner: banner, from: from)
+          run_rb(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception), from: from)
         end
 
         def bundle(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1289,7 +1325,8 @@ module Squared
             op.clear
           end
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, from: :"bundle:#{flag}").tap { |ret| success?(ret, banner, output) }
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception), from: :"bundle:#{flag}")
+            .tap { |ret| success?(ret, banner, output) }
         end
 
         def rake(*args, sync: true, banner: verbose?, with: nil, pass: PASS_RUBY[:rake], **kwargs)
@@ -1299,7 +1336,8 @@ module Squared
           op.concat(args)
           op.append(escape: true)
           print_run(op, banner, **kwargs)
-          run(op, ({ 'BANNER' => '0' } unless banner), sync: sync, banner: false, from: :rake)
+          var = { 'BANNER' => '0' } unless banner
+          run(op, var, sync: sync, banner: false, exception: kwargs.fetch(:exception, exception), from: :rake)
         end
 
         def irb(*args, banner: verbose?, with: nil, pass: PASS_RUBY[:irb], **kwargs)
@@ -1313,7 +1351,7 @@ module Squared
           op.concat(args)
           op.append(delim: true)
           print_run(op, banner, **kwargs)
-          run(banner: false, from: :irb)
+          run(banner: false, exception: kwargs.fetch(:exception, exception), from: :irb)
         end
 
         def rbs(flag, *args, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1331,11 +1369,11 @@ module Squared
             sig = args.shift
             y = option('y', ignore: false)
             i = 1
-            args.map { |val| basepath(val).relative_path_from(path) }.each do |file|
+            args.map! { |val| basepath(val).relative_path_from(path) }.each do |file|
               dir = basepath sig, file.dirname
               dir.mkpath unless dir.exist?
               base = file.basename.to_s
-              rbs = dir.join("#{base.stripext}.rbs")
+              rbs = dir + "#{base.stripext}.rbs"
               status = if rbs.exist?
                          case y
                          when '0', 'false'
@@ -1362,7 +1400,7 @@ module Squared
             op.clear
               .append(*args)
             print_run(op, banner, **kwargs)
-            run(banner: false, from: :"rbs:#{flag}")
+            run(banner: false, exception: kwargs.fetch(:exception, exception), from: :"rbs:#{flag}")
           end
         end
 
@@ -1370,6 +1408,9 @@ module Squared
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
           op = OptionPartition.new(opts, OPT_RUBY[:rubocop], session('rubocop'), project: self,
                                                                                  no: OPT_RUBY[:no][:rubocop])
+          if @rubocopfile && !op.arg?('c', 'config') && !rootpath('.rubocop.yml', ascend: true).exist?
+            op.add_path(@rubocopfile, option: 'c')
+          end
           op.concat(args)
           op.each do |val|
             if basepath(val).file?
@@ -1383,13 +1424,12 @@ module Squared
           op.append(delim: true)
             .clear(errors: true)
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, from: :rubocop)
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception), from: :rubocop)
         end
 
         def gemspec
-          return @gemspec || nil unless @gemspec.nil?
-
-          @gemspec = gemfile && Gem::Specification.load(gemfile.to_s) rescue false
+          @gemspec = !gemfile.nil? && Gem::Specification.load(gemfile.to_s) rescue false if @gemspec.nil?
+          @gemspec || nil
         end
 
         def gemname
@@ -1402,7 +1442,7 @@ module Squared
 
         def copy?
           return true if @copy.is_a?(Hash) ? copy[:into] : super
-          return gemdir? if @gemdir
+          return gemdir? if gemdir
 
           if version
             begin
@@ -1418,8 +1458,8 @@ module Squared
                   val =~ /(\d\.\d)\.[^.]+$/ && File.join(val, 'lib/ruby/gems', "#{$1}.0")
                 end
               when /bundler?/
-                pwd_set { `bundle env` }[/^\s+Gem Home\s+(.+)$/, 1]
-              end.tap { |val| @gemdir = Pathname.new(val) if val }
+                pwd_set { `bundle env` }[/^\s+Gem Path\s+([^#{File::PATH_SEPARATOR}]+)/, 1]
+              end.tap { |val| self.gemdir = val if val }
             rescue StandardError => e
               log.debug e
             end
@@ -1428,11 +1468,14 @@ module Squared
           return false unless @autodetect
 
           set = lambda do |val, path|
+            dir = Pathname.new(path.strip) + gempath
+            return false unless dir.writable?
+
             if (ver = version) && ver != val
               log.warn "using version #{val}".subhint("given #{ver}")
             end
             self.version = val
-            @gemdir = Pathname.new(path.strip) + gempath
+            self.gemdir = dir
           end
           if version
             opt = gempwd
@@ -1447,30 +1490,30 @@ module Squared
                   next unless out =~ /\(#{Regexp.escape(val)}[^)]*\):([^\n]+)/
 
                   set.call(val, $1)
-                  return gemdir? if @gemdir
+                  return gemdir? if gemdir
                 end
             end
-            @gemdir = Pathname.new(Gem.dir) + gempath
+            self.gemdir = Pathname.new(Gem.dir) + gempath
           else
             parse = lambda do |path|
-              next unless path
+              return false unless path
 
-              lib = Regexp.new(['', 'gems', "#{gemname}-([^#{File::SEPARATOR}]+)", ''].join(File::SEPARATOR))
-              if (ver = path[lib, 1]) && (val = path[/\A(.+)#{gempath(ver[1])}/, 1])
+              ver = path[Regexp.new(['', 'gems', "#{gemname}-([^#{File::SEPARATOR}]+)", ''].join(File::SEPARATOR)), 1]
+              if ver && (val = path[/\A(.+)#{Regexp.escape(gempath(ver))}/, 1])
                 set.call(ver, val)
               end
             end
-            if RUBY_VERSION >= '2.6'
+            if semgte?('2.6')
               target = RUBY_VERSION.start_with?('2.6') ? RubyVM : $LOAD_PATH
               parse.call(target.resolve_feature_path(gemname)&.last)
             end
-            unless @gemdir || pwd_set { parse.call(`#{bundle_output('show', gemname)}`) }
+            unless gemdir || pwd_set { parse.call(`#{bundle_output('show', gemname)}`) }
               raise_error Errno::ENOENT, 'gems home'
             end
           end
         rescue StandardError => e
           log.error e
-          @version = nil
+          self.version = nil
           @gemdir = nil
           @autodetect = false
         else
@@ -1544,8 +1587,8 @@ module Squared
           end
         end
 
-        def config_set(key, *val)
-          run(bundle_output('config set', key, *val), banner: false, series: true)
+        def config_set(key, *val, global: false)
+          run(bundle_output('config', ('--global' if global), 'set', key, *val), banner: false, series: true)
         end
 
         def preopts
@@ -1557,10 +1600,11 @@ module Squared
         end
 
         def rakefile
-          return @rakefile || nil unless @rakefile.nil?
-
-          file = Rake::Application::DEFAULT_RAKEFILES.find { |val| exist?(val) }
-          @rakefile = file ? basepath(file) : false
+          if @rakefile.nil?
+            file = Rake::Application::DEFAULT_RAKEFILES.find { |val| exist?(val) }
+            @rakefile = !file.nil? && basepath(file)
+          end
+          @rakefile || nil
         end
 
         def rakepwd
@@ -1621,11 +1665,12 @@ module Squared
         end
 
         def gemfile
-          return @gemfile || nil unless @gemfile.nil?
-
-          @gemfile = [project, name].map! { |val| basepath("#{val}.gemspec") }
-                                    .concat(path.glob('*.gemspec'))
-                                    .find(&:exist?) || false
+          if @gemfile.nil?
+            @gemfile = [project, name].map! { |val| basepath("#{val}.gemspec") }
+                                      .concat(path.glob('*.gemspec'))
+                                      .find(&:exist?) || false
+          end
+          @gemfile || nil
         end
 
         def gemlib
@@ -1642,9 +1687,9 @@ module Squared
         end
 
         def gemdir?
-          return false unless @gemdir
+          return false unless gemdir
 
-          @gemdir.exist? && !@gemdir.empty?
+          gemdir.exist? && !gemdir.empty? && gemdir.writable?
         end
       end
 

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

@@ -27,9 +27,11 @@ module Squared
           def multiple=(val)
             case val
             when Enumerable
-              @multiple.concat(val.to_a.map(&:to_s))
+              @multiple.concat(val.to_a.map { |val| val.is_a?(Regexp) ? val : val.to_s })
             when String, Symbol, Pathname
               @multiple << val.to_s
+            when Regexp
+              @multiple << val
             when NilClass, FalseClass
               @multiple.clear
             end
@@ -119,7 +121,7 @@ module Squared
               extras.concat(if n == 0
                               data
                             else
-                              super(data[0...n])
+                              super(data[0, n])
                               data[n..-1]
                             end)
               self
@@ -131,35 +133,51 @@ module Squared
           def <<(obj)
             return super if extras.empty? && !extras?(obj)
 
-            unless !extras.include?(@partition) && include?(obj) && @uniq.match?(s = obj.to_s) && !multiple.include?(s)
+            unless !extras.include?(@partition) && include?(obj) && @uniq.match?(s = obj.to_s) && !multiple?(s)
               extras << obj
             end
             self
           end
 
+          def size
+            super + extras.size
+          end
+
+          def include?(obj)
+            return true if super
+            return extras.include?(obj) unless (n = extras.index(@partition))
+
+            extras[0..n].include?(obj)
+          end
+
+          def multiple?(val)
+            multiple.any? { |obj| obj.is_a?(Regexp) ? obj.match?(val) : obj == val }
+          end
+
           def to_a
             pass
           end
 
           def to_s
-            pass.join(@delim)
+            to_a.join(@delim)
           end
 
           def to_enum(*args)
-            pass.to_enum(*args)
+            to_a.to_enum(*args)
           end
 
           def to_json(*args)
-            pass.to_json(*args)
+            to_a.to_json(*args)
           end
 
           def to_yaml(*args)
-            pass.to_yaml(*args)
+            to_a.to_yaml(*args)
           end
 
           alias add :<<
           alias add? :<<
           alias push :<<
+          alias member? include?
           alias concat merge
 
           private
@@ -169,7 +187,7 @@ module Squared
           end
 
           def extras?(obj)
-            obj == @partition || (include?(obj) && (!@uniq.match?(s = obj.to_s) || multiple.include?(s)))
+            obj == @partition || (include?(obj) && (!@uniq.match?(s = obj.to_s) || multiple?(s)))
           end
         end
       end