squared 0.4.7 → 0.4.8

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

@@ -7,6 +7,9 @@ module Squared
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_RUBY = {
+          ruby: %w[a c l n p s S w d|debug jit rjit v|verbose y|yydebug 0=im? backtrace-limit=i crash-report=q
+                   disable=q dump=q e=q enable=q encoding=b external-encoding=b Eex=m? F=qm i=m? internal-encoding=b
+                   I=pm parser=b r=bm W=bm? x=pm?].freeze,
           rake: %w[A|all B|build-all comments n|dry-run p|execute-print=q m|multitask P|prereqs q|quiet
                    X|no-deprecation-warnings N|no-search G|no-system nosearch nosystem rules s|silent g|system
                    v|verbose backtrace=b? D|describe=q? e|execute=q E|execute-continue=q I|libdir=p job-stats=b?
@@ -78,6 +81,7 @@ module Squared
           'update' => %i[patch minor major all].freeze,
           'outdated' => %i[patch minor major].freeze,
           'gem' => %i[install uninstall update pristine outdated push build exec].freeze,
+          'ruby' => %i[file script version].freeze,
           'exec' => nil,
           'cache' => nil,
           'config' => nil,
@@ -124,7 +128,7 @@ module Squared
           return unless outdated? && ref?(Ruby.ref)
 
           namespace name do
-            @@tasks[Ruby.ref].each do |action, flags|
+            Ruby.subtasks do |action, flags|
               next if @pass.include?(action)
 
               if flags.nil?
@@ -182,16 +186,54 @@ module Squared
                       end
                     when 'gem'
                       case flag
-                      when :outdated, :build, :push, :exec
+                      when :outdated
+                        format_desc action, flag, 'major|minor|patch|(i)nteractive?,opts*'
+                        task flag, [:semver] do |_, args|
+                          case (filter = args.semver)
+                          when 'major', 'minor', 'patch', 'interactive', 'i'
+                            filter = 'interactive' if filter == 'i'
+                            args = args.to_a.drop(1)
+                          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+' : nil)
                         task flag do |_, args|
-                          gemx flag, args.to_a
+                          gem! flag, args.to_a
                         end
                       else
                         format_desc action, flag, "opts*,name+#{flag == :pristine ? '|name?@version' : ''}"
                         task flag do |_, args|
                           opts = param_guard(action, flag, args: args.to_a)
-                          gemx flag, opts
+                          gem! flag, opts
+                        end
+                      end
+                    when 'ruby'
+                      case flag
+                      when :file
+                        format_desc action, flag, 'path,opts*,args*'
+                        task flag, [:rb] do |_, args|
+                          file = param_guard(action, flag, args: args, key: :rb)
+                          ruby(flag, args.to_a.drop(1), file: file)
+                        end
+                      when :script
+                        format_desc action, flag, 'command|RUBY_E,opts*,args*'
+                        task flag, [:e] do |_, args|
+                          if (command = ENV['RUBY_E'])
+                            opts = args.to_a
+                          else
+                            command = param_guard(action, flag, args: args, key: :e)
+                            opts = args.to_a.drop(1)
+                          end
+                          ruby(flag, opts, command: command)
+                        end
+                      when :version
+                        format_desc action, flag
+                        task flag do
+                          ruby flag
                         end
                       end
                     end
@@ -279,7 +321,7 @@ module Squared
                   end
                   minor_set = -> { styles[0] = cur[2] == lat[2] ? :yellow : :green }
                   if data.empty?
-                    semmajor?(cur, lat) ? major_set.() : minor_set.()
+                    semmajor?(cur, lat) ? major_set.call : minor_set.call
                   else
                     data.each do |val|
                       break unless line =~ /(>=?|=|~>|!=|<=?) (#{Regexp.escape(val.join)})/
@@ -287,11 +329,11 @@ module Squared
                       v = semver(val).join
                       case $1
                       when '>', '>='
-                        semmajor?(cur, lat) ? major_set.() : minor_set.()
+                        semmajor?(cur, lat) ? major_set.call : minor_set.call
                       when '<', '<='
                         if c <= v
                           if semmajor?(cur, lat)
-                            major_set.()
+                            major_set.call
                           else
                             styles[0] = :yellow
                           end
@@ -329,11 +371,11 @@ module Squared
                                                               index: 2)
                   end
                 end
-                out.("#{start.to_s.rjust(2)}. #{line}")
+                out.call("#{start.to_s.rjust(2)}. #{line}")
               elsif line.start_with?('Gem')
                 unless stdin?
                   sub = { pat: /^(.+)(?<!\dm)(Gem|Latest)(.+)$/, styles: theme[:header], index: 2 }
-                  out.(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
+                  out.call(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
                 end
               else
                 next
@@ -376,7 +418,96 @@ module Squared
           run_rb(from: :update)
         end
 
-        def gemx(flag, opts = [])
+        def ruby(flag, opts = [], file: nil, command: nil)
+          case flag
+          when :file, :script
+            op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, args: true)
+            if file
+              op.extras.unshift(shell_quote(basepath(file)))
+            elsif command
+              op << quote_option('e', command, option: false)
+            end
+            if (args = ENV['RUBY_ARGS'])
+              op.extras << args
+            end
+            op.append(delim: true, escape: false, quote: false) unless op.empty?
+          when :version
+            pwd_set do
+              out = []
+              [
+                '$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|
+                next unless val.empty? || File.exist?(val.sub('$HOME', Dir.home))
+
+                trim = ->(s) { s[/^\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/^([a-z]+)-/i, '\1 ') }
+                ver = '.ruby-version'
+                out << trim.call(case (cmd = File.basename(val))
+                                 when 'rvm'
+                                   `rvm current`[/^\S+/, 0]
+                                 when 'rbenv'
+                                   name = `rbenv version-name`
+                                   name =~ SEM_VER ? "ruby #{name}" : name
+                                 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`
+                                 end)
+                unless val.empty?
+                  out << trim.call(case cmd
+                                   when 'chruby.sh'
+                                     `#{chruby.with('chruby --version')}`.sub(':', '')
+                                   when 'install'
+                                     "asdf #{`asdf version`.sub(/^v/, '')}"
+                                   else
+                                     `#{cmd} --version`
+                                   end)
+                end
+                begin
+                  out << ('which %s' % case cmd
+                                       when 'rbenv'
+                                         `rbenv which ruby`
+                                       when 'chruby.sh'
+                                         `#{chruby.with('which ruby')}`
+                                       when 'install'
+                                         `asdf which ruby`
+                                       else
+                                         `which ruby`
+                                       end)
+                rescue StandardError => e
+                  log.debug e
+                end
+                if ver
+                  path.ascend do |ent|
+                    next unless (ent = ent.join(ver)).exist?
+
+                    hint = File.read(ent).lines(chomp: true).reject(&:empty?).join(', ') rescue nil
+                    out << message("found #{ent}", hint: hint)
+                  end
+                end
+                break
+              end
+              out.map!(&:split)
+              pad = out.map(&:first).map!(&:size).max
+              puts(out.map! { |line| "#{line.first.rjust(pad)} #{line[1..-1].join(' ')}" })
+            end
+            return
+          end
+          run_rb(banner: op.arg?('v'), from: :"ruby:#{flag}")
+        end
+
+        def gem!(flag, opts = [], filter: nil)
           cmd = gem_session
           case flag
           when :outdated
@@ -420,6 +551,10 @@ module Squared
             op.clear
             on :first, from
             print_item format_banner(cmd.to_s)
+            major = 0
+            minor = 0
+            patch = 0
+            update = []
             pwd_set(pass: !pwd.nil?, from: from) do
               items = [[%w[Gem Current Latest], nil]]
               IO.popen(cmd.done).each do |line|
@@ -427,9 +562,9 @@ module Squared
                   cur = semscan($2)
                   lat = semscan($3)
                   items << [$~.to_a.drop(1), if semmajor?(cur, lat)
-                                               %i[green bold]
+                                               1
                                              else
-                                               cur[2] == lat[2] ? [:yellow] : [:green]
+                                               cur[2] == lat[2] ? 3 : 2
                                              end]
                 else
                   puts line
@@ -448,9 +583,7 @@ module Squared
                   e = b.size if b.size > e
                   f = c.size if c.size > f
                 end
-                major = 0
-                minor = 0
-                patch = 0
+                j = 0
                 items.each_with_index do |item, i|
                   next if i == 0 && stdin?
 
@@ -464,33 +597,80 @@ module Squared
                     puts line
                     puts sub_style(ARG[:BORDER][1] * n, styles: borderstyle)
                   else
-                    styles = item.last
-                    a = a.ljust(d)
-                    if styles.first == :green
-                      a = sub_style(a, styles: if styles.size == 2
-                                                 major += 1
-                                                 theme[:major]
-                                               else
-                                                 minor += 1
-                                                 theme[:active]
-                                               end)
+                    g = a.ljust(d)
+                    pat = [/\A([^.]+\.)([^.]+\..+)\z/, /\A([^.]+\.[^.]+\.)(.+)\z/]
+                    pre = b.start_with?('0.')
+                    latest = [theme[:current]]
+                    case item.last
+                    when 1
+                      case filter
+                      when 'major'
+                        update << a
+                      when 'minor', 'patch'
+                        next
+                      end
+                      g = sub_style(g, styles: theme[:major])
+                      major += 1
+                      styles = %i[green bold]
+                      pat = pre ? pat.first : nil
+                      latest << :bold
+                    when 2
+                      case filter
+                      when 'major', 'minor'
+                        update << a
+                      when 'patch'
+                        next
+                      end
+                      g = sub_style(g, styles: theme[:active])
+                      minor += 1
+                      styles = %i[green]
+                      pat = pre ? pat.last : pat.first
                     else
+                      case filter
+                      when 'major', 'minor', 'patch'
+                        update << a
+                      end
                       patch += 1
+                      styles = %i[yellow]
+                      pat = pat.last
                     end
                     b = b.rjust(e)
-                    b = sub_style(b, styles: theme[:current]) if theme[:current]
-                    c = sub_style(c.rjust(f), *colormap(styles))
-                    puts "#{"#{i}.".rjust(pad)} #{a}    #{b}  #{c}"
+                    b = sub_style(b, *colormap(styles), pat: pat, index: 2)
+                    h = sub_style(c.rjust(f), styles: latest.flatten.compact, pat: pat, index: 2)
+                    j += 1
+                    puts "#{"#{j}.".rjust(pad)} #{g}    #{b}  #{h}"
+                    update << a if filter == 'interactive' && confirm_outdated(a, c, item.last)
                   end
                 end
-                unless stdin?
-                  status = print_footer("major #{major} / minor #{minor} / patch #{patch}", right: true).split("\n")
-                  status[1] = sub_style(status[1], pat: /^( +major )(\d+)(.+)$/, styles: theme[:major], index: 2)
-                  status[1] = sub_style(status[1], pat: /^(.+)(minor )(\d+)(.+)$/, styles: theme[:active], index: 3)
-                  puts status
-                end
               end
             end
+            unless update.empty?
+              cmd = gem_output 'update', '-f'
+              if (val = option('document', prefix: 'gem', ignore: false))
+                cmd << case val
+                       when '0', 'false'
+                         '--no-document'
+                       else
+                         basic_option('document', val)
+                       end
+              end
+              if (val = option('user-install', prefix: 'gem', ignore: false))
+                cmd << case val
+                       when '0', 'false'
+                         '--no-user-install'
+                       else
+                         '--user-install'
+                       end
+              end
+              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] = sub_style(status[1], pat: /^( +major )(\d+)(.+)$/, styles: theme[:major], index: 2)
+              status[1] = sub_style(status[1], pat: /^(.+)(minor )(\d+)(.+)$/, styles: theme[:active], index: 3)
+              puts status
+            end
             on :last, from
             return
           when :build, :push
@@ -502,7 +682,7 @@ module Squared
               end
             elsif flag == :build
               spec = [basepath("#{project}.gemspec"), basepath("#{name}.gemspec"), *Dir.glob(basepath('*.gemspec'))]
-              op << File.basename(spec) if (spec = spec.find { |val| File.exist?(val) })
+              op << File.basename(spec) if (spec = spec.find { |file| File.exist?(file) })
             end
           when :exec
             raise_error('missing command', hint: flag) if op.empty?
@@ -600,7 +780,7 @@ module Squared
                 ver.each do |val|
                   next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
 
-                  set.(val, $1)
+                  set.call(val, $1)
                   break
                 end
               end
@@ -612,14 +792,14 @@ module Squared
 
               lib = Regexp.new(['', 'gems', "#{project}-([^#{File::SEPARATOR}]+)", ''].join(File::SEPARATOR))
               if (ver = path[lib, 1]) && (val = path[/\A(.+)#{gempath(ver[1])}/, 1])
-                set.(ver, val)
+                set.call(ver, val)
               end
             end
             if RUBY_VERSION >= '2.6'
               target = RUBY_VERSION.start_with?('2.6') ? RubyVM : $LOAD_PATH
-              parse.(target.resolve_feature_path(project)&.last)
+              parse.call(target.resolve_feature_path(project)&.last)
             end
-            pwd_set { parse.(`#{bundle_output('show', project)}`) } unless @gemdir
+            pwd_set { parse.call(`#{bundle_output('show', project)}`) } unless @gemdir
           end
           raise_error('parse failed', hint: @version || 'path') unless @gemdir
         rescue StandardError => e
@@ -660,6 +840,10 @@ module Squared
           end
         end
 
+        def ruby_session(*cmd, **kwargs)
+          session('ruby', *preopts, *cmd, **kwargs)
+        end
+
         def gem_session(*cmd, **kwargs)
           ret = session('gem', *cmd, **kwargs)
           return ret if cmd.empty?
@@ -683,6 +867,10 @@ module Squared
           session_output('gem', *cmd, **kwargs)
         end
 
+        def ruby_output(*cmd, **kwargs)
+          session_output('ruby', *cmd, **kwargs)
+        end
+
         def bundle_output(*cmd, **kwargs)
           session_output('bundle', *cmd, **kwargs)
         end

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

@@ -16,10 +16,10 @@ module Squared
             include Prompt
 
             def append(target, *args, delim: false, escape: false, quote: true)
-              return if args.empty?
+              return if (ret = args.flatten).empty?
 
               target << '--' if delim && !target.include?('--')
-              ret = args.flatten.map { |val| escape ? shell_escape(val, quote: quote) : shell_quote(val) }
+              ret.map! { |val| escape ? shell_escape(val, quote: quote) : shell_quote(val) } if escape || quote
               if target.is_a?(Set)
                 target.merge(ret)
               else
@@ -117,6 +117,7 @@ module Squared
                 else
                   next
                 end
+                m << flag if val[n + 2] == 'm'
                 bare << flag if val.end_with?('?')
               else
                 bare << val
@@ -138,17 +139,18 @@ module Squared
                 if opt =~ /\A([^=]+)=(.+)\z/
                   key = $1
                   val = $2
-                  match = ->(flag, pat) { flag.include?(key) && pat.match?(val) }
+                  merge = m.include?(key)
+                  r = ->(flag, pat) { flag.include?(key) && pat.match?(val) }
                   if e.include?(key)
-                    target << shell_option(key, val)
+                    target << shell_option(key, val, merge: merge)
                   elsif q.include?(key)
-                    target << quote_option(key, val, double: qq.include?(key))
+                    target << quote_option(key, val, double: qq.include?(key), merge: merge)
                   elsif p.include?(key) && path
-                    target << quote_option(key, path.join(val))
-                  elsif m.include?(key)
+                    target << quote_option(key, path.join(val), merge: merge)
+                  elsif b.include?(key) || r.call(i, /^\d+$/) || r.call(f, /^\d*(?:\.\d+)?$/) || r.call(si, /^-?\d+$/)
+                    target << basic_option(key, val, merge: merge)
+                  elsif merge
                     target << basic_option(key, val, merge: true)
-                  elsif b.include?(key) || match.(i, /^\d+$/) || match.(f, /^\d*(?:\.\d+)?$/) || match.(si, /^-?\d+$/)
-                    target << basic_option(key, val)
                   else
                     @extras << opt
                   end

data/lib/squared/workspace/repo.rb

@@ -3,8 +3,6 @@
 module Squared
   module Workspace
     module Repo
-      include Common::Format
-
       class << self
         def read_manifest(path)
           require 'rexml/document'
@@ -149,9 +147,9 @@ module Squared
             end
           end
 
-          desc.('all[{0}]')
+          desc.call('all[{0}]')
           task 'all', [:opts] do |_, args|
-            parse_opts.(args)
+            parse_opts.call(args)
             stage ||= 'all'
             repo['sync'].invoke
             next if env('REPO_DRYRUN', equals: '2')
@@ -174,21 +172,21 @@ module Squared
             end
           end
 
-          desc.("init[manifest?=#{target},{0}]", target)
+          desc.call("init[manifest?=#{target},{0}]", target)
           task 'init', [:manifest, :opts] do |_, args|
-            parse_opts.(args)
+            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)
             repo['all'].invoke
           end
 
-          desc.('sync[{0}]')
+          desc.call('sync[{0}]')
           task 'sync', [:opts] do |_, args|
             unless branch || stage == 'init'
               raise_error('repo not initialized', hint: task_name('repo:init'), kind: LoadError)
             end
-            parse_opts.(args)
+            parse_opts.call(args)
             cmd << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}"
             cmd << '--fail-fast' if failfast
             puts if newline && stage != 'init'

data/lib/squared/workspace/series.rb

@@ -66,16 +66,17 @@ module Squared
         end
       end
 
-      attr_reader :sync, :multiple, :parallel
+      attr_reader :exclude, :sync, :multiple, :parallel
 
       def_delegators :@data, :[], :each, :each_key, :keys, :fetch, :to_a, :to_s, :inspect, :merge!, :key?
       def_delegators :@workspace, :task_desc, :task_name, :task_namespace, :task_join, :format_desc
 
-      def initialize(workspace)
+      def initialize(workspace, exclude: [])
         @workspace = workspace
         @sync = []
         @multiple = []
         @parallel = []
+        @exclude = exclude.freeze
         @session = {
           group: {},
           parent: {},
@@ -89,7 +90,7 @@ module Squared
         group, parent, id = @session.values
         ws = proj.workspace
         @data.each do |key, items|
-          next if (tasks = ws.task_resolve(proj, key)).empty?
+          next if exclude.include?(key) || (tasks = ws.task_resolve(proj, key)).empty?
 
           if (g = proj.group)
             id << g
@@ -113,13 +114,13 @@ module Squared
         @data.merge!(@session[:parent]) if @session[:id].uniq.size > 1
         @data.merge!(@session[:group])
         @data.each do |key, items|
-          next if items.empty? || @workspace.task_exclude?(t = name_get(key))
+          next if items.empty? || exclude.include?(key) || @workspace.task_exclude?(t = name_get(key))
 
           key = task_name(t)
           val = format_desc(key, out: true)
           if items.size > 1
             @multiple << key
-            if parallel.include?(t) || pattern.any? { |pat| t.match?(pat) } || subcheck.(t)
+            if parallel.include?(t) || pattern.any? { |pat| t.match?(pat) } || subcheck.call(t)
               task_desc("#{val} (thread)", name: key)
               multitask key => items
               @parallel << key

data/lib/squared/workspace.rb

@@ -10,8 +10,7 @@ module Squared
           if id.is_a?(Symbol)
             project id
           else
-            id = dirpath(id) if id.is_a?(String)
-            __get__(:project).find { |_, val| val.path.to_s == id.to_s }
+            __get__(:project).find { |_, val| File.expand_path(val.path) == File.expand_path(id) }
           end
         end
         ret.size == 1 ? ret.first : ret
@@ -33,12 +32,6 @@ module Squared
       def project(name)
         __get__(:project)[name.to_s]
       end
-
-      def dirpath(val, absolute: true)
-        Pathname.new(val).realdirpath
-      rescue StandardError
-        absolute ? Pathname.pwd.join(val) : Pathname.new(val)
-      end
     end
   end
 end

metadata

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