squared 0.8.3 → 0.8.5

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

@@ -12,6 +12,7 @@ module Squared
         include Enumerable
         include Comparable
         include Common::Format
+        include Host
         include System
         include Shell
         include Prompt
@@ -338,6 +339,7 @@ module Squared
                         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)
+                        digest = args.digest
                         unless tag.match?(URI_SCHEME)
                           tag = unpack_get tag, ext
                           tag ||= if @release
@@ -346,7 +348,7 @@ module Squared
                                     raise ArgumentError, message('no base uri', tag, hint: ext)
                                   end
                         end
-                        force = case (digest = args.digest)
+                        force = case digest
                                 when 'f', 'force'
                                   digest = nil
                                   true
@@ -362,7 +364,8 @@ module Squared
                       when :set
                         format_desc action, flag, 'version,dir?=u/home|p/arent'
                         task flag, [:version] do |_, args|
-                          args = if (version = args.version)
+                          version = args.version
+                          args = if version
                                    args.extras
                                  else
                                    version, opts = choice_index('Select a version',
@@ -377,7 +380,9 @@ module Squared
                           asdf(flag, args, version: version)
                         end
                       else
-                        format_desc(action, flag, case flag when :exec, :env then 'command' end)
+                        format_desc(action, flag, case flag
+                                                  when :exec, :env then 'command'
+                                                  end)
                         task flag do |_, args|
                           args = args.to_a
                           if args.empty? && (flag == :exec || flag == :env)
@@ -533,7 +538,8 @@ module Squared
           graph_deps.flatten(1).sort.each do |proj|
             next if @@graph[:_].include?(proj)
 
-            if (val = ENV["PREREQS_#{proj.envname_get}"] || ENV["PREREQS_#{proj.ref.upcase}"])
+            val = ENV["PREREQS_#{proj.envname_get}"] || ENV["PREREQS_#{proj.ref.upcase}"]
+            if val
               split_escape(val) do |meth|
                 if proj.has?(meth)
                   begin
@@ -581,7 +587,8 @@ module Squared
           on :first, :clean unless pass
           case @clean
           when Struct
-            if (val = instance_eval(&@clean.block) || @clean.run)
+            val = instance_eval(&@clean.block) || @clean.run
+            if val
               cur = @clean
               @clean = val
               clean(*args, sync: sync, pass: true, **kwargs)
@@ -817,7 +824,7 @@ module Squared
             cmd << name
             banner = false if flag == :latest || flag == :where
           end
-          success?(run(banner: banner, from: symjoin('asdf', flag)), banner, flag == :set || flag == :reshim)
+          success?(run(banner: banner, from: symjoin('asdf', flag)), banner, %i[set reshim].include?(flag))
         end
 
         def first(key, *args, **kwargs, &blk)
@@ -906,7 +913,7 @@ module Squared
               ret = shell_t(*args, name: send, chdir: chdir, exception: exception, timeout: timeout || 0)
             end
           rescue Timeout::Error => e
-            print_error(Logger::ERROR, cmd, subject: name, hint: e)
+            print_error(Logger::ERROR, e, subject: name, hint: cmd)
             exit 1 unless exception?(Logger::DEBUG, Logger::INFO)
           rescue => e
             on_error(e, exception: true)
@@ -1366,9 +1373,8 @@ module Squared
         def run_b(obj, **kwargs)
           case obj
           when Struct
-            if (val = instance_eval(&obj.block) || obj.run)
-              run_b(val, **kwargs)
-            end
+            val = instance_eval(&obj.block) || obj.run
+            run_b(val, **kwargs) if val
           when Proc
             instance_eval(&obj)
           when Method
@@ -1726,7 +1732,7 @@ module Squared
         end
 
         def print_success
-          puts 'Success'
+          puts ARG[:SUCCESS]
         end
 
         def print_error(*args, loglevel: Logger::WARN, **kwargs)
@@ -1921,7 +1927,8 @@ module Squared
 
         def append_hash(data, target: @session || [], build: false)
           if build && (type = env('BUILD', suffix: 'TYPE', ignore: false))
-            if (extra = data[type = "__#{type}__"] || data[type.to_sym]).is_a?(Hash)
+            extra = data[type = "__#{type}__"] || data[type.to_sym]
+            if extra.is_a?(Hash)
               data = data.merge(extra)
             else
               extra = nil
@@ -2139,7 +2146,10 @@ module Squared
           if accept
             hint = Array(ret).map { |val| sub_style(val.to_s, theme[:inline]) }.join(', ')
             accept = Array(accept).map { |val| Array(val) }
-            ret = Array(ret) if accept.any? { |val| val[1] == true }
+            if accept.any? { |val| val[1] == true }
+              ret = [ret]
+              multiple = -1
+            end
             begin
               item = accept.shift
               c = confirm("#{item[0]}#{" [#{hint}]" if hint}", item[2] ? 'Y' : 'N')
@@ -2152,7 +2162,7 @@ module Squared
             end until accept.empty?
           end
           if values
-            ret = Array(ret)
+            ret = [ret] unless accept && multiple == -1
             Array(values).each do |val|
               if val.is_a?(Array)
                 val, force = val
@@ -2198,7 +2208,7 @@ module Squared
                   cmd.reverse! if File::NULL == 'NUL'
                   cmd.unshift('').join(' ')
                 end
-          if workspace.powershell?
+          if powershell?
             "#{shell_bin('powershell.exe')} -Command \"& {#{args.join(' ; ')}}\"#{out}"
           else
             args.map { |val| "#{val}#{out}" }.join(' && ')
@@ -2335,7 +2345,7 @@ module Squared
         end
 
         def indexchar
-          workspace.windows? ? '=' : '^'
+          windows? ? '=' : '^'
         end
 
         def shortname(*args, suffix: '?', delim: ',', pass: false)
@@ -2432,7 +2442,7 @@ module Squared
           return if from == false
 
           require 'timeout'
-          unless (path.to_s == Dir.pwd || pass) && (workspace.mri? || !workspace.windows?)
+          unless (path.to_s == Dir.pwd || pass) && (mri? || !windows?)
             pwd = Dir.pwd
             Dir.chdir(path)
           end
@@ -2775,6 +2785,20 @@ module Squared
           false
         end
 
+        def choice!(args, char: ':', first: true, empty: false, only: false)
+          return true if (empty && args.empty?) || (only && args.size == 1 && args.first == char)
+
+          if first
+            if args.first == char
+              args.shift
+              return true
+            end
+          elsif args.delete(char)
+            return true
+          end
+          false
+        end
+
         def variables
           VAR_SET
         end