squared 0.6.0 → 0.6.2

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

@@ -20,7 +20,8 @@ module Squared
                   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
+                  back-trace-limit=i context-mode=i prompt=b prompt-mode=b].freeze,
+          rbs: %w[I=pm r=bm no-stdlib no-collection collection=p log-level=b log-output=p repo=p].freeze
         }.freeze
         OPT_BUNDLE = {
           common: %w[no-color V|verbose r|retry=i].freeze,
@@ -124,6 +125,7 @@ module Squared
           ruby: %w[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,
           gem: {
             contents: %w[s spec-dir].freeze,
             dependency: %w[s source].freeze,
@@ -159,11 +161,12 @@ module Squared
           'ruby' => %i[file script version].freeze,
           'gem' => %i[install uninstall outdated update pristine build push exec command].freeze,
           'bundle' => %i[install update cache exec config reinstall command].freeze,
+          'rbs' => nil,
           'rake' => nil,
           'irb' => nil
         })
 
-        def initialize(*, autodetect: false, gemspec: nil, asdf: 'ruby', **kwargs)
+        def initialize(*, autodetect: false, gemspec: nil, steep: 'Steepfile', asdf: 'ruby', **kwargs)
           super
           if @pass.include?(Ruby.ref)
             initialize_ref Ruby.ref
@@ -179,6 +182,7 @@ module Squared
                      elsif gemspec
                        basepath(gemspec.include?('.') ? gemspec : "#{gemspec}.gemspec")
                      end
+          @steepfile = basepath(steep).yield_self { |file| file if file.exist? }
           return unless rakefile && @output[0].nil? && @copy.nil? && !version && !@autodetect
 
           begin
@@ -213,33 +217,41 @@ module Squared
                 when 'rake'
                   next unless rakefile
 
-                  format_desc action, nil, "task+,opts*|#{indexchar}index+|#,pattern*"
+                  format_desc action, nil, "task+|#{indexchar}index+,opts*|#,pattern*"
                   task action, [:command] do |_, args|
                     if args.command == '#'
                       format_list(raketasks, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile, &:join)
                     else
-                      items, opts = args.to_a.partition { |val| indexitem(val) }
-                      if items.empty?
-                        rake(banner: true, opts: opts)
-                      else
-                        tasks = raketasks
-                        while (n, pre = indexitem(items.shift))
+                      tasks = raketasks
+                      cmd = nil
+                      opts = []
+                      queue = lambda do
+                        if cmd
+                          cmd += "[#{opts.join(',')}]" unless opts.empty?
+                          rake(cmd, banner: true)
+                          cmd = nil
+                        elsif !opts.empty?
+                          rake(banner: true, opts: opts)
+                        end
+                        opts.clear
+                      end
+                      args.to_a.each do |item|
+                        if (n, pre = indexitem(item))
+                          queue.call
                           if (item = tasks[n.pred])
-                            cmd = pre ? "#{pre} #{item.first}" : item.first
+                            cmd = [pre, item.first].compact.join(' ')
                           elsif exception
                             indexerror n, tasks
                           else
                             log.warn "rake task #{n} of #{tasks.size} (out of range)"
-                            next
-                          end
-                          if opts.empty?
-                            rake(cmd, banner: true)
-                          else
-                            rake(cmd + "[#{opts.join(',')}]", banner: true)
                             opts.clear
+                            next
                           end
+                        else
+                          opts << item
                         end
                       end
+                      queue.call
                     end
                   end
                 when 'irb'
@@ -250,6 +262,72 @@ module Squared
                     name = gemname if gemlib.any? { |file| exist?(file, "#{gemname}.rb") }
                     irb(*args, opts: opts, name: name, verbose: false)
                   end
+                when 'rbs'
+                  next unless @steepfile
+
+                  data = {}
+                  target = nil
+                  File.foreach(@steepfile) do |line|
+                    if line =~ /^\s*target(?:\s+|\(\s*)(?::(\S+)|(["'])(.+)\2)/
+                      target = [[], []]
+                      data[$1 || $3.gsub(/[: ]/, '-')] = target
+                      next
+                    end
+                    next unless target && line =~ /^\s*(check|signature)\s+(["'])(.+)\2/
+
+                    target[$1 == 'check' ? 1 : 0] << $3
+                  end
+                  next if data.empty?
+
+                  namespace 'rbs' do
+                    data.each do |key, item|
+                      sig, lib = item
+                      next if sig.empty? || lib.empty?
+
+                      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))
+                        end
+                        if args.empty?
+                          files = choice_index('Select files', list, multiple: true, force: 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)).exist?
+                              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
+                        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)
+                              else
+                                sig.first
+                              end
+                        rbs(:prototype, sig, *files)
+                      end
+                    end
+                  end
                 end
               else
                 namespace action do
@@ -274,9 +352,9 @@ module Squared
                                  end
                           gem(flag, opts: opts, banner: true, filter: {
                             semver: semver,
-                            update: opts.delete('u') || opts.delete('update'),
-                            interactive: opts.delete('i') || opts.delete('interactive'),
-                            select: opts.delete('s') || opts.delete('select')
+                            update: has_value!(opts, 'u', 'update'),
+                            interactive: has_value!(opts, 'i', 'interactive'),
+                            select: has_value!(opts, 's', 'select')
                           })
                         end
                       when :build, :push, :exec, :update
@@ -320,7 +398,7 @@ module Squared
                         format_desc action, flag, 'f/orce?,opts*'
                         task flag do |_, args|
                           opts = args.to_a
-                          opts << 'redownload' if opts.delete('f') || opts.delete('force')
+                          opts << 'redownload' if has_value!(opts, 'f', 'force')
                           if (lock = basepath('Gemfile.lock')).exist?
                             config = basepath '.bundle', 'config'
                             if config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
@@ -406,17 +484,17 @@ module Squared
         end
 
         def copy(from: gemlib, into: @gemdir, override: false, **kwargs)
+          return if @copy == false
+
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
             return super unless @copy.is_a?(Hash)
 
             from = @copy[:from] if @copy.key?(:from)
+            into = @copy[:into] if @copy.key?(:into)
             glob = @copy[:include] if @copy.key?(:include)
             pass = @copy[:exclude] if @copy.key?(:exclude)
-            into = @copy[:into] if @copy.key?(:into)
-          elsif @copy == false
-            return
           end
           return unless into
 
@@ -439,8 +517,8 @@ module Squared
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           cmd = bundle_output 'outdated'
           if flag
-            se = (opts.delete('s') || opts.delete('select')) && !stdin?
-            up = opts.delete('u') || opts.delete('update')
+            se = has_value!(opts, 's', 'select') && !stdin?
+            up = has_value!(opts, 'u', 'update')
             cmd << "--#{flag}"
             OptionPartition.new(opts, bundleopts(:outdated), cmd, project: self)
                            .clear
@@ -673,6 +751,7 @@ module Squared
               end
               out.map!(&:split)
               pad = out.map(&:first).map!(&:size).max
+              print_item
               puts(out.map! { |line| '%*s %s' % [pad, line.first, line[1..-1].join(' ')] })
             end
             return
@@ -1064,9 +1143,7 @@ module Squared
               output = val.match?(/(?:un)?set/)
             else
               a = op.dup
-              b = op.shift
-              c = op.shift
-              d = op.shift
+              b, c, d = op.slice!(0, 3)
               e = op.arg?('global', 'local')
               op << b
               getname = -> { op << (c || readline('Enter name', force: true)) }
@@ -1161,6 +1238,56 @@ module Squared
           run(banner: false, from: :irb)
         end
 
+        def rbs(flag, *args, banner: verbose?, with: nil, pass: nil, **kwargs)
+          case pass
+          when NilClass
+            pass = PASS_RUBY[:rbs]
+          when Array
+            pass += PASS_RUBY[:rbs]
+          end
+          opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
+          cmd, opts = rbs_session(opts: opts)
+          op = OptionPartition.new(opts, [], cmd << flag, project: self)
+          case flag
+          when :prototype
+            sig = args.shift
+            y = option('y', ignore: false)
+            i = 1
+            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')
+              status = if rbs.exist?
+                         case y
+                         when '0', 'false'
+                           'ignored'
+                         else
+                           next unless y || confirm_basic('Overwrite?', rbs, 'N')
+
+                           'overwrite'
+                         end
+                       end
+              unless status == 'ignored'
+                ret = run(op.target.temp(File.extname(base) == '.rbi' ? 'rbi' : 'rb', file, '>', rbs), banner: false,
+                                                                                                       series: true)
+                if !ret
+                  status = 'FAIL'
+                elsif File.empty?(rbs)
+                  status = 'empty'
+                end
+              end
+              puts "#{i.to_s.rjust(2)}. #{rbs.relative_path_from(path)}".subhint(status)
+              i += 1
+            end
+          else
+            op.clear
+              .append(*args)
+            print_run(op, banner, **kwargs)
+            run(banner: false, from: :"rbs:#{flag}")
+          end
+        end
+
         def gemspec
           return @gemspec || nil unless @gemspec.nil?
 
@@ -1285,6 +1412,13 @@ module Squared
           session('rake', *preopts, *cmd, **kwargs)
         end
 
+        def rbs_session(*cmd, opts: nil)
+          return session('rbs', *cmd) unless opts
+
+          op = OptionPartition.new(opts, OPT_RUBY[:rbs], project: self)
+          [session('rbs', *op.to_a, *cmd), op.extras]
+        end
+
         def gem_output(*cmd, **kwargs)
           session_output('gem', *cmd, **kwargs)
         end
@@ -1320,7 +1454,7 @@ module Squared
         end
 
         def config_set(key, *val)
-          run(bundle_output('config set', key, *val), banner: false, series: false)
+          run(bundle_output('config set', key, *val), banner: false, series: true)
         end
 
         def preopts

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

@@ -10,9 +10,9 @@ module Squared
           include Common::Shell
           extend Forwardable
 
-          OPT_NAME = /\A(?:(--)|-)((?(1)[A-Za-z\d]+|[A-Za-z\d]))\z/
-          OPT_VALUE = /\A-{0,2}([^= ]+)(?: *= *| +)(.+)\z/
-          OPT_SINGLE = /\A-([A-Za-z\d])(.+)\z/
+          OPT_NAME = /\A(?:(--)|-)((?(1)[^\[\]=\s-][^\[\]=\s]*|[^\[\]=\s-]))\z/
+          OPT_VALUE = /\A-{0,2}([^\[\]=\s-][^\[\]=\s]*)(?:=|\s+)(\S.*)\z/
+          OPT_SINGLE = /\A-([^\[\]=\s-])(.+)\z/
           private_constant :OPT_NAME, :OPT_VALUE, :OPT_SINGLE
 
           class << self
@@ -27,9 +27,9 @@ module Squared
               target << '--' if delim && !target.include?('--')
               if strip
                 pat, s = Array(strip)
-                ret.map! { |val| val.gsub(pat, s || '') }
+                ret.map! { |val| val.is_a?(String) ? val.gsub(pat, s || '') : val }
               end
-              ret, err = ret.partition { |val| filter.match?(val) } if filter
+              ret, err = ret.partition { |val| filter.match?(val.to_s) } if filter
               if block_given?
                 out = []
                 err ||= []
@@ -47,7 +47,9 @@ module Squared
               end
               if escape || quote
                 ret.map! do |val|
-                  if escape
+                  if opt?(val)
+                    val
+                  elsif escape
                     shell_escape(val, quote: quote, double: double)
                   else
                     shell_quote(val, force: force, double: double)
@@ -117,8 +119,17 @@ module Squared
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               r << matchopts(s, value) unless s.empty?
-              s = target.to_a.compact
-              r.any? { |pat| s.any?(pat) }
+              a = target.to_a
+              if (n = a.index('--'))
+                a = a[0..n]
+              end
+              r.any? { |pat| a.any?(pat) }
+            end
+
+            def opt?(val)
+              return false unless val.is_a?(String)
+
+              val.start_with?('-') && (OPT_NAME.match?(val) || OPT_VALUE.match?(val) || OPT_SINGLE.match?(val))
             end
 
             def pattern?(val)
@@ -140,13 +151,13 @@ module Squared
             end
 
             def shortopt(*group)
-              group.map! { |s| s.delete_prefix('-') }
-              "-(?:#{Regexp.escape(group.join('|'))})(?:\\z|[^ =]| +[^ -])"
+              group.map! { |s| Regexp.escape(s.delete_prefix('-')) }
+              "-(?:#{group.join('|')})(?:\\z|[^ =]| +[^ -])"
             end
 
             def longopt(*group, value)
-              group.map! { |s| s.delete_prefix('--') }
-              "--(?:#{Regexp.escape(group.join('|'))})(?:#{value ? '=[^ ]| +[^ -]' : '[= ]|\z'})"
+              group.map! { |s| Regexp.escape(s.delete_prefix('--')) }
+              "--(?:#{group.join('|')})(?:#{value ? '=[^ ]| +[^ -]' : '[= ]|\z'})"
             end
           end
 
@@ -155,7 +166,8 @@ module Squared
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
                          :merge, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
           def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :shift, :unshift,
-                         :pop, :push, :concat, :index, :join, :map, :map!, :detect, :select, :select!, :reject, :size
+                         :pop, :push, :concat, :index, :join, :detect, :map, :map!, :select, :select!, :slice, :slice!,
+                         :reject, :size
 
           def_delegator :@extras, :delete, :remove
           def_delegator :@extras, :delete_at, :remove_at
@@ -187,6 +199,7 @@ module Squared
             f = []
             si = []
             bl = []
+            ml = []
             list.flat_map do |val|
               x, y = val.split('|', 2)
               if y
@@ -223,6 +236,9 @@ module Squared
                   @values << Regexp.escape(flag)
                 when '!'
                   bl << flag
+                when '+'
+                  ml << flag
+                  bare << flag
                 else
                   next
                 end
@@ -248,8 +264,10 @@ module Squared
               f.concat(tr.call(f))
               si.concat(tr.call(si))
               bl.concat(tr.call(bl))
+              ml.concat(tr.call(ml))
               no.concat(tr.call(no))
             end
+            target.multiple.concat(ml.map { |val| val.size == 1 ? "-#{val}" : "--#{val}" }) if target.is_a?(JoinSet)
             numtype = [
               [i, /\A\d+\z/],
               [f, /\A\d*(?:\.\d+)?\z/],
@@ -442,7 +460,7 @@ module Squared
 
           def add_path(*args, force: true, double: false, **kwargs)
             if args.empty?
-              args = select { |s| s.is_a?(String) }
+              args = select { |val| val.is_a?(String) }
               args.map! { |val| path + val } if path
               append(args, force: force, **kwargs)
             else
@@ -452,7 +470,8 @@ module Squared
           end
 
           def add_quote(*args, **kwargs)
-            merge(args.compact.map! { |val| val == '--' ? val : shell_quote(val, **kwargs) })
+            merge(args.compact
+                      .map! { |val| val == '--' || OptionPartition.opt?(val) ? val : shell_quote(val, **kwargs) })
             self
           end
 
@@ -621,11 +640,22 @@ module Squared
             super[/[^:]+\z/, 0]
           end
 
-          attr_reader :delim
+          alias to_ary to_a
 
-          def initialize(data = [], delim: ' ')
-            super(data.compact)
+          attr_reader :delim, :extras
+          attr_accessor :multiple
+
+          def initialize(data = [], delim: ' ', partition: '--', uniq: /\A--?[^\[\]=\s-]/, multiple: [])
             @delim = delim
+            @partition = partition
+            @uniq = uniq
+            @multiple = multiple
+            @extras = []
+            super(data.compact)
+          end
+
+          def insert(*args)
+            replace Set.new(to_ary.reject { |val| val.nil? || (val.is_a?(String) && val.empty?) }.insert(*args))
           end
 
           def last(val, pat)
@@ -634,7 +664,7 @@ module Squared
           end
 
           def pass(&blk)
-            ret = to_a.map!(&:to_s).reject(&:empty?)
+            ret = to_ary.map!(&:to_s).reject(&:empty?)
             @last&.each do |val, pat, key|
               items = []
               index = nil
@@ -655,6 +685,7 @@ module Squared
               end
               ret[items.last] = val
             end
+            ret.concat(extras.map(&:to_s).reject(&:empty?)) unless extras.empty?
             return ret unless block_given?
 
             ret.reject(&blk)
@@ -676,18 +707,82 @@ module Squared
 
           def temp(*args, &blk)
             args.compact!
-            ret = pass(&blk)
-            ret = Set.new(ret.concat(args)).to_a unless args.empty?
-            ret.join(@delim)
+            pass(&blk)
+              .concat(args)
+              .join(@delim)
           end
 
           def done
             to_s.tap { clear }
           end
 
+          def merge(enum)
+            if !extras.empty?
+              extras.concat(enum.to_a)
+              self
+            elsif (n = enum.find_index { |val| extras?(val) })
+              data = enum.to_a
+              @extras = if n == 0
+                          data
+                        else
+                          super(data[0...n])
+                          data[n..-1]
+                        end
+              self
+            else
+              super
+            end
+          end
+
+          def <<(obj)
+            extras!(obj) || super
+          end
+
+          def add(obj)
+            extras!(obj) || super
+          end
+
+          def add?(obj)
+            extras!(obj) || super
+          end
+
+          def to_a
+            pass
+          end
+
           def to_s
             pass.join(@delim)
           end
+
+          def to_enum(*args)
+            pass.to_enum(*args)
+          end
+
+          def to_json(*args)
+            pass.to_json(*args)
+          end
+
+          def to_yaml(*args)
+            pass.to_yaml(*args)
+          end
+
+          alias push :<<
+          alias concat merge
+
+          private
+
+          def extras!(obj)
+            return if extras.empty? && !extras?(obj)
+
+            unless !extras.include?(@partition) && include?(obj) && @uniq.match?(s = obj.to_s) && !multiple.include?(s)
+              extras << obj
+            end
+            self
+          end
+
+          def extras?(obj)
+            obj == @partition || (include?(obj) && (!@uniq.match?(s = obj.to_s) || multiple.include?(s)))
+          end
         end
       end
     end

metadata

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