squared 0.4.13 → 0.4.15

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

@@ -9,7 +9,6 @@ module Squared
   module Workspace
     module Project
       class Base
-        include Comparable
         include Common::Format
         include System
         include Shell
@@ -17,6 +16,7 @@ module Squared
         include Utils
         include Support
         include Rake::DSL
+        include ::Comparable
 
         VAR_SET = %i[parent global script index envname desc dependfile dependindex theme archive env dev prod graph
                      pass exclude].freeze
@@ -76,8 +76,8 @@ module Squared
         attr_reader :name, :project, :workspace, :path, :theme, :exception, :pipe, :verbose,
                     :group, :parent, :dependfile
 
-        def initialize(workspace, path, name, *, group: nil, archive: nil, first: {}, last: {}, error: {},
-                       common: ARG[:COMMON], **kwargs)
+        def initialize(workspace, path, name, *, group: nil, first: {}, last: {}, error: {}, common: ARG[:COMMON],
+                       **kwargs)
           @path = path
           @workspace = workspace
           @name = name.to_s.freeze
@@ -90,14 +90,7 @@ module Squared
           @copy = kwargs[:copy]
           @clean = kwargs[:clean]
           @version = kwargs[:version]
-          @archive = case archive
-                     when String, Array
-                       { uri: archive }
-                     when Hash
-                       archive
-                     end
           @release = kwargs[:release]
-          @envname = @name.gsub(/[^\w]+/, '_').upcase.freeze
           @output = []
           @ref = []
           @children = []
@@ -106,6 +99,7 @@ module Squared
             last: last,
             error: error
           }
+          @envname = env_key(@name).freeze
           @desc = (@name.include?(':') ? @name.split(':').join(ARG[:SPACE]) : @name).freeze
           @parent = nil
           @global = false
@@ -114,10 +108,11 @@ module Squared
           exception_set kwargs[:exception]
           pipe_set kwargs[:pipe]
           verbose_set kwargs[:verbose]
-          theme_set common
           graph_set kwargs[:graph]
           pass_set kwargs[:pass]
           exclude_set kwargs[:exclude]
+          archive_set kwargs[:archive]
+          theme_set common
           initialize_ref Base.ref
         end
 
@@ -205,7 +200,7 @@ module Squared
             file &&= @workspace.home.join(env('LOG_DIR', ''), file).realdirpath
           rescue StandardError => e
             file = nil
-            warn log_message(Logger::WARN, e, pass: true) if warning?
+            warn log_message(Logger::WARN, e) if warning?
           end
           log[:progname] ||= @name
           if (val = env('LOG_LEVEL', ignore: false))
@@ -243,21 +238,26 @@ module Squared
           end
         end
 
+        def ==(other)
+          equal?(other)
+        end
+
         def <=>(other)
-          return 0 unless workspace == other.workspace
+          return unless workspace == other.workspace
+          return 0 if equal?(other)
 
           a, b = graph_deps
           return 1 if a.include?(other)
 
           c, d = graph_deps other
-          e = b.reject { |val| d.include?(val) }
-          f = d.reject { |val| b.include?(val) }
+          e = b - d
+          f = d - b
           if parent == other.parent
             g = []
             h = []
           else
-            g = a.reject { |val| c.include?(val) }
-            h = c.reject { |val| a.include?(val) }
+            g = a - c
+            h = c - a
           end
           g << self
           h << other
@@ -271,14 +271,12 @@ module Squared
             -1
           elsif f.any? { |val| e.include?(val) }
             1
-          elsif @index != -1 && (i = other.instance_variable_get(:@index)) != -1
-            @index < i ? -1 : 1
-          else
-            0
+          elsif @index >= 0 && (i = other.instance_variable_get(:@index)) >= 0
+            @index <=> i
           end
         rescue StandardError => e
           log&.debug e
-          0
+          nil
         end
 
         def ref
@@ -420,7 +418,7 @@ module Squared
 
           out = obj.link(self, *args, **kwargs, &blk) if obj.respond_to?(:link)
           if !out
-            warn log_message(Logger::WARN, 'link not compatible', subject: obj.to_s, hint: name, pass: true)
+            warn log_message(Logger::WARN, 'link not compatible', subject: obj.to_s, hint: name)
           elsif out.respond_to?(:build)
             out.build
           end
@@ -475,9 +473,9 @@ module Squared
             case opts
             when Hash
               opts = append_hash(opts, build: true)
-              cmd = as_a(cmd).push(flags).concat(opts).compact.join(' ')
+              cmd = Array(cmd).push(flags).concat(opts).compact.join(' ')
             when Enumerable
-              cmd = as_a(cmd).concat(opts.to_a)
+              cmd = Array(cmd).concat(opts.to_a)
               cmd.map! { |val| "#{val} #{flags}" } if flags
               cmd = cmd.join(' && ')
             else
@@ -513,9 +511,7 @@ module Squared
                     next
                   end
                 end
-                if warning?
-                  warn log_message(Logger::WARN, name, 'method not found', subject: 'prereqs', hint: meth, pass: true)
-                end
+                warn log_message(Logger::WARN, name, 'method not found', subject: 'prereqs', hint: meth)
               end
             elsif proj.build?
               proj.build(sync: sync)
@@ -659,7 +655,7 @@ module Squared
             headers = headers.is_a?(Hash) ? headers.merge(val) : val
           end
           data = nil
-          (uri = as_a(uri)).each_with_index do |url, index|
+          (uri = Array(uri)).each_with_index do |url, index|
             fetch_uri(url, headers) do |f|
               data = f.read
               if algo && algo.hexdigest(data) != digest
@@ -697,7 +693,7 @@ module Squared
             file.write(data)
             file.close
             if create
-              warn log_message(Logger::WARN, 'force remove', subject: name, hint: target, pass: true)
+              warn log_message(Logger::WARN, 'force remove', subject: name, hint: target)
               target.rmtree
               target.mkpath
             end
@@ -810,6 +806,8 @@ module Squared
               exclude_set val
             when :parent
               parent_set val
+            when :archive
+              archive_set val
             when :run
               run_set(*args, **kwargs)
             when :script
@@ -971,16 +969,28 @@ module Squared
           puts_oe(*args, pipe: pipe)
         end
 
-        def run(cmd = @session, var = nil, exception: @exception, sync: true, from: nil, banner: true, chdir: path, **)
+        def run(cmd = @session, var = nil, exception: @exception, sync: true, from: nil, banner: true, chdir: path,
+                interactive: nil, **)
           unless cmd
-            if warning?
-              from &&= from.to_s
-              warn log_message(Logger::WARN, from || 'unknown', subject: project, hint: 'no command given', pass: true)
-            end
-            return
+            from = from&.to_s || 'unknown'
+            return warn log_message(Logger::WARN, 'no command given', subject: project, hint: from, pass: true)
           end
+          i = interactive && !(@session && option('y'))
           cmd = cmd.target if cmd.is_a?(OptionPartition)
           cmd = session_done cmd
+          if i
+            title, y = case interactive
+                       when Array
+                         interactive
+                       when String
+                         [interactive, 'N']
+                       else
+                         ['Run', 'Y']
+                       end
+            unless confirm("#{title}? [#{sub_style(cmd, styles: theme[:inline])}] #{y == 'Y' ? '[Y/n]' : '[y/N]'} ", y)
+              raise_error('user cancelled', hint: from)
+            end
+          end
           log&.info cmd
           on :first, from
           begin
@@ -1041,7 +1051,7 @@ module Squared
             elsif obj.is_a?(Array) && obj.any? { |val| !val.is_a?(String) }
               build(*obj, **kwargs)
             elsif obj
-              run_s(obj.is_a?(Enumerable) ? obj.to_a : obj, **kwargs)
+              run_s(*Array(obj), **kwargs)
             end
           end
         end
@@ -1088,7 +1098,7 @@ module Squared
 
             t = dedupe.call(proj.name)
             j = if out
-                  if i == items.size - 1 || check.call(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?
@@ -1100,9 +1110,9 @@ module Squared
             end
             if !out
               if !tasks && (script = workspace.script_get(:graph, group: proj.group, ref: proj.allref))
-                group = script[:graph]
+                tasks = script[:graph]
               end
-              (tasks || group || (dev? ? ['build', 'copy'] : ['depend', 'build'])).each do |meth|
+              (tasks || (dev? ? ['build', 'copy'] : ['depend', 'build'])).each do |meth|
                 next if pass.include?(meth)
 
                 if workspace.task_defined?(cmd = task_join(proj.name, meth))
@@ -1113,7 +1123,7 @@ module Squared
                   end
                   run(cmd, sync: false, banner: false)
                   ENV.delete(key) if key
-                elsif proj.has?(meth, tasks || group ? nil : workspace.baseref)
+                elsif proj.has?(meth, tasks ? nil : workspace.baseref)
                   proj.__send__(meth.to_sym, sync: sync)
                 end
               end
@@ -1138,7 +1148,7 @@ module Squared
           done
         end
 
-        def graph_collect(target, start = [], data: {}, pass: [])
+        def graph_collect(target, start = [], data: {}, pass: [], root: [])
           deps = []
           (start.empty? ? target.instance_variable_get(:@graph) : start)&.each do |val|
             next if pass.include?(val)
@@ -1150,12 +1160,13 @@ module Squared
             else
               items = workspace.find(group: val, ref: val.to_sym)
             end
-
             items.each do |proj|
-              next if pass.include?(proj.name)
+              next if pass.include?(name = proj.name)
 
-              graph_collect(proj, data: data, pass: pass) if proj.graph? && !data.key?(proj.name)
-              next if (objs = data.fetch(proj.name, [])).include?(target)
+              if proj.graph? && !data.key?(name) && !root.include?(name)
+                graph_collect(proj, data: data, pass: pass, root: root + [name, target.name])
+              end
+              next if (objs = data.fetch(name, [])).include?(target)
 
               deps << proj
               deps.concat(objs)
@@ -1195,7 +1206,7 @@ module Squared
                 end
           return ret == equals.to_s unless equals.nil?
 
-          ret.empty? || (ignore && as_a(ignore).any? { |val| ret == val.to_s }) ? default : ret
+          ret.empty? || (ignore && Array(ignore).any? { |val| ret == val.to_s }) ? default : ret
         end
 
         def session(*cmd, prefix: cmd.first, main: true, path: true, options: true)
@@ -1243,7 +1254,7 @@ module Squared
         def option(*args, target: @session, prefix: target&.first, **kwargs)
           if prefix
             args.each do |val|
-              ret = env("#{stripext(prefix)}_#{val.gsub(/\W/, '_')}".upcase, **kwargs)
+              ret = env(env_key(stripext(prefix), val), **kwargs)
               return ret if ret
             end
           end
@@ -1307,6 +1318,18 @@ module Squared
           ret.join("\n")
         end
 
+        def print_status(*args, from: nil)
+          return if stdin?
+
+          case from
+          when :outdated
+            out = print_footer("major #{args[0]} / minor #{args[1]} / patch #{args[2]}", right: true).split("\n")
+            out[1] = sub_style(out[1], pat: /^( +major )(\d+)(.+)$/, styles: theme[:major], index: 2)
+            out[1] = sub_style(out[1], pat: /^(.+)(minor )(\d+)(.+)$/, styles: theme[:active], index: 3)
+            puts out
+          end
+        end
+
         def format_desc(action, flag, opts = nil, **kwargs)
           return unless TASK_METADATA
 
@@ -1380,7 +1403,7 @@ module Squared
               out << ''
             end
             if from
-              out << from
+              out << (from = from.to_s)
               pat = /\A(#{Regexp.escape(from)})(.*)\z/
             end
           else
@@ -1549,7 +1572,7 @@ module Squared
           raise_error("invalid JSON #{kind.name}", val, hint: hint) if kind && !ret.is_a?(kind)
         rescue StandardError => e
           log&.warn e
-          warn log_message(Logger::WARN, e, subject: name, pass: true) if warning?
+          warn log_message(Logger::WARN, e, subject: name) if warning?
         else
           ret
         end
@@ -1606,25 +1629,28 @@ module Squared
           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] }
+            a, b = Array(column)
+            ret = Array(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) }
+            hint = Array(ret).map { |val| sub_style(val, styles: theme[:inline]) }.join(', ')
+            accept = Array(accept).map { |val| Array(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
+              item = accept.first
+              d, e = item[2] ? ['Y', '[Y/n]'] : ['N', '[y/N]']
+              c = confirm("#{item[0]}#{a ? " [#{a}]" : ''} #{e} ", d, timeout: 60)
+              if item[1] == true
                 ret << c
               elsif !c
                 break
               end
-              a = nil
+              hint = nil
+              accept.shift
               break if accept.empty?
             end
             exit 1 unless accept.empty?
@@ -1655,7 +1681,7 @@ module Squared
           if (ret = instance_eval(&blk)).nil?
             val
           else
-            ret.is_a?(Array) ? ret : [ret]
+            Array(ret)
           end
         end
 
@@ -1709,13 +1735,17 @@ module Squared
         end
 
         def indexitem(val)
-          [$1.to_i, $2 && $2[1..-1]] if val =~ /\A\^(\d+)(:.+)?\z/
+          [$1.to_i, $2 && $2[1..-1]] if val =~ /\A[=^#{indexchar}](\d+)(:.+)?\z/
         end
 
         def indexerror(val, list = nil)
           raise_error("requested index #{val}", hint: list && "of #{list.size}")
         end
 
+        def indexchar
+          workspace.windows? ? '=' : '^'
+        end
+
         def printsucc
           @@print_order += 1
         end
@@ -1768,7 +1798,8 @@ module Squared
           pwd = Pathname.pwd
           if block_given?
             begin
-              if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join <= RUBY_VERSION)
+              pass = semscan(pass).join <= RUBY_VERSION if pass.is_a?(String)
+              if (path == pwd || pass == true) && !workspace.jruby_win?
                 ret = yield
               else
                 Dir.chdir(path)
@@ -1888,19 +1919,9 @@ module Squared
                      end
         end
 
-        def theme_set(common)
-          @theme = if !verbose
-                     {}
-                   elsif common
-                     workspace.theme
-                   else
-                     __get__(:theme)[:project][to_sym] ||= {}
-                   end
-        end
-
         def graph_set(val)
           @graph = if val
-                     as_a(val).map { |s| workspace.prefix ? workspace.task_name(s).to_sym : s.to_sym }.freeze
+                     Array(val).map { |s| workspace.prefix ? workspace.task_name(s).to_sym : s.to_sym }.freeze
                    end
         end
 
@@ -1912,6 +1933,25 @@ module Squared
           @exclude = (val ? as_a(val, :to_sym) : []).freeze
         end
 
+        def archive_set(val)
+          @archive = case val
+                     when String, Array
+                       { uri: val }
+                     when Hash
+                       val
+                     end
+        end
+
+        def theme_set(common)
+          @theme = if !verbose
+                     {}
+                   elsif common
+                     workspace.theme
+                   else
+                     __get__(:theme)[:project][to_sym] ||= {}
+                   end
+        end
+
         def dependfile_set(list)
           @dependindex = list.index { |file| basepath(file).exist? }.tap do |index|
             @dependfile = @path + list[index || 0]
@@ -2011,6 +2051,10 @@ module Squared
           ARG[:BANNER] && !env('BANNER', equals: '0')
         end
 
+        def pwd?
+          path == Pathname.pwd
+        end
+
         def stdin?
           pipe == 0
         end

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

@@ -21,7 +21,8 @@ module Squared
           compose: {
             common: %w[all-resources compatibility dry-run ansi|b env-file=p f|file=p parallel=b profile=b progress=b
                        project-directory=p p|project-name=e].freeze,
-            build: %w[no-cache pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b ssh=qq].freeze,
+            build: %w[check no-cache pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
+                      ssh=qq].freeze,
             exec: %w[dry-run privileged d|detach e|env=qq index=i T|no-TTY=b? user=e w|workdir=q].freeze,
             run: %w[build dry-run no-deps quiet-pull remove-orphans rm P|service-ports use-aliases cap-add=b cap-drop=b
                     d|detach entrypoint=q e|env=qq i|interactive=b? l|label=q name=b T|no-TTY=b? p|publish=e pull=b
@@ -159,7 +160,7 @@ module Squared
                         compose! flag, args.to_a
                       end
                     when :exec, :run
-                      format_desc action, flag, "service,command#{flag == :exec ? '' : '?'},args*,opts*"
+                      format_desc action, flag, "service,command#{flag == :exec ? '' : '?'}|:,args*,opts*"
                       task flag, [:service] do |_, args|
                         service = param_guard(action, flag, args: args, key: :service)
                         compose!(flag, args.extras, service: service)
@@ -264,7 +265,6 @@ module Squared
           when Enumerable
             ret.merge(opts.to_a)
           end
-
           [args, flags].each_with_index do |target, index|
             if target.is_a?(String)
               ret << target
@@ -279,12 +279,12 @@ module Squared
               ret << quote_option('secret', @secrets, double: true)
             when Hash
               append = lambda do |type|
-                as_a(@secrets[type]).each { |arg| ret << quote_option('secret', "type=#{type},#{arg}", double: true) }
+                Array(@secrets[type]).each { |arg| ret << quote_option('secret', "type=#{type},#{arg}", double: true) }
               end
               append.call(:file)
               append.call(:env)
             else
-              as_a(@secrets).each { |arg| ret << quote_option('secret', arg) }
+              Array(@secrets).each { |arg| ret << quote_option('secret', arg) }
             end
             if (val = option('tag', ignore: false))
               append_tag val
@@ -312,7 +312,7 @@ module Squared
           when :bake
             unless op.empty?
               args = op.dup
-              op.extras.clear
+              op.reset
               if Dir.exist?(args.last)
                 if projectpath?(val = args.pop)
                   context = val
@@ -359,7 +359,7 @@ module Squared
               both = run[:bind] + run[:tmpfs]
               diff = run[:bind].reject { |val| run[:tmpfs].include?(val) }
               delim = Regexp.new(",\\s*(?=#{both.join('|')})")
-              as_a(@mounts).each do |val|
+              Array(@mounts).each do |val|
                 args = []
                 tmpfs = true
                 val.split(delim).each do |opt|
@@ -565,7 +565,9 @@ module Squared
         end
 
         def append_command(flag, val, list, target: @session, from: nil)
-          if (args = env('DOCKER_ARGS'))
+          if list.delete(':')
+            list << readline('Enter command [args]', force: true)
+          elsif (args = env('DOCKER_ARGS'))
             list << args
           end
           case flag
@@ -588,7 +590,7 @@ module Squared
         def append_file(type, target: @session)
           return unless type == 2 || type == 4 || @file.is_a?(Array)
 
-          files = as_a(@file).map { |val| quote_option('file', path + val) }
+          files = Array(@file).map { |val| quote_option('file', path + val) }
           if target.is_a?(Set)
             target.merge(files)
           else
@@ -662,7 +664,7 @@ module Squared
                 cols.each do |key|
                   next if (key == 'Tag' && !dd) || (key == 'Size' && data[key] == '0B')
 
-                  puts "#{g + f} #{key}: #{as_a(data[key]).join(', ')}" unless data[key].to_s.empty?
+                  puts "#{g + f} #{key}: #{Array(data[key]).join(', ')}" unless data[key].to_s.empty?
                 end
                 w = 9 + flag.to_s.size + 4 + ee.size
                 puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), styles: theme[:inline])