squared 0.4.14 → 0.5.0

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

@@ -81,7 +81,7 @@ module Squared
           'install' => %i[redownload local prefer-local].freeze,
           'update' => %i[patch minor major all].freeze,
           'outdated' => %i[patch minor major].freeze,
-          'gem' => %i[install uninstall update pristine outdated build push exec].freeze,
+          'gem' => %i[install uninstall update pristine outdated push build exec].freeze,
           'ruby' => %i[file script version].freeze,
           'exec' => nil,
           'cache' => nil,
@@ -102,10 +102,11 @@ module Squared
           end
           dependfile_set GEMFILE
           @autodetect = autodetect
-          return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || rakefile.empty?
+          @rakelist = nil
+          return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || (file = rakefile).nil?
 
           begin
-            File.foreach(rakefile) do |line|
+            File.foreach(file) do |line|
               next unless line.match?(%r{\brequire\s+(["'])bundler/gem_tasks\1})
 
               cmd = bundle_output('exec rake').to_s
@@ -134,36 +135,26 @@ module Squared
               if flags.nil?
                 case action
                 when 'rake'
-                  next if rakefile.empty?
+                  next unless rakefile
 
-                  format_desc action, nil, "task+,opts*|#{indexchar}index+|#,pattern*"
+                  format_desc action, nil, 'tasks*,opts*|^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 })
-                    else
-                      args, opts = args.to_a.partition { |val| indexitem(val) }
-                      if args.empty?
-                        rake(opts: opts)
+                      format_list(read_rakefile, 'rake[^N]', 'tasks', grep: args.extras, from: rakefile.to_s,
+                                                                      each: ->(val) { val[0] + val[1].to_s })
+                    elsif (n, opts = indexitem(args.command))
+                      list = read_rakefile
+                      if (item = list[n - 1])
+                        cmd = opts ? "#{opts} #{item.first}" : item.first
+                      elsif exception
+                        indexerror n, list
                       else
-                        list = read_rakefile
-                        while (n, pre = indexitem(args.shift))
-                          if (item = list[n - 1])
-                            cmd = pre ? "#{pre} #{item.first}" : item.first
-                          elsif exception
-                            indexerror n, list
-                          else
-                            log.warn "rake task #{n} of #{list.size} (out of range)"
-                            next
-                          end
-                          if opts.empty?
-                            rake cmd
-                          else
-                            rake(cmd + shell_escape("[#{opts.join(',')}]"))
-                            opts.clear
-                          end
-                        end
+                        log.warn "rake task #{n} of #{list.size} (out of range)"
+                        next
                       end
+                      rake(args.extras.empty? ? cmd : cmd + shell_escape("[#{args.extras.join(',')}]"))
+                    else
+                      rake(opts: args.to_a)
                     end
                   end
                 when 'irb'
@@ -173,12 +164,16 @@ module Squared
                   format_desc action, nil, 'opts*,args*|:'
                   task action do |_, args|
                     args = args.to_a
-                    irb(gemname, args, args: (readline('Enter file [arguments]', force: false) if args.delete(':')))
+                    if args.last == ':'
+                      args.pop
+                      load = readline('Enter file and arguments', force: false)
+                    end
+                    irb(gemname, args, load: load)
                   end
                 else
-                  format_desc(action, nil, 'opts*', before: case action
-                                                            when 'cache', 'check' then nil
-                                                            else 'command+' end)
+                  format_desc(action, nil, OPT_BUNDLE[action.to_sym], after: case action
+                                                                             when 'cache', 'check' then nil
+                                                                             else 'command+' end)
                   task action do |_, args|
                     bundle(action, *args.to_a)
                   end
@@ -200,24 +195,20 @@ module Squared
                           case (filter = args.semver)
                           when 'major', 'minor', 'patch', 'interactive', 'i'
                             filter = 'interactive' if filter == 'i'
-                            args = args.extras
+                            args = args.to_a.drop(1)
                           else
                             filter = nil
                             args = args.to_a
                           end
                           gem!(flag, args, filter: filter)
                         end
-                      when :build, :push, :exec, :update
-                        format_desc(action, flag, 'opts*', after: case flag
-                                                                  when :exec then 'command,args*'
-                                                                  when :push then 'file?'
-                                                                  when :update then 'name*'
-                                                                  end)
+                      when :build, :push, :exec
+                        format_desc(action, flag, 'opts*', before: flag == :exec ? 'command,args*' : nil)
                         task flag do |_, args|
                           gem! flag, args.to_a
                         end
                       else
-                        format_desc(action, flag, 'opts*', after: flag == :pristine ? 'name*|name?@version' : 'name*')
+                        format_desc action, flag, "opts*,name+#{flag == :pristine ? '|name?@version' : ''}"
                         task flag do |_, args|
                           args = param_guard(action, flag, args: args.to_a)
                           gem! flag, args
@@ -229,18 +220,19 @@ module Squared
                         format_desc action, flag, 'path,opts*,args*'
                         task flag, [:rb] do |_, args|
                           file = args.rb
-                          args = args.extras
+                          args = args.to_a.drop(1)
                           unless file && !file.include?('*')
-                            file, opts, prog = choice_index('Select a file', Dir.glob(file || (path + '*.rb')),
-                                                            values: (file ? [] : ['Options']) << 'Arguments',
-                                                            force: true, series: !args.include?('v'))
+                            values = ['Arguments']
+                            values.prepend('Options') unless file
+                            file, opts, extra = choice_index('Select a file', Dir.glob(file || '*.rb', base: path),
+                                                             values: values, force: true, series: !args.include?('v'))
                             if file
-                              prog = opts
+                              extra = opts
                             else
                               args.concat(OptionPartition.strip(opts))
                             end
                           end
-                          ruby(flag, args, file: file, args: prog)
+                          ruby(flag, args, file: file, args: extra)
                         end
                       when :script
                         format_desc action, flag, 'opts*,args*'
@@ -294,8 +286,8 @@ module Squared
           on :first, :copy
           dest = Pathname.new(into).realpath
           print_item unless @output[0] || task_invoked?(/^copy(?::#{Ruby.ref}|$)/)
-          glob = Array(glob || '**/*')
-          Array(from).each_with_index do |val, i|
+          glob = as_a(glob || '**/*')
+          as_a(from).each_with_index do |val, i|
             a = path + val
             b = dest + val
             c = glob[i] || glob.first
@@ -319,7 +311,7 @@ module Squared
           end
           log.info cmd.to_s
           on :first, :outdated
-          banner = format_banner(cmd.to_s)
+          banner = format_banner cmd.to_s
           print_item banner if sync
           pwd_set(from: :outdated) do
             start = 0
@@ -410,7 +402,7 @@ module Squared
             end
             if found > 0
               begin
-                if major == 0 && dependfile.read =~ /\b(?:source\s+(["'])(.+?)\1|remote:\s+(\S+))/
+                if major == 0 && dependfile.read =~ /\b(?:source\s+(["'])((?~\1))\1|remote:\s+(\S+))/
                   status = ($2 || $3).chomp('/')
                   right = true
                 end
@@ -436,7 +428,7 @@ module Squared
         def update(flag, opts = [])
           bundle_session 'update', "--#{flag}"
           append_bundle(opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common],
-                        append: flag == :all ? nil : /\A\w+=/)
+                        append: flag == :all ? nil : /\A[a-z\-]+=/)
           run_rb(from: :update)
         end
 
@@ -445,7 +437,7 @@ module Squared
           when :file, :script
             op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, args: true)
             if file
-              op.extras.unshift(shell_quote(path + file))
+              op.extras.prepend(shell_quote(path + file))
             elsif command
               op << quote_option('e', command, option: false)
             end
@@ -472,8 +464,9 @@ module Squared
                                  when 'rvm'
                                    `rvm current`[/^\S+/, 0]
                                  when 'rbenv'
-                                   name = `rbenv version-name`
-                                   name =~ SEM_VER ? "ruby #{name}" : name
+                                   `rbenv version-name`.yield_self do |name|
+                                     name.match?(SEM_VER) ? "ruby #{name}" : name
+                                   end
                                  when 'chruby.sh'
                                    chruby = session_output 'source', val
                                    `#{chruby.with('ruby --version')}`
@@ -484,14 +477,12 @@ module Squared
                                    ver = nil
                                    `ruby --version`
                                  end)
-                break if workspace.windows?
-
                 unless val.empty?
                   out << trim.call(case cmd
                                    when 'chruby.sh'
                                      `#{chruby.with('chruby --version')}`.sub(':', '')
                                    when 'install'
-                                     "asdf #{`asdf version`.sub(/^v/, '')}"
+                                     "asdf #{`asdf version`.delete_prefix('v')}"
                                    else
                                      `#{cmd} --version`
                                    end)
@@ -534,6 +525,8 @@ module Squared
           case flag
           when :outdated
             cmd << gempwd << 'outdated'
+          when :push
+            cmd << 'push' << project
           else
             cmd << flag
           end
@@ -542,9 +535,12 @@ module Squared
           case flag
           when :install, :update
             list.concat(OPT_GEM[:install_base])
+            first = ['=']
+          when :uninstall, :pristine
+            first = ['=']
           end
           cmd.merge(preopts)
-          op = OptionPartition.new(opts, list, cmd, project: self, no: OPT_GEM[:no][flag])
+          op = OptionPartition.new(opts, list, cmd, project: self, no: OPT_GEM[:no][flag], first: first)
           op.each do |opt|
             if opt =~ op.values
               case $1
@@ -645,8 +641,7 @@ module Squared
                       styles = %i[yellow]
                       pat = pat.last
                     end
-                    b = b.rjust(e)
-                    b = sub_style(b, *colormap(styles), pat: pat, index: 2)
+                    b = sub_style(b.rjust(e), *colormap(styles), pat: pat, index: 2)
                     h = sub_style(c.rjust(f), styles: latest.flatten.compact, pat: pat, index: 2)
                     j += 1
                     if queue
@@ -664,15 +659,15 @@ module Squared
             else
               unless update.empty?
                 cmd = gem_output 'update', '-f'
-                if (val = option('document', prefix: 'gem', ignore: false))
+                option('document', prefix: 'gem', ignore: false) do |val|
                   cmd << case val
                          when '0', 'false'
                            '--no-document'
                          else
-                           basic_option('document', val)
+                           basic_option 'document', val
                          end
                 end
-                if (val = option('user-install', prefix: 'gem', ignore: false))
+                option('user-install', prefix: 'gem', ignore: false) do |val|
                   cmd << case val
                          when '0', 'false'
                            '--no-user-install'
@@ -683,32 +678,31 @@ module Squared
                 cmd.merge(update)
                 run(cmd, banner: false, from: :'gem:update')
               end
-              print_status(major, minor, patch, from: :outdated)
+              unless stdin?
+                status = print_footer("major #{major} / minor #{minor} / patch #{patch}", right: true).split("\n")
+                status[1] = status[1]
+                            .yield_self do |s|
+                              sub_style(s, pat: /^( +major )(\d+)(.+)$/, styles: theme[:major], index: 2)
+                            end
+                            .yield_self do |s|
+                              sub_style(s, pat: /^(.+)(minor )(\d+)(.+)$/, styles: theme[:active], index: 3)
+                            end
+                puts status
+              end
             end
             on :last, from
             return
-          when :build
-            if op.empty?
-              spec = [path + "#{project}.gemspec", path + "#{name}.gemspec", *Dir.glob(path + '*.gemspec')]
-              op << File.basename(spec) if (spec = spec.find { |file| File.exist?(file) })
-            else
-              op << shell_quote(path + op.shift)
-              op.clear(pass: false)
-            end
-          when :push
-            if op.empty?
-              op << shell_quote(path + choice_index('Select a file', Dir.glob('*.gem', base: path), force: true))
-            else
-              file = path + op.shift
-              raise_error("unknown args: #{op.join(', ')}", hint: flag) unless op.empty?
-              if file.exist?
-                op << shell_quote(file)
+          when :build, :push
+            if !op.empty?
+              if flag == :build && op.size == 1
+                op << shell_quote(path + op.first)
               else
-                raise_error('gem not found', hint: file)
+                raise_error("unknown args: #{op.join(', ')}", hint: flag)
               end
+            elsif flag == :build
+              spec = [path + "#{project}.gemspec", path + "#{name}.gemspec", *path.glob('*.gemspec')]
+              op << File.basename(spec) if (spec = spec.find { |file| File.exist?(file) })
             end
-            run_rb(from: from, interactive: "Push #{sub_style(project, styles: theme[:active])}")
-            return
           when :exec
             raise_error('missing command', hint: flag) if op.empty?
             op << basic_option('gem', project) unless op.arg?('g', 'gem')
@@ -716,43 +710,26 @@ module Squared
               op.push(args)
             end
             op.append(delim: true, quote: false)
-          when :update
-            unless op.arg?('system')
-              op.push(project) if op.empty?
-              op.adjoin
-            end
-            op.clear(errors: true)
           else
-            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(':')
+            raise_error('missing gemname', hint: flag) if op.empty? && !op.arg?('system')
+            if flag == :pristine
               if op.arg?('all')
-                if flag == :pristine
-                  append_repeat 'skip', op.extras
-                  op.reset
-                else
-                  op.clear
-                end
-              elsif (n = op.extras.find_index { |val| val.match?(/(\A|[a-z])@\d/) })
-                items = op.extras.to_a
-                name = items.delete_at(n)
-                if (n = name.index('@')) == 0
-                  pre = project
+                append_repeat 'skip', op.extras
+                op.extras.clear
+              elsif (n = op.first.index('@'))
+                name = op.shift
+                if n == 0
+                  op << project
                   ver = name[1..-1]
                 else
-                  pre = name[0, n]
-                  ver = name[(n + 1)..-1]
+                  op << shell_escape(name[0, n])
+                  ver = name[n + 1..-1]
                 end
-                op.adjoin(pre, shell_option('version', ver))
-                  .clear(items)
-                  .reset
-              elsif flag != :install
-                op.adjoin
+                op << shell_option('version', ver)
+                op.clear
               end
             end
             op.append.clear(errors: true)
-            op << '--' << post if post
           end
           run_rb(from: from)
         end
@@ -793,13 +770,14 @@ module Squared
           run_s(args, banner: false, from: :rake)
         end
 
-        def irb(name, opts = [], path: @path + 'lib', args: nil)
+        def irb(name, opts = [], path: @path + 'lib', load: nil)
           op = OptionPartition.new(opts, OPT_RUBY[:irb], session('irb'), project: self, first: [/\.rb$/])
-          r = args ? [] : ['bundler/setup']
-          (r << name).each { |val| op << shell_option('r', val, merge: true) }
-          Array(path).each { |val| op << quote_option('I', val, merge: true) }
-          if args
-            op << '--' << args
+          r = as_a name
+          r.prepend('bundler/setup') unless load
+          r.each { |val| op << shell_option('r', val, merge: true) }
+          as_a(path).each { |val| op << quote_option('I', val, merge: true) }
+          if load
+            op << '--' << load
             op.clear
           else
             op.append(delim: true)
@@ -849,14 +827,15 @@ module Squared
             pwd_set(pass: !pwd.nil?) do
               out = `#{gem_output(pwd, 'list --local -d', project)}`
               if out =~ /#{Regexp.escape(project)} \(([^)]+)\)/
-                ver = $1.split(/\s*,\s*/)
-                ver.unshift(@version).uniq!
-                ver.each do |val|
-                  next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
-
-                  set.call(val, $1)
-                  break
-                end
+                $1.split(/\s*,\s*/)
+                  .prepend(@version)
+                  .uniq
+                  .each do |val|
+                    next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
+
+                    set.call(val, $1)
+                    break
+                  end
               end
             end
           end
@@ -892,7 +871,7 @@ module Squared
         private
 
         def run_rb(**kwargs)
-          run(banner: !@session&.include?('--quiet'), **kwargs)
+          run(banner: !@session.include?('--quiet'), **kwargs)
         end
 
         def append_bundle(opts, list, target: @session, append: nil)
@@ -954,16 +933,18 @@ module Squared
         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 ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/
+          return @rakelist if @rakelist
 
-                ret << [$1, $2]
-              end
+          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
+          @rakelist = ret
         end
 
         def preopts
@@ -979,20 +960,19 @@ module Squared
         end
 
         def rakefile
-          return @rakefile if @rakefile
+          return unless (file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? })
 
-          file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }
-          @rakefile = file ? path + file : ''
+          path + file
         end
 
         def rakepwd
-          return if pwd? || Rake::VERSION < '13.0.4'
+          return unless Rake::VERSION >= '13.0.4'
 
           quote_option 'C', path
         end
 
         def gempwd
-          return if pwd? || Gem::VERSION < '3.4.2'
+          return unless Gem::VERSION >= '3.4.2'
 
           quote_option 'C', path
         end

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

@@ -31,7 +31,7 @@ module Squared
             def clear(target, opts, pass: true, styles: nil, **kwargs)
               return if opts.empty?
 
-              kwargs[:subject] ||= stripext(target.first)
+              kwargs[:subject] ||= stripext target.first
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
               warn log_message(Logger::WARN, opts.join(', '), pass: true, **kwargs)
@@ -50,10 +50,11 @@ module Squared
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               unless s.empty?
-                s.map! { |val| Regexp.escape(shell_option(val)) }
+                s.map! { |val| Regexp.escape(val.start_with?('-') ? val : shell_option(val)) }
                 r << /\A(?:#{s.join('|')})#{value ? '[ =].' : '(?: |=|\z)'}/
               end
-              target.any? { |opt| r.any? { |val| opt&.match?(val) } }
+              s = target.to_a.compact
+              r.any? { |pat| s.any?(pat) }
             end
           end
 
@@ -65,7 +66,7 @@ module Squared
                          :pop, :push, :join, :map, :map!, :select, :reject, :size
 
           def initialize(opts, list, target = Set.new, project: nil, path: nil, **kwargs, &blk)
-            @target = target.is_a?(Set) ? target : Set.new(target)
+            @target = target.is_a?(Set) ? target : target.to_set
             @project = project
             @path = path || project&.path
             @errors = []
@@ -139,7 +140,6 @@ module Squared
             numcheck = ->(k, v) { numtype.any? { |flag, pat| flag.include?(k) && pat.match?(v) } }
             skip = false
             opts.each do |opt|
-              next skip = true if opt == '--'
               next @extras << opt if skip
 
               if single&.match?(opt)
@@ -189,8 +189,7 @@ module Squared
           end
 
           def append(*args, **kwargs)
-            args = extras if args.empty?
-            OptionPartition.append(target, *args, **kwargs)
+            OptionPartition.append(target, *(args.empty? ? extras : args), **kwargs)
             self
           end
 
@@ -207,42 +206,82 @@ module Squared
             self
           end
 
-          def adjoin(*args, start: false)
-            i = -1
-            (items = to_a).each_with_index do |val, index|
-              if i == 0
-                next unless val.start_with?('-')
+          def arg?(*args, **kwargs)
+            OptionPartition.arg?(target, *args, **kwargs)
+          end
+        end
+
+        class JoinSet < Set
+          def self.to_s
+            super[/[^:]+\z/, 0]
+          end
+
+          attr_reader :delim
 
-                i = index
-                break
-              elsif index > 0 && !val.start_with?('-')
-                if start
-                  i = index + (start.is_a?(Numeric) ? start : 1)
-                  break
+          def initialize(data = [], delim: ' ')
+            super(data.compact)
+            @delim = delim
+          end
+
+          def last(val, pat)
+            (@last ||= []).append([val, pat, $1]) if val =~ pat
+            self << val
+          end
+
+          def pass(&blk)
+            ret = to_a.map!(&:to_s).reject(&:empty?)
+            @last&.each do |val, pat, key|
+              i = []
+              j = nil
+              ret.each_with_index do |opt, index|
+                if opt == val
+                  j = index
+                elsif j && opt[pat, 1] == key
+                  i << index
                 end
-                i = 0
               end
-            end
-            if i > 0
-              if args.empty?
-                args = dup
-                reset
+              next unless j && !i.empty?
+
+              val = ret[j]
+              cur = j
+              i.each do |k|
+                ret[cur] = ret[k]
+                cur = k
               end
-              args = items[0...i] + args + items[i..-1]
-              target.clear
+              ret[i.last] = val
             end
-            merge(args)
-            self
+            block_given? ? ret.reject(&blk) : ret
           end
 
-          def reset(errors: false)
-            extras.clear
-            clear(errors: true) if errors
-            self
+          def and(*args)
+            self << '&&'
+            merge args
           end
 
-          def arg?(*args, **kwargs)
-            OptionPartition.arg?(target, *args, **kwargs)
+          def or(*args)
+            self << '||'
+            merge args
+          end
+
+          def with(*args, &blk)
+            temp('&&', *args, &blk)
+          end
+
+          def temp(*args, &blk)
+            args.compact!
+            ret = pass(&blk)
+            ret = Set.new(ret.concat(args)).to_a unless args.empty?
+            ret.join(@delim)
+          end
+
+          def done
+            ret = to_s
+            clear
+            ret
+          end
+
+          def to_s
+            pass.join(@delim)
           end
         end
       end

data/lib/squared/workspace/project.rb

@@ -3,16 +3,6 @@
 module Squared
   module Workspace
     module Project
-      class << self
-        attr_accessor :line_width
-
-        def max_width(lines)
-          n = [lines.max_by(&:size).size, 80].max
-          [n, Rake.application.terminal_width].min
-        end
-      end
-
-      @line_width = ENV.fetch('LOG_COLUMNS', 80).to_i
     end
   end
 end