squared 0.5.0 → 0.5.2

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

@@ -4,7 +4,7 @@ module Squared
   module Workspace
     module Project
       class Ruby < Git
-        GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
+        GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb gems.rb Isolate].freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_RUBY = {
           ruby: %w[0=im? a c e=q E=bm F=qm i=bm? I=pm l n p r=bm s S w W=bm? x=pm? d|debug jit rjit v|verbose y|yydebug
@@ -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 push build exec].freeze,
+          'gem' => %i[install uninstall update pristine outdated build push exec].freeze,
           'ruby' => %i[file script version].freeze,
           'exec' => nil,
           'cache' => nil,
@@ -102,11 +102,10 @@ module Squared
           end
           dependfile_set GEMFILE
           @autodetect = autodetect
-          @rakelist = nil
-          return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || (file = rakefile).nil?
+          return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || rakefile.empty?
 
           begin
-            File.foreach(file) do |line|
+            File.foreach(rakefile) do |line|
               next unless line.match?(%r{\brequire\s+(["'])bundler/gem_tasks\1})
 
               cmd = bundle_output('exec rake').to_s
@@ -135,26 +134,36 @@ module Squared
               if flags.nil?
                 case action
                 when 'rake'
-                  next unless rakefile
+                  next if rakefile.empty?
 
-                  format_desc action, nil, 'tasks*,opts*|^index|#,pattern*'
+                  format_desc action, nil, "task+,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
                     if args.command == '#'
-                      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
+                      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)
                       else
-                        log.warn "rake task #{n} of #{list.size} (out of range)"
-                        next
+                        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
                       end
-                      rake(args.extras.empty? ? cmd : cmd + shell_escape("[#{args.extras.join(',')}]"))
-                    else
-                      rake(opts: args.to_a)
                     end
                   end
                 when 'irb'
@@ -164,16 +173,12 @@ module Squared
                   format_desc action, nil, 'opts*,args*|:'
                   task action do |_, args|
                     args = args.to_a
-                    if args.last == ':'
-                      args.pop
-                      load = readline('Enter file and arguments', force: false)
-                    end
-                    irb(gemname, args, load: load)
+                    irb(gemname, args, args: (readline('Enter file [arguments]', force: false) if args.delete(':')))
                   end
                 else
-                  format_desc(action, nil, OPT_BUNDLE[action.to_sym], after: case action
-                                                                             when 'cache', 'check' then nil
-                                                                             else 'command+' end)
+                  format_desc(action, nil, 'opts*', before: case action
+                                                            when 'cache', 'check' then nil
+                                                            else 'command+' end)
                   task action do |_, args|
                     bundle(action, *args.to_a)
                   end
@@ -195,20 +200,24 @@ module Squared
                           case (filter = args.semver)
                           when 'major', 'minor', 'patch', 'interactive', 'i'
                             filter = 'interactive' if filter == 'i'
-                            args = args.to_a.drop(1)
+                            args = args.extras
                           else
                             filter = nil
                             args = args.to_a
                           end
                           gem!(flag, args, filter: filter)
                         end
-                      when :build, :push, :exec
-                        format_desc(action, flag, 'opts*', before: flag == :exec ? 'command,args*' : nil)
+                      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)
                         task flag do |_, args|
                           gem! flag, args.to_a
                         end
                       else
-                        format_desc action, flag, "opts*,name+#{flag == :pristine ? '|name?@version' : ''}"
+                        format_desc(action, flag, 'opts*', after: flag == :pristine ? 'name*|name?@version' : 'name*')
                         task flag do |_, args|
                           args = param_guard(action, flag, args: args.to_a)
                           gem! flag, args
@@ -220,19 +229,18 @@ module Squared
                         format_desc action, flag, 'path,opts*,args*'
                         task flag, [:rb] do |_, args|
                           file = args.rb
-                          args = args.to_a.drop(1)
+                          args = args.extras
                           unless file && !file.include?('*')
-                            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'))
+                            file, opts, prog = choice_index('Select a file', Dir.glob(file || '*.rb', base: path),
+                                                            values: (file ? [] : ['Options']) << 'Arguments',
+                                                            force: true, series: !args.include?('v'))
                             if file
-                              extra = opts
+                              prog = opts
                             else
                               args.concat(OptionPartition.strip(opts))
                             end
                           end
-                          ruby(flag, args, file: file, args: extra)
+                          ruby(flag, args, file: file, args: prog)
                         end
                       when :script
                         format_desc action, flag, 'opts*,args*'
@@ -286,8 +294,8 @@ module Squared
           on :first, :copy
           dest = Pathname.new(into).realpath
           print_item unless @output[0] || task_invoked?(/^copy(?::#{Ruby.ref}|$)/)
-          glob = as_a(glob || '**/*')
-          as_a(from).each_with_index do |val, i|
+          glob = Array(glob || '**/*')
+          Array(from).each_with_index do |val, i|
             a = path + val
             b = dest + val
             c = glob[i] || glob.first
@@ -296,7 +304,7 @@ module Squared
               copy_dir(a, b, c, pass: pass, verbose: verbose)
             rescue StandardError => e
               log.error e
-              ret = on(:error, :copy, e)
+              ret = on :error, :copy, e
               raise if exception && ret != true
             end
           end
@@ -385,7 +393,7 @@ module Squared
                                                               index: 2)
                   end
                 end
-                out.call("#{start.to_s.rjust(2)}. #{line}")
+                out.call('%2d. %s' % [start, line])
               elsif line.start_with?('Gem')
                 unless stdin?
                   sub = { pat: /^(.+)(?<!\dm)(Gem|Latest)(.+)$/, styles: theme[:header], index: 2 }
@@ -477,6 +485,8 @@ module Squared
                                    ver = nil
                                    `ruby --version`
                                  end)
+                break if workspace.windows?
+
                 unless val.empty?
                   out << trim.call(case cmd
                                    when 'chruby.sh'
@@ -513,7 +523,7 @@ module Squared
               end
               out.map!(&:split)
               pad = out.map(&:first).map!(&:size).max
-              puts(out.map! { |line| "#{line.first.rjust(pad)} #{line[1..-1].join(' ')}" })
+              puts(out.map! { |line| '%*s %s' % [pad, line.first, line[1..-1].join(' ')] })
             end
             return
           end
@@ -525,8 +535,6 @@ module Squared
           case flag
           when :outdated
             cmd << gempwd << 'outdated'
-          when :push
-            cmd << 'push' << project
           else
             cmd << flag
           end
@@ -535,12 +543,9 @@ 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], first: first)
+          op = OptionPartition.new(opts, list, cmd, project: self, no: OPT_GEM[:no][flag])
           op.each do |opt|
             if opt =~ op.values
               case $1
@@ -597,7 +602,7 @@ module Squared
 
                   a, b, c = item.first
                   if i == 0
-                    line = "#{' #'.ljust(pad)} #{a.ljust(d)}    #{b.rjust(e)}  #{c.rjust(f)}"
+                    line = '%-*s %-*s    %*s  %*s' % [pad, ' #', d, a, e, b, f, c]
                     n = line.size
                     2.times do
                       line = sub_style(line, pat: /^(.+)(?<!\dm)(#{a}|#{c})(.*)$/, styles: theme[:header], index: 2)
@@ -648,7 +653,7 @@ module Squared
                       puts queue
                       queue = nil
                     end
-                    puts "#{"#{j}.".rjust(pad)} #{g}    #{b}  #{h}"
+                    puts '%*s %s    %s  %s' % [pad, "#{j}.", g, b, h]
                     update << a if filter == 'interactive' && confirm_outdated(a, c, item.last)
                   end
                 end
@@ -678,31 +683,32 @@ module Squared
                 cmd.merge(update)
                 run(cmd, banner: false, from: :'gem:update')
               end
-              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
+              print_status(major, minor, patch, from: :outdated)
             end
             on :last, from
             return
-          when :build, :push
-            if !op.empty?
-              if flag == :build && op.size == 1
-                op << shell_quote(path + op.first)
-              else
-                raise_error("unknown args: #{op.join(', ')}", hint: flag)
-              end
-            elsif flag == :build
+          when :build
+            if op.empty?
               spec = [path + "#{project}.gemspec", path + "#{name}.gemspec", *path.glob('*.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)
+              else
+                raise_error('gem not found', hint: file)
+              end
+            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')
@@ -710,26 +716,43 @@ 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? && !op.arg?('system')
-            if flag == :pristine
+            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(':')
               if op.arg?('all')
-                append_repeat 'skip', op.extras
-                op.extras.clear
-              elsif (n = op.first.index('@'))
-                name = op.shift
-                if n == 0
-                  op << project
+                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
                   ver = name[1..-1]
                 else
-                  op << shell_escape(name[0, n])
-                  ver = name[n + 1..-1]
+                  pre = name[0, n]
+                  ver = name[(n + 1)..-1]
                 end
-                op << shell_option('version', ver)
-                op.clear
+                op.adjoin(pre, shell_option('version', ver))
+                  .clear(items)
+                  .reset
+              elsif flag != :install
+                op.adjoin
               end
             end
             op.append.clear(errors: true)
+            op << '--' << post if post
           end
           run_rb(from: from)
         end
@@ -770,14 +793,13 @@ module Squared
           run_s(args, banner: false, from: :rake)
         end
 
-        def irb(name, opts = [], path: @path + 'lib', load: nil)
+        def irb(name, opts = [], path: @path + 'lib', args: nil)
           op = OptionPartition.new(opts, OPT_RUBY[:irb], session('irb'), project: self, first: [/\.rb$/])
-          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
+          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
             op.clear
           else
             op.append(delim: true)
@@ -834,12 +856,13 @@ module Squared
                     next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
 
                     set.call(val, $1)
-                    break
+                    return gemdir? if @gemdir
                   end
               end
             end
-          end
-          unless @gemdir
+            require 'rubygems'
+            @gemdir = Pathname.new(Gem.dir) + gempath
+          else
             parse = lambda do |path|
               next unless path
 
@@ -852,9 +875,10 @@ module Squared
               target = RUBY_VERSION.start_with?('2.6') ? RubyVM : $LOAD_PATH
               parse.call(target.resolve_feature_path(project)&.last)
             end
-            pwd_set { parse.call(`#{bundle_output('show', project)}`) } unless @gemdir
+            if !@gemdir && !pwd_set { parse.call(`#{bundle_output('show', project)}`) }
+              raise_error 'gems directory not found'
+            end
           end
-          raise_error('parse failed', hint: @version || 'path') unless @gemdir
         rescue StandardError => e
           log.error e
           @version = nil
@@ -871,7 +895,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)
@@ -933,18 +957,16 @@ module Squared
         end
 
         def read_rakefile
-          return @rakelist if @rakelist
-
-          ret = []
-          pwd = rakepwd
-          pwd_set(pass: !pwd.nil?) do
-            IO.popen(rake_output(pwd, '-AT').to_s).each do |line|
-              next unless line =~ /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/
+          @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]
+                ret << [$1, $2]
+              end
             end
           end
-          @rakelist = ret
         end
 
         def preopts
@@ -960,19 +982,19 @@ module Squared
         end
 
         def rakefile
-          return unless (file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? })
-
-          path + file
+          @rakefile ||= Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }.yield_self do |file|
+            file ? path + file : ''
+          end
         end
 
         def rakepwd
-          return unless Rake::VERSION >= '13.0.4'
+          return if pwd? || Rake::VERSION < '13.0.4'
 
           quote_option 'C', path
         end
 
         def gempwd
-          return unless Gem::VERSION >= '3.4.2'
+          return if pwd? || Gem::VERSION < '3.4.2'
 
           quote_option 'C', path
         end

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

@@ -35,7 +35,7 @@ module Squared
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
               warn log_message(Logger::WARN, opts.join(', '), pass: true, **kwargs)
-              return if pass || confirm("Run? [#{sub_style(target, styles: styles)}] [y/N] ", 'N')
+              return if pass || confirm("Run? [#{sub_style(target, styles: styles)}]", 'N')
 
               raise_error 'user cancelled'
             end
@@ -140,6 +140,7 @@ 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,7 +190,8 @@ module Squared
           end
 
           def append(*args, **kwargs)
-            OptionPartition.append(target, *(args.empty? ? extras : args), **kwargs)
+            args = extras if args.empty?
+            OptionPartition.append(target, *args, **kwargs)
             self
           end
 
@@ -206,6 +208,40 @@ 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?('-')
+
+                i = index
+                break
+              elsif index > 0 && !val.start_with?('-')
+                if start
+                  i = index + (start.is_a?(Numeric) ? start : 1)
+                  break
+                end
+                i = 0
+              end
+            end
+            if i > 0
+              if args.empty?
+                args = dup
+                reset
+              end
+              args = items[0...i] + args + items[i..-1]
+              target.clear
+            end
+            merge(args)
+            self
+          end
+
+          def reset(errors: false)
+            extras.clear
+            clear(errors: true) if errors
+            self
+          end
+
           def arg?(*args, **kwargs)
             OptionPartition.arg?(target, *args, **kwargs)
           end

data/lib/squared/workspace/repo.rb

@@ -177,7 +177,8 @@ module Squared
             parse_opts.call(args)
             stage = 'init'
             puts if newline
-            system("repo init -u #{env('REPO_URL') || manifest_url} -m #{args.manifest || target}.xml", chdir: root)
+            Common::System.shell("repo init -u #{env('REPO_URL') || manifest_url} -m #{args.manifest || target}.xml",
+                                 chdir: root)
             repo['all'].invoke
           end
 
@@ -214,7 +215,7 @@ module Squared
 
         path = sub_style(root, styles: theme[:inline])
         @repo_override = Common::Prompt.confirm(
-          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation? [y/N] ",
+          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation?",
           'N',
           timeout: env('REPO_TIMEOUT', 15, ignore: '0')
         )

data/lib/squared/workspace/series.rb

@@ -10,16 +10,16 @@ module Squared
 
       TASK_BASE = []
       TASK_BATCH = {}
-      TASK_EXTEND = {}
+      TASK_EXTEND = Workspace.hashlist
       TASK_KEYS = []
-      TASK_ALIAS = {}
+      TASK_ALIAS = Workspace.hashobj
       TASK_NAME = {}
       private_constant :TASK_BASE, :TASK_BATCH, :TASK_EXTEND, :TASK_KEYS, :TASK_ALIAS, :TASK_NAME
 
       class << self
         def add(task, obj)
           key_set task
-          (TASK_EXTEND[task] ||= []) << obj
+          TASK_EXTEND[task] << obj
         end
 
         def batch(*args, obj)
@@ -37,7 +37,7 @@ module Squared
 
         def alias(ref, obj)
           if obj.is_a?(Hash)
-            obj.each { |key, val| (TASK_ALIAS[key] ||= {})[ref] = val }
+            obj.each { |key, val| TASK_ALIAS[key][ref] = val }
           else
             TASK_ALIAS[obj]&.delete(ref)
           end
@@ -79,8 +79,8 @@ module Squared
         @chain = {}
         @exclude = exclude.freeze
         @session = {
-          group: {},
-          parent: {},
+          group: Workspace.hashlist,
+          parent: Workspace.hashlist,
           id: []
         }
         @data = {}
@@ -95,7 +95,7 @@ module Squared
 
           if (g = proj.group)
             id << g
-            (group[:"#{key}:#{g}"] ||= []).concat(tasks)
+            group[:"#{key}:#{g}"].concat(tasks)
           else
             items.concat(tasks)
           end
@@ -106,7 +106,7 @@ module Squared
           next unless (b = ws.find_base(proj)) && (n = b.ref.to_s) != g
 
           id << n
-          (parent[:"#{key}:#{n}"] ||= []).concat(tasks)
+          parent[:"#{key}:#{n}"].concat(tasks)
         end
       end
 

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

@@ -3,9 +3,9 @@
 module Squared
   module Workspace
     module Support
-      RunData = Struct.new(:run, :block)
-      ChainData = Struct.new(:action, :step, :with, :before, :after, :sync)
-      BannerData = Struct.new(:command, :order, :styles, :border)
+      RunData = Struct.new('RunData', :run, :block)
+      ChainData = Struct.new('ChainData', :action, :step, :with, :before, :after, :sync)
+      BannerData = Struct.new('BannerData', :command, :order, :styles, :border)
     end
   end
 end

data/lib/squared/workspace.rb

@@ -27,6 +27,14 @@ module Squared
         !!project(name)&.enabled?
       end
 
+      def hashobj
+        Hash.new { |data, key| data[key] = {} }
+      end
+
+      def hashlist
+        Hash.new { |data, key| data[key] = [] }
+      end
+
       private
 
       def project(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - An Pham