squared 0.5.3 → 0.5.5

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

@@ -25,8 +25,8 @@ module Squared
           common: %w[no-color V|verbose retry=i].freeze,
           install: %w[frozen no-cache no-prune system binstubs=p? path=p standalone=q? target-rbconfig=p trust-policy=b
                       with=q without=q].freeze,
-          install_base: %w[full-index quiet retry gemfile=p j|jobs=i].freeze,
-          update: %w[conservative local pre redownload ruby strict bundler=b? g|group=q source=b].freeze,
+          install_base: %w[force full-index quiet redownload retry gemfile=p j|jobs=i].freeze,
+          update: %w[conservative local pre ruby strict bundler=b? g|group=q source=b].freeze,
           outdated: %w[filter-major filter-minor filter-patch groups local parseable pre only-explicit strict
                        update-strict g|group=q source=b].freeze,
           exec: %w[gemfile=p].freeze,
@@ -91,7 +91,7 @@ module Squared
           'irb' => nil
         })
 
-        def initialize(*, autodetect: false, gemspec: nil, **kwargs)
+        def initialize(*, autodetect: false, gemspec: nil, asdf: 'ruby', **kwargs)
           super
           if @pass.include?(Ruby.ref)
             initialize_ref Ruby.ref
@@ -102,7 +102,13 @@ module Squared
           end
           dependfile_set GEMFILE
           @autodetect = autodetect
-          @gemfile = path + gemspec if gemspec
+          @gemfile = if gemspec == false
+                       false
+                     elsif gemspec
+                       path + (gemspec.include?('.') ? gemspec : "#{gemspec}.gemspec")
+                     elsif (gemspec = path + "#{name}.gemspec").exist? || (gemspec = path + "#{project}.gemspec").exist?
+                       gemspec
+                     end
           return if !@output[0].nil? || !@copy.nil? || version || @autodetect || !rakefile
 
           begin
@@ -126,7 +132,7 @@ module Squared
 
         def populate(*, **)
           super
-          return unless outdated? && ref?(Ruby.ref)
+          return unless (outdated? && ref?(Ruby.ref)) || @only
 
           namespace name do
             Ruby.subtasks do |action, flags|
@@ -140,21 +146,21 @@ module Squared
                   format_desc action, nil, "task+,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
                     if args.command == '#'
-                      format_list(read_rakefile, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile,
-                                                                                 each: ->(val) { val[0] + val[1].to_s })
+                      format_list(raketasks, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile,
+                                                                             each: ->(val) { val[0] + val[1].to_s })
                     else
                       args, opts = args.to_a.partition { |val| indexitem(val) }
                       if args.empty?
                         rake(opts: opts)
                       else
-                        list = read_rakefile
+                        tasks = raketasks
                         while (n, pre = indexitem(args.shift))
-                          if (item = list[n - 1])
+                          if (item = tasks[n - 1])
                             cmd = pre ? "#{pre} #{item.first}" : item.first
                           elsif exception
-                            indexerror n, list
+                            indexerror n, tasks
                           else
-                            log.warn "rake task #{n} of #{list.size} (out of range)"
+                            log.warn "rake task #{n} of #{tasks.size} (out of range)"
                             next
                           end
                           if opts.empty?
@@ -171,7 +177,7 @@ module Squared
                   format_desc action, nil, 'opts*,args*|:'
                   task action do |_, args|
                     args = args.to_a
-                    name = basepath('lib').join("#{gemname}.rb").exist? ? gemname : nil
+                    name = gemlib.any? { |file| basepath(file).join("#{gemname}.rb").exist? } ? gemname : nil
                     irb(name, args, args: (readline('Enter file [arguments]', force: false) if args.delete(':')))
                   end
                 else
@@ -209,7 +215,7 @@ 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?|:'
                                                                   when :update then 'name*'
                                                                   end)
                         task flag do |_, args|
@@ -275,7 +281,7 @@ module Squared
           end
         end
 
-        def copy(from: 'lib', into: @gemdir, override: false, **kwargs)
+        def copy(from: gemlib, into: @gemdir, override: false, **kwargs)
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
@@ -426,7 +432,16 @@ module Squared
 
         def install(flag, opts = [])
           bundle_session 'install', "--#{flag}"
-          append_bundle opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:install] + OPT_BUNDLE[:common]
+          op = append_bundle opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:install] + OPT_BUNDLE[:common]
+          if op.arg?('force')
+            op.delete('--force')
+            if flag != :redownload
+              op << '--redownload'
+            elsif (lock = basepath('Gemfile.lock')).exist?
+              config = basepath('.bundle', 'config')
+              lock.delete unless config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
+            end
+          end
           run_rb(from: :install)
         end
 
@@ -451,16 +466,44 @@ module Squared
           when :version
             pwd_set do
               out = []
-              [
+              order = { 'rvm' => -1, 'rbenv' => -1, 'chruby' => -1, 'asdf' => -1 }
+              ENV.fetch('PATH', '').split(':').each_with_index do |val, index|
+                order.each_key do |key|
+                  if val.match?(%r{[/.]#{key}/})
+                    order[key] = index
+                    break
+                  end
+                end
+              end
+              paths = [
                 '$HOME/.rvm/bin/rvm',
                 '/usr/local/rvm/bin/rvm',
                 '/usr/share/rvm/bin/rvm',
                 "#{ENV.fetch('RBENV_ROOT', '$HOME/.rbenv')}/bin/rbenv",
                 '/usr/bin/rbenv',
-                '/usr/local/share/chruby/chruby.sh',
-                "#{ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf')}/plugins/ruby/bin/install",
-                ''
-              ].each do |val|
+                '/usr/local/share/chruby/chruby.sh'
+              ]
+              paths << "#{ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf')}/installs/#{@asdf.first}" if @asdf
+              paths.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
+              .push('')
+              .each do |val|
                 next unless val.empty? || File.exist?(val.sub('$HOME', Dir.home))
 
                 trim = ->(s) { s[/\A\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/\A([a-z]+)-/i, '\1 ') }
@@ -475,12 +518,15 @@ module Squared
                                  when 'chruby.sh'
                                    chruby = session_output 'source', val
                                    `#{chruby.with('ruby --version')}`
-                                 when 'install'
-                                   ver = '.tool-versions'
-                                   `asdf current ruby`[/ruby\s+\S+/, 0].sub(/\s+/, ' ')
                                  else
-                                   ver = nil
-                                   `ruby --version`
+                                   if @asdf
+                                     cmd = 'asdf'
+                                     ver = '.tool-versions'
+                                     `asdf current #{@asdf.first}`[/\A\S+\s+\S+/, 0].sub(/\s+/, ' ')
+                                   else
+                                     ver = nil
+                                     `ruby --version`
+                                   end
                                  end)
                 break if workspace.windows?
 
@@ -488,7 +534,7 @@ module Squared
                   out << trim.call(case cmd
                                    when 'chruby.sh'
                                      `#{chruby.with('chruby --version')}`.sub(':', '')
-                                   when 'install'
+                                   when 'asdf'
                                      "asdf #{`asdf version`.delete_prefix('v')}"
                                    else
                                      `#{cmd} --version`
@@ -500,8 +546,8 @@ module Squared
                                          `rbenv which ruby`
                                        when 'chruby.sh'
                                          `#{chruby.with('which ruby')}`
-                                       when 'install'
-                                         `asdf which ruby`
+                                       when 'asdf'
+                                         `asdf which #{@asdf.first}`
                                        else
                                          `which ruby`
                                        end)
@@ -566,7 +612,7 @@ module Squared
             minor = 0
             patch = 0
             update = []
-            pwd_set(pass: !pwd.nil?, from: from) do
+            pwd_set(pass: !gempwd.nil?, from: from) do
               items = [[%w[Gem Current Latest], nil]]
               IO.popen(cmd.done).each do |line|
                 if line =~ /^(\S+) \((\S+) < ([^)]+)\)$/
@@ -685,25 +731,25 @@ module Squared
             on :last, from
             return
           when :build
-            if !op.empty?
-              op << shell_quote(path + op.shift)
-              op.clear(pass: false)
-            elsif (file = gemfile)
-              op << shell_quote(file)
+            if op.empty?
+              op.add_path(gemfile)
+            else
+              op.add_path(op.shift)
+                .clear(pass: false)
             end
           when :push
-            if op.empty?
-              file = path + (if (spec = gemspec)
+            if op.empty? || (n = op.index(':'))
+              file = path + (if !n && (spec = gemspec)
                                "#{spec.name}-#{spec.version}.gem"
                              else
                                choice_index('Select a file', Dir.glob('*.gem', base: path), force: true)
                              end)
             else
-              file = path + op.shift
+              file = path + op.shift.yield_self { |val| val.include?('.') ? val : "#{val}.gem" }
               raise_error('gem not found', hint: file) unless file.exist?
               raise_error("unknown args: #{op.join(', ')}", hint: flag) unless op.empty?
             end
-            op << shell_quote(file)
+            op.add_path(file)
             run_rb(from: from, interactive: "Push #{sub_style(gemname, styles: theme[:active])}")
             return
           when :exec
@@ -730,7 +776,7 @@ module Squared
             raise_error('missing gemname', hint: flag) if op.empty?
             case flag
             when :install, :uninstall, :pristine
-              post = readline('Enter command [args]', force: true) if flag == :install && op.extras.delete(':')
+              post = readline('Enter command [args]', force: true) if flag == :install && op.remove(':')
               if op.arg?('all')
                 if flag == :pristine
                   append_repeat 'skip', op.extras
@@ -797,7 +843,7 @@ module Squared
           run_s(args, banner: false, from: :rake)
         end
 
-        def irb(name = nil, opts = [], path: basepath('lib'), args: nil)
+        def irb(name = nil, opts = [], path: gemlib, args: nil)
           op = OptionPartition.new(opts, OPT_RUBY[:irb], session('irb'), project: self, first: [/\.rb$/])
           r = args ? [] : ['bundler/setup']
           r << name if name
@@ -815,15 +861,11 @@ module Squared
         def gemspec
           return @gemspec unless @gemspec.nil?
 
-          begin
-            if (file = gemfile)
-              require 'rubygems'
-              @gemspec = Gem::Specification.load(file.to_s)
-            end
-          rescue StandardError => e
-            log.debug e
-          end
-          @gemspec ||= false
+          @gemspec = if (file = gemfile)
+                       Gem::Specification.load(file.to_s) rescue false
+                     else
+                       false
+                     end
         end
 
         def gemname
@@ -885,7 +927,6 @@ module Squared
                   end
               end
             end
-            require 'rubygems'
             @gemdir = Pathname.new(Gem.dir) + gempath
           else
             parse = lambda do |path|
@@ -940,6 +981,7 @@ module Squared
           else
             op.clear
           end
+          op
         end
 
         def ruby_session(*cmd, **kwargs)
@@ -981,27 +1023,10 @@ module Squared
           session_output('rake', *cmd, **kwargs)
         end
 
-        def read_rakefile
-          @read_rakefile ||= [].tap do |ret|
-            pwd = rakepwd
-            pwd_set(pass: !pwd.nil?) do
-              IO.popen(rake_output(pwd, '-AT').to_s).each do |line|
-                next unless line =~ /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/
-
-                ret << [$1, $2]
-              end
-            end
-          end
-        end
-
         def preopts
           verbosetype > 1 && !session_arg?('quiet') ? ['--verbose'] : []
         end
 
-        def gemdir?
-          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
-        end
-
         def variables
           (super + %i[version autodetect]).freeze
         end
@@ -1015,13 +1040,26 @@ module Squared
         end
 
         def rakepwd
-          return if pwd? || Rake::VERSION < '13.0.4'
+          return unless !pwd? && semgte?(Rake::VERSION, '13.0.4')
 
           quote_option 'C', path
         end
 
+        def raketasks
+          @raketasks ||= [].tap do |ret|
+            opt = rakepwd
+            pwd_set(pass: !opt.nil?) do
+              IO.popen(rake_output(opt, '-AT').to_s).each do |line|
+                next unless line =~ /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/
+
+                ret << [$1, $2]
+              end
+            end
+          end
+        end
+
         def gempwd
-          return if pwd? || Gem::VERSION < '3.4.2'
+          return unless !pwd? && semgte?(Gem::VERSION, '3.4.2')
 
           quote_option 'C', path
         end
@@ -1034,9 +1072,23 @@ module Squared
                                     .find { |file| File.exist?(file) } || false
         end
 
+        def gemlib
+          @gemlib ||= begin
+            lib = Set.new(['lib'])
+            if (spec = gemspec)
+              lib.merge(spec.require_paths || [])
+            end
+            lib.select { |file| basepath(file).exist? }
+          end
+        end
+
         def gempath(val = version)
           File.join('gems', "#{gemname}-#{val}")
         end
+
+        def gemdir?
+          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
+        end
       end
 
       Application.implement Ruby

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

@@ -10,6 +10,9 @@ module Squared
           include Common::Shell
           extend Forwardable
 
+          OPT_VALUE = /\A([^=]+)=(.+)\z/
+          private_constant :OPT_VALUE
+
           class << self
             include Common::Format
             include Shell
@@ -45,6 +48,15 @@ module Squared
               val.map { |s| s.sub(/\A-([a-z\d])(.+)\z/i, '\1=\2').sub(/\A--?/, '') }.reject(&:empty?)
             end
 
+            def select(list, bare: true, no: true, single: false, double: false)
+              ret = bare ? list.grep_v(/=/) : list.grep(/=/).map! { |val| val.split('=', 2).first }
+              ret.map! { |val| val.split('|', 2).last }
+              ret = ret.grep_v(/^no-/) unless no
+              return ret if single == double
+
+              ret.select { |val| single ? val.size == 1 : val.size > 1 }
+            end
+
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               unless s.empty?
@@ -54,14 +66,21 @@ module Squared
               s = target.to_a.compact
               r.any? { |pat| s.any?(pat) }
             end
+
+            def pattern?(val)
+              val.match?(/(?:\A\^|\$\z)/) || val.match?(/(?:\.[*+]|\(\?:|\\[dsw]|\[.+\]|\{\d+,?\d*\})/)
+            end
           end
 
           attr_reader :target, :extras, :found, :errors, :values, :project, :path
 
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
-                         :merge, :delete, :delete?, :delete_if, :grep, :inspect, :to_a, :to_s
+                         :merge, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
           def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :last, :shift, :unshift,
-                         :pop, :push, :index, :delete_at, :join, :map, :map!, :select, :reject, :size
+                         :pop, :push, :concat, :index, :delete_at, :join, :map, :map!, :select, :reject, :size
+
+          def_delegator :@extras, :delete, :remove
+          def_delegator :@extras, :delete_if, :remove_if
 
           def initialize(opts, list, target = Set.new, project: nil, path: nil, **kwargs, &blk)
             @target = target.is_a?(Set) ? target : target.to_set
@@ -139,35 +158,35 @@ module Squared
             skip = false
             opts.each do |opt|
               next skip = true if opt == '--'
-              next @extras << opt if skip
+              next push opt if skip
 
               if single&.match?(opt)
-                target << "-#{opt}"
+                add "-#{opt}"
               elsif bare.include?(opt)
-                target << (opt.size == 1 ? "-#{opt}" : "--#{opt}")
+                add(opt.size == 1 ? "-#{opt}" : "--#{opt}")
               elsif opt.start_with?('no-') && no.include?(name = opt[3..-1])
-                target << "--no-#{name}"
+                add "--no-#{name}"
               else
-                if opt =~ /\A([^=]+)=(.+)\z/
+                if opt =~ OPT_VALUE
                   key = $1
                   val = $2
                   merge = m.include?(key)
                   if e.include?(key)
-                    target << shell_option(key, val, merge: merge)
+                    add shell_option(key, val, merge: merge)
                   elsif q.include?(key)
-                    target << quote_option(key, val, double: qq.include?(key), merge: merge)
+                    add quote_option(key, val, double: qq.include?(key), merge: merge)
                   elsif p.include?(key) && path
-                    target << quote_option(key, path + val, merge: merge)
+                    add quote_option(key, path + val, merge: merge)
                   elsif b.include?(key) || numcheck.call(key, val)
-                    target << basic_option(key, val, merge: merge)
+                    add basic_option(key, val, merge: merge)
                   elsif merge
-                    target << basic_option(key, val, merge: true)
+                    add basic_option(key, val, merge: true)
                   else
-                    @extras << opt
+                    push opt
                   end
                   opt = key
                 else
-                  @extras << opt
+                  push opt
                   skip = true if args
                 end
                 skip = true if first&.any? { |s| s.is_a?(Regexp) ? opt.match?(s) : !opt.include?(s) }
@@ -193,6 +212,22 @@ module Squared
             self
           end
 
+          def uniq(list)
+            items = map { |val| nameonly(val) }
+            list.reject do |val|
+              next true if items.include?(s = nameonly(val))
+
+              pat = /\A#{s = fill_option(s)}(?:#{s.start_with?('--') ? '[= ]' : '.*'}|\z)/
+              any? { |opt| opt.match?(pat) }
+            end
+          end
+
+          def uniq!(list)
+            n = size
+            concat uniq(list)
+            extras if size > n
+          end
+
           def clear(opts = nil, errors: false, **kwargs)
             styles = project.theme[:inline] if project
             if !opts
@@ -230,10 +265,63 @@ module Squared
               args = items[0...i] + args + items[i..-1]
               target.clear
             end
-            merge(args)
+            merge args
             self
           end
 
+          def add_path(*args, **kwargs)
+            add shell_quote(path ? path.join(*args) : File.join(*args), **kwargs)
+            self
+          end
+
+          def add_quote(*args, **kwargs)
+            merge(args.map { |val| shell_quote(val, **kwargs) })
+            self
+          end
+
+          def splice(*exclude, quote: true, delim: true, path: false, pattern: false, &blk)
+            found, other = if block_given?
+                             partition(&blk)
+                           elsif exclude.first.is_a?(Symbol)
+                             partition(&exclude.first)
+                           else
+                             partition do |val|
+                               next false if pattern && OptionPartition.pattern?(val)
+
+                               exclude.none? { |pat| val.match?(Regexp.new(pat)) }
+                             end
+                           end
+            unless found.empty?
+              add '--' if delim
+              extras.clear
+              concat other
+              if path
+                found.each { |val| add_path(val) }
+              else
+                merge(quote ? found.map! { |val| shell_quote(val) } : found)
+              end
+            end
+            self
+          end
+
+          def append?(key, val = nil, type: nil, **kwargs)
+            return false if arg?(key)
+
+            val = yield self if block_given?
+            return false unless val
+
+            type ||= :quote if kwargs.empty?
+            op << case type
+                  when :quote
+                    quote_option(key, val)
+                  when :basic
+                    basic_option(key, val)
+                  else
+                    shell_option(key, val, **kwargs)
+                  end
+            true
+          end
+
           def reset(errors: false)
             extras.clear
             clear(errors: true) if errors
@@ -243,6 +331,12 @@ module Squared
           def arg?(*args, **kwargs)
             OptionPartition.arg?(target, *args, **kwargs)
           end
+
+          private
+
+          def nameonly(val)
+            val[OPT_VALUE, 1] || val
+          end
         end
 
         class JoinSet < Set