squared 0.5.2 → 0.5.3

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

@@ -19,7 +19,7 @@ module Squared
         include ::Comparable
 
         VAR_SET = %i[parent global script index envname desc dependfile dependindex theme archive env dev prod graph
-                     pass exclude].freeze
+                     pass only exclude].freeze
         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
@@ -73,8 +73,8 @@ module Squared
           'unpack' => %i[zip tar gem ext].freeze
         })
 
-        attr_reader :name, :project, :workspace, :path, :theme, :exception, :pipe, :verbose,
-                    :group, :parent, :dependfile
+        attr_reader :name, :project, :workspace, :path, :theme, :group, :parent, :dependfile,
+                    :exception, :pipe, :verbose
 
         def initialize(workspace, path, name, *, group: nil, first: {}, last: {}, error: {}, common: ARG[:COMMON],
                        **kwargs)
@@ -89,16 +89,15 @@ module Squared
           @test = kwargs[:test]
           @copy = kwargs[:copy]
           @clean = kwargs[:clean]
-          @version = kwargs[:version]
           @release = kwargs[:release]
+          self.version = kwargs[:version]
+          self.exception = kwargs[:exception]
+          self.pipe = kwargs[:pipe]
+          self.verbose = kwargs[:verbose]
           @output = []
           @ref = []
           @children = []
-          @events = {
-            first: first,
-            last: last,
-            error: error
-          }
+          @events = hashobj.update({ first: first, last: last, error: error })
           @envname = env_key(@name).freeze
           @desc = (@name.include?(':') ? @name.split(':').join(ARG[:SPACE]) : @name).freeze
           @parent = nil
@@ -110,11 +109,9 @@ module Squared
           @session = nil
           @index = -1
           run_set(kwargs[:run], kwargs[:env], opts: kwargs.fetch(:opts, true))
-          exception_set kwargs[:exception]
-          pipe_set kwargs[:pipe]
-          verbose_set kwargs[:verbose]
           graph_set kwargs[:graph]
           pass_set kwargs[:pass]
+          only_set kwargs[:only]
           exclude_set kwargs[:exclude]
           archive_set kwargs[:archive]
           theme_set common
@@ -176,9 +173,7 @@ module Squared
         def initialize_events(ref, **)
           return unless (events = @workspace.events_get(group: @group, ref: ref))
 
-          events.each do |task, data|
-            data.each { |ev, blk| (@events[ev] ||= {})[task] ||= [blk] }
-          end
+          events.each { |task, data| data.each { |ev, blk| @events[ev][task] ||= [blk] } }
         end
 
         def initialize_logger(log: nil, **)
@@ -284,6 +279,29 @@ module Squared
           nil
         end
 
+        def version=(val)
+          @version = val&.to_s
+        end
+
+        def exception=(val)
+          @exception = env_bool(val, workspace.exception, strict: true)
+        end
+
+        def pipe=(val)
+          @pipe = env_pipe(val, workspace.pipe, strict: true)
+        end
+
+        def verbose=(val)
+          @verbose = case val
+                     when NilClass
+                       workspace.verbose
+                     when String
+                       env_bool(val, workspace.verbose, strict: true, index: true)
+                     else
+                       val
+                     end
+        end
+
         def ref
           Base.ref
         end
@@ -294,7 +312,7 @@ module Squared
 
           namespace name do
             Base.subtasks do |action, flags|
-              next if @pass.include?(action)
+              next if task_pass?(action)
 
               namespace action do
                 flags.each do |flag|
@@ -500,11 +518,9 @@ module Squared
                 if proj.respond_to?(meth.to_sym)
                   begin
                     proj.__send__(meth, sync: sync)
-                  rescue StandardError => e
-                    ret = on :error, :prereqs, e
-                    raise unless ret == true
-                  else
                     next
+                  rescue StandardError => e
+                    on_error(:prereqs, e, exception: true)
                   end
                 end
                 warn log_message(Logger::WARN, name, 'method not found', subject: 'prereqs', hint: meth)
@@ -557,9 +573,7 @@ module Squared
             begin
               @clean.each { |cmd, opts| build(cmd.to_s, opts, sync: sync) }
             rescue StandardError => e
-              log&.error e
-              ret = on :error, from, e
-              raise if exception && ret != true
+              on_error e, from
             end
           else
             if @clean.is_a?(Enumerable) && !series?(@clean)
@@ -608,8 +622,7 @@ module Squared
           end
           ret = graph_branch(self, data, tasks, out, sync: sync, pass: pass)
         rescue StandardError => e
-          ret = on :error, :graph, e
-          raise unless ret == true
+          on_error(:graph, e, exception: true)
         else
           if out
             [out, ret]
@@ -618,13 +631,13 @@ module Squared
           end
         end
 
-        def unpack(target, uri:, sync: true, digest: nil, ext: nil, force: false, depth: 1, headers: {}, from: :unpack)
-          require 'open-uri'
+        def unpack(target, file = nil, uri: nil, sync: true, digest: nil, ext: nil, force: false, depth: 1, headers: {},
+                   verbose: self.verbose, from: :unpack)
           if !target.exist?
             target.mkpath
           elsif !target.directory?
             raise_error('invalid location', hint: target)
-          elsif !target.empty?
+          elsif !file && !target.empty?
             raise_error('directory not empty', hint: target) unless force || env('UNPACK_FORCE')
             create = true
           end
@@ -651,44 +664,53 @@ module Squared
           if (val = env('HEADERS')) && (val = parse_json(val, hint: "HEADERS_#{@envname}"))
             headers = headers.is_a?(Hash) ? headers.merge(val) : val
           end
-          data = nil
-          (uri = Array(uri)).each_with_index do |url, index|
-            URI.open(url, headers) do |f|
-              data = f.read
-              if algo && algo.hexdigest(data) != digest
-                data = nil
-                raise_error("checksum failed: #{digest}", hint: url) if index == uri.size - 1
-              end
-              next if ext && index == 0
-
-              case f.content_type
-              when 'application/zip'
-                ext = 'zip'
-              when 'application/x-gzip'
-                ext = 'tgz'
-              when 'application/x-xz'
-                ext = 'txz'
+          if file
+            ext ||= File.extname(file)[1..-1]
+          else
+            require 'open-uri'
+            data = nil
+            (uri = Array(uri)).each_with_index do |url, index|
+              URI.open(url, headers) do |f|
+                data = f.read
+                if algo && algo.hexdigest(data) != digest
+                  data = nil
+                  raise_error("checksum failed: #{digest}", hint: url) if index == uri.size - 1
+                end
+                next if ext && index == 0
+
+                case f.content_type
+                when 'application/zip'
+                  ext = 'zip'
+                when 'application/x-gzip'
+                  ext = 'tgz'
+                when 'application/x-xz'
+                  ext = 'txz'
+                end
               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
-            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
           ext = ext.downcase
           if (val = env("#{%w[zip 7z gem].include?(ext) ? ext.upcase : 'TAR'}_DEPTH", ignore: false))
             depth = val.to_i
           end
           begin
-            if ext == 'gem'
-              dir = Dir.mktmpdir
-              file = File.new(File.join(dir, File.basename(uri)), 'w')
-            else
-              require 'tempfile'
-              file = Tempfile.new("#{name}-")
+            unless file
+              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
+              file = Pathname.new(file)
+              delete = true
             end
-            file.write(data)
-            file.close
             if create
               warn log_message(Logger::WARN, 'force remove', subject: name, hint: target)
               target.rmtree
@@ -696,7 +718,7 @@ module Squared
             end
             case ext
             when 'zip', 'aar'
-              session 'unzip', shell_quote(file.path), quote_option('d', target)
+              session 'unzip', shell_quote(file), quote_option('d', target)
             when 'tar', 'tgz', 'tar.gz', 'tar.xz', 'gz', 'xz'
               flags = +(verbose ? 'v' : '')
               if ext.end_with?('gz')
@@ -704,24 +726,24 @@ module Squared
               elsif ext.end_with?('xz')
                 flags += 'J'
               end
-              session 'tar', "-x#{flags}", basic_option('strip-components', depth), quote_option('f', file.path),
+              session 'tar', "-x#{flags}", basic_option('strip-components', depth), quote_option('f', file),
                       quote_option('C', target)
               depth = 0
             when '7z'
-              session '7z', 'x', shell_quote(file.path), "-o#{shell_quote(target)}"
+              session '7z', 'x', shell_quote(file), "-o#{shell_quote(target)}"
             when 'gem'
-              session 'gem', 'unpack', shell_quote(file.path), quote_option('target', target)
+              session 'gem', 'unpack', shell_quote(file), quote_option('target', target)
               depth = 0 unless val
             else
-              raise_error("unsupported format: #{ext}", hint: uri)
+              raise_error("unsupported format: #{ext}", hint: uri || file)
             end
-            run(sync: sync, from: from)
+            run(sync: sync, banner: verbose, from: from)
             while depth > 0 && target.children.size == 1
               entry = target.children.first
               break unless entry.directory?
 
               i = 0
-              while (dest = target + "#{File.basename(file.path)}-#{i}").exist?
+              while (dest = target + "#{File.basename(file)}-#{i}").exist?
                 i += 1
               end
               FileUtils.mv(entry, dest)
@@ -733,8 +755,8 @@ module Squared
           ensure
             if dir
               remove_entry dir
-            else
-              file&.unlink
+            elsif delete && file&.exist?
+              file.unlink
             end
           end
         end
@@ -752,7 +774,7 @@ module Squared
         end
 
         def event(name, key, *args, override: false, **kwargs, &blk)
-          data = @events[name.to_sym] ||= {}
+          data = @events[name.to_sym]
           items = if override
                     data[key.to_sym] = []
                   else
@@ -806,6 +828,8 @@ module Squared
               graph_set val
             when :pass
               pass_set val
+            when :only
+              only_set val
             when :exclude
               exclude_set val
             when :parent
@@ -966,11 +990,11 @@ 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: self.exception, sync: true, from: nil, banner: true, chdir: path,
                 interactive: nil, **)
           unless cmd
-            from = from&.to_s || 'unknown'
-            return warn log_message(Logger::WARN, 'no command given', subject: project, hint: from, pass: true)
+            warn log_message(Logger::WARN, 'no command given', subject: project, hint: from || 'unknown', pass: true)
+            return
           end
           i = interactive && !(@session && option('y'))
           cmd = cmd.target if cmd.is_a?(OptionPartition)
@@ -984,9 +1008,7 @@ module Squared
                        else
                          ['Run', 'Y']
                        end
-            unless confirm("#{title}? [#{sub_style(cmd, styles: theme[:inline])}]", y)
-              raise_error('user cancelled', hint: from)
-            end
+            exit 1 unless confirm("#{title}? [#{sub_style(cmd, styles: theme[:inline])}]", y)
           end
           log&.info cmd
           on :first, from
@@ -1010,10 +1032,7 @@ module Squared
               ret = shell(*args, chdir: chdir, exception: exception)
             end
           rescue StandardError => e
-            log&.error e
-            ret = on :error, from, e
-            raise unless ret == true
-
+            on_error(from, e, exception: true)
             false
           else
             on :last, from
@@ -1269,6 +1288,10 @@ module Squared
           puts 'Success'
         end
 
+        def print_error(err, loglevel: Logger::WARN, pass: false)
+          warn log_message(loglevel, err, pass: pass) if warning?
+        end
+
         def print_item(*val)
           puts unless printfirst?
           printsucc
@@ -1311,7 +1334,7 @@ module Squared
           ret.join("\n")
         end
 
-        def print_status(*args, from: nil)
+        def print_status(*args, from: nil, **kwargs)
           return if stdin?
 
           case from
@@ -1320,6 +1343,12 @@ module Squared
             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
+          when :completed
+            if verbose && kwargs[:start]
+              msg = sub_style('completed', styles: theme[:active])
+              puts log_message(Logger::INFO, *args, msg, subject: kwargs[:subject],
+                                                         hint: time_format(epochtime - kwargs[:start]))
+            end
           end
         end
 
@@ -1604,13 +1633,9 @@ module Squared
                          multiple: false, force: true, **kwargs)
           puts if !series && !printfirst?
           msg = "#{msg} (optional)" unless force
-          unless (ret = choice(msg, list, multiple: multiple, force: force, **kwargs)) || !force
-            raise_error 'user cancelled'
-          end
-          if ret.nil? || ret.empty?
-            return unless force
-
-            exit 1
+          unless (ret = choice(msg, list, multiple: multiple, force: force, **kwargs)) && !ret.empty?
+            exit 1 if force
+            return
           end
           ret = multiple ? ret.map! { |val| val.sub(trim, '') } : ret.sub(trim, '') if trim
           if column
@@ -1655,8 +1680,8 @@ module Squared
           ret
         end
 
-        def command_args(args, force: false, **kwargs)
-          return unless args.size == 1 && !option('i', 'interactive', **kwargs, equals: '0')
+        def command_args(args, min: 0, force: false, **kwargs)
+          return if args.size > min || option('i', 'interactive', **kwargs, equals: '0')
 
           readline('Enter arguments', force: force)
         end
@@ -1717,6 +1742,21 @@ module Squared
           val.scan(SEM_VER).first.yield_self { |data| fill ? semver(data) : data }
         end
 
+        def semcmp(val, other)
+          a, b = [val, other].map! { |ver| ver.match(SEM_VER) }
+          return 1 unless a
+          return -1 unless b
+          return 0 if a[0] == b[0]
+
+          a, b = [a, b].map! { |c| [c[1], c[3], c[5] || '0'] }
+          a.each_with_index do |c, index|
+            next if c == (d = b[index])
+
+            return c.to_i < d.to_i ? 1 : -1
+          end
+          0
+        end
+
         def indexitem(val)
           [$1.to_i, $2 && $2[1..-1]] if val =~ /\A[=^#{indexchar}](\d+)(:.+)?\z/
         end
@@ -1758,9 +1798,9 @@ module Squared
         end
 
         def on(event, from, *args, **kwargs)
-          return unless from && (data = @events[event])
+          return unless from && @events.key?(event)
 
-          data[from]&.each do |obj|
+          @events[event][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
@@ -1777,10 +1817,19 @@ module Squared
           end
         end
 
+        def on_error(err, from, exception: self.exception, pass: false, dryrun: false)
+          log&.error err
+          unless dryrun
+            ret = on :error, from, err
+            raise err if exception && ret != true
+          end
+          print_error(err, pass: pass) unless ret
+        end
+
         def pwd_set(pass: false, from: nil)
           pass = semscan(pass).join <= RUBY_VERSION if pass.is_a?(String)
           pwd = Dir.pwd
-          if (path.to_s == pwd || pass == true) && !workspace.jruby_win?
+          if (path.to_s == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
             ret = yield
           else
             Dir.chdir(path)
@@ -1788,9 +1837,7 @@ module Squared
             Dir.chdir(pwd)
           end
         rescue StandardError => e
-          log&.error e
-          ret = on :error, from, e
-          raise if exception && ret != true
+          on_error e, from
         else
           ret
         end
@@ -1865,25 +1912,6 @@ module Squared
           @parent = val if val.is_a?(Project::Base)
         end
 
-        def exception_set(val)
-          @exception = env_bool(val, workspace.exception, strict: true)
-        end
-
-        def pipe_set(val)
-          @pipe = env_pipe(val, workspace.pipe, strict: true)
-        end
-
-        def verbose_set(val)
-          @verbose = case val
-                     when NilClass
-                       workspace.verbose
-                     when String
-                       env_bool(val, workspace.verbose, strict: true, index: true)
-                     else
-                       val
-                     end
-        end
-
         def graph_set(val)
           @graph = if val
                      Array(val).map { |s| workspace.prefix ? workspace.task_name(s).to_sym : s.to_sym }.freeze
@@ -1891,7 +1919,11 @@ module Squared
         end
 
         def pass_set(val)
-          @pass = (val ? as_a(val, :to_s) : []).freeze
+          @pass = Array(val).freeze
+        end
+
+        def only_set(val)
+          @only = val && as_a(val, :to_s).freeze
         end
 
         def exclude_set(val)
@@ -1950,6 +1982,10 @@ module Squared
           end
         end
 
+        def task_pass?(key)
+          @only ? !@only.include?(key) : @pass.include?(key)
+        end
+
         def projectpath?(val)
           Pathname.new(val).cleanpath.yield_self do |file|
             file.absolute? ? file.to_s.start_with?(File.join(path, '')) : !file.to_s.start_with?(File.join('..', ''))
@@ -2051,6 +2087,14 @@ module Squared
           BLK_SET
         end
 
+        def hashobj
+          Workspace::Support.hashobj
+        end
+
+        def hashlist
+          Workspace::Support.hashlist
+        end
+
         def borderstyle
           workspace.banner_get(*@ref, group: group)&.border || theme[:border]
         end

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

@@ -94,6 +94,7 @@ module Squared
         subtasks({
           'build' => %i[tag context bake].freeze,
           'compose' => %i[build run exec up].freeze,
+          'bake' => %i[build check].freeze,
           'image' => %i[list rm push tag save].freeze,
           'container' => %i[run create exec update commit inspect diff start stop restart pause unpause top stats kill
                             rm].freeze,
@@ -112,7 +113,6 @@ module Squared
           @mounts = mounts
           @secrets = secrets
           @registry = tagjoin registry, kwargs[:username]
-          @file = nil
           initialize_ref Docker.ref
           initialize_logger(**kwargs)
           initialize_env(**kwargs)
@@ -129,12 +129,12 @@ module Squared
 
           namespace name do
             Docker.subtasks do |action, flags|
-              next if @pass.include?(action)
+              next if task_pass?(action)
 
               namespace action do
                 flags.each do |flag|
                   case action
-                  when 'build'
+                  when 'build', 'bake'
                     case flag
                     when :tag, :context
                       format_desc(action, flag, 'opts*', before: flag == :tag ? 'name' : 'dir')
@@ -142,16 +142,26 @@ module Squared
                         param = param_guard(action, flag, args: args, key: flag)
                         buildx(:build, args.extras, "#{flag}": param)
                       end
-                    when :bake
+                    when :bake, :build
+                      next unless bake?
+
                       format_desc action, flag, ':?,opts*,target*,context?'
                       task flag do |_, args|
                         args = args.to_a
                         if args.first == ':'
                           choice_command :bake
                         else
-                          buildx flag, args
+                          buildx :bake, args
                         end
                       end
+                    when :check
+                      next unless bake?
+
+                      format_desc action, flag, 'target'
+                      task flag, [:target] do |_, args|
+                        target = param_guard(action, flag, args: args, key: :target)
+                        buildx :bake, ['allow=fs.read=*', 'call=check', target]
+                      end
                     end
                   when 'compose'
                     case flag
@@ -306,7 +316,7 @@ module Squared
           op.parse(OPT_DOCKER[:buildx][flag == :bake ? :bake : :build] + OPT_DOCKER[:buildx][:shared])
           case flag
           when :build, :context
-            append_tag(tag || option('tag', ignore: false) || @tag)
+            append_tag(tag || option('tag', ignore: false) || self.tag)
             append_context context
           when :bake
             unless op.empty?
@@ -316,7 +326,7 @@ module Squared
                 if projectpath?(val = args.pop)
                   context = val
                 else
-                  op.extras << val
+                  op.push(val)
                 end
               end
               op.append(args, escape: true)
@@ -572,12 +582,7 @@ module Squared
           case flag
           when :run
             unless session_arg?('name', target: target)
-              target << basic_option('name', dnsname("#{name}_%s" % if RUBY_VERSION >= '3.1'
-                                                                      require 'random/formatter'
-                                                                      Random.new.alphanumeric(6)
-                                                                    else
-                                                                      (0...6).map { rand(97..122).chr }.join
-                                                                    end))
+              target << basic_option('name', dnsname("#{name}_%s" % rand_s(6)))
             end
           when :exec
             raise_error('no command args', hint: from) if list.empty?
@@ -679,11 +684,7 @@ module Squared
             puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) if found || y
           end
         rescue StandardError => e
-          log.error e
-          ret = on :error, from, e
-          raise if exception && ret != true
-
-          warn log_message(Logger::WARN, e, pass: true) if warning?
+          on_error e, from
         end
 
         def confirm_command(*args, title: nil, target: nil, as: nil)
@@ -740,7 +741,7 @@ module Squared
             cmd = docker_output ctx
             case flag
             when :tag
-              args = tagjoin @registry, @tag
+              args = tagjoin @registry, tag
             when :save
               opts = "#{opts}.tar" unless opts.end_with?('.tar')
               cmd << quote_option('output', File.expand_path(opts))
@@ -751,11 +752,7 @@ module Squared
             else
               cmd << opts << '--'
             end
-            cmd.merge(if out.is_a?(Array)
-                        out.map! { |val| parse.call(val) }
-                      else
-                        [parse.call(out)]
-                      end)
+            cmd.merge(Array(out).map! { |val| parse.call(val) })
             cmd << args
             print_success if success?(run(cmd)) && ctx.start_with?(/(?:network|tag|save)/)
           end