squared 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac2411d2abc2d5caca8296cd25de89f28ede8458dd42809216e9ecb60dbc12e3
-  data.tar.gz: 2574d5d757f7405c47d792c47f83520325a633514801885706404efc3a10fa8b
+  metadata.gz: 42ae11aaf561b6e6d821f7590e37982c408cb4f09aa4946084e4d3ec29c6fdff
+  data.tar.gz: 3ef75c9101dfd1676c035396055bd5585b33e3be41498dbd19eac2a98ea80a81
 SHA512:
-  metadata.gz: 6623132213ca2b9510f867ffd711ce8541ef3d707290a51ae40eeca20dbe8ec027c4b47630d67ba96527faa9630a71b9befd89020bbba2ac329fc76925200c61
-  data.tar.gz: 909a95ac73cd5261d4d2bf184fb90ae6069d92fc30ba850d574da048f73938090ddea6ea7693fc6d0353df8a63213d964b2a964f44e3afa9f8f4188c47f8f5aa
+  metadata.gz: cf24602228107b3e1a760749acf96f367cd0877ea6d45a2b0153ea08ba2a3bb014b547986e2406d2aaca4744e005bad2d9994d4a5807a7cc1afe517191aca775
+  data.tar.gz: 87e429e0eb78518ea637ecd863aab3359fef584b3c87340cc5a4d9f83718e7b89ac7b258a9e7a9f7d7ece3169776a8fb61d6e5f575c7420778510f3a122d84db

data/CHANGELOG.md

@@ -1,5 +1,48 @@
 # Changelog
 
+## [0.6.5] - 2025-11-18
+
+### Added
+
+- Ruby command rubocop with stored command options was created.
+
+### Changed
+
+- Node command outdated uses inline interactive prompts.
+- Python task outdated no longer updates packages directly.
+
+### Fixed
+
+- Common format method emphasize modified frozen string in Ruby 2.5.
+
+## [0.6.4] - 2025-11-16
+
+### Added
+
+- Python command outdated can hide non-upgradable packages.
+- Ruby command outdated option dry-run was implemented.
+- Ruby command outdated option interactive was implemented.
+- Repo binary can be downloaded and run from any local directory.
+- Python command outdated option dry-run was implemented.
+- Common shell defined Array instance method quote!.
+- Python command outdated option interactive was implemented.
+
+### Changed
+
+- Gem command outdated uses inline interactive prompts.
+- Log messages with level INFO can be called without level argument.
+- Project base attribute project was converted into an accessor.
+
+### Fixed
+
+- Node command tsc did not accept a tsconfig or watch argument.
+- Repo application tasks are not created on Windows.
+- Repo module used conflicting REPO_URL with Repo application.
+- Project task outdated did not check pass and only exclusions.
+- Python command install did not include available options.
+- Workspace static method resolve did nothing when given a String.
+- Project base run command types did not include Struct.
+
 ## [0.6.3] - 2025-11-14
 
 ### Added
@@ -16,6 +59,9 @@
 - Requiring individual project classes in Rakefile is optional.
 - Application class uses static method register instead of series_wrap.
 - Project support modules are required inside Base class module.
+
+### Fixed
+
 - Project graph print did not display parent and last child consequetively.
 - Project outdated interactive prompts use exact column alignments.
 
@@ -1388,6 +1434,8 @@
 
 - Changelog was created.
 
+[0.6.5]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.5
+[0.6.4]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.4
 [0.6.3]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.3
 [0.6.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.2
 [0.6.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.1

data/README.md

@@ -82,7 +82,7 @@ Workspace::Application.load_ref('lib/squared/workspace/project', gem: 'squared')
 Workspace::Application
   .new(Dir.pwd, main: "squared") # Dir.pwd? (main? is implicitly basename)
   .banner("group", "project", styles: ["yellow", "black"], border: "bold") # name | project | path | ref | group? | parent? | version?
-  .repo("https://github.com/anpham6/squared-repo", "nightly", script: ["build:dev", "build:prod"], ref: :node) # Repo (optional)
+  .repo("https://github.com/anpham6/squared-repo", "nightly", script: ["build:dev", "prod"], install: "#{ENV["HOME"]}/.bin", ref: :node) # Repo (optional)
   .run("rake install", ref: :ruby)
   .depend(false, group: "default")
   .clean("rake clean", group: "default")
@@ -154,7 +154,7 @@ Node = Workspace::Project::Node                                      # tsc
 Node.options("build:dev", "target=es2022", project: "tsconfig.json") # :node (ref)
 Node.options("build:dev", "outDir=tmp", :squared)                    # squared (project name)
 
-Ruby = Workspace::Project::Ruby                                      # ruby | gem | rake | bundle | irb | rbs
+Ruby = Workspace::Project::Ruby                                      # ruby | gem | rake | bundle | irb | rbs | rubocop
 Ruby.options("lint", "rubocop", opts: ["gemfile=Gemfile"])           # :ruby
 Ruby.options("lint", "--parallel", :squared)
 
@@ -792,7 +792,7 @@ REPO_DEV             # pattern,0,1
 REPO_PROD            # pattern,0,1
 REPO_WARN            # 0,1
 REPO_SYNC            # 0,1
-REPO_URL             # manifest repository
+REPO_GIT             # manifest repository
 REPO_MANIFEST        # e.g. latest,nightly,prod
 REPO_GROUPS          # e.g. base,prod,docs
 REPO_STAGE           # 0,1,2,3,4

data/lib/squared/common/format.rb

@@ -189,12 +189,15 @@ module Squared
       end
 
       def log_message(level, *args, subject: nil, hint: nil, append: true, pass: false, color: ARG[:COLOR])
+        if args.empty?
+          args.concat(Array(level))
+          level = Logger::INFO
+        end
         args = args.map(&:to_s)
         if level.is_a?(::Numeric)
           if append && respond_to?(:log)
-            (log rescue nil).tap do |ref|
-              ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(::Logger)
-            end
+            ref = log rescue nil
+            ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(::Logger)
           end
           return false unless pass || level >= ARG[:LEVEL]
         end
@@ -271,7 +274,7 @@ module Squared
         pr = lambda do |line|
           s = line.ljust(n)
           sub.each { |h| sub_style!(s, **h) }
-          s = "#{b0} #{s} #{b0}"
+          s = +"#{b0} #{s} #{b0}"
           if border
             [[/\A(#{Regexp.escape(b0)})(.+)\z/om], [/\A(.+)(#{Regexp.escape(b0)})\z/om, 2]].each do |args|
               sub_style!(s, **opt_style(border, *args))

data/lib/squared/common/shell.rb

@@ -10,6 +10,7 @@ module Squared
       private_constant :QUOTE_VALUE
 
       String.define_method(:stripquote) { sub(QUOTE_VALUE, '\2') }
+      Array.define_method(:quote!) { |**kwargs| map! { |s| Shell.shell_quote(s, **kwargs) } }
 
       module_function
 

data/lib/squared/config.rb

@@ -233,10 +233,8 @@ module Squared
               end
         return unless (lines = print_keys(type, doc, keys, file: file, opts: opts))
 
-        title = Pathname.new(file)
-                        .realpath
-                        .to_s
-                        .sub(/^#{Regexp.escape(File.join(Dir.pwd, ''))}/, '')
+        title = File.realpath(file)
+                    .sub(/^#{Regexp.escape(File.join(Dir.pwd, ''))}/, '')
         emphasize(lines, title: title, sub: unless stdin?
                                               [
                                                 opt_style(theme[:banner], /\A((?:[^:]|(?<! ):(?! ))+)\z/),

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.6.3'
+  VERSION = '0.6.5'
 end

data/lib/squared/workspace/application.rb

@@ -24,7 +24,7 @@ module Squared
               impl_series.base_set(obj)
             else
               kind_project.unshift(obj)
-              obj.tasks&.each { |task| impl_series.add(task, obj) }
+              impl_series.extend_set(obj)
             end
             if (args = obj.batchargs)
               impl_series.batch(*args)
@@ -529,7 +529,7 @@ module Squared
         if (base = task_base?(key))
           tasks << key if obj.has?(key, baseref)
         elsif (batch = series.batch_get(key))
-          obj.allref.each do |ref|
+          obj.allref do |ref|
             next unless obj.has?(key, ref) && (data = batch[ref])
 
             data.each do |val|
@@ -548,7 +548,7 @@ module Squared
         if tasks.empty?
           return [] if (base && !obj.ref?(baseref)) || !(data = series.alias_get(key))
 
-          obj.allref.each do |ref|
+          obj.allref do |ref|
             next unless obj.has?(key, ref) && (alt = data[ref])
 
             ret = task_resolve obj, alt
@@ -628,7 +628,7 @@ module Squared
       end
 
       def task_include?(obj, key, ref = nil)
-        return false if @series.exclude?(key)
+        return false if series.exclude?(key)
 
         task_base?(key) ? obj.has?(key, ref || baseref) : task_extend?(obj, key)
       end

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

@@ -115,8 +115,9 @@ module Squared
           'asdf' => %i[set exec current update latest where reshim]
         })
 
-        attr_reader :name, :project, :workspace, :path, :theme, :group, :parent, :children, :dependfile,
+        attr_reader :name, :workspace, :path, :theme, :group, :parent, :children, :dependfile,
                     :exception, :pipe, :verbose, :global
+        attr_accessor :project
 
         def initialize(workspace, path, name, *, group: nil, first: {}, last: {}, error: {}, common: ARG[:COMMON],
                        **kwargs)
@@ -250,7 +251,7 @@ module Squared
                    print_error e
                  end
           log[:progname] ||= @name
-          log[:level] = val.match?(/\d/) ? log_sym(val.to_i) : val if (val = env('LOG_LEVEL', ignore: false))
+          env('LOG_LEVEL', ignore: false) { |val| log[:level] = val.start_with?(/\d/) ? log_sym(val.to_i) : val }
           log.delete(:file)
           @log = [file, log]
         end
@@ -258,28 +259,24 @@ module Squared
         def initialize_env(dev: nil, prod: nil, **)
           @dev = env_match('BUILD', dev, suffix: 'DEV', strict: true)
           @prod = env_match('BUILD', prod, suffix: 'PROD', strict: true)
-          if @output[2] != false && (val = env('BUILD', suffix: 'ENV'))
-            @output[2] = parse_json(val, hint: "BUILD_#{@envname}_ENV") || @output[2]
-          end
+          env('BUILD', suffix: 'ENV') { |val| @output[2] = val if (val = parse_json(val)) } unless @output[0] == false
           unless @output[0] == false || @output[0].is_a?(Array)
-            if (val = env('BUILD', suffix: 'OPTS'))
+            env('BUILD', suffix: 'OPTS') do |val|
               n = @output[0] ? 1 : 3
               @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))
+            env(ref.to_s.upcase, suffix: 'OPTS') { |val| @output[4] = merge_opts(@output[4], shell_split(val)) }
+          end
+          env('BUILD', suffix: 'VERSION') { |val| self.version = val }
+          env('BUILD', strict: true) do |val|
+            if val == '0'
+              @output = [false]
+            elsif script?
+              script_set val
+            else
+              run_set val
             end
           end
-          @version = val if (val = env('BUILD', suffix: 'VERSION'))
-          return unless (val = env('BUILD', strict: true))
-
-          if val == '0'
-            @output = [false]
-          elsif script?
-            script_set val
-          else
-            run_set val
-          end
         end
 
         def ==(other)
@@ -559,10 +556,9 @@ module Squared
               flags = append_hash(flags, target: []).join(' ') if flags.is_a?(Hash)
               cmd = case opts
                     when Hash
-                      Array(cmd).push(flags)
-                                .concat(append_hash(opts, target: [], build: true))
-                                .compact
-                                .join(' ')
+                      [cmd, flags].concat(append_hash(opts, target: [], build: true))
+                                  .compact
+                                  .join(' ')
                     when Enumerable
                       cmd = Array(cmd).concat(opts.to_a)
                       cmd.map! { |val| "#{val} #{flags}" } if flags
@@ -638,10 +634,10 @@ module Squared
           case @clean
           when Struct
             if (val = instance_eval(&@clean.block) || @clean.run)
-              temp = @clean
-              @clean = val
-              clean(*args, sync: sync, pass: true, **kwargs)
-              @clean = temp
+              @clean = @clean.tap do
+                @clean = val
+                clean(*args, sync: sync, pass: true, **kwargs)
+              end
             end
           when String
             run_s(@clean, sync: sync)
@@ -702,7 +698,9 @@ module Squared
             if order
               out.map! do |val|
                 name = ret.find { |proj| val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/) }&.name
-                (n = name && order[name]) ? val.subhint(n.succ) : val
+                next val unless (n = name && order[name])
+
+                val.subhint(n.succ)
               end
             else
               [out, ret]
@@ -743,9 +741,9 @@ module Squared
                    end
           end
           env('HEADERS') do |val|
-            if (data = parse_json(val, hint: "HEADERS_#{@envname}"))
-              headers = headers.is_a?(Hash) ? headers.merge(data) : data
-            end
+            next unless (data = parse_json(val))
+
+            headers = headers.is_a?(Hash) ? headers.merge(data) : data
           end
           if file
             ext ||= File.extname(file)[1..-1]
@@ -888,13 +886,9 @@ module Squared
         end
 
         def event(name, key, *args, override: false, **kwargs, &blk)
-          data = @events[name.to_sym]
-          items = if override
-                    data[key.to_sym] = []
-                  else
-                    data[key.to_sym] ||= []
-                  end
-          items << [block_given? ? [blk] + args : args, kwargs]
+          args.unshift(blk) if block_given?
+          ev = @events[name.to_sym]
+          (override ? ev[key.to_sym] = [] : ev[key.to_sym] ||= []) << [args, kwargs]
           self
         end
 
@@ -919,8 +913,10 @@ module Squared
 
         def run(cmd = @session, var = nil, exception: self.exception, sync: true, banner: true, from: nil, chdir: path,
                 interactive: nil, hint: nil, series: false, **)
-          return print_error('no command session started', subject: project, hint: from, pass: true) unless cmd
-
+          unless cmd
+            print_error('no command session started', subject: project, hint: from, pass: true)
+            return
+          end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
           if interactive && sync && (!@session || !option('y'))
             msg, y, h = case interactive
@@ -1120,14 +1116,41 @@ module Squared
           @log = Logger.new((@log.first if enabled?), **@log.last)
         end
 
-        def allref
-          @ref.reverse_each
+        def allref(&blk)
+          @ref.reverse_each(&blk)
         end
 
         def basepath(*args)
           path.join(*args)
         end
 
+        def basepath!(*args, type: nil)
+          ret = basepath(*args)
+          return unless ret.exist?
+
+          if type
+            (type.is_a?(String) ? type.chars : type).each do |ch|
+              case ch
+              when 'f'
+                return nil unless ret.file?
+              when 'd'
+                return nil unless ret.directory?
+              when 'l'
+                return nil unless ret.symlink?
+              when 'r'
+                return nil unless ret.readable?
+              when 'w'
+                return nil unless ret.writable?
+              when 'e'
+                return nil unless ret.executable?
+              else
+                return nil
+              end
+            end
+          end
+          ret
+        end
+
         def rootpath(*args, ascend: nil)
           ret = basepath(*args)
           return ret unless ascend && !ret.exist?
@@ -1162,6 +1185,15 @@ module Squared
           name.to_sym
         end
 
+        protected
+
+        def script_get(*args, key: nil)
+          ret = workspace.script_get(*args, group: group, ref: allref)
+          return ret unless ret && key
+
+          ret.fetch(key, nil)
+        end
+
         private
 
         def puts(*args, **kwargs)
@@ -1216,7 +1248,6 @@ module Squared
         def graph_branch(target, data, tasks = nil, out = nil, sync: true, pass: [], done: [], order: nil, depth: 0,
                          single: false, last: false, context: nil)
           tag = ->(proj) { "#{proj.name}#{"@#{proj.version}" if SEM_VER.match?(proj.version)}" }
-          script = ->(proj) { workspace.script_get(:graph, group: proj.group, ref: proj.allref)&.fetch(:graph, nil) }
           uniq = lambda do |name|
             next [] unless (ret = data[name])
 
@@ -1296,21 +1327,22 @@ module Squared
                                 end
               end
             else
-              (tasks || (subtasks = script.call(proj)) || (dev? ? %w[build copy] : %w[depend build])).each do |meth|
-                next if pass.include?(meth)
+              (tasks || (graph = proj.script_get(:graph, key: :graph)) || (dev? ? %w[build copy] : %w[depend build]))
+                .each do |meth|
+                  next if pass.include?(meth)
 
-                if workspace.task_defined?(cmd = task_join(name, meth))
-                  if ENV.key?(key = "BANNER_#{name.upcase}")
-                    key = nil
-                  else
-                    ENV[key] = '0'
+                  if workspace.task_defined?(cmd = task_join(name, meth))
+                    if ENV.key?(key = "BANNER_#{name.upcase}")
+                      key = nil
+                    else
+                      ENV[key] = '0'
+                    end
+                    run(cmd, sync: false, banner: false)
+                    ENV.delete(key) if key
+                  elsif proj.has?(meth, (workspace.baseref unless tasks || graph))
+                    proj.__send__(meth.to_sym, sync: sync)
                   end
-                  run(cmd, sync: false, banner: false)
-                  ENV.delete(key) if key
-                elsif proj.has?(meth, (workspace.baseref unless tasks || subtasks))
-                  proj.__send__(meth.to_sym, sync: sync)
                 end
-              end
             end
             done << proj
           end
@@ -1376,12 +1408,13 @@ module Squared
                   ignore = ['0'].freeze if ignore.nil?
                   ENV[name] || ENV.fetch(key, '')
                 end
-          if !equals.nil?
+          if equals.nil?
+            ret = default if ret.empty? || (ignore && Array(ignore).any? { |val| ret == val.to_s })
+            return ret if ret.nil?
+          else
             ret = Array(equals).any? { |val| ret == val.to_s }
-          elsif ret.empty? || (ignore && Array(ignore).any? { |val| ret == val.to_s })
-            ret = default
           end
-          return yield ret if block_given? && !ret.nil?
+          return yield ret if block_given?
 
           ret
         end
@@ -1658,7 +1691,9 @@ module Squared
         end
 
         def empty_status(msg, title, obj, always: false)
-          "#{msg}#{message(hint: message(title, obj.to_s)) unless !always && (!obj || obj == 0 || obj.to_s.empty?)}"
+          return msg if !always && (!obj || obj == 0 || obj.to_s.empty?)
+
+          msg.subhint(obj.is_a?(Numeric) ? "#{obj} #{title}" : message(title, obj.to_s))
         end
 
         def append_repeat(flag, opts, target: @session)
@@ -1865,19 +1900,12 @@ module Squared
         end
 
         def confirm_basic(msg, target, default = 'Y', style: :inline, **kwargs)
-          confirm("#{msg} [#{sub_style(target.to_s, theme[style])}]", default, **kwargs)
+          confirm("#{msg} [#{sub_style(target.to_s, style.is_a?(Symbol) ? theme[style] : style)}]", default, **kwargs)
         end
 
-        def confirm_outdated(pkg, ver, rev, cur = nil, lock: false, col0: 0, col1: 0, col2: nil, col3: 0, col4: 0,
+        def confirm_outdated(pkg, ver, type, cur = nil, lock: false, col0: 0, col1: 0, col2: nil, col3: 0, col4: 0,
                              **kwargs)
-          h = sub_style(case rev
-                        when 1
-                          'MAJOR'
-                        when 2
-                          'MINOR'
-                        else
-                          'PATCH'
-                        end, (rev == 1 && theme[:major]) || theme[:header])
+          h = sub_style(semrev(type).upcase, (type == 1 && theme[:major]) || theme[:header])
           case col0
           when 0
             col0 = "#{h}: "
@@ -1893,11 +1921,15 @@ module Squared
                 cur = cur.ljust(col2 || cur.size.succ)
                 lock ? sub_style(cur, color(:red)) : cur
               end
-          d = rev == 1 || lock ? 'N' : 'Y'
+          d = type == 1 || lock ? 'N' : 'Y'
           e = "#{col0}#{b}#{c}#{sub_style(col1 > 0 ? ver.ljust(col3) : ver.rjust(ver.size.succ), theme[:inline])}"
           confirm("#{e}#{col4 > 0 ? ' ' * [col4 - e.stripstyle.size - 1, 2].max : '  '}", d, **kwargs)
         end
 
+        def confirm_semver(msg, type, style: (type == 1 && theme[:major]) || :inline, timeout: 0, **kwargs)
+          confirm_basic(msg, semrev(type), type == 1 ? 'N' : 'Y', style: style, timeout: timeout, **kwargs)
+        end
+
         def choice_index(msg, list, values: nil, accept: nil, series: false, trim: nil, column: nil, multiple: false,
                          force: true, **kwargs)
           puts unless series || printfirst?
@@ -1962,7 +1994,9 @@ module Squared
         end
 
         def block_args(fallback = nil, &blk)
-          (ret = instance_eval(&blk)).nil? ? fallback : Array(ret)
+          return fallback if (ret = instance_eval(&blk)).nil?
+
+          Array(ret)
         end
 
         def runenv
@@ -1976,8 +2010,6 @@ module Squared
         end
 
         def relativepath(*list, all: false)
-          return [] if list.empty?
-
           list.flatten.map! { |val| Pathname.new(val) }.select { |val| projectpath?(val) }.map! do |val|
             ret = (val.absolute? ? val.relative_path_from(path) : val.cleanpath).to_s
             all && val.to_s.end_with?('/') ? "#{ret}/*" : ret
@@ -2064,6 +2096,27 @@ module Squared
           join ? ret.join : ret
         end
 
+        def semtype(cur, lat)
+          if semmajor?(cur, lat)
+            1
+          else
+            cur[2] == lat[2] ? 3 : 2
+          end
+        end
+
+        def semrev(type)
+          case type
+          when 1
+            'major'
+          when 2
+            'minor'
+          when 3
+            'patch'
+          else
+            'unknown'
+          end
+        end
+
         def semgte?(val, other)
           semcmp(val, other) != 1
         end
@@ -2080,6 +2133,30 @@ module Squared
           workspace.windows? ? '=' : '^'
         end
 
+        def shortname(*args, suffix: '?', delim: ',', pass: false)
+          return unless TASK_METADATA || pass
+
+          args.map! do |ch|
+            "#{ch}/#{case ch
+                     when 'i'
+                       'nteractive'
+                     when 's'
+                       'elect'
+                     when 'u'
+                       'pdate'
+                     when 'h'
+                       'ide'
+                     when 'f'
+                       'orce'
+                     when 'd'
+                       'ry-run'
+                     else
+                       next
+                     end}#{suffix}"
+          end.compact
+             .join(delim)
+        end
+
         def printsucc
           @@print_order += 1
         end
@@ -2244,7 +2321,7 @@ module Squared
         def asdf_set(val)
           @asdf = if @@asdf && val
                     dir = @@asdf.path.join('installs', val)
-                    [val, dir] if dir.exist? && !dir.empty?
+                    [val, dir] if dir.directory? && !dir.empty?
                   end
         end
 
@@ -2268,7 +2345,7 @@ module Squared
         end
 
         def as_get(val, from)
-          (@global && @as[from][val]) || val
+          (global && @as[from][val]) || val
         end
 
         def task_build(keys)
@@ -2322,7 +2399,7 @@ module Squared
 
         def runnable?(val)
           case val
-          when String, Enumerable, Proc, Method
+          when String, Enumerable, Proc, Method, Struct
             true
           else
             false
@@ -2407,12 +2484,7 @@ module Squared
           return false unless target.is_a?(Enumerable)
 
           args = args.first if args.size == 1 && args.first.is_a?(Enumerable)
-          case target
-          when Hash
-            args.is_a?(Enumerable) ? args.any? { |obj| target.value?(obj) } : target.value?(args)
-          else
-            args.is_a?(Enumerable) ? args.any? { |obj| target.include?(obj) } : target.include?(args)
-          end
+          args.any? { |obj,| target.include?(obj) }
         end
 
         def has_value!(target, *args, first: false)
@@ -2450,7 +2522,7 @@ module Squared
         end
 
         def scriptargs
-          { target: script? ? @output[1] : @output[0], script: script?, ref: ref, group: group, global: @global }
+          { target: script? ? @output[1] : @output[0], script: script?, ref: ref, group: group, global: global }
         end
       end