squared 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f66aceeba825bcfd6afd3b20e5c39431d94450639cc70e07c3c8c22725426595
-  data.tar.gz: b23a0282dbe08d322ed19931ddaa59be93c4b5caeb603fb90ca4283a0f195bb0
+  metadata.gz: 42ae11aaf561b6e6d821f7590e37982c408cb4f09aa4946084e4d3ec29c6fdff
+  data.tar.gz: 3ef75c9101dfd1676c035396055bd5585b33e3be41498dbd19eac2a98ea80a81
 SHA512:
-  metadata.gz: ffa105272b8235dd427597c590d372d910edc40e2cd988dfe6b779355c2f036f32fdf6ec909d336cb84a7bf38db425e456a982b51cfad4d4fa499cb583382f27
-  data.tar.gz: cb767f0c63b833b4550199caf2d0fc2f2d98bda119e4f0c128de5e7083fe6da7813402a46aaabfabb0b19dd56c23f77d7732167673df2bf50996ca47c55d9fa0
+  metadata.gz: cf24602228107b3e1a760749acf96f367cd0877ea6d45a2b0153ea08ba2a3bb014b547986e2406d2aaca4744e005bad2d9994d4a5807a7cc1afe517191aca775
+  data.tar.gz: 87e429e0eb78518ea637ecd863aab3359fef584b3c87340cc5a4d9f83718e7b89ac7b258a9e7a9f7d7ece3169776a8fb61d6e5f575c7420778510f3a122d84db

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.6.5] - 2025-11-18
+
+### Added
+
+- Ruby command rubocop with stored command options was created.
+
+### Changed
+
+- Node command outdated uses inline interactive prompts.
+- Python task outdated no longer updates packages directly.
+
+### Fixed
+
+- Common format method emphasize modified frozen string in Ruby 2.5.
+
 ## [0.6.4] - 2025-11-16
 
 ### Added
@@ -1419,6 +1434,7 @@
 
 - Changelog was created.
 
+[0.6.5]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.5
 [0.6.4]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.4
 [0.6.3]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.3
 [0.6.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.2

data/README.md

@@ -154,7 +154,7 @@ Node = Workspace::Project::Node                                      # tsc
 Node.options("build:dev", "target=es2022", project: "tsconfig.json") # :node (ref)
 Node.options("build:dev", "outDir=tmp", :squared)                    # squared (project name)
 
-Ruby = Workspace::Project::Ruby                                      # ruby | gem | rake | bundle | irb | rbs
+Ruby = Workspace::Project::Ruby                                      # ruby | gem | rake | bundle | irb | rbs | rubocop
 Ruby.options("lint", "rubocop", opts: ["gemfile=Gemfile"])           # :ruby
 Ruby.options("lint", "--parallel", :squared)
 

data/lib/squared/common/format.rb

@@ -196,9 +196,8 @@ module Squared
         args = args.map(&:to_s)
         if level.is_a?(::Numeric)
           if append && respond_to?(:log)
-            (log rescue nil).tap do |ref|
-              ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(::Logger)
-            end
+            ref = log rescue nil
+            ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(::Logger)
           end
           return false unless pass || level >= ARG[:LEVEL]
         end
@@ -275,7 +274,7 @@ module Squared
         pr = lambda do |line|
           s = line.ljust(n)
           sub.each { |h| sub_style!(s, **h) }
-          s = "#{b0} #{s} #{b0}"
+          s = +"#{b0} #{s} #{b0}"
           if border
             [[/\A(#{Regexp.escape(b0)})(.+)\z/om], [/\A(.+)(#{Regexp.escape(b0)})\z/om, 2]].each do |args|
               sub_style!(s, **opt_style(border, *args))

data/lib/squared/config.rb

@@ -233,10 +233,8 @@ module Squared
               end
         return unless (lines = print_keys(type, doc, keys, file: file, opts: opts))
 
-        title = Pathname.new(file)
-                        .realpath
-                        .to_s
-                        .sub(/^#{Regexp.escape(File.join(Dir.pwd, ''))}/, '')
+        title = File.realpath(file)
+                    .sub(/^#{Regexp.escape(File.join(Dir.pwd, ''))}/, '')
         emphasize(lines, title: title, sub: unless stdin?
                                               [
                                                 opt_style(theme[:banner], /\A((?:[^:]|(?<! ):(?! ))+)\z/),

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/lib/squared/workspace/application.rb

@@ -529,7 +529,7 @@ module Squared
         if (base = task_base?(key))
           tasks << key if obj.has?(key, baseref)
         elsif (batch = series.batch_get(key))
-          obj.allref.each do |ref|
+          obj.allref do |ref|
             next unless obj.has?(key, ref) && (data = batch[ref])
 
             data.each do |val|
@@ -548,7 +548,7 @@ module Squared
         if tasks.empty?
           return [] if (base && !obj.ref?(baseref)) || !(data = series.alias_get(key))
 
-          obj.allref.each do |ref|
+          obj.allref do |ref|
             next unless obj.has?(key, ref) && (alt = data[ref])
 
             ret = task_resolve obj, alt

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

@@ -251,7 +251,7 @@ module Squared
                    print_error e
                  end
           log[:progname] ||= @name
-          log[:level] = val.match?(/\d/) ? log_sym(val.to_i) : val if (val = env('LOG_LEVEL', ignore: false))
+          env('LOG_LEVEL', ignore: false) { |val| log[:level] = val.start_with?(/\d/) ? log_sym(val.to_i) : val }
           log.delete(:file)
           @log = [file, log]
         end
@@ -259,28 +259,24 @@ module Squared
         def initialize_env(dev: nil, prod: nil, **)
           @dev = env_match('BUILD', dev, suffix: 'DEV', strict: true)
           @prod = env_match('BUILD', prod, suffix: 'PROD', strict: true)
-          if @output[2] != false && (val = env('BUILD', suffix: 'ENV'))
-            @output[2] = parse_json(val, hint: "BUILD_#{@envname}_ENV") || @output[2]
-          end
+          env('BUILD', suffix: 'ENV') { |val| @output[2] = val if (val = parse_json(val)) } unless @output[0] == false
           unless @output[0] == false || @output[0].is_a?(Array)
-            if (val = env('BUILD', suffix: 'OPTS'))
+            env('BUILD', suffix: 'OPTS') do |val|
               n = @output[0] ? 1 : 3
               @output[n] = merge_opts(@output[n], shell_split(val))
             end
-            if (val = env(ref.to_s.upcase, suffix: 'OPTS'))
-              @output[4] = merge_opts(@output[4], shell_split(val))
+            env(ref.to_s.upcase, suffix: 'OPTS') { |val| @output[4] = merge_opts(@output[4], shell_split(val)) }
+          end
+          env('BUILD', suffix: 'VERSION') { |val| self.version = val }
+          env('BUILD', strict: true) do |val|
+            if val == '0'
+              @output = [false]
+            elsif script?
+              script_set val
+            else
+              run_set val
             end
           end
-          @version = val if (val = env('BUILD', suffix: 'VERSION'))
-          return unless (val = env('BUILD', strict: true))
-
-          if val == '0'
-            @output = [false]
-          elsif script?
-            script_set val
-          else
-            run_set val
-          end
         end
 
         def ==(other)
@@ -702,7 +698,9 @@ module Squared
             if order
               out.map! do |val|
                 name = ret.find { |proj| val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/) }&.name
-                (n = name && order[name]) ? val.subhint(n.succ) : val
+                next val unless (n = name && order[name])
+
+                val.subhint(n.succ)
               end
             else
               [out, ret]
@@ -743,9 +741,9 @@ module Squared
                    end
           end
           env('HEADERS') do |val|
-            if (data = parse_json(val, hint: "HEADERS_#{@envname}"))
-              headers = headers.is_a?(Hash) ? headers.merge(data) : data
-            end
+            next unless (data = parse_json(val))
+
+            headers = headers.is_a?(Hash) ? headers.merge(data) : data
           end
           if file
             ext ||= File.extname(file)[1..-1]
@@ -888,13 +886,9 @@ module Squared
         end
 
         def event(name, key, *args, override: false, **kwargs, &blk)
-          data = @events[name.to_sym]
-          items = if override
-                    data[key.to_sym] = []
-                  else
-                    data[key.to_sym] ||= []
-                  end
-          items << [block_given? ? [blk] + args : args, kwargs]
+          args.unshift(blk) if block_given?
+          ev = @events[name.to_sym]
+          (override ? ev[key.to_sym] = [] : ev[key.to_sym] ||= []) << [args, kwargs]
           self
         end
 
@@ -919,8 +913,10 @@ module Squared
 
         def run(cmd = @session, var = nil, exception: self.exception, sync: true, banner: true, from: nil, chdir: path,
                 interactive: nil, hint: nil, series: false, **)
-          return print_error('no command session started', subject: project, hint: from, pass: true) unless cmd
-
+          unless cmd
+            print_error('no command session started', subject: project, hint: from, pass: true)
+            return
+          end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
           if interactive && sync && (!@session || !option('y'))
             msg, y, h = case interactive
@@ -1120,14 +1116,41 @@ module Squared
           @log = Logger.new((@log.first if enabled?), **@log.last)
         end
 
-        def allref
-          @ref.reverse_each
+        def allref(&blk)
+          @ref.reverse_each(&blk)
         end
 
         def basepath(*args)
           path.join(*args)
         end
 
+        def basepath!(*args, type: nil)
+          ret = basepath(*args)
+          return unless ret.exist?
+
+          if type
+            (type.is_a?(String) ? type.chars : type).each do |ch|
+              case ch
+              when 'f'
+                return nil unless ret.file?
+              when 'd'
+                return nil unless ret.directory?
+              when 'l'
+                return nil unless ret.symlink?
+              when 'r'
+                return nil unless ret.readable?
+              when 'w'
+                return nil unless ret.writable?
+              when 'e'
+                return nil unless ret.executable?
+              else
+                return nil
+              end
+            end
+          end
+          ret
+        end
+
         def rootpath(*args, ascend: nil)
           ret = basepath(*args)
           return ret unless ascend && !ret.exist?
@@ -1162,6 +1185,15 @@ module Squared
           name.to_sym
         end
 
+        protected
+
+        def script_get(*args, key: nil)
+          ret = workspace.script_get(*args, group: group, ref: allref)
+          return ret unless ret && key
+
+          ret.fetch(key, nil)
+        end
+
         private
 
         def puts(*args, **kwargs)
@@ -1216,7 +1248,6 @@ module Squared
         def graph_branch(target, data, tasks = nil, out = nil, sync: true, pass: [], done: [], order: nil, depth: 0,
                          single: false, last: false, context: nil)
           tag = ->(proj) { "#{proj.name}#{"@#{proj.version}" if SEM_VER.match?(proj.version)}" }
-          script = ->(proj) { workspace.script_get(:graph, group: proj.group, ref: proj.allref)&.fetch(:graph, nil) }
           uniq = lambda do |name|
             next [] unless (ret = data[name])
 
@@ -1296,21 +1327,22 @@ module Squared
                                 end
               end
             else
-              (tasks || (subtasks = script.call(proj)) || (dev? ? %w[build copy] : %w[depend build])).each do |meth|
-                next if pass.include?(meth)
+              (tasks || (graph = proj.script_get(:graph, key: :graph)) || (dev? ? %w[build copy] : %w[depend build]))
+                .each do |meth|
+                  next if pass.include?(meth)
 
-                if workspace.task_defined?(cmd = task_join(name, meth))
-                  if ENV.key?(key = "BANNER_#{name.upcase}")
-                    key = nil
-                  else
-                    ENV[key] = '0'
+                  if workspace.task_defined?(cmd = task_join(name, meth))
+                    if ENV.key?(key = "BANNER_#{name.upcase}")
+                      key = nil
+                    else
+                      ENV[key] = '0'
+                    end
+                    run(cmd, sync: false, banner: false)
+                    ENV.delete(key) if key
+                  elsif proj.has?(meth, (workspace.baseref unless tasks || graph))
+                    proj.__send__(meth.to_sym, sync: sync)
                   end
-                  run(cmd, sync: false, banner: false)
-                  ENV.delete(key) if key
-                elsif proj.has?(meth, (workspace.baseref unless tasks || subtasks))
-                  proj.__send__(meth.to_sym, sync: sync)
                 end
-              end
             end
             done << proj
           end
@@ -1376,12 +1408,13 @@ module Squared
                   ignore = ['0'].freeze if ignore.nil?
                   ENV[name] || ENV.fetch(key, '')
                 end
-          if !equals.nil?
+          if equals.nil?
+            ret = default if ret.empty? || (ignore && Array(ignore).any? { |val| ret == val.to_s })
+            return ret if ret.nil?
+          else
             ret = Array(equals).any? { |val| ret == val.to_s }
-          elsif ret.empty? || (ignore && Array(ignore).any? { |val| ret == val.to_s })
-            ret = default
           end
-          return yield ret if block_given? && !ret.nil?
+          return yield ret if block_given?
 
           ret
         end
@@ -1658,7 +1691,9 @@ module Squared
         end
 
         def empty_status(msg, title, obj, always: false)
-          "#{msg}#{message(hint: message(title, obj.to_s)) unless !always && (!obj || obj == 0 || obj.to_s.empty?)}"
+          return msg if !always && (!obj || obj == 0 || obj.to_s.empty?)
+
+          msg.subhint(obj.is_a?(Numeric) ? "#{obj} #{title}" : message(title, obj.to_s))
         end
 
         def append_repeat(flag, opts, target: @session)
@@ -1959,7 +1994,9 @@ module Squared
         end
 
         def block_args(fallback = nil, &blk)
-          (ret = instance_eval(&blk)).nil? ? fallback : Array(ret)
+          return fallback if (ret = instance_eval(&blk)).nil?
+
+          Array(ret)
         end
 
         def runenv
@@ -1973,8 +2010,6 @@ module Squared
         end
 
         def relativepath(*list, all: false)
-          return [] if list.empty?
-
           list.flatten.map! { |val| Pathname.new(val) }.select { |val| projectpath?(val) }.map! do |val|
             ret = (val.absolute? ? val.relative_path_from(path) : val.cleanpath).to_s
             all && val.to_s.end_with?('/') ? "#{ret}/*" : ret
@@ -2286,7 +2321,7 @@ module Squared
         def asdf_set(val)
           @asdf = if @@asdf && val
                     dir = @@asdf.path.join('installs', val)
-                    [val, dir] if dir.exist? && !dir.empty?
+                    [val, dir] if dir.directory? && !dir.empty?
                   end
         end
 
@@ -2310,7 +2345,7 @@ module Squared
         end
 
         def as_get(val, from)
-          (@global && @as[from][val]) || val
+          (global && @as[from][val]) || val
         end
 
         def task_build(keys)
@@ -2449,7 +2484,7 @@ module Squared
           return false unless target.is_a?(Enumerable)
 
           args = args.first if args.size == 1 && args.first.is_a?(Enumerable)
-          args.any? { |obj| target.include?(obj) }
+          args.any? { |obj,| target.include?(obj) }
         end
 
         def has_value!(target, *args, first: false)
@@ -2487,7 +2522,7 @@ module Squared
         end
 
         def scriptargs
-          { target: script? ? @output[1] : @output[0], script: script?, ref: ref, group: group, global: @global }
+          { target: script? ? @output[1] : @output[0], script: script?, ref: ref, group: group, global: global }
         end
       end
 

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

@@ -200,7 +200,7 @@ module Squared
 
                       case flag
                       when :build
-                        format_desc action, flag, 'opts*,target*,context/:'
+                        format_desc action, flag, 'opts*,target*,context|:'
                         task flag do |_, args|
                           args = args.to_a
                           if args.first == ':'
@@ -221,7 +221,7 @@ module Squared
 
                       case flag
                       when :exec, :run
-                        format_desc action, flag, "service|:,command#{'?' unless flag == :exec}|::,args*,opts*"
+                        format_desc action, flag, "service/:,command#{'?' unless flag == :exec}/::,args*,opts*"
                         task flag, [:service] do |_, args|
                           service = param_guard(action, flag, args: args, key: :service)
                           compose!(flag, args.extras, service: service)
@@ -711,7 +711,7 @@ module Squared
             when 2, 4
               return
             when 3
-              return unless COMPOSEFILE.select { |val| basepath(val).exist? }.size > 1
+              return unless COMPOSEFILE.select { |val| basepath!(val) }.size > 1
             end
           end
           files = Array(@file).map { |val| quote_option('file', basepath(val)) }

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

@@ -489,7 +489,7 @@ module Squared
                                                               when :push then 'pathspec*,:'
                                                               when :branch then 'name,stash/:'
                                                               when :clear, :list, :all then nil
-                                                              else 'stash/:'
+                                                              else 'stash?|:'
                                                               end)
                     task flag do |_, args|
                       stash flag, args.to_a
@@ -751,7 +751,7 @@ module Squared
                         switch(flag, commit: commit)
                       end
                     when :branch
-                      format_desc action, flag, 'name|:,opts*'
+                      format_desc action, flag, 'name/:,opts*'
                       task flag, [:name] do |_, args|
                         args = if (branch = args.name)
                                  branch = nil if branch == ':'
@@ -765,7 +765,7 @@ module Squared
                   when 'reset'
                     case flag
                     when :commit
-                      format_desc action, flag, 'ref|:,opts*'
+                      format_desc action, flag, 'ref/:,opts*'
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
                         args = if commit && commit != ':'
@@ -921,7 +921,7 @@ module Squared
                         restore(flag, args, commit: commit, files: files)
                       end
                     when :staged, :worktree
-                      format_desc action, flag, 'opts*,pathspec*,:?'
+                      format_desc action, flag, 'opts*,pathspec*|:'
                       task flag do |_, args|
                         args = args.to_a
                         if args.empty? || args.last == ':'
@@ -1243,8 +1243,8 @@ module Squared
         def revbuild(flag = nil, opts = [], sync: nil, **kwargs)
           kw = lambda do
             {
-              include: relativepath(Array(kwargs[:include]), all: true),
-              exclude: relativepath(Array(kwargs[:exclude]), all: true)
+              include: relativepath(*Array(kwargs[:include]), all: true),
+              exclude: relativepath(*Array(kwargs[:exclude]), all: true)
             }
           end
           unless workspace.closed

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

@@ -159,7 +159,7 @@ module Squared
           end
           @dependname = 'package.json'
           dependfile_set [@dependname]
-          @tsfile = basepath(ts).yield_self { |file| file if file.exist? }
+          @tsfile = basepath! ts
           @pm = { __: init }
         end
 
@@ -630,13 +630,20 @@ module Squared
           end
           found = []
           avail = []
-          rev = flag || (prod? ? :patch : :minor)
+          flag ||= case (up = option('u', 'update'))
+                   when 'major', 'minor'
+                     up.to_sym
+                   else
+                     prod? ? :patch : :minor
+                   end
           if sync && !stdin?
-            if has_value?(opts, 's', 'select') && !dryrun
-              items = []
-            elsif has_value?(opts, 'i', 'interactive')
-              ia = true
-            end
+            items = if has_value?(opts, 's', 'select')
+                      se = true
+                      []
+                    elsif has_value?(opts, 'i', 'interactive')
+                      ia = true
+                      []
+                    end
           end
           unless data.empty?
             JSON.parse(data).each_pair do |key, val|
@@ -647,7 +654,7 @@ module Squared
               ch = file[0]
               if ch.match?(/[~^]/)
                 file = file[1..-1]
-              elsif ia && rev == :major
+              elsif ia && flag == :major
                 major = true
               else
                 avail << [key, file, latest, true]
@@ -656,7 +663,7 @@ module Squared
               current = val['current'] || file
               want = val['wanted']
               unless latest[SEM_VER, 6]
-                case rev
+                case flag
                 when :major
                   want = latest
                 when :minor
@@ -675,7 +682,7 @@ module Squared
               b = f[2]
               c = w[0]
               d = w[2]
-              upgrade = case rev
+              upgrade = case flag
                         when :major
                           a == '0' ? c == '0' || c == '1' : true
                         when :minor
@@ -717,6 +724,7 @@ module Squared
           if !found.empty?
             col1 = width.call(found, 0) + 4
             col2 = width.call(found, 1) + 4
+            col3 = pad.call(found.size, found).size + 2 + col1 + col2 + width.call(found, 2)
             packages = []
             pat = ->(a) { /("#{Regexp.escape(a[0])}"\s*:\s*)"([~^])#{'?' if a[4]}#{Regexp.escape(a[1])}"/ }
             edit = lambda do |a, pkg, mod|
@@ -724,60 +732,57 @@ module Squared
               modified += 1
               "#{pkg}\"#{mod || (a[3] == 1 && a[4] ? '^' : '')}#{a[2]}\""
             end
-            kwargs = { col1: col1, col2: col2, col3: width.call(found, 2), timeout: 0 }
             found.each_with_index do |item, i|
               a, b, c, d, e = item
-              f = ia && (rev != :major || e || semmajor?(item[5], item[6]))
-              col0 = "#{pad.call(i, found)}. "
-              if f && !confirm_outdated(a, c, (d / 2.0).ceil, b, lock: e, col0: col0, **kwargs)
-                cur = -1
-              else
-                cur = modified
-                doc.send(items ? :sub : :sub!, pat.call(item)) do |capture|
-                  if $2 == '~' && rev != :patch
-                    cur = -1
-                    pending += 1
-                    capture
-                  else
-                    edit.call(item, $1, $2)
-                  end
+              cur = modified
+              doc.send(items ? :sub : :sub!, pat.call(item)) do |capture|
+                if $2 == '~' && flag != :patch
+                  cur = -1
+                  pending += 1
+                  capture
+                else
+                  edit.call(item, $1, $2)
                 end
               end
-              if f
-                a = ' ' * col1
-                b = ' ' * col2
-              else
-                a = a.ljust(col1)
-                b = b.ljust(col2)
-                sub_style! b, theme[:current] if theme[:current] && !stdin?
+              a = a.ljust(col1)
+              b = b.ljust(col2)
+              sub_style! b, theme[:current] if theme[:current] && !stdin?
+              if cur == -1
+                c = 'SKIP'
+              elsif modified == cur
+                c = 'FAIL'
+              elsif !stdin?
+                if d == 1
+                  sub_style! a, theme[:major]
+                  sub_style! c, :bold, color(:green)
+                else
+                  sub_style!(c, **opt_style(color(d == 3 ? :green : :yellow), SEM_VER, d))
+                end
+                g = item
               end
-              c = if cur == -1
-                    'SKIP'
-                  elsif modified == cur
-                    'FAIL'
-                  elsif stdin?
-                    c
-                  else
-                    g = item
-                    if d == 1
-                      sub_style! a, theme[:major]
-                      sub_style c, :bold, color(:green)
-                    else
-                      sub_style(c, **opt_style(color(d == 3 ? :green : :yellow), SEM_VER, d))
-                    end
-                  end
-              s = a + b + c
-              if !items
-                puts "#{f ? ' ' * col0.size : col0}#{s}"
-              elsif g
+              s = "#{pad.call(i, found)}. #{a}#{b}#{c}"
+              if se
                 items << [s, g]
+                next
+              elsif ia && g
+                items << [g]
+                if flag != :major || e || semmajor?(item[5], item[6])
+                  items.pop unless confirm_semver(s.ljust(col3 + s.size - s.stripstyle.size), (d / 2.0).ceil)
+                  next
+                end
               end
+              puts s
             end
             pending = avail.reduce(pending) { |a, b| a + (b[3] ? 0 : 1) }
-            if dryrun || (modified == 0 && (pending > 0 || (items && pending == 0)))
+            if (dryrun && Array(items).empty?) || (modified == 0 && (pending > 0 || (items && pending == 0)))
               n = if items
-                    puts(items.empty? ? 'No updates were found' : items.map(&:first))
-                    items.size
+                    if items.empty?
+                      puts 'No updates were selected'
+                      0
+                    else
+                      puts items.map(&:first) if se
+                      items.size
+                    end
                   else
                     found.size
                   end
@@ -785,24 +790,32 @@ module Squared
             elsif modified > 0
               if items
                 packages.clear
-                choice('Select a package', items.map(&:first), multiple: true, force: false, index: true, border: true)
-                  .each do |n|
-                    item = items[n.pred].last
-                    doc.sub!(pat.call(item)) { edit.call(item, $1, $2) }
-                  end
+                if ia
+                  (1..items.size)
+                else
+                  choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                 border: true)
+                end.each do |n|
+                  item = items[n.pred].last
+                  doc.sub!(pat.call(item)) { edit.call(item, $1, $2) }
+                end
               end
               unless packages.empty?
-                File.write(dependfile, doc)
-                if sync && (opts.include?('diff') || option('diff'))
-                  run(git_output('diff', shell_quote(dependfile)), banner: false)
-                end
-                if has_value?(opts, 'u', 'update') || option('update')
-                  package(:update, packages: packages, from: :'outdated:update')
-                else
-                  modified = -1
+                modified = -1
+                if dryrun
                   footer.call(0, found.size)
+                else
+                  File.write(dependfile, doc)
+                  if sync && (opts.include?('diff') || option('diff'))
+                    run(git_output('diff', shell_quote(dependfile)), banner: false)
+                  end
+                  if has_value?(opts, 'u', 'update') || up
+                    package(:update, packages: packages, from: :'outdated:update')
+                  else
+                    footer.call(0, found.size)
+                  end
+                  commit(:add, [dependname], pass: true)
                 end
-                commit(:add, [dependname], pass: true)
               end
             end
           elsif !avail.empty?

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

@@ -330,7 +330,7 @@ module Squared
                         end
                       end
                     when 'outdated'
-                      format_desc(action, flag, "eager?,no-deps?,#{shortname('h', 'i', 's', 'd')}",
+                      format_desc(action, flag, "eager?,no-deps?,#{shortname('h', 'i', 's', 'u', 'd')}",
                                   before: ('user?' unless venv))
                       task flag do |_, args|
                         outdated flag, args.to_a
@@ -408,18 +408,28 @@ module Squared
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           cmd = pip_session 'list --outdated'
           cmd << if flag
-                   se = has_value!(opts, 's', 'select')
+                   se = has_value! opts, 's', 'select'
                    ia = has_value!(opts, 'i', 'interactive') && !se
+                   up = has_value! opts, 'u', 'update'
                    hide = has_value! opts, 'h', 'hide'
                    dryrun = has_value! opts, 'd', 'dry-run'
                    if !sync || stdin?
                      se = false
                      ia = false
                    elsif se || ia
+                     up = true
                      items = []
                    end
                    '--not-required' if opts.include?('no-deps')
                  else
+                   if (up = option('u', 'update'))
+                     flag = case up
+                            when 'major', 'minor'
+                              up.to_sym
+                            else
+                              :patch
+                            end
+                   end
                    '--not-required' unless option('not-required', equals: '0')
                  end
           cmd << '--local' if option('l', 'local')
@@ -521,7 +531,7 @@ module Squared
                   patch
                 end
               end.tap do |packages|
-                unless packages.empty?
+                if up && !packages.empty?
                   base = %w[eager no-deps]
                   base << 'user' unless venv
                   opts = (base & opts).map! { |val| val == 'eager' ? "upgrade-strategy=#{val}" : val }
@@ -624,7 +634,7 @@ module Squared
           op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
           dist = lambda do
             dir = basepath 'dist'
-            return dir if dir.directory? && !dir.empty?
+            next dir if dir.directory? && !dir.empty?
 
             if dir.exist?
               raise_error 'no source to publish', hint: dir
@@ -729,26 +739,26 @@ module Squared
           run(sync: sync, banner: banner, from: :"pip:#{flag}").yield_self { |val| ret || val }
         end
 
-        def variable_set(key, *val, **, &blk)
+        def variable_set(key, *args, **, &blk)
           if block_given?
             case key
             when :dependfile, :venv, :editable
-              val = block_args val, &blk
+              args = block_args args, &blk
             end
           end
           case key
           when :dependfile
-            req = basepath(*val)
-            if (index = DEP_PYTHON.index(req.basename.to_s))
+            val = basepath(*args)
+            if (index = DEP_PYTHON.index(val.basename.to_s))
               @dependindex = index
-              @dependfile = req
+              @dependfile = val
             else
-              log.warn "variable_set: @#{key}=#{req} (not supported)"
+              log.warn "variable_set: @#{key}=#{val} (not supported)"
             end
           when :editable
-            editable_set val.first
+            editable_set args.first
           when :venv
-            instance_variable_set(:"@#{key}", (basepath(*val) unless val.empty?))
+            instance_variable_set(:"@#{key}", (basepath(*args) unless args.empty?))
           else
             super
           end

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

@@ -21,7 +21,21 @@ module Squared
                   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,
-          rbs: %w[I=pm r=bm no-stdlib no-collection collection=p log-level=b log-output=p repo=p].freeze
+          rbs: %w[I=pm r=bm no-stdlib no-collection collection=p log-level=b log-output=p repo=p].freeze,
+          rubocop: %w[D P r=bm auto-gen-config a|autocorrect A|autocorrect-all d|debug disable-pending-cops
+                      display-only-correctable display-only-fail-level-offenses display-only-failed
+                      display-only-safe-correctable S|display-style-guide display-time editor-mode enable-pending-cops
+                      E|extra-details F|fail-fast force-default-config force-exclusion x|fix-layout
+                      ignore-disable-comments ignore-parent-exclusion ignore-unrecognized-cops init l|lint
+                      L|list-target-files lsp memory no-detach only-guide-cops only-recognized-file-types
+                      no-exclude-limit profile raise-cop-error regenerate-todo restart-server safe server-status
+                      start-server stderr stop-server C|cache=b cache-root=p config=p exclude-limit=i fail-level=b
+                      f|format=b except=q only=q o|out=p plugin=p require=p show-cops=q show-docs-url=q
+                      s|stdin=p].freeze,
+          no: {
+            rubocop: %w[auto-gen-enforced-style auto-gen-only-exclude auto-gen-timestamp color display-cop-names
+                        offense-counts parallel server].freeze
+          }
         }.freeze
         OPT_BUNDLE = {
           common: %w[no-color V|verbose r|retry=i].freeze,
@@ -126,6 +140,7 @@ module Squared
           rake: %w[I libdir r require].freeze,
           irb: %w[I r].freeze,
           rbs: %w[I r repo].freeze,
+          rubocop: %w[format plugin r require].freeze,
           gem: {
             contents: %w[s spec-dir].freeze,
             dependency: %w[s source].freeze,
@@ -161,12 +176,14 @@ 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
+          'irb' => nil,
+          'rbs' => nil,
+          'rubocop' => nil
         })
 
-        def initialize(*, autodetect: false, gemspec: nil, steep: 'Steepfile', asdf: 'ruby', **kwargs)
+        def initialize(*, autodetect: false, gemspec: nil, steep: 'Steepfile', rubocop: '.rubocop.yml', asdf: 'ruby',
+                       **kwargs)
           super
           if @pass.include?(Ruby.ref)
             initialize_ref Ruby.ref
@@ -182,7 +199,8 @@ module Squared
                      elsif gemspec
                        basepath(gemspec.include?('.') ? gemspec : "#{gemspec}.gemspec")
                      end
-          @steepfile = basepath(steep).yield_self { |file| file if file.exist? }
+          @steepfile = basepath! steep
+          @rubocopfile = basepath!(rubocop) || basepath!(Dir.home, '.rubocop.yml')
           return unless rakefile && @output[0].nil? && @copy.nil? && !version && !@autodetect
 
           begin
@@ -300,7 +318,7 @@ module Squared
                           args.each do |val|
                             if val.include?('*')
                               files.concat(Dir.glob(val, base: path))
-                            elsif !(file = basepath(val)).exist?
+                            elsif !(file = basepath!(val))
                               print_error(val, hint: 'not found')
                             elsif file.directory?
                               files.concat(file.glob('**/*.rb'))
@@ -328,6 +346,24 @@ module Squared
                       end
                     end
                   end
+                when 'rubocop'
+                  next unless @rubocopfile
+
+                  format_desc action, nil, 'opts*,path*/:'
+                  task action do |_, args|
+                    opts, args = args.to_a.partition do |val|
+                      next true if val.match?(/\A(?:(?:[A-Z]|[a-z-]+)=.|[a-z]+(?:-[a-z]+)*\Z)/)
+
+                      !val.include?('*') && !val.end_with?('/')
+                    end
+                    if opts.delete(':') || !args.empty?
+                      args << 'lib/' if args.empty?
+                      list = args.map { |val| val.end_with?('/') ? "#{val}**/*.rb" : val }
+                                 .flat_map { |val| Dir.glob(val, base: path) }
+                      args = choice_index('Select files', list, multiple: true)
+                    end
+                    rubocop(*args, opts: opts, banner: true)
+                  end
                 end
               else
                 namespace action do
@@ -400,7 +436,7 @@ module Squared
                         task flag do |_, args|
                           opts = args.to_a
                           opts << 'redownload' if has_value!(opts, 'f', 'force')
-                          if (lock = basepath('Gemfile.lock')).exist?
+                          if (lock = basepath!('Gemfile.lock'))
                             config = basepath '.bundle', 'config'
                             if config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
                               if opts.include?('redownload')
@@ -477,9 +513,7 @@ module Squared
                 cmd << '--without=development'
               end
             end
-            if (n = option('jobs')).to_i > 0
-              cmd << "-j#{n}"
-            end
+            option('jobs') { |n| cmd << "-j#{n}" if n.to_i > 0 }
             run_rb(from: :depend, sync: sync)
           end
         end
@@ -530,6 +564,14 @@ module Squared
             end
             OptionPartition.new(opts, bundleopts(:outdated), cmd << "--#{flag}", project: self)
                            .clear
+          elsif (up = option('u', 'update'))
+            flag = case up
+                   when 'major', 'minor'
+                     up.to_sym
+                   else
+                     :patch
+                   end
+            items = []
           end
           dryrun ||= dryrun?(prefix: 'bundle')
           log.info cmd.to_s
@@ -655,16 +697,21 @@ module Squared
                 end
               end
               begin
-                status = if gems
-                           "#{gems.size} packages were updated"
-                         elsif dependfile.read =~ /\b(?:source\s+(["'])((?~\1))\1|remote:\s+(\S+))/
-                           right = true
-                           ($2 || $3).chomp('/')
-                         end
+                status = nil
+                if gems
+                  status = "#{gems.size} packages were updated"
+                else
+                  File.foreach(dependfile) do |line|
+                    next unless line =~ /\b(?:source\s+(["'])((?~\1))\1|remote:\s+(\S+))/
+
+                    status = ($2 || $3).chomp('/')
+                    break
+                  end
+                end
               rescue StandardError => e
                 log.debug e
               end
-              puts print_footer(status || 'Updates are available', right: right)
+              puts print_footer(status || 'Updates are available', right: status.include?('/'))
             elsif start == 0 && banner
               puts 'No updates were found'
             end
@@ -1319,6 +1366,26 @@ module Squared
           end
         end
 
+        def rubocop(*args, sync: true, banner: verbose?, with: nil, pass: PASS_RUBY[:rubocop], **kwargs)
+          opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
+          op = OptionPartition.new(opts, OPT_RUBY[:rubocop], session('rubocop'), project: self,
+                                                                                 no: OPT_RUBY[:no][:rubocop])
+          op.concat(args)
+          op.each do |val|
+            if basepath(val).file?
+              op.found << val
+            else
+              op.errors << val
+            end
+          end
+          op.swap
+            .map! { |val| basepath(val).relative_path_from(path) }
+          op.append(delim: true)
+            .clear(errors: true)
+          print_run(op, banner, **kwargs)
+          run(sync: sync, banner: banner, from: :rubocop)
+        end
+
         def gemspec
           return @gemspec || nil unless @gemspec.nil?
 

metadata

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