squared 0.4.11 → 0.4.12

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

@@ -212,16 +212,11 @@ module Squared
           elsif (val = log[:file])
             file = val.is_a?(String) ? Time.now.strftime(val) : "#{@name}-#{Date.today}.log"
           end
-          if file
-            file = (val = env('LOG_DIR')) ? @workspace.home.join(val, file) : @workspace.home + file
-            begin
-              file = file.realdirpath
-            rescue StandardError => e
-              raise if @exception
-
-              file = nil
-              warn log_message(Logger::WARN, e, pass: true) if warning?
-            end
+          begin
+            file &&= @workspace.home.join(env('LOG_DIR', ''), file).realdirpath
+          rescue StandardError => e
+            file = nil
+            warn log_message(Logger::WARN, e, pass: true) if warning?
           end
           log[:progname] ||= @name
           if (val = env('LOG_LEVEL', ignore: false))
@@ -355,7 +350,7 @@ module Squared
               false
             end
           end
-          if path.is_a?(String) && (seg = path[%r{^(.+)[\\/]\*+$}, 1])
+          if path.is_a?(String) && (seg = path[%r{\A(.+)[\\/]\*+\z}, 1])
             return self unless checkdir.call(path = basepath(seg))
 
             path = path.children.select { |val| checkdir.call(val) }
@@ -366,10 +361,11 @@ module Squared
             return self
           elsif !projectpath?(path = basepath(path)) || !checkdir.call(path)
             return self
-          elsif name.is_a?(Symbol)
-            name = name.to_s
-          elsif !name.is_a?(String)
-            name = nil
+          else
+            name = case name
+                   when String, Symbol
+                     name.to_s
+                   end
           end
           if @withargs
             data = @withargs.dup
@@ -389,6 +385,11 @@ module Squared
           self
         end
 
+        def chain(*args, **kwargs)
+          workspace.chain(*args, project: self, **kwargs)
+          self
+        end
+
         def inject(obj, *args, **kwargs, &blk)
           return self unless enabled?
 
@@ -518,7 +519,7 @@ module Squared
             if @clean.is_a?(Enumerable) && !series?(@clean)
               @clean.each do |val|
                 entry = path + (val = val.to_s)
-                if entry.directory? && val.match?(%r{[\\/]$})
+                if entry.directory? && val.match?(%r{[\\/]\z})
                   log&.warn "rm -rf #{entry}"
                   rm_rf(entry, verbose: verbose)
                 else
@@ -572,8 +573,7 @@ module Squared
           end
         end
 
-        def unpack(target, uri:, sync: true, digest: nil, ext: nil, force: false, depth: 1, headers: {},
-                   from: :unpack)
+        def unpack(target, uri:, sync: true, digest: nil, ext: nil, force: false, depth: 1, headers: {}, from: :unpack)
           if !target.exist?
             target.mkpath
           elsif !target.directory?
@@ -581,18 +581,11 @@ module Squared
           elsif !target.empty?
             raise_error('directory not empty', hint: target) unless force || env('UNPACK_FORCE')
             create = true
-          elsif !uri
-            raise_error('no download uri', hint: target)
           end
           if digest
             require 'digest'
-            if (n = digest.index(':').to_i) > 0
-              size = digest[0, n].downcase
-              digest = digest[n + 1..-1]
-            else
-              size = digest.size
-            end
-            algo = case size
+            digest, type = digest.split(':', 2).reverse
+            algo = case type&.downcase || digest.size
                    when 32, 'md5'
                      Digest::MD5
                    when 'rmd160'
@@ -610,16 +603,15 @@ module Squared
                    end
           end
           if (val = env('HEADERS')) && (val = parse_json(val, hint: "HEADERS_#{@envname}"))
-            headers = val
+            headers = headers.is_a?(Hash) ? headers.merge(val) : val
           end
           data = nil
           (uri = as_a(uri)).each_with_index do |url, index|
-            last = index == uri.size - 1
             fetch_uri(url, headers) do |f|
               data = f.read
               if algo && algo.hexdigest(data) != digest
                 data = nil
-                raise_error("checksum failed: #{digest}", hint: url) if last
+                raise_error("checksum failed: #{digest}", hint: url) if index == uri.size - 1
               end
               next if ext && index == 0
 
@@ -632,14 +624,11 @@ module Squared
                 ext = 'txz'
               end
             end
-            if data
-              uri = url
-              break
-            elsif last
-              raise_error('no content', hint: url)
-            end
+            break uri = url if data
+          end
+          unless data && (ext ||= URI.parse(uri).path[/\.(\w+)(?:\?|\z)/, 1])
+            raise_error("no content#{data ? ' type' : ''}", hint: uri)
           end
-          raise_error('no content type', hint: uri) unless ext ||= URI.parse(uri).path[/\.(\w+)(\?|$)/i, 1]
           ext = ext.downcase
           if (val = env("#{%w[zip 7z gem].include?(ext) ? ext.upcase : 'TAR'}_DEPTH", ignore: false))
             depth = val.to_i
@@ -698,8 +687,8 @@ module Squared
           ensure
             if dir
               remove_entry dir
-            elsif file
-              file.unlink
+            else
+              file&.unlink
             end
           end
         end
@@ -916,6 +905,7 @@ module Squared
             end
             return
           end
+          cmd = cmd.target if cmd.is_a?(OptionPartition)
           cmd = session_done cmd
           log&.info cmd
           on :first, from
@@ -1178,8 +1168,8 @@ module Squared
         end
 
         def print_item(*val)
-          puts if @@print_order > 0 && stdout?
-          @@print_order += 1
+          puts if !printfirst? && stdout?
+          printsucc
           puts val unless val.empty? || (val.size == 1 && val.first.nil?)
         end
 
@@ -1209,10 +1199,9 @@ module Squared
 
         def print_footer(*lines, sub: nil, reverse: false, right: false, **kwargs)
           n = Project.max_width(lines)
-          sub = as_a sub
           lines.map! do |val|
             s = right ? val.rjust(n) : val.ljust(n)
-            sub.each { |h| s = sub_style(s, **h) }
+            sub&.each { |h| s = sub_style(s, **h) }
             s
           end
           ret = [sub_style(ARG[:BORDER][1] * n, styles: kwargs.key?(:border) ? kwargs[:border] : borderstyle), *lines]
@@ -1243,7 +1232,7 @@ module Squared
             if data[:command]
               if cmd =~ /\A(?:"((?:[^"]|(?<=\\)")+)"|'((?:[^']|(?<=\\)')+)'|(\S+)) /
                 path = $3 || $2 || $1
-                cmd = cmd.sub(path, File.basename(path).upcase)
+                cmd = cmd.sub(path, stripext(path).upcase)
               end
               out << cmd
             end
@@ -1502,12 +1491,12 @@ module Squared
           b = sub_style("#{pkg} #{ver}", styles: theme[:inline])
           c, d = rev == 1 || lock ? ['y/N', 'N'] : ['Y/n', 'Y']
           e = lock ? " #{sub_style('(locked)', styles: color(:red))}" : ''
-          confirm("Upgrade to #{a}? #{b + e} [#{c}] ", d)
+          confirm "Upgrade to #{a}? #{b + e} [#{c}] ", d
         end
 
         def choice_index(msg, list, values: nil, accept: nil, series: false, trim: nil, column: nil,
                          multiple: false, force: true, **kwargs)
-          puts if !series && @@print_order > 0
+          puts if !series && !printfirst?
           msg = "#{msg} (optional)" unless force
           unless (ret = choice(msg, list, multiple: multiple, force: force, **kwargs)) || !force
             raise_error 'user cancelled'
@@ -1519,7 +1508,7 @@ module Squared
           end
           ret = multiple ? ret.map! { |val| val.sub(trim, '') } : ret.sub(trim, '') if trim
           if column
-            a, b = as_a(column)
+            a, b = as_a column
             ret = as_a(ret).map! { |val| val[a, b || 1] }
             ret = ret.first unless multiple
           end
@@ -1554,7 +1543,7 @@ module Squared
               ret << (val.empty? ? nil : val)
             end
           end
-          @@print_order += 1 unless series
+          printsucc unless series
           ret
         end
 
@@ -1608,15 +1597,17 @@ module Squared
         end
 
         def indexitem(val)
-          return unless val =~ /\A\^(\d+)(:.+)?\z/
-
-          [$1.to_i, $2 && $2[1..-1]]
+          [$1.to_i, $2 && $2[1..-1]] if val =~ /\A\^(\d+)(:.+)?\z/
         end
 
         def indexerror(val, list = nil)
           raise_error("requested index #{val}", hint: list && "of #{list.size}")
         end
 
+        def printsucc
+          @@print_order += 1
+        end
+
         def color(val)
           ret = theme[val]
           ret && !ret.empty? ? ret : [val]
@@ -1642,16 +1633,14 @@ module Squared
         end
 
         def on(event, from, *args, **kwargs)
-          return unless from
-
-          @events[event][from]&.each do |obj|
-            if obj.is_a?(Array) && obj[1].is_a?(Hash)
-              opts = kwargs.empty? ? obj[1] : obj[1].merge(kwargs)
-              target = obj[0]
-            else
-              opts = kwargs
-              target = obj
-            end
+          return unless from && (data = @events[event])
+
+          data[from]&.each do |obj|
+            target, opts = if obj.is_a?(Array) && obj[1].is_a?(Hash)
+                             [obj[0], kwargs.empty? ? obj[1] : obj[1].merge(kwargs)]
+                           else
+                             [obj, kwargs]
+                           end
             as_a(target, flat: true).each do |cmd|
               case cmd
               when Proc, Method
@@ -1796,6 +1785,10 @@ module Squared
           (cur[0] == '0' && want[0] == '0' ? cur[2] != want[2] : cur[0] != want[0]) && !want[5]
         end
 
+        def printfirst?
+          @@print_order == 0
+        end
+
         def runnable?(val)
           case val
           when String, Enumerable, Proc, Method
@@ -1825,8 +1818,9 @@ module Squared
           return true if val || from_sync?(ac = workspace.task_name(action))
           return val if group && !(val = from_sync?(ac, group)).nil?
           return val if (base = workspace.find_base(self)) && !(val = from_sync?(ac, base.ref)).nil?
+          return false if workspace.series.chain?(val = task_join(name, action))
 
-          if task_invoked?(task_join(name, ac)) && (!task_invoked?(ac) || !workspace.task_defined?(ac, 'sync'))
+          if task_invoked?(val) && (!task_invoked?(ac) || !workspace.task_defined?(ac, 'sync'))
             true
           else
             val = workspace.series.name_get(action)

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

@@ -653,11 +653,11 @@ module Squared
                 index += 1
                 next unless confirm("#{h + b}? [#{c}] ", d, timeout: 60)
 
-                puts if @@print_order == 0
+                puts if printfirst?
               end
               yield id
             end
-            puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) unless found || y
+            puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) if found || y
           end
         rescue StandardError => e
           log.error e
@@ -670,13 +670,13 @@ module Squared
         def confirm_command(*args, title: nil, target: nil, as: nil)
           return false unless title && target
 
-          puts unless @@print_order == 0
+          puts unless printfirst?
           t = title.to_s.split(':')
           emphasize(args, title: message(t.first.upcase, *t.drop(1)), border: borderstyle, sub: [
             { pat: /\A(\w+(?: => \w+)+)(.*)\z/, styles: theme[:header] },
             { pat: /\A(.+)\z/, styles: theme[:caution] }
           ])
-          @@print_order += 1
+          printsucc
           a = t.last.capitalize
           b = sub_style(target, styles: theme[:subject])
           c = as && sub_style(as, styles: theme[:inline])

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

@@ -14,7 +14,11 @@ module Squared
         check = ->(proj) { proj.is_a?(Project::Git) && !proj.exclude?(Project::Git.ref) && git_clone?(proj.path) }
         if uri.is_a?(Array)
           base = name
-          uri.each { |val| repo << proj if (proj = @project[val.to_s]) && check.call(proj) }
+          uri.each do |val|
+            if (proj = @project[val.to_s]) && check.call(proj)
+              repo << proj
+            end
+          end
         elsif uri
           data[name.to_s] = uri
         elsif name.is_a?(Enumerable)
@@ -121,20 +125,18 @@ module Squared
       def rev_write(name = nil, data = nil, sync: true, utc: nil)
         return unless @revfile
 
+        sleep 0 while !sync && @revlock
+        @revlock = true
         if name
           data&.each { |key, val| rev_entry(name, key, val: val) }
           rev_timeutc(name, utc) if utc
         end
-        sleep 0 while !sync && @revlock
-        begin
-          @revlock = true
-          File.write(@revfile, JSON.pretty_generate(@revdoc))
-        rescue StandardError => e
-          log&.debug e
-          warn log_message(Logger::WARN, e, pass: true) if warning?
-        ensure
-          @revlock = false
-        end
+        File.write(@revfile, JSON.pretty_generate(@revdoc))
+      rescue StandardError => e
+        log&.debug e
+        warn log_message(Logger::WARN, e, pass: true) if warning?
+      ensure
+        @revlock = false
       end
 
       def git_clone?(path, name = nil)
@@ -457,8 +459,8 @@ module Squared
                   when 'stash'
                     format_desc(action, flag, 'opts*', after: case flag
                                                               when :push then 'pathspec*'
-                                                              when :list then nil
-                                                              else 'commit?' end)
+                                                              when :clear, :list then nil
+                                                              else 'stash?|:' end)
                     task flag do |_, args|
                       stash flag, args.to_a
                     end
@@ -516,15 +518,7 @@ module Squared
                           index = choice_commit(multiple: true)
                         else
                           index = []
-                          args.each do |val|
-                            if matchhead(val)
-                              index << commithead(val)
-                            elsif (sha = commithash(val))
-                              index << sha
-                            else
-                              break
-                            end
-                          end
+                          args.each { |val| index << (commithead(val) || commithash(val) || break) }
                           args = args.drop(index.size)
                         end
                         diff(flag, args, index: index)
@@ -1012,10 +1006,13 @@ module Squared
             when :push
               append_pathspec op.extras
             when :pop, :apply, :drop
-              unless op.empty?
+              if op.extras.delete(':')
+                op << choice_index('Choose a stash', git_spawn('stash list', stdout: false),
+                                   column: /^[^@]+@\{(\d+)\}/, force: true)
+              elsif !op.empty?
                 op << shell_escape(op.pop)
-                op.clear
               end
+              op.clear
             when :clear
               if confirm("Remove #{sub_style('all', styles: theme[:active])} stash entries? [y/N] ", 'N')
                 source(stdout: true)
@@ -1064,7 +1061,7 @@ module Squared
                       { pat: /^(## )(.+?)(\.{3})(.+)$/, styles: [nil, g, nil, r], index: -1 }
                     ]
                   else
-                    [{ pat: /^(\t+)([a-z]+: +.+)$/, styles: r, index: 2 }]
+                    [pat: /^(\t+)([a-z]+: +.+)$/, styles: r, index: 2]
                   end
           end
           out, banner, from = source(io: true)
@@ -1072,7 +1069,7 @@ module Squared
           list_result(ret, 'files', from: from, action: 'modified')
         end
 
-        def revbuild(flag = nil, opts = [], sync: invoked_sync?('revbuild', flag), **kwargs)
+        def revbuild(flag = nil, opts = [], sync: nil, **kwargs)
           statusargs = lambda do
             {
               include: relativepath(as_a(kwargs[:include]), all: true),
@@ -1090,6 +1087,7 @@ module Squared
           sha = git_spawn('rev-parse --verify HEAD').chomp
           return if sha.empty?
 
+          sync = invoked_sync?('revbuild', flag) if sync.nil?
           kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? statusargs.call : @revbuild || {}
           case flag
           when :build
@@ -1457,7 +1455,7 @@ module Squared
             else
               git_spawn 'fetch --all --prune --quiet' if option('sync')
               out, banner, from = source(cmd << '-vv --no-abbrev --list', io: true)
-              ret = write_lines(out, grep: /^\*\s+#{Regexp.escape(head)}\s/, banner: banner, first: true) do |line|
+              ret = write_lines(out, grep: [/^\*\s+#{Regexp.escape(head)}\s/], banner: banner, first: true) do |line|
                 next line if stdin?
 
                 data = line.sub(/^\*\s+/, '').split(/\s+/)
@@ -1585,7 +1583,7 @@ module Squared
           op << shell_quote(remote) if remote
           out, banner, from = source(io: true)
           print_item banner
-          ret = write_lines(out, grep: op.extras)
+          ret = write_lines(out, grep: op.extras, prefix: "refs/#{flag}/")
           list_result(ret, flag.to_s, from: from, grep: op.extras)
         end
 
@@ -1662,7 +1660,7 @@ module Squared
         def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false, banner: true,
                    multiple: false, **kwargs)
           cmd = cmd.target if cmd.is_a?(OptionPartition)
-          banner = nil if multiple && banner
+          banner = nil if banner && (multiple || !banner?)
           if cmd.respond_to?(:done)
             if io && banner == false
               from = nil
@@ -1723,15 +1721,27 @@ module Squared
           end
         end
 
-        def write_lines(data, banner: nil, loglevel: nil, grep: nil, sub: nil, pass: false, first: false)
-          grep &&= as_a(grep).yield_self { |a| a.empty? || a.include?('*') ? nil : a.map { |val| Regexp.new(val) } }
-          sub &&= stdin? ? nil : as_a(sub)
+        def write_lines(data, grep: [], prefix: nil, sub: nil, banner: nil, loglevel: nil, pass: false, first: false)
+          grep = unless grep.empty?
+                   grep.map do |val|
+                     if val.is_a?(Regexp)
+                       val
+                     else
+                       val = ".*#{val}" if prefix && !val.sub!(/\A(\^|\\A)/, '')
+                       Regexp.new("#{prefix}#{val == '*' ? '.+' : val}")
+                     end
+                   end
+                 end
+          sub = nil if stdin?
           ret = 0
           out = []
           data.each do |line|
             next if grep&.none? { |pat| pat.match?(line) }
 
-            line = yield line if block_given?
+            if block_given?
+              line = yield line
+              next unless line
+            end
             if loglevel
               log&.add loglevel, line
             else
@@ -1749,20 +1759,15 @@ module Squared
           ret
         end
 
-        def list_result(size, type, from: nil, action: 'found', grep: nil)
+        def list_result(size, type, grep: [], action: 'found', from: nil)
           if verbose
             if size > 0
               styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
               styles << :bold if styles.size <= 1
               puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
-                                sub: { pat: /^(\d+)(.+)$/, styles: styles })
+                                sub: [pat: /^(\d+)(.+)$/, styles: styles])
             else
-              puts empty_status("No #{type} were #{action}", 'grep', grep.is_a?(Array) ? case grep.size
-                                                                                         when 0
-                                                                                           nil
-                                                                                         else
-                                                                                           grep.join(', ')
-                                                                                         end : grep.to_s)
+              puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
             end
           end
           on :last, from
@@ -1843,7 +1848,7 @@ module Squared
               when 'refspec'
                 refspec << shell_escape($2, quote: true)
               end
-            elsif op.arg?('--multiple')
+            elsif op.arg?('multiple')
               op.found << opt
             else
               op.errors << opt
@@ -1858,7 +1863,7 @@ module Squared
               op.merge(refspec)
             end
             op.delete('--all')
-          elsif op.arg?('--multiple')
+          elsif op.arg?('multiple')
             op.swap.merge(op.map! { |opt| shell_escape(opt, quote: true) })
             return
           elsif option('all')
@@ -1975,7 +1980,7 @@ module Squared
         end
 
         def commithash(val)
-          val[/:(\h{5,40})\z/, 1] || val[/\A#\{(\h{5,40})\}\z/, 1]
+          val[/\A:(\h{5,40})\z/, 1] || val[/\A#\{(\h{5,40})\}\z/, 1]
         end
 
         def commithead(val)