squared 0.4.7 → 0.4.9

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

@@ -4,7 +4,6 @@ require 'json'
 require 'date'
 require 'time'
 require 'logger'
-require 'digest'
 
 module Squared
   module Workspace
@@ -22,7 +21,8 @@ module Squared
         BLK_SET = %i[run depend doc lint test copy clean].freeze
         SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?\b/.freeze
         URI_SCHEME = %r{^([a-z][a-z\d+-.]*)://[^@:\[\]\\^<>|\s]}i.freeze
-        private_constant :VAR_SET, :BLK_SET, :SEM_VER, :URI_SCHEME
+        TASK_METADATA = Rake::TaskManager.record_task_metadata
+        private_constant :VAR_SET, :BLK_SET, :SEM_VER, :URI_SCHEME, :TASK_METADATA
 
         class << self
           def populate(*); end
@@ -47,7 +47,9 @@ module Squared
             @ref ||= to_s.downcase.to_sym
           end
 
-          def subtasks(val)
+          def subtasks(val = nil, &blk)
+            return @@tasks[val || ref].each(&blk) if block_given?
+
             @@tasks[ref] = val.freeze
           end
 
@@ -61,12 +63,11 @@ module Squared
         end
 
         @@tasks = {}
-        @@task_desc = Rake::TaskManager.record_task_metadata
         @@print_order = 0
 
         subtasks({
           'graph' => %i[run print].freeze,
-          'unpack' => %i[zip tar ext].freeze
+          'unpack' => %i[zip tar gem ext].freeze
         })
 
         attr_reader :name, :project, :workspace, :path, :theme, :exception, :pipe, :verbose,
@@ -97,7 +98,7 @@ module Squared
           @exception = env_bool(kwargs[:exception], workspace.exception, strict: true)
           @pipe = env_pipe(kwargs[:pipe], workspace.pipe, strict: true)
           @verbose = case verbose
-                     when nil
+                     when NilClass
                        workspace.verbose
                      when String
                        env_bool(verbose, workspace.verbose, strict: true, index: true)
@@ -212,7 +213,7 @@ module Squared
             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.join(file)
+            file = (val = env('LOG_DIR')) ? @workspace.home.join(val, file) : @workspace.home + file
             begin
               file = file.realdirpath
             rescue StandardError => e
@@ -224,7 +225,7 @@ module Squared
           end
           log[:progname] ||= @name
           if (val = env('LOG_LEVEL', ignore: false))
-            log[:level] = val.match?(/^\d$/) ? log_sym(val.to_i) : val
+            log[:level] = val.match?(/\d/) ? log_sym(val.to_i) : val
           end
           log.delete(:file)
           @log = [file, log]
@@ -239,10 +240,10 @@ module Squared
           unless @output[0] == false || @output[0].is_a?(Array)
             if (val = env('BUILD', suffix: 'OPTS'))
               n = @output[0] ? 1 : 3
-              @output[n] = merge_opts(@output[n], shell_split(val, escape: false))
+              @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, escape: false))
+              @output[4] = merge_opts(@output[4], shell_split(val))
             end
           end
           @version = val if (val = env('BUILD', suffix: 'VERSION'))
@@ -267,7 +268,7 @@ module Squared
           return unless ref?(Base.ref)
 
           namespace name do
-            @@tasks[Base.ref].each do |action, flags|
+            Base.subtasks do |action, flags|
               next if @pass.include?(action)
 
               namespace action do
@@ -300,17 +301,21 @@ module Squared
                       end
                     end
                   when 'unpack'
-                    format_desc(action, flag, 'tag/url,dir,digest?,f/force?', before: flag == :ext ? 'ext' : nil)
+                    format_desc(action, flag, 'tag/url,dir,digest?,f|force?', before: flag == :ext ? 'ext' : nil)
                     params = %i[tag dir digest force]
                     params.unshift(:ext) if flag == :ext
                     task flag, params do |_, args|
-                      ext = param_guard(action, flag, args: args, key: :ext).downcase if flag == :ext
+                      ext = flag == :ext ? param_guard(action, flag, args: args, key: :ext) : flag.to_s
                       tag = param_guard(action, flag, args: args, key: :tag)
                       dir = param_guard(action, flag, args: args, key: :dir)
                       unless tag.match?(URI_SCHEME)
-                        raise_error 'no base uri' unless @release
-
-                        tag = "#{@release.include?('??') ? @release.sub('??', tag) : @release + tag}.#{flag}"
+                        if flag == :gem
+                          tag = "https://rubygems.org/downloads/#{File.basename(tag, '.gem')}.gem"
+                        elsif @release
+                          tag = "%s.#{ext}" % [@release.include?('??') ? @release.sub('??', tag) : @release + tag]
+                        else
+                          raise_error("no base uri: #{tag}", hint: ext)
+                        end
                       end
                       case (digest = args.digest)
                       when 'f', 'force'
@@ -319,7 +324,7 @@ module Squared
                       else
                         force = args.fetch(:force, false)
                       end
-                      unpack(basepath(dir), uri: tag, digest: digest, ext: ext || flag.to_s, force: force)
+                      unpack(path + dir, uri: tag, digest: digest, ext: ext, force: force)
                     end
                   end
                 end
@@ -351,15 +356,15 @@ module Squared
             end
           end
           if path.is_a?(String) && (seg = path[%r{^(.+)[\\/]\*+$}, 1])
-            return self unless checkdir.(path = basepath(seg))
+            return self unless checkdir.call(path = basepath(seg))
 
-            path = path.children.select { |val| checkdir.(val) }
+            path = path.children.select { |val| checkdir.call(val) }
           end
           if path.is_a?(Array)
             name = @name if name == true
             path.each { |val| add(val, name && task_join(name, File.basename(val)), **kwargs, &blk) }
             return self
-          elsif !projectpath?(path = basepath(path)) || !checkdir.(path)
+          elsif !projectpath?(path = basepath(path)) || !checkdir.call(path)
             return self
           elsif name.is_a?(Symbol)
             name = name.to_s
@@ -396,19 +401,26 @@ module Squared
           self
         end
 
-        def build(*args, sync: invoked_sync?('build'), from: @buildtype || :build, **)
+        def build(*args, sync: invoked_sync?('build'), from: :run, **)
           banner = verbose
           if args.empty?
-            return unless from == (@buildtype || :build)
+            return unless from == :run
 
             run_b(@run, sync: sync, from: from) if series?(@run)
             args = @output
             banner = verbosetype > 1 if task_invoked?('build', 'build:sync', 'default')
           end
+          if args.first.is_a?(Struct)
+            f, blk = args.first.to_a
+            args[0] = instance_eval(&blk) || f
+            return unless args[0]
+          end
           if args.all? { |val| val.is_a?(Array) }
             cmd = []
             var = {}
             args.each do |val|
+              next instance_exec(*val[1..-1], &val[0]) if val.first.is_a?(Proc)
+
               a, b, c, d, e = val
               case b
               when Hash
@@ -431,7 +443,7 @@ module Squared
             cmd, opts, var, flags, extra = args
           end
           if cmd
-            cmd = as_get(cmd)
+            cmd = as_get cmd
             opts = compose(opts, script: false) if opts && respond_to?(:compose)
             flags = append_hash(flags).join(' ') if flags.is_a?(Hash)
             case opts
@@ -449,6 +461,7 @@ module Squared
             return unless (opts || extra) && respond_to?(:compose)
 
             cmd = compose(as_get(opts), flags, script: true, args: extra, from: from)
+            from = :script if from == :run && script?
           end
           run(cmd, var, from: from, banner: banner, sync: sync)
         end
@@ -479,11 +492,18 @@ module Squared
           run_b(@copy, sync: sync, from: :copy)
         end
 
-        def clean(*, sync: invoked_sync?('clean'), **)
+        def clean(*args, sync: invoked_sync?('clean'), pass: false, **kwargs)
           return unless @clean
 
-          on :first, :clean
+          on :first, :clean unless pass
           case @clean
+          when Struct
+            if (any = instance_eval(&@clean.block) || @clean.run)
+              temp = @clean
+              @clean = any
+              clean(*args, sync: sync, pass: true, **kwargs)
+              @clean = temp
+            end
           when String
             run_s(@clean, sync: sync)
           when Hash
@@ -497,13 +517,13 @@ module Squared
           else
             if @clean.is_a?(Enumerable) && !series?(@clean)
               @clean.each do |val|
-                path = basepath(val = val.to_s)
-                if path.directory? && val.match?(%r{[\\/]$})
-                  log&.warn "rm -rf #{path}"
-                  rm_rf(path, verbose: verbose)
+                entry = path + (val = val.to_s)
+                if entry.directory? && val.match?(%r{[\\/]$})
+                  log&.warn "rm -rf #{entry}"
+                  rm_rf(entry, verbose: verbose)
                 else
-                  log&.warn "rm #{path}"
-                  (val.include?('*') ? Dir[path] : [path]).each do |file|
+                  log&.warn "rm #{entry}"
+                  (val.include?('*') ? Dir[entry] : [entry]).each do |file|
                     next unless File.file?(file)
 
                     begin
@@ -518,7 +538,7 @@ module Squared
               run_b(@clean, sync: sync)
             end
           end
-          on :last, :clean
+          on :last, :clean unless pass
         end
 
         def graph(start = [], tasks = nil, sync: invoked_sync?('graph'), pass: [], out: nil)
@@ -552,7 +572,7 @@ module Squared
           end
         end
 
-        def unpack(target, sync: true, uri: nil, digest: nil, ext: nil, force: false, depth: 1, headers: {},
+        def unpack(target, uri:, sync: true, digest: nil, ext: nil, force: false, depth: 1, headers: {},
                    from: :unpack)
           if !target.exist?
             target.mkpath
@@ -561,8 +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]
@@ -616,13 +639,19 @@ module Squared
               raise_error('no content', hint: url)
             end
           end
-          ext ||= URI.parse(uri).path[/\.(\w+)(\?|$)/i, 1]
-          if (n = env("#{ext == 'zip' || ext == '7z' ? ext.upcase : 'TAR'}_DEPTH", ignore: false))
-            depth = n.to_i
+          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
           end
           begin
-            require 'tempfile'
-            file = Tempfile.new("#{name}-")
+            if ext == 'gem'
+              dir = Dir.mktmpdir
+              file = File.new(File.join(dir, File.basename(uri)), 'w')
+            else
+              require 'tempfile'
+              file = Tempfile.new("#{name}-")
+            end
             file.write(data)
             file.close
             if create
@@ -630,7 +659,7 @@ module Squared
               target.rmtree
               target.mkpath
             end
-            case ext.downcase
+            case ext
             when 'zip', 'aar'
               session 'unzip', shell_quote(file.path), quote_option('d', target)
             when 'tar', 'tgz', 'tar.gz', 'tar.xz', 'gz', 'xz'
@@ -645,6 +674,9 @@ module Squared
               depth = 0
             when '7z'
               session '7z', 'x', shell_quote(file.path), "-o#{shell_quote(target)}"
+            when 'gem'
+              session 'gem', 'unpack', shell_quote(file.path), quote_option('target', target)
+              depth = 0 unless val
             else
               raise_error("unsupported format: #{ext}", hint: uri)
             end
@@ -653,15 +685,22 @@ module Squared
               entry = target.children.first
               break unless entry.directory?
 
-              dest = target.join(File.basename(file.path))
-              mv(entry, dest)
-              dest.children.each { |child| mv(child, target) }
+              i = 0
+              while (dest = target + "#{File.basename(file.path)}-#{i}").exist?
+                i += 1
+              end
+              FileUtils.mv(entry, dest)
+              dest.children.each { |child| FileUtils.mv(child, target) }
               dest.rmdir
               target = entry
               depth -= 1
             end
           ensure
-            file&.unlink
+            if dir
+              remove_entry dir
+            elsif file
+              file.unlink
+            end
           end
         end
 
@@ -721,7 +760,7 @@ module Squared
               @parent = val if (val = val.first).is_a?(Project::Base)
             when :graph
               @graph = case val.first
-                       when nil, false
+                       when NilClass, FalseClass
                          nil
                        else
                          val.flatten.map!(&:to_s).freeze
@@ -877,7 +916,7 @@ module Squared
             end
             return
           end
-          cmd = session_done(cmd)
+          cmd = session_done cmd
           log&.info cmd
           on :first, from
           begin
@@ -924,7 +963,13 @@ module Squared
 
         def run_b(obj, from: nil, sync: true)
           case obj
-          when Proc, Method
+          when Struct
+            if (any = instance_eval(&obj.block) || obj.run)
+              run_b(any, from: from, sync: sync)
+            end
+          when Proc
+            instance_eval(&obj)
+          when Method
             obj.call
           else
             if series?(obj)
@@ -953,14 +998,14 @@ module Squared
           end
           start = target.name
           if depth == 0
-            items = check.(dedupe.(start))
+            items = check.call(dedupe.call(start))
             single = items.size == 1
           else
-            items = check.(data[start])
+            items = check.call(data[start])
           end
           if out
             a, b, c, d, e = ARG[:GRAPH]
-            f = tag.(target)
+            f = tag.call(target)
             out << case depth
                    when 0
                      f
@@ -977,15 +1022,15 @@ module Squared
           items.each_with_index do |proj, i|
             next if done.include?(proj)
 
-            t = dedupe.(proj.name)
+            t = dedupe.call(proj.name)
             j = if out
-                  if i == items.size - 1 || check.(post = items[i + 1..-1]).empty?
+                  if i == items.size - 1 || check.call(post = items[i + 1..-1]).empty?
                     true
                   elsif !t.empty? && depth > 0
                     post.reject { |pr| t.include?(pr) }.empty?
                   end
                 end
-            unless start == proj.name || (none = check.(t).empty?)
+            unless start == proj.name || (none = check.call(t).empty?)
               graph_branch(proj, data, tasks, out, sync: sync, pass: pass, done: done, depth: depth.succ,
                                                    single: single, last: j == true, context: target)
             end
@@ -1011,7 +1056,7 @@ module Squared
             elsif none
               a, b, c, d = ARG[:GRAPH]
               out << if depth == 0
-                       "#{i == items.size - 1 ? d : c}#{b * 4} #{tag.(proj)}"
+                       "#{i == items.size - 1 ? d : c}#{b * 4} #{tag.call(proj)}"
                      else
                        s = ''.dup
                        k = 0
@@ -1021,7 +1066,7 @@ module Squared
                          s += "#{indent || (last && data[final].last == context) ? ' ' : a}   "
                          k += 1
                        end
-                       s + "#{j ? d : c}#{b * 3} #{tag.(proj)}"
+                       s + "#{j ? d : c}#{b * 3} #{tag.call(proj)}"
                      end
             end
             done << proj
@@ -1078,7 +1123,7 @@ module Squared
           end
           ret = JoinSet.new(cmd.flatten(1))
           if options && (val = env("#{prefix}_OPTIONS"))
-            split_escape(val).each { |opt| ret.last(fill_option(opt), /^(--?[^ =]+)[ =].+$/) }
+            split_escape(val).each { |opt| ret.last(fill_option(opt), /\A(--?[^ =]+)[ =].+\z/m) }
           end
           main ? @session = ret : ret
         end
@@ -1086,7 +1131,7 @@ module Squared
         def session_delete(*args, target: @session)
           ret = []
           args.each do |val|
-            pat = /^#{Regexp.escape(shell_option(val))}(?: |=|$)/
+            pat = /\A#{Regexp.escape(shell_option(val))}(?: |=|\z)/
             if (key = target.find { |opt| opt.match?(pat) })
               target.delete(key)
               ret << key
@@ -1128,6 +1173,10 @@ module Squared
           OptionPartition.clear(target, opts, styles: theme[:inline], **kwargs)
         end
 
+        def print_success(*)
+          puts 'Success'
+        end
+
         def print_item(*val)
           puts if @@print_order > 0 && stdout?
           @@print_order += 1
@@ -1160,7 +1209,7 @@ module Squared
 
         def print_footer(*lines, sub: nil, reverse: false, right: false, **kwargs)
           n = Project.max_width(lines)
-          sub = as_a(sub)
+          sub = as_a sub
           lines.map! do |val|
             s = right ? val.rjust(n) : val.ljust(n)
             sub.each { |h| s = sub_style(s, **h) }
@@ -1172,7 +1221,7 @@ module Squared
         end
 
         def format_desc(action, flag, opts = nil, **kwargs)
-          return unless @@task_desc
+          return unless TASK_METADATA
 
           ret = [@desc, action]
           ret << flag if flag
@@ -1232,7 +1281,7 @@ module Squared
             items.each_with_index do |val, i|
               next unless reg.empty? || reg.any? { |pat| val[0].match?(pat) }
 
-              out << "#{i.succ.to_s.rjust(pad)}. #{each ? each.(val) : val[0]}"
+              out << "#{i.succ.to_s.rjust(pad)}. #{each ? each.call(val) : val[0]}"
             end
           end
           sub = [headerstyle]
@@ -1287,7 +1336,7 @@ module Squared
               append_repeat(key, val, target: target)
             when Numeric
               target << basic_option(key, val)
-            when false
+            when FalseClass
               target << shell_option(key).sub(/^--(?!no-)/, '--no-')
             else
               target << shell_option(key, val.is_a?(String) ? val : nil)
@@ -1427,7 +1476,7 @@ module Squared
           end
         end
 
-        def param_guard(action, flag, args: nil, key: nil, pat: nil, values: nil)
+        def param_guard(action, flag, args:, key: nil, pat: nil, values: nil)
           if args && key
             val = args.fetch(key, nil)
             return val unless val.nil? || (pat && !val.match?(pat)) || (values && !values.include?(val))
@@ -1441,6 +1490,74 @@ module Squared
           args
         end
 
+        def confirm_outdated(pkg, ver, rev, lock: false)
+          a = sub_style(case rev
+                        when 1
+                          'MAJOR'
+                        when 2
+                          'MINOR'
+                        else
+                          'PATCH'
+                        end, styles: theme[:header])
+          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)
+        end
+
+        def choice_index(msg, list, values: nil, multiple: false, accept: nil, series: false, trim: nil, column: nil,
+                         attempts: 5, force: true)
+          puts if !series && @@print_order > 0
+          msg = "#{msg} (optional)" unless force
+          unless (ret = choice(msg, list, multiple: multiple, force: force, attempts: attempts)) || !force
+            raise_error 'user cancelled'
+          end
+          if ret.nil? || ret.empty?
+            return unless force
+
+            exit 1
+          end
+          ret = multiple ? ret.map! { |val| val.sub(trim, '') } : ret.sub(trim, '') if trim
+          if column
+            a, b = as_a(column)
+            ret = as_a(ret).map! { |val| val[a, b || 1] }
+            ret = ret.first unless multiple
+          end
+          if accept
+            a = as_a(ret).map { |val| sub_style(val, styles: theme[:inline]) }.join(', ')
+            accept = as_a(accept).map { |val| as_a(val) }
+            if accept.any? { |val| val[1] == true }
+              ret = [ret]
+              multiple = -1
+            end
+            loop do
+              c = confirm("#{accept.first[0]}#{a ? " [#{a}]" : ''} [y/N] ", 'N', timeout: 60)
+              if accept.shift[1] == true
+                ret << c
+              elsif !c
+                break
+              end
+              a = nil
+              break if accept.empty?
+            end
+            exit 1 unless accept.empty?
+          end
+          if values
+            ret = [ret] unless accept && multiple == -1
+            values.each do |val|
+              if val.is_a?(Array)
+                val, force = val
+              else
+                force = false
+              end
+              val = readline(val, force: force)
+              ret << (val.empty? ? nil : val)
+            end
+          end
+          @@print_order += 1 unless series
+          ret
+        end
+
         def runenv
           nil
         end
@@ -1470,7 +1587,7 @@ module Squared
             raise_error 'pathspec not within worktree' unless pass || files.size == proj.size
             files = proj
           end
-          files.map { |val| val == '.' ? '.' : shell_quote(basepath(val)) }
+          files.map { |val| val == '.' ? '.' : shell_quote(path + val) }
         end
 
         def semver(val)
@@ -1506,7 +1623,7 @@ module Squared
         end
 
         def colormap(val)
-          val.compact.map! { |s| color(s) }.flatten
+          val.compact.flat_map { |s| color(s) }
         end
 
         def epochtime
@@ -1515,7 +1632,7 @@ module Squared
 
         def verbosetype
           case verbose
-          when true
+          when TrueClass
             1
           when Numeric
             verbose.succ
@@ -1546,15 +1663,15 @@ module Squared
           end
         end
 
-        def pwd_set(done = nil, pass: false, from: nil, dryrun: false, &blk)
+        def pwd_set(done = nil, pass: false, from: nil, dryrun: false)
           pwd = Pathname.pwd
           if block_given?
             begin
-              if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join >= RUBY_VERSION)
-                ret = instance_eval(&blk)
+              if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join <= RUBY_VERSION)
+                ret = yield
               else
                 Dir.chdir(path)
-                ret = instance_eval(&blk)
+                ret = yield
                 Dir.chdir(pwd)
               end
             rescue StandardError => e
@@ -1605,13 +1722,13 @@ module Squared
             @output = if cmd.all? { |data| data.is_a?(Hash) }
                         diso = false
                         dise = false
-                        cmd.map { |data| parse.(data) }
+                        cmd.map { |data| parse.call(data) }
                       else
                         cmd.dup
                       end
             return
           when Hash
-            @output = parse.(data)
+            @output = parse.call(data)
           else
             @output[0] = cmd
           end
@@ -1717,6 +1834,10 @@ module Squared
           end
         end
 
+        def success?(ret)
+          ret == true && stdout? && banner?
+        end
+
         def banner?
           ARG[:BANNER] && !env('BANNER', equals: '0')
         end