squared 0.4.7 → 0.4.8

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)
@@ -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(basepath(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
@@ -405,10 +410,17 @@ module Squared
             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
@@ -479,11 +491,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
@@ -518,7 +537,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)
@@ -561,8 +580,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 +638,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 +658,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 +673,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 +684,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.join("#{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 +759,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
@@ -924,7 +962,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 +997,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 +1021,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 +1055,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 +1065,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
@@ -1172,7 +1216,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 +1276,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 +1331,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)
@@ -1441,6 +1485,39 @@ 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, timeout: 60)
+        end
+
+        def choice_index(msg, list, values: nil, multiple: false, accept: nil, trim: nil)
+          puts if @@print_order > 0
+          raise_error 'user cancelled' unless (ret = choice(msg, list, multiple: multiple))
+          ret = multiple ? ret.map! { |val| val.sub(trim, '') } : ret.sub(trim, '') if trim
+          exit 1 if accept && !confirm("#{accept} [#{ret.join(', ')}] [y/N] ", 'N', timeout: 60)
+          if values
+            ret = [ret]
+            values.each do |val|
+              val, req = val if val.is_a?(Array)
+              val = Readline.readline("#{val} (#{req ? 'required' : 'optional'}): ", true).strip
+              raise_error 'user cancelled' if req && val.empty?
+              ret << (val.empty? ? nil : val)
+            end
+          end
+          @@print_order += 1
+          ret
+        end
+
         def runenv
           nil
         end
@@ -1515,7 +1592,7 @@ module Squared
 
         def verbosetype
           case verbose
-          when true
+          when TrueClasss
             1
           when Numeric
             verbose.succ
@@ -1546,15 +1623,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)
+                ret = yield
               else
                 Dir.chdir(path)
-                ret = instance_eval(&blk)
+                ret = yield
                 Dir.chdir(pwd)
               end
             rescue StandardError => e
@@ -1605,13 +1682,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

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

@@ -125,7 +125,7 @@ module Squared
           return unless ref?(Docker.ref)
 
           namespace name do
-            @@tasks[Docker.ref].each do |action, flags|
+            Docker.subtasks do |action, flags|
               next if @pass.include?(action)
 
               namespace action do
@@ -151,31 +151,38 @@ module Squared
                     when :build, :up
                       format_desc action, flag, 'opts*,service*'
                       task flag do |_, args|
-                        composex flag, args.to_a
+                        compose! flag, args.to_a
                       end
                     when :exec, :run
                       format_desc action, flag, "service,command#{flag == :exec ? '' : '?'},args*,opts*"
                       task flag, [:service] do |_, args|
                         service = param_guard(action, flag, args: args, key: :service)
-                        composex(flag, args.extras, service: service)
+                        compose!(flag, args.extras, service: service)
                       end
                     end
                   when 'container'
                     case flag
                     when :exec, :commit
-                      format_desc(action, flag, 'id/name,opts*', after: flag == :exec ? 'args+' : 'tag?')
+                      format_desc(action, flag, flag == :exec ? 'id/name?,opts*,args+' : 'id/name,tag?,opts*')
                       task flag, [:id] do |_, args|
-                        id = param_guard(action, flag, args: args, key: :id)
-                        container(flag, args.extras, id: id)
+                        if flag == :exec && !args.id
+                          choice_command flag
+                        else
+                          id = param_guard(action, flag, args: args, key: :id)
+                          container(flag, args.extras, id: id)
+                        end
                       end
                     when :run
-                      format_desc action, flag, 'image,opts*,args*'
+                      format_desc action, flag, 'image?,opts*,args*'
                       task flag, [:image] do |_, args|
-                        image = param_guard(action, flag, args: args, key: :image)
-                        container(flag, args.extras, id: image)
+                        if args.image
+                          container(flag, args.extras, id: args.image)
+                        else
+                          choice_command flag
+                        end
                       end
                     else
-                      format_desc(action, flag, 'opts*', after: "id/name#{flag == :update ? '+' : '*'}")
+                      format_desc(action, flag, 'opts*,id/name', after: flag == :update ? '+' : '*')
                       task flag do |_, args|
                         container flag, args.to_a
                       end
@@ -188,7 +195,7 @@ module Squared
                         tag = param_guard(action, flag, args: args, key: :tag)
                         image(flag, args.extras, id: tag)
                       end
-                    else
+                    when :list, :rm
                       format_desc(action, flag, flag == :rm ? 'id*,opts*' : 'opts*,args*')
                       task flag do |_, args|
                         image flag, args.to_a
@@ -197,8 +204,11 @@ module Squared
                   when 'network'
                     format_desc action, flag, 'target,opts*'
                     task flag, [:target] do |_, args|
-                      target = param_guard(action, flag, args: args, key: :target)
-                      network(flag, args.extras, target: target)
+                      if (target = args.target)
+                        network(flag, args.extras, target: target)
+                      else
+                        choice_command flag
+                      end
                     end
                   end
                 end
@@ -251,13 +261,13 @@ module Squared
           when :build
             case @secrets
             when String
-              quote_option('secret', @secrets, double: true)
+              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) }
               end
-              append.(:file)
-              append.(:env)
+              append.call(:file)
+              append.call(:env)
             else
               as_a(@secrets).each { |arg| ret << quote_option('secret', arg) }
             end
@@ -304,7 +314,7 @@ module Squared
           run(from: :"buildx:#{flag}")
         end
 
-        def composex(flag, opts = [], service: nil)
+        def compose!(flag, opts = [], service: nil)
           cmd, opts = docker_session('compose', opts: opts)
           op = OptionPartition.new(opts, OPT_DOCKER[:compose][:common], cmd, project: self)
           append_file filetype unless op.arg?('f', 'file')
@@ -449,8 +459,7 @@ module Squared
               op << id
             else
               if op.empty?
-                list_image(flag, docker_output('image', 'ls', '-a'), from: from) do |val|
-                  puts val
+                list_image(flag, docker_output('image ls -a'), from: from) do |val|
                   image(:rm, opts, sync: sync, id: val)
                 end
               else
@@ -522,6 +531,9 @@ module Squared
         end
 
         def append_command(flag, val, list, target: @session, from: nil)
+          if (args = env('DOCKER_ARGS'))
+            list << args
+          end
           case flag
           when :run
             unless session_arg?('name', target: target)
@@ -532,7 +544,7 @@ module Squared
             raise_error('no command args', hint: from) if list.empty?
           end
           target << val << list.shift
-          target << shell_quote(list.join(' && '), double: true, option: false) unless list.empty?
+          target << list.join(' && ') unless list.empty?
         end
 
         def append_file(type, target: @session)
@@ -569,7 +581,7 @@ module Squared
           end
         end
 
-        def list_image(flag, cmd, hint: nil, from: nil, no: true, &blk)
+        def list_image(flag, cmd, hint: nil, from: nil, no: true)
           pwd_set do
             found = false
             index = 0
@@ -586,7 +598,7 @@ module Squared
                                        id
                                      end)
               ee = data['Image'] || rt || aa
-              next unless ee.match?(pat) || aa.match?(pat)
+              next unless option('all') || ee.match?(pat) || aa.match?(pat)
 
               bb = index.succ.to_s
               cc = bb.size + 1
@@ -618,7 +630,7 @@ module Squared
               next unless confirm("#{h + b}? [#{c}] ", d, timeout: 60)
 
               puts if @@print_order == 0
-              blk.call id
+              yield id
             end
             puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) unless found
           end
@@ -646,6 +658,35 @@ module Squared
           confirm("#{a} #{b}#{c ? " as #{c}" : ''}? [y/N] ", 'N', timeout: 60)
         end
 
+        def choice_command(flag)
+          msg, cmd, index = case flag
+                            when :run
+                              ['Choose an image', 'images -a', 2]
+                            when :exec
+                              ['Choose a container', 'ps -a', 0]
+                            else
+                              ['Choose a network', 'network ls', 0]
+                            end
+          lines = `#{docker_output(cmd)}`.lines
+          header = lines.shift
+          if lines.empty?
+            puts log_message(Logger::INFO, 'none found', subject: name, hint: "docker #{cmd}")
+          else
+            puts " #  #{header}"
+            case flag
+            when :run, :exec
+              values = [['Options', flag == :run], ['Command arguments', flag == :exec]]
+              cmd = flag.to_s
+            else
+              values = [['Options', false], ['Container', true]]
+              cmd = "network #{flag}"
+            end
+            out, opts, args = choice_index(msg, lines, values: values)
+            ret = run docker_output(cmd, opts, '--', out.split(/\s+/)[index], args)
+            puts 'Success' if ret && cmd.start_with?('network')
+          end
+        end
+
         def filetype(val = dockerfile)
           case File.extname(val)
           when '.hcl', '.json'