squared 0.7.9 → 0.8.0

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

@@ -105,7 +105,7 @@ module Squared
           end
 
           def bannerargs
-            %i[version dependfile venv].freeze
+            %i[version dependfile venv editable].freeze
           end
 
           def venv?
@@ -216,7 +216,7 @@ module Squared
                               found |= 1
                               run(pdm_session('run', val), from: :run)
                             else
-                              raise "script: #{val}" if exception?
+                              raise message('script', val) if exception?
 
                               found |= 2
                               log.warn "run script \"#{val}\"".subhint('not indexed')
@@ -265,10 +265,10 @@ module Squared
 
                           format_desc action, flag, 'c/reate?,d/epend?,opts*'
                           task flag do |_, args|
-                            args = args.to_a
-                            rm_rf(venv, verbose: true)
-                            venv_init if has_value!(args, 'c', 'create')
-                            depend :force, args if has_value!(args, 'd', 'depend')
+                            opts = args.to_a
+                            rm_rf(venv, verbose: !silent?)
+                            venv_init if has_value!(opts, 'c', 'create')
+                            depend :force, opts if has_value!(opts, 'd', 'depend')
                           end
                         when :exec
                           format_desc action, flag, 'command,args*'
@@ -391,7 +391,7 @@ module Squared
                                                                 else 'outdir?,srcdir?'
                                                                 end)
                       task flag do |_, args|
-                        build! flag, args.to_a
+                        build_ flag, args.to_a
                       end
                       break if be
                     when 'publish'
@@ -438,9 +438,9 @@ module Squared
               if flag
                 cmd << case flag
                        when :requirement, :target
-                         quote_option(flag, basepath(target))
+                         quote_option flag, basepath(target)
                        else
-                         shell_option(flag)
+                         shell_option flag
                        end
                 op = append_pip flag, opts, pipopts(:install)
                 op.clear
@@ -614,7 +614,8 @@ module Squared
             op.clear
           when :user, :upgrade
             op.concat(packages)
-            raise_error ArgumentError, 'no packages listed', hint: flag if op.empty?
+            raise ArgumentError, message('no packages listed', hint: flag) if op.empty?
+
             op << "--#{flag}"
             op.append
             python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
@@ -622,7 +623,7 @@ module Squared
           run(banner: banner, from: :install)
         end
 
-        def build!(flag, opts = [], outdir: nil, srcdir: nil)
+        def build_(flag, opts = [], outdir: nil, srcdir: nil)
           list = case flag
                  when :poetry
                    cmd = poetry_session 'build'
@@ -685,7 +686,6 @@ module Squared
             run(from: from)
           end
         end
-        alias build_ build!
 
         def publish(flag, opts = [], test: false)
           list = case flag
@@ -706,12 +706,9 @@ module Squared
           dist = lambda do
             dir = basepath 'dist'
             return dir if dir.directory? && !dir.empty?
+            raise message('no source to publish', hint: dir) if dir.exist?
 
-            if dir.exist?
-              raise_error 'no source to publish', hint: dir
-            else
-              raise_error Errno::ENOENT, dir, hint: 'publish'
-            end
+            raise Errno::ENOENT, message(dir, hint: 'publish')
           end
           if test
             if op.arg?('r', flag == :hatch ? 'repo' : 'repository')
@@ -772,7 +769,7 @@ module Squared
               when :install, :uninstall
                 op << '.' if installable? && !op.arg?('r', 'requirement')
               else
-                raise_error ArgumentError, 'no packages listed', hint: flag
+                raise ArgumentError, message('no packages listed', hint: flag)
               end
             elsif flag == :install
               op.append_any
@@ -795,7 +792,8 @@ module Squared
               .clear
           when :cache
             op.concat(args)
-            raise_error 'no subcommand', hint: flag if op.empty?
+            raise message('no subcommand', hint: flag) if op.empty?
+
             op << (action = op.shift)
             case action
             when 'dir', 'info', 'purge'
@@ -803,13 +801,15 @@ module Squared
             when 'list', 'remove'
               op.add_first(quote: true)
             else
-              raise_error ArgumentError, "unrecognized args: #{action}", hint: flag
+              raise ArgumentError, message('unrecognized args', action, hint: flag)
             end
             op.clear
           when :config
             op.concat(args)
-            raise_error 'no subcommand', hint: flag if op.empty?
-            op << (action = op.shift)
+            raise message('no subcommand', hint: flag) if op.empty?
+
+            action = op.shift
+            op << action
             case action
             when 'list', 'edit', 'debug'
               nil
@@ -817,7 +817,7 @@ module Squared
               op.add_first
               op.add_first(quote: true, expect: true) if action == 'set'
             else
-              raise_error ArgumentError, "unrecognized args: #{action}", hint: flag
+              raise ArgumentError, message('unrecognized args', action, hint: flag)
             end
             op.clear
           when :hash
@@ -854,7 +854,7 @@ module Squared
         def variable_set(key, *args, **, &blk)
           if block_given?
             case key
-            when :dependfile, :editable, :venv
+            when :dependfile, :venv
               args = block_args args, &blk
             end
           end
@@ -871,8 +871,6 @@ module Squared
                 log.warn "variable_set: @dependfile=#{val}".subhint('not supported')
               end
             end
-          when :editable
-            editable_set args.first
           when :venv
             @venv = (basepath(*args) unless args.empty? || args.first.nil?)
           else
@@ -1026,7 +1024,7 @@ module Squared
 
               if found
                 line.chomp!($1) if line =~ /(?<=[\d"'{}\[\]]|true|false)(\s*#.*)$/
-                break if line.match?(/^\s*\[(?:[\w.\-"' ]+|".+"|'.+')\]\s*$/)
+                break if line.match?(/^\s*\[([\w.\-"' ]+|".+"|'.+')\]\s*$/)
 
                 if ch
                   val = line.rstrip
@@ -1130,7 +1128,7 @@ module Squared
         end
 
         def variables
-          (super + %i[venv editable]).freeze
+          (super + %i[venv]).freeze
         end
 
         def runenv

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

@@ -382,7 +382,7 @@ module Squared
                             if val.include?('*')
                               out.concat(Dir.glob(val, base: path))
                             elsif !(file = basepath!(val))
-                              print_error(val, hint: 'not found')
+                              print_error('file not found', hint: val)
                             elsif file.directory?
                               out.concat(file.glob('**/*.rb'))
                             else
@@ -438,17 +438,18 @@ module Squared
                     when 'gem'
                       case flag
                       when :outdated
-                        format_desc action, flag, "semver?=major|minor|patch,#{shortname('i', 's', 'u', 'd')},opts*"
+                        format_desc action, flag, "semver?=(=)major|minor|patch,#{shortname('i', 's', 'u', 'd')},opts*"
                         task flag, [:semver] do |_, args|
-                          opts = case (semver = args.semver)
-                                 when 'major', 'minor', 'patch'
+                          opts = if args.semver =~ /^(=)?(major|minor|patch)$/i
+                                   equals = !$1.nil?
+                                   semver = $2.downcase
                                    args.extras
                                  else
-                                   semver = nil
                                    args.to_a
                                  end
                           gem(flag, opts: opts, banner: true, filter: {
                             semver: semver,
+                            equals: equals,
                             update: has_value!(opts, 'u', 'update'),
                             interactive: has_value!(opts, 'i', 'interactive'),
                             select: has_value!(opts, 's', 'select'),
@@ -506,23 +507,16 @@ module Squared
                         format_desc action, flag, 'f/orce?,l/ocal?,opts*'
                         task flag do |_, args|
                           opts = args.to_a
-                          opts << 'local' if has_value!(opts, 'l', 'local')
+                          opts << 'local' if has_value!(opts, 'l')
                           opts << 'redownload' if has_value!(opts, 'f', 'force')
                           if (lock = basepath!('Gemfile.lock'))
-                            case (val = ENV['BUNDLE_FROZEN'])
-                            when '0', 'false'
-                              nil
-                            else
-                              if val
-                                print_error("BUNDLE_FROZEN: #{val}", loglevel: Logger::INFO, subject: name, hint: flag)
+                            config = basepath '.bundle', 'config'
+                            if config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
+                              if opts.include?('redownload')
+                                run(bundle_output('config unset frozen'), banner: false)
+                              else
+                                print_error('Gemfile.lock is frozen', subject: name, hint: flag)
                                 lock = nil
-                              elsif basepath!('.bundle', 'config')&.read&.match?(/\bBUNDLE_FROZEN:\s+"true"/)
-                                if opts.include?('redownload')
-                                  run(bundle_output('config unset frozen'), banner: false)
-                                else
-                                  print_error('Gemfile.lock is frozen', subject: name, hint: flag)
-                                  lock = nil
-                                end
                               end
                             end
                             lock&.delete
@@ -569,7 +563,7 @@ module Squared
                                       else
                                         %w[## ;]
                                       end
-                          msg = if Readline.respond_to?(:readmultiline)
+                          msg = if Prompt.reline.respond_to?(:readmultiline)
                                   'ruby>'
                                 else
                                   multiline = Array(multiline)
@@ -698,9 +692,9 @@ module Squared
                                                    .lines
                                                    .map { |line| line.sub(/#.*$/, '').strip }
                                                    .reject(&:empty?)
-                                                   .yield_self do |data|
-                                                     target = data.find { |line| line.include?(tool) }
-                                                     target ? [target] : data
+                                                   .yield_self do |lines|
+                                                     target = lines.find { |line| line.include?(tool) }
+                                                     target ? [target] : lines
                                                    end
                                                    .join(', ')
                                              end
@@ -734,7 +728,7 @@ module Squared
                             out.map!(&:split)
                             pad = as_a(out, :first, :size).max
                             print_item
-                            puts(out.map { |line| '%*s %s' % [pad, line.first, line[1..-1].join(' ')] })
+                            puts(out.map { |line| '%*s %s' % [pad, line.first, line.drop(1).join(' ')] })
                           end
                         end
                       when :reshim
@@ -1074,6 +1068,7 @@ module Squared
             buffer = []
             filter = kwargs.fetch(:filter, {})
             semver = filter[:semver]
+            equals = filter[:equals]
             update = if sync && filter[:select]
                        semver ||= 'major'
                        items = []
@@ -1150,6 +1145,8 @@ module Squared
                     when 2
                       case semver
                       when 'major', 'minor'
+                        next if equals && semver == 'major'
+
                         update&.push(a)
                       when 'patch'
                         next
@@ -1163,6 +1160,8 @@ module Squared
                     else
                       case semver
                       when 'major', 'minor', 'patch'
+                        next if equals && semver != 'patch'
+
                         update&.push(a)
                       end
                       unless stdin?
@@ -1261,26 +1260,36 @@ module Squared
           case flag
           when :build
             if op.empty?
-              raise_error Errno::ENOENT, 'gemspec', hint: project unless gemfile
+              raise Errno::ENOENT, message('gemspec', hint: project) unless gemfile
+
               op.add_path(gemfile)
             else
-              op.add_first(path: true)
+              op.add_first(path: !op.first.include?('*'), quote: true)
                 .clear(pass: false)
             end
           when :push
+            target = gemname
             if op.empty? || (n = op.index(':'))
               file = basepath(if !n && (spec = gemspec)
                                 "#{spec.name}-#{spec.version}.gem"
                               else
                                 choice_index 'Select a file', Dir.glob('*.gem', base: path)
                               end)
+              op.add_path(file)
+            elsif (file = op.shift).include?('*')
+              file = '*.gem' if file == '*'
+              target = Dir.glob(file, base: path).join(', ')
+              raise Errno::ENOENT, message(file, hint: flag) if target.empty?
+
+              op.add_quote(file)
             else
-              file = basepath(op.shift.yield_self { |val| val.include?('.') ? val : "#{val}.gem" })
-              raise_error Errno::ENOENT, file, hint: flag unless file.exist?
-              raise_error ArgumentError, "unrecognized args: #{op.join(', ')}", hint: flag unless op.empty?
+              file = basepath(file.include?('.') ? file : "#{file}.gem")
+              raise Errno::ENOENT, message(file, hint: flag) unless file.exist?
+              raise ArgumentError, message('unrecognized args', op.join(', '), hint: flag) unless op.empty?
+
+              op.add_path(file)
             end
-            op.add_path(file)
-            return run(from: from, interactive: ['Push', 'N', gemname]) unless with || !banner
+            return run(from: from, interactive: ['Push', 'N', target]) unless with || !banner
           when :exec
             min = if op.arg?('g', 'gem')
                     1
@@ -1336,7 +1345,8 @@ module Squared
                 op.unshift(name)
               end
             end
-            raise_error ArgumentError, 'missing gem name', hint: flag if op.empty?
+            raise ArgumentError, message('missing gem name', hint: flag) if op.empty?
+
             if op.arg?('all')
               if flag == :pristine
                 append_repeat 'skip', op.extras
@@ -1376,7 +1386,7 @@ module Squared
                 op << action
                 op.clear
               else
-                raise_error ArgumentError, "unrecognized arg: #{action}", hint: flag
+                raise ArgumentError, message('unrecognized command', action, hint: flag)
               end
             end
           when :open, :owner, :unpack, :yank
@@ -1413,7 +1423,7 @@ module Squared
                    end
           end
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          invalid = ->(a) { raise_error ArgumentError, "unrecognized args: #{a.join(', ')}", hint: flag }
+          invalid = ->(a) { raise ArgumentError, message('unrecognized args', a.join(', '), hint: flag) }
           cmd = bundle_session flag
           case flag
           when :cache, :check, :clean, :init, :install, :lock, :pack, :package, :platform
@@ -1738,7 +1748,7 @@ module Squared
         def project
           return @project unless @project.frozen?
 
-          @project = ((spec = gemspec) ? spec.name : @project).dup
+          @project = (gemspec&.name || @project).dup
         end
 
         def depend?
@@ -1833,8 +1843,8 @@ module Squared
         private
 
         def run_repl(*args, opts:, banner:, from:, delim: true, **kwargs)
-          op = OptionPartition.new(opts, OPT_RUBY[from], session(*bundle_args(from)),
-                                   project: self, strict: strict?, first: [/\.rb$/])
+          op = OptionPartition.new(opts, OPT_RUBY[from], session(*bundle_args(from)), project: self, strict: strict?,
+                                                                                      first: [/\.rb$/])
           r = []
           r << 'bundler/setup' if !op.arg?('r') && bundle_load
           r.concat(Array(kwargs[:name])) if kwargs[:name]
@@ -1955,10 +1965,6 @@ module Squared
           verbose? ? ['--verbose'] : []
         end
 
-        def variables
-          (super + %i[autodetect]).freeze
-        end
-
         def rakefile
           if @rakefile.nil?
             file = Rake::Application::DEFAULT_RAKEFILES.find { |val| exist?(val) }

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

@@ -125,8 +125,8 @@ module Squared
               extras.concat(if n == 0
                               data
                             else
-                              super(data[0, n])
-                              data[n..-1]
+                              super(data.take(n))
+                              data.drop(n)
                             end)
               self
             else

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

@@ -20,8 +20,8 @@ module Squared
             include Shell
             include Prompt
 
-            def append(target, *args, delim: false, escape: false, quote: true, strip: nil, force: true, double: false,
-                       filter: nil, pass: nil, preserve: true, **)
+            def append(target, *args, delim: false, escape: false, quote: true, strip: nil, double: false, filter: nil,
+                       pass: nil, **kwargs)
               return if (ret = args.flatten(1)).empty?
 
               target << '--' if delim && !target.include?('--')
@@ -52,7 +52,7 @@ module Squared
                 if !(pa = val.is_a?(Pathname)) && escape
                   shell_escape(val, quote: quote, double: double)
                 elsif quote || pa
-                  shell_quote(val, force: force, double: double, preserve: preserve)
+                  shell_quote(val, double: double, **kwargs)
                 else
                   val
                 end
@@ -135,7 +135,7 @@ module Squared
               [name, $3, $2 || (name.size == 1 && $1.empty? ? true : '')]
             end
 
-            def arg?(target, *args, value: false, **)
+            def arg?(target, *args, value: false)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               r << matchopts(s, value) unless s.empty?
               a = target.to_a
@@ -315,7 +315,7 @@ module Squared
             end
             numtype = [
               [i, /\A\d+\z/],
-              [f, /\A\d*(?:\.\d+)?\z/],
+              [f, /\A\d*(\.\d+)?\z/],
               [si, /\A-?\d+\z/]
             ].freeze
             numcheck = ->(k, v) { numtype.any? { |flag, pat| flag.include?(k) && v.match?(pat) } }
@@ -609,7 +609,7 @@ module Squared
                 val = OptionPartition.send(:matchopts, val) unless val.is_a?(Regexp)
                 blk = proc { |s| s&.match?(val) }
               else
-                raise TypeError, "unknown: #{val}"
+                raise TypeError, Common::Format.message('unknown', val, hint: target.first)
               end
             end
             ret = find_all(&blk)
@@ -658,10 +658,7 @@ module Squared
 
           def readline(msg, fallback = nil, option: nil, quote: false, force: true, double: false)
             begin
-              require 'readline' unless defined?(Readline)
-              ret = Readline.readline("#{msg}#{force ? ':' : '?'} ", false).strip
-            rescue LoadError
-              raise unless (ret = fallback) || !force
+              ret = Common::Prompt.reline.readline("#{msg}#{force ? ':' : '?'} ", false).strip
             rescue Interrupt
               exit(force ? 1 : 0)
             else

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

@@ -7,6 +7,15 @@ module Squared
         module Utils
           private
 
+          def symjoin(*args, char: ':')
+            args.flatten.join(char).to_sym
+          end
+
+          def collect_hash(data, pass: [])
+            data = data.reject { |key,| pass.include?(key) } unless pass.empty?
+            data.values.flatten
+          end
+
           def rand_s(size)
             require 'random/formatter'
             Random.new.alphanumeric(size)
@@ -26,29 +35,13 @@ module Squared
             end
           end
 
-          def matchmap(list, prefix = nil, negate: false)
-            ret = negate ? [[], []] : []
-            list.each do |val|
-              unless val.is_a?(Regexp)
-                val = val.dup
-                n = 1 if negate && val.delete_prefix!('!')
-                if prefix
-                  a = nil
-                  val.sub!(/\A(\^|\\A)/) do |s|
-                    a = s
-                    nil
-                  end
-                  val = ".*#{val}" unless a
-                end
-              end
-              pat = Regexp.new("#{a}#{prefix}#{val == '*' ? '.+' : val}")
-              if negate
-                ret[n || 0] << pat
-              else
-                ret << pat
-              end
+          def matchmap(list, prefix: nil)
+            list.map do |val|
+              next val if val.is_a?(Regexp)
+
+              val = ".*#{val}" if prefix && !val.sub!(/\A(\^|\\A)/, '')
+              Regexp.new("#{prefix}#{val == '*' ? '.+' : val}")
             end
-            ret
           end
 
           def matchany?(list, *args, empty: true)

data/lib/squared/workspace/repo.rb

@@ -20,7 +20,7 @@ module Squared
                           elsif !repo_install? && !repo_confirm
                             @root = nil
                           end
-                          raise_error Errno::EEXIST, path.cleanpath, hint: 'REPO_HOME' unless @root
+                          raise Errno::EEXIST, message(path.cleanpath, hint: 'REPO_HOME') unless @root
                         end
                         path.realdirpath
                       elsif (val = env('REPO_ROOT'))
@@ -28,7 +28,7 @@ module Squared
                         if !@root.exist?
                           @root.mkpath
                         elsif !repo_install?(parent: true) && !repo_confirm
-                          raise_error Errno::EEXIST, @root, hint: 'REPO_ROOT'
+                          raise Errno::EEXIST, message(@root, hint: 'REPO_ROOT')
                         end
                         @root.join(main).realdirpath
                       elsif repo_install?(parent: true) && (!home.exist? || @root + main == home)
@@ -157,6 +157,8 @@ module Squared
                   [proj, proj.build? && (script || run), doc && proj.doc?, lint && proj.lint?, test && proj.test?]
                 end
                 .select do |proj, run, doc, lint, test|
+                  next unless proj
+
                   proj.doc(sync: true) if doc
                   proj.build(sync: true) if run
                   next if n.anybits?(4)
@@ -275,7 +277,7 @@ module Squared
                          end
       end
 
-      def repo_run(cmd, opts = [], exception: false, options: true, **kwargs)
+      def repo_run(cmd, opts = [], exception: exception?, options: true, **kwargs)
         cmd = [repo_bin, cmd]
         cmd << opts.uniq.join(' ') unless opts.empty?
         env('REPO_OPTIONS', **kwargs) { |val| cmd << val } if options
@@ -308,7 +310,7 @@ module Squared
         r = r.keys
         pass = g.empty? && r.empty?
         select do |proj|
-          next unless proj.enabled?(baseref)
+          next unless proj.enabled?(ref: baseref)
 
           proj.global_set(name)
           i = -1
@@ -339,7 +341,7 @@ module Squared
           task_invoke(name, **proj.workspace.invokeargs)
         end
       rescue => e
-        raise if exception
+        raise if exception?
 
         warn log_warn(e, pass: true) if warning
       end

data/lib/squared/workspace/series.rb

@@ -38,10 +38,18 @@ module Squared
             end
           end
           if (args = obj.batchargs)
-            batch_set(*args)
+            if args.first.is_a?(Hash)
+              batch_set(obj.ref, *args)
+            else
+              batch_set(*args)
+            end
           end
           if (args = obj.aliasargs)
-            alias_set(*args)
+            if args.first.is_a?(Hash)
+              alias_set(obj.ref, *args)
+            else
+              alias_set(*args)
+            end
           end
         end
         workspace.config_get(:batch)&.each { |args| batch_set(*args) }

metadata

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