squared 0.5.7 → 0.5.8

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

@@ -104,11 +104,11 @@ module Squared
       end
 
       def rev_timeutc(*keys)
-        rev_entry(*keys, val: rev_timenow)
+        rev_entry(*keys, val: time_epoch)
       end
 
       def rev_timesince(*keys, clock: false)
-        epoch = rev_timenow - rev_entry(*keys).to_i
+        epoch = time_epoch - rev_entry(*keys).to_i
       rescue StandardError
         nil
       else
@@ -1236,10 +1236,10 @@ module Squared
               return
             end
           end
-          start = epochtime
+          start = time_epoch
           build(@output, sync: sync, from: :'git:revbuild')
         rescue StandardError => e
-          warn log_message(Logger::WARN, e, pass: true) if warning?
+          print_error(e, pass: true)
         else
           print_status(name, subject: 'revbuild', start: start, from: :completed)
           workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
@@ -1601,9 +1601,7 @@ module Squared
               end
               on :last, from
             end
-            if ret == 0
-              warn log_message(Logger::WARN, name, 'no ref found', subject: 'branch', hint: 'head', pass: true)
-            end
+            print_error(name, 'no ref found', subject: 'branch', hint: 'head', pass: true) if ret == 0
             return
           end
           return unless success?(source(stdout: stdout))
@@ -1746,8 +1744,8 @@ module Squared
                                                                                  end)
           case flag
           when :blame
-            raise_error 'no file found' unless (n = op.index { |s| (path + s).file? })
-            op << '--' << shell_quote(path + op.delete_at(n))
+            raise_error 'no file found' unless (n = op.index { |s| basepath(s).file? })
+            op << '--' << shell_quote(basepath(op.delete_at(n)))
             op.clear
           when :revert
             if VAL_GIT[:rebase][:send].any? { |val| op.arg?(val) }
@@ -1950,7 +1948,7 @@ module Squared
             next if !glob.empty? && glob.none? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
             next if !pass.empty? && pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
 
-            ret[file] = algorithm.hexdigest(File.read(path + file))
+            ret[file] = algorithm.hexdigest(File.read(basepath(file)))
           end
           ret
         end
@@ -1982,7 +1980,7 @@ module Squared
               when 'recurse-submodules'
                 op.append?($1, $2, type: :basic)
               when 'refspec'
-                refspec << shell_escape($2, quote: true)
+                refspec << shell_quote($2)
               end
             elsif op.arg?('multiple')
               op.found << opt
@@ -2000,12 +1998,12 @@ module Squared
             end
             op.delete('--all')
           elsif op.arg?('multiple')
-            op.swap.merge(op.map! { |opt| shell_escape(opt, quote: true) })
+            op.add_quote(*op.found)
             return
           elsif option('all')
             op << '--all'
           end
-          op.clear(errors: true, subject: flag.to_s) if flag
+          op.clear(errors: true, subject: flag) if flag
         end
 
         def append_commit(*val, target: @session, head: false)

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

@@ -5,7 +5,7 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run=!? include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
+          common: %w[dry-run=!? include-workspace-root=!? loglevel=b workspaces=!? w|workspace=v].freeze,
           install: %w[prefer-dedupe=!? package-lock-only=!? audit=! bin-links=! cpu=b fund=! libc=b os=b
                       package-lock=!].freeze,
           install_base: %w[ignore-scripts=!? install-links=!? strict-peer-deps=!? include=b omit=b
@@ -109,7 +109,7 @@ module Squared
             initialize_build(Node.ref, prod: prod?, **kwargs)
             initialize_env(**kwargs)
           end
-          @dependfile = @path + 'package.json'
+          @dependfile = basepath 'package.json'
           @pm = { __: init }
         end
 
@@ -268,11 +268,6 @@ module Squared
                           otp = args.first
                         else
                           tag, otp = param_guard(action, flag, args: args)
-                          unless SEM_VER.match?(tag)
-                            a = sub_style(project, styles: theme[:active])
-                            b = sub_style(tag, styles: theme[:inline])
-                            exit 1 unless confirm("Publish #{a}@#{b}?", 'N')
-                          end
                         end
                         publish(flag, otp: otp, tag: tag, dryrun: dryrun, access: access)
                       end
@@ -379,12 +374,10 @@ module Squared
                     target.mkpath
                     subdir << target.to_s
                   end
-                  begin
-                    FileUtils.cp(path + s, dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
-                  rescue StandardError => e
-                    print_error e
-                    errors += 1
-                  end
+                  FileUtils.cp(basepath(s), dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
+                rescue StandardError => e
+                  print_error e
+                  errors += 1
                 end
               rescue StandardError => e
                 on_error e, :copy
@@ -395,7 +388,7 @@ module Squared
             end
             glob = Array(glob || '**/*')
             target = []
-            from = path + from
+            from = basepath from
             if workspace
               from.glob('*').each do |entry|
                 next unless entry.directory?
@@ -423,11 +416,9 @@ module Squared
             end
             target.each do |src, to|
               glob.each { |val| log.info "cp #{from + val} #{to}" }
-              begin
-                copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbose)
-              rescue StandardError => e
-                on_error e, :copy
-              end
+              copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbose)
+            rescue StandardError => e
+              on_error e, :copy
             end
           end
           on :last, :copy
@@ -480,7 +471,7 @@ module Squared
               if flag == :add
                 cmd << "--save-#{save}"
                 cmd << '--save-exact' if exact
-                cmd.merge(packages.map { |pkg| shell_escape(pkg) })
+                cmd.merge(packages.map { |pkg| shell_quote(pkg) })
               end
               cmd << '--workspaces=false' if env('NODE_WORKSPACES', equals: '0')
               cmd << '--package-lock=false' if option('package-lock', equals: '0')
@@ -663,14 +654,19 @@ module Squared
         end
 
         def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
-          if !version || read_packagemanager(:private)
-            warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: version ? 'private' : nil)
+          unless version && !read_packagemanager(:private)
+            print_error('invalid task "publish"', subject: name, hint: version ? 'private' : nil)
             return
           end
           cmd = session 'npm', 'publish'
           cmd << basic_option('otp', otp) if otp ||= option('otp')
-          cmd << basic_option('tag', tag) if tag ||= option('tag')
-          cmd << basic_option('access', access) if access ||= option('access')
+          cmd << basic_option('tag', tag.tr(' ', '-')) if tag ||= option('tag')
+          case access || option('access')
+          when 'p', 'public'
+            cmd << '--access=public'
+          when 'r', 'restricted'
+            cmd << '--access=restricted'
+          end
           dryrun ||= dryrun?('npm')
           if dryrun
             cmd << '--dry-run'
@@ -727,7 +723,7 @@ module Squared
               if opt =~ op.values
                 case $1
                 when 'w', 'workspace'
-                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
                 end
               elsif opt.include?('=')
                 op.errors << opt
@@ -819,7 +815,7 @@ module Squared
 
                 case $1
                 when 'w', 'workspace'
-                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
                   op.found << opt
                 end
               end

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

@@ -207,7 +207,7 @@ module Squared
                       if flag == :create
                         format_desc action, flag, 'dir,opts*'
                         task flag, [:dir] do |_, args|
-                          dir = path + param_guard(action, flag, args: args, key: :dir)
+                          dir = basepath param_guard(action, flag, args: args, key: :dir)
                           venv_create dir, args.extras
                         end
                       elsif venv
@@ -245,10 +245,7 @@ module Squared
                       when :upgrade
                         format_desc action, flag, 'opts*'
                         task flag do |_, args|
-                          args = args.to_a
-                          args.prepend('upgrade')
-                          args.append('pip')
-                          install flag, args
+                          install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
                         format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
@@ -360,7 +357,7 @@ module Squared
                 when :user
                   cmd << '--user'
                 when :target
-                  cmd << quote_option('target', path + target)
+                  cmd << quote_option('target', basepath(target))
                 when :force
                   cmd << '--force-reinstall'
                 end
@@ -483,11 +480,7 @@ module Squared
             cmd << '--user' if user
             cmd << basic_option('upgrade-strategy', strategy) if strategy
             append_value out
-            if workspace.windows?
-              pip = cmd.to_a.drop(1)
-              cmd = python_session '-m pip'
-              cmd.merge(pip)
-            end
+            python_session('-m pip', *cmd.to_a.drop(1)) if workspace.windows?
           end
           run(from: :install)
         end
@@ -524,7 +517,7 @@ module Squared
               if op.arg?(*args)
                 op.push(srcdir)
               else
-                op << quote_option(args.last, path + srcdir)
+                op << quote_option(args.last, basepath(srcdir))
               end
               srcdir = nil
             end
@@ -558,7 +551,7 @@ module Squared
           end
           op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
           dist = lambda do
-            path.join('dist').tap do |dir|
+            basepath('dist').tap do |dir|
               raise_error('no source files found', hint: dir) unless dir.directory? && !dir.empty?
             end
           end
@@ -574,7 +567,7 @@ module Squared
             if op.empty?
               op.push("#{dist.call}/*")
             else
-              op.map! { |val| path + val }
+              op.map! { |val| basepath(val) }
             end
             op.append
           else
@@ -650,7 +643,7 @@ module Squared
 
         def poetry_session(*cmd)
           ret = session('poetry', *cmd, *preopts)
-          option('project', ignore: false) { |val| ret << quote_option('project', path + val) }
+          option('project', ignore: false) { |val| ret << quote_option('project', basepath(val)) }
           ret
         end
 
@@ -671,7 +664,7 @@ module Squared
         end
 
         def append_pip(flag, opts, target: @session, from: nil)
-          if !from || opts.empty?
+          unless from && !opts.empty?
             append_global(target: target)
             return []
           end
@@ -695,11 +688,11 @@ module Squared
             op << '--no-build-isolation' if option('build-isolation', equals: '0')
             op.swap
             if edit
-              edit = path + edit unless %r{\A[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
+              edit = basepath(edit) unless %r{\A[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
               if flag == :editable
                 op.push(edit)
               else
-                target << quote_option('e', edit)
+                op << quote_option('e', edit)
               end
             end
             case flag
@@ -710,25 +703,25 @@ module Squared
               []
             end
           else
-            opts
+            op.extras
           end
         end
 
         def append_editable(target: @session)
-          return if requirements?
+          return if requirements? && editable == '.'
 
           if (val = option('editable', 'e', target: target, ignore: false))
-            session_delete('e', 'editable', target: target)
+            OptionPartition.delete_key(target, 'e', 'editable')
             case val
             when '0', 'false'
               return
             else
-              val = path + val
+              val = basepath val
             end
           elsif session_arg?('e', 'editable', target: target) || !(val = editable)
             return
           end
-          target << quote_option('e', val)
+          target << quote_option('e', basepath(val))
         end
 
         def append_global(target: @session)
@@ -737,11 +730,11 @@ module Squared
                       when '0', 'false'
                         '--no-cache-dir'
                       else
-                        quote_option('cache-dir', path + val)
+                        quote_option('cache-dir', basepath(val))
                       end
           end
           option('proxy', target: target) { |val| target << shell_option('proxy', val) }
-          option('python', target: target) { |val| target << quote_option('python', path + val) }
+          option('python', target: target) { |val| target << quote_option('python', basepath(val)) }
           append_nocolor(target: target)
         end
 
@@ -863,7 +856,7 @@ module Squared
                       when '.', Pathname
                         val
                       when String
-                        Pathname.new(editable)
+                        Pathname.new(val) unless val.empty?
                       end
         end
 
@@ -874,8 +867,7 @@ module Squared
             val, *opts = val
             @venvopts = opts
           end
-          @venv = Pathname.new(val)
-          @venv = @path + @venv unless @venv.absolute?
+          @venv = basepath(val)
           if projectpath?(@venv)
             if @venv.exist?
               log.debug "venv found: #{@venv}"