squared 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ea608e0b2d67acb3d15eaf67d7c70fc4c301c1c7ebf0dbfa9fba2e9ccabe0b
-  data.tar.gz: 806aeee453718e1ff75f1f83c3f2ac763fd989cdddeca18b570a1d383c90484c
+  metadata.gz: 9600e055e98f7c95c616af1a848044cb945f64597d986cad88392523a7ffb737
+  data.tar.gz: 255dc97b2d9738085a37fc336f43a6a835270d1ddcf28e9889712d077bc7f827
 SHA512:
-  metadata.gz: bcde780730f2426af5561183d7d33d172f7dc7a096f9b21b3098593e18758a6a5bdb26e40ccabfaf7e0cf2e6963f067289c304e2e7626b85c15dd2c589e907e0
-  data.tar.gz: efcae50c9cfd39b72c013035df135533fee434e7985c3896d409a3d2d1850f16c2c7d2dd811e89431ddc46e2fbc64f752ece5bc8f1205d79d052bcec59fb7749
+  metadata.gz: 498761f07fcfe36010066c6e0e9c6487aaef3652214420c9d6012a61155980bc13475531416a4584641bd0a2ef909016e0f04d1224c991363050692c224f6798
+  data.tar.gz: 3addf62ff638f20117db50cd40a13149490401f9b97a04f19ef2a6d6e02133eea763595ee1df8239933cc68db7e6725caa29de1cb1356b4fec93a38565ccbf7e

data/CHANGELOG.md

@@ -1,5 +1,114 @@
 # Changelog
 
+## [0.5.2] - 2025-07-16
+
+### Changed
+
+- Common method choice can accept dashed ranges for selection lists.
+
+## [0.4.15] - 2025-07-16
+
+### Added
+
+- Python command outdated option user was implemented.
+- Git command commit action amend and amend-orig are interactive.
+
+### Changed
+
+- Ruby task copy does not guess Gem directory when version is used.
+- Workspace hash-based data uses global method for key creation.
+
+## [0.3.13] - 2025-07-16
+
+### Fixed
+
+- See `0.2.13`.
+
+## [0.2.13] - 2025-07-16
+
+### Fixed
+
+- Project graph did not ignore circular references.
+
+## [0.1.10] - 2025-07-16
+
+### Fixed
+
+- Module namespaces were not combined in the right order.
+- Workspace group tasks were not registered.
+
+## [0.5.1] - 2025-07-05
+
+### Changed
+
+- Common method confirm will automatically append hint with defaults.
+
+### Fixed
+
+- Gem command push did not prompt for gem to publish.
+
+## [0.4.14] - 2025-07-05
+
+### Added
+
+- Python command run for project scripts was implemented.
+- Python command build and publish with PDM was implemented.
+- Python command run detects program tool scripts.
+- Git command stash action branch was implemented.
+- Docker command compose action exec and run are interactive.
+- Double dash can be used to end parsing for options.
+- Python command outdated tasks with semver was implemented.
+
+### Changed
+
+- Ruby command rake supports running multiple indexes.
+- Ruby private method rakefile when nil returns empty string.
+- Ruby private method gempwd and rakepwd ignores current directory.
+- Ruby command gem action update parameters are optional.
+- Gem command install and uninstall can parse name and version.
+- Kernel method Array is used in place of common method as_a.
+- Ruby public method irb parameter load was renamed args.
+
+### Fixed
+
+- Box border did not print corners on Windows.
+- Index character was not captured on Windows.
+- Node command publish did not prompt for package to publish.
+- Python command publish did not prompt for package to publish.
+- Project confirmation accept dialog did not always quit.
+- Git command add did not detect when no files were changed.
+
+## [0.3.12] - 2025-07-05
+
+### Fixed
+
+- Gem command exec did not include gem option flag.
+- Project graph did not print first level border.
+- Node command update did not use correct event name.
+- Gem command push did not validate gem file to publish.
+- Node command publish did not publish when silent.
+
+## [0.2.12] - 2025-07-05
+
+### Fixed
+
+- See `0.1.9`.
+
+## [0.1.9] - 2025-07-05
+
+### Added
+
+- Initial support for using JRuby.
+- Config viewer theme color for boolean was implemented.
+
+### Fixed
+
+- Project output divider was not printed when not verbose.
+- Directory context was not threaded using JRuby.
+- Index character was not captured on Windows.
+- Common method is used for Kernel shell commands.
+- Git did not highlight output for single commands.
+
 ## [0.5.0] - 2025-06-16
 
 ### Added
@@ -78,6 +187,8 @@
 
 ## [0.3.11] - 2025-05-15
 
+### Fixed
+
 - See `0.2.11`.
 
 ## [0.2.11] - 2025-05-15
@@ -340,6 +451,8 @@
 
 ## [0.3.7] - 2025-04-08
 
+### Fixed
+
 - See `0.2.7`.
 
 ## [0.2.7] - 2025-04-08
@@ -761,7 +874,11 @@
 
 - Changelog was created.
 
+[0.5.2]: https://github.com/anpham6/squared/releases/tag/v0.5.2-ruby
+[0.5.1]: https://github.com/anpham6/squared/releases/tag/v0.5.1-ruby
 [0.5.0]: https://github.com/anpham6/squared/releases/tag/v0.5.0-ruby
+[0.4.15]: https://github.com/anpham6/squared/releases/tag/v0.4.15-ruby
+[0.4.14]: https://github.com/anpham6/squared/releases/tag/v0.4.14-ruby
 [0.4.13]: https://github.com/anpham6/squared/releases/tag/v0.4.13-ruby
 [0.4.12]: https://github.com/anpham6/squared/releases/tag/v0.4.12-ruby
 [0.4.11]: https://github.com/anpham6/squared/releases/tag/v0.4.11-ruby
@@ -776,6 +893,8 @@
 [0.4.2]: https://github.com/anpham6/squared/releases/tag/v0.4.2-ruby
 [0.4.1]: https://github.com/anpham6/squared/releases/tag/v0.4.1-ruby
 [0.4.0]: https://github.com/anpham6/squared/releases/tag/v0.4.0-ruby
+[0.3.13]: https://github.com/anpham6/squared/releases/tag/v0.3.13-ruby
+[0.3.12]: https://github.com/anpham6/squared/releases/tag/v0.3.12-ruby
 [0.3.11]: https://github.com/anpham6/squared/releases/tag/v0.3.11-ruby
 [0.3.10]: https://github.com/anpham6/squared/releases/tag/v0.3.10-ruby
 [0.3.9]: https://github.com/anpham6/squared/releases/tag/v0.3.9-ruby
@@ -788,6 +907,8 @@
 [0.3.2]: https://github.com/anpham6/squared/releases/tag/v0.3.2-ruby
 [0.3.1]: https://github.com/anpham6/squared/releases/tag/v0.3.1-ruby
 [0.3.0]: https://github.com/anpham6/squared/releases/tag/v0.3.0-ruby
+[0.2.13]: https://github.com/anpham6/squared/releases/tag/v0.2.13-ruby
+[0.2.12]: https://github.com/anpham6/squared/releases/tag/v0.2.12-ruby
 [0.2.11]: https://github.com/anpham6/squared/releases/tag/v0.2.11-ruby
 [0.2.10]: https://github.com/anpham6/squared/releases/tag/v0.2.10-ruby
 [0.2.9]: https://github.com/anpham6/squared/releases/tag/v0.2.9-ruby
@@ -800,6 +921,8 @@
 [0.2.2]: https://github.com/anpham6/squared/releases/tag/v0.2.2-ruby
 [0.2.1]: https://github.com/anpham6/squared/releases/tag/v0.2.1-ruby
 [0.2.0]: https://github.com/anpham6/squared/releases/tag/v0.2.0-ruby
+[0.1.10]: https://github.com/anpham6/squared/releases/tag/v0.1.10-ruby
+[0.1.9]: https://github.com/anpham6/squared/releases/tag/v0.1.9-ruby
 [0.1.8]: https://github.com/anpham6/squared/releases/tag/v0.1.8-ruby
 [0.1.7]: https://github.com/anpham6/squared/releases/tag/v0.1.7-ruby
 [0.1.6]: https://github.com/anpham6/squared/releases/tag/v0.1.6-ruby

data/README.ruby.md

@@ -509,7 +509,7 @@ Most project classes will inherit from `Git` which enables these tasks:
 | restore    | restore          | staged worktree                               |
 | rev        | rev              | commit output                                 |
 | show       | show             | format oneline                                |
-| stash      | stash            | push pop apply drop list                      |
+| stash      | stash            | push pop apply branch drop clear list         |
 | switch     | switch           | create detach merge                           |
 | tag        | tag              | add sign delete list                          |
 

data/lib/squared/common/base.rb

@@ -63,6 +63,7 @@ module Squared
           hash: %i[green black!],
           array: %i[blue black!],
           number: [:magenta],
+          boolean: [:magenta],
           undefined: %i[red italic]
         },
         logger: {
@@ -103,13 +104,15 @@ module Squared
       return [] if obj.nil?
 
       unless obj.is_a?(::Array)
-        obj = if obj.respond_to?(:to_a) && !obj.is_a?(::Hash) && (val = obj.to_a).is_a?(::Array)
+        obj = if obj.respond_to?(:to_ary)
+                obj.to_ary
+              elsif obj.respond_to?(:to_a) && !obj.is_a?(::Hash) && (val = obj.to_a).is_a?(::Array)
                 val
               else
                 [obj]
               end
       end
-      obj = obj.flatten(flat.is_a?(::Numeric) ? flat : nil) if flat
+      obj = flat.is_a?(::Numeric) ? obj.flatten(flat) : obj.flatten if flat
       obj = obj.compact if compact
       obj = obj.map(&meth.shift) until meth.empty?
       return obj unless block_given?

data/lib/squared/common/format.rb

@@ -29,7 +29,13 @@ module Squared
         bright_white!: '107'
       }.freeze
       BOX_GRAPH = ['│', '─', '├', '└', '┬'].freeze
-      BOX_BORDER = ['│', '─', '╭', '╮', '╯', '╰', '├', '┤', '┬', '┴'].freeze
+      BOX_BORDER = ['│', '─', '┌', '┐', '┘', '└', '├', '┤', '┬', '┴'].tap do |val|
+        if ENV['TERM']&.end_with?('256color')
+          val.slice!(2, 4)
+          val.insert(2, '╭', '╮', '╯', '╰')
+        end
+        val.freeze
+      end
       TEXT_STYLE = [:bold, :dim, :italic, :underline, :blinking, nil, :inverse, :hidden, :strikethrough].freeze
       private_constant :AIX_TERM, :BOX_GRAPH, :BOX_BORDER, :TEXT_STYLE
 
@@ -61,7 +67,7 @@ module Squared
         end
         wrap = ->(s, n) { "\x1B[#{n.join(';')}m#{s}\x1B[0m" }
         code = []
-        args.concat(as_a(styles)).flatten.each_with_index do |type, i|
+        args.concat(Array(styles)).flatten.each_with_index do |type, i|
           next unless type
 
           if index == -1

data/lib/squared/common/prompt.rb

@@ -8,6 +8,14 @@ module Squared
       def confirm(msg, default = nil, agree: 'Y', cancel: 'N', attempts: 5, timeout: 30)
         require 'readline'
         require 'timeout'
+        if agree == 'Y' && cancel == 'N' && !msg.match?(%r{\[(?:Yn|nY|Y/n|y/N)\]})
+          case default
+          when 'Y'
+            msg = "#{msg} [Y/n] "
+          when 'N'
+            msg = "#{msg} [y/N] "
+          end
+        end
         agree = /^#{Regexp.escape(agree)}$/i if agree.is_a?(::String)
         cancel = /^#{Regexp.escape(cancel)}$/i if cancel.is_a?(::String)
         Timeout.timeout(timeout) do
@@ -35,13 +43,13 @@ module Squared
         require 'readline'
         require 'timeout'
         if list
-          grep &&= (grep.is_a?(::Enumerable) ? grep : [grep]).map { |val| Regexp.new(val) }
+          grep &&= Array(grep).map { |val| Regexp.new(val) }
           items = []
           list.each do |val|
             next if grep&.none? { |pat| pat.match?(line) }
 
             items << val.chomp
-            puts "#{items.size.to_s.rjust(2)}. #{val}"
+            puts '%2d. %s' % [items.size, val]
           end
           max = items.size
           raise_error 'empty selection list' if max == 0
@@ -52,18 +60,30 @@ module Squared
                                       end}] "
           end
         end
-        valid = ->(s) { s.match?(/^-?\d+$/) && s.to_i.between?(min, max) }
+        valid = ->(s) { s.match?(/^\d+$/) && s.to_i.between?(min, max) }
         Timeout.timeout(timeout) do
           while (ch = Readline.readline(msg))
             unless (ch = ch.strip).empty?
               if multiple
                 a = ch.split(/\s*,\s*/)
-                b = a.select { |s| valid.call(s) }.map!(&:to_i).sort
-                next unless a.size == b.size
-                return b unless items
-                next if multiple.is_a?(::Numeric) && multiple != b.size
+                b = a.map do |s|
+                  if s =~ /^(\d+)-(\d+)$/
+                    next unless valid.call($1) && valid.call($2)
 
-                return b.map! { |i| items[i - 1] }
+                    c = $1.to_i
+                    d = $2.to_i
+                    next (c..d).to_a if c < d
+                  elsif valid.call(s)
+                    s.to_i
+                  end
+                end
+                unless b.include?(nil)
+                  b.flatten!
+                  b.uniq!
+                  b.sort!
+                  return b unless items
+                  return b.map! { |i| items[i - 1] } unless multiple.is_a?(::Numeric) && multiple != b.size
+                end
               elsif valid.call(ch)
                 return items ? items[ch.to_i - 1] : ch.to_i
               end

data/lib/squared/common/system.rb

@@ -1,23 +1,32 @@
 # frozen_string_literal: true
 
 require 'pathname'
-require 'fileutils'
+require 'rake'
 
 module Squared
   module Common
     module System
       module_function
 
-      def shell(*args, **kwargs)
-        if RUBY_VERSION < '2.6'
-          exception = kwargs.delete(:exception)
-          ret = Kernel.system(*args, **kwargs)
-          return ret if ret || !exception
-
-          raise $?.to_s
+      def shell(*args, name: :system, **kwargs)
+        if RUBY_ENGINE == 'jruby' && Rake::Win32.windows?
+          e = kwargs[:exception]
+          if (dir = kwargs[:chdir]) && ((pwd = Dir.pwd) != dir)
+            Dir.chdir(dir)
+            ret = Kernel.send(name, *args)
+            Dir.chdir(pwd)
+          else
+            ret = Kernel.send(name, *args)
+          end
+        elsif RUBY_VERSION < '2.6'
+          e = kwargs.delete(:exception)
+          ret = Kernel.send(name, *args, **kwargs)
         else
-          Kernel.system(*args, **kwargs)
+          return Kernel.send(name, *args, **kwargs)
         end
+        return ret if ret || !e
+
+        raise $?.to_s
       end
 
       def copy_dir(src, dest, glob = ['**/*'], create: false, link: nil, force: false, pass: nil, hidden: false,
@@ -31,10 +40,9 @@ module Squared
         flags = hidden ? [File::FNM_DOTMATCH] : []
         if pass
           exclude = []
-          pass = [pass] unless pass.is_a?(::Array)
-          pass.each { |val| exclude.concat(Dir.glob(val, *flags, base: base)) }
+          Array(pass).each { |val| exclude.concat(Dir.glob(val, *flags, base: base)) }
         end
-        (glob.is_a?(::Enumerable) ? glob : [glob]).each do |val|
+        Array(glob).each do |val|
           Dir.glob(val, *flags, base: base) do |file|
             next if exclude&.include?(file) || (entry = base + file).directory?
 
@@ -83,8 +91,7 @@ module Squared
         unless force
           target = Pathname.new(dest)
           if target.directory?
-            src = [src] unless src.is_a?(::Enumerable)
-            src = src.reject { |val| target.join(File.basename(val)).exist? }
+            src = Array(src).reject { |val| target.join(File.basename(val)).exist? }
             return if src.empty?
           elsif target.exist?
             return

data/lib/squared/common/utils.rb

@@ -17,13 +17,13 @@ module Squared
         val = val.strip
         return [val, '', ''] unless (i = val.index('='))
 
-        last = val[i + 1..-1].strip
+        last = val[(i + 1)..-1].strip
         quote = ''
         if last =~ /\A(["'])(.+)\1\z/
           last = $2
           quote = $1
         end
-        [val[0..i - 1], last, quote]
+        [val[0..(i - 1)], last, quote]
       end
 
       def task_invoke(*cmd, args: [], exception: true, warning: true)
@@ -97,7 +97,11 @@ module Squared
         ret = env_value(key, suffix: suffix, strict: strict)
         return ret == equals.to_s unless equals.nil?
 
-        ret.empty? || (ignore && as_a(ignore).any? { |val| val.to_s == ret }) ? default : ret
+        ret.empty? || (ignore && Array(ignore).any? { |val| val.to_s == ret }) ? default : ret
+      end
+
+      def env_key(*val)
+        val.join('_').gsub(/\W+/, '_').upcase
       end
 
       def env_value(key, default = '', suffix: nil, strict: false)

data/lib/squared/config.rb

@@ -15,8 +15,7 @@ module Squared
         def parse(gem, namespace, ext = [pkg])
           require gem
           obj = eval namespace
-          ext = [ext] unless ext.is_a?(Array)
-          ext.each { |val| @@mime_obj[val] = [obj, ext] }
+          Array(ext).each { |val| @@mime_obj[val] = [obj, ext] }
         rescue LoadError, NameError => e
           warn e
           nil
@@ -89,7 +88,7 @@ module Squared
                       @required = true
                       project ? [project, 'not found'] : ['name', 'missing']
                     end
-        warn log_message(Logger::WARN, msg, subject: self.class, hint: hint, pass: true)
+        warn log_message(Logger::WARN, msg, subject: self.class, hint: hint)
       end
 
       def build
@@ -129,7 +128,7 @@ module Squared
             require(gem || type)
             obj = eval namespace
           else
-            as_a(ext).each do |val|
+            Array(ext).each do |val|
               next unless (data = @@mime_obj[val])
 
               obj = data.first
@@ -137,7 +136,7 @@ module Squared
             end
           end
           if obj
-            ext << type if (ext = as_a(ext)).empty?
+            ext << type if (ext = Array(ext)).empty?
             if !file && target?
               ext.each do |val|
                 next unless (out = basepath("#{main}.#{val}")).exist?
@@ -250,6 +249,8 @@ module Squared
                                                 { pat: /\A((?~: ): \{)(.+)(\}\s*)\z/m, styles: theme[:hash], index: 2 },
                                                 { pat: /\A((?~: ): \[)(.+)(\]\s*)\z/m, styles: theme[:array],
                                                   index: 2 },
+                                                { pat: /\A((?~: ): )(true|false)(\s*)\z/m, styles: theme[:boolean],
+                                                  index: 2 },
                                                 { pat: /\A((?~: ): (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
                                                   index: 2 }
                                               ]
@@ -293,7 +294,7 @@ module Squared
         if stdin?
           puts out.map!(&:last).join("\n")
         else
-          out.map! { |item| "#{item[0].ljust(pad)} : #{item[1]}" }
+          out.map! { |item| '%-*s : %s' % [pad, item[0], item[1]] }
         end
       end
 

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -92,9 +92,9 @@ module Squared
         @prefix = prefix
         @series = Application.series_wrap(self)
         @project = {}
-        @kind = {}
+        @kind = Workspace.hashlist
         @extensions = []
-        @envname = @main.gsub(/[^\w]+/, '_').upcase.freeze
+        @envname = env_key(@main).freeze
         @pipe = env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
         @exception = env_bool exception
         @verbose = env_bool(verbose, verbose.nil? || verbose.is_a?(String) ? @pipe != 0 : verbose, index: true)
@@ -106,20 +106,20 @@ module Squared
         else
           @theme = {}
         end
-        @chain = {}
+        @chain = Workspace.hashlist
         @script = {
-          group: {},
-          ref: {},
+          group: Workspace.hashobj,
+          ref: Workspace.hashobj,
           group!: {},
           ref!: {}
         }.freeze
         @events = {
-          group: {},
-          ref: {}
+          group: Workspace.hashobj,
+          ref: Workspace.hashobj
         }.freeze
         @pass = {
-          group: {},
-          ref: {},
+          group: Workspace.hashobj,
+          ref: Workspace.hashobj,
           global: {},
           pattern: []
         }.freeze
@@ -224,8 +224,8 @@ module Squared
             end
           end
         end
-        data = Support::ChainData.new(action, step, ns.call(with), ns.call(before), ns.call(after), sync)
-        (@chain[task_name(task.to_s)] ||= []) << data
+        data = Struct::ChainData.new(action, step, ns.call(with), ns.call(before), ns.call(after), sync)
+        @chain[task_name(task.to_s)] << data
         self
       end
 
@@ -267,9 +267,9 @@ module Squared
 
       def pass(name, group: @group, ref: @ref, &blk)
         data = if group
-                 @pass[:group][group] ||= {}
+                 @pass[:group][group]
                elsif ref
-                 @pass[:ref][ref] ||= {}
+                 @pass[:ref][ref]
                else
                  @pass[:global]
                end
@@ -278,7 +278,7 @@ module Squared
       end
 
       def banner(*args, command: true, styles: nil, border: nil, group: @group, ref: @ref)
-        data = Support::BannerData.new(command, [], check_style(styles, empty: false), check_style(border))
+        data = Struct::BannerData.new(command, [], check_style(styles, empty: false), check_style(border))
         args.each do |meth|
           if meth.is_a?(Array)
             found = false
@@ -305,10 +305,10 @@ module Squared
         end
         if group
           label = :group
-          items = as_a group
+          items = Array(group)
         else
           label = :ref
-          items = ref ? as_a(ref) : [:_]
+          items = Array(ref || :_)
         end
         items.each { |val| @banner[label][val.to_sym] = data }
         self
@@ -362,7 +362,7 @@ module Squared
       end
 
       def compose(name, &blk)
-        namespace(task_name(name), &blk) if block_given?
+        namespace(task_name(name), &blk)
         self
       end
 
@@ -374,7 +374,7 @@ module Squared
       def style(obj, *args, target: nil, empty: false)
         data = nil
         if target
-          as_a(target).each_with_index do |key, i|
+          Array(target).each_with_index do |key, i|
             if i == 0
               break unless (data = __get__(:theme)[key.to_sym])
             else
@@ -480,7 +480,7 @@ module Squared
       end
 
       def task_namespace(val, first: false)
-        return nil unless (ret = val.to_s.split(':')).size > 1
+        return unless (ret = val.to_s.split(':')).size > 1
 
         first ? ret.first : task_join(*ret[0..-2])
       end
@@ -625,6 +625,14 @@ module Squared
         Rake::Win32.windows?
       end
 
+      def jruby?
+        RUBY_ENGINE == 'jruby'
+      end
+
+      def jruby_win?
+        jruby? && windows?
+      end
+
       def docker?
         !Dir['/.dockerenv', '/docker-*.{sh,d}'].empty?
       end
@@ -779,7 +787,7 @@ module Squared
           task key do
             unless failed.empty? && group.empty?
               puts log_message(Logger::ERROR, *(failed + group.map { |val| val.action }.flatten),
-                               subject: 'failed placement', hint: false, pass: true)
+                               subject: 'failed placement', hint: false)
             end
             cols = level.flatten(1).map(&:size).max
             level.each_with_index do |grp, n|
@@ -801,7 +809,7 @@ module Squared
 
       def script_command(task, val, group, ref, on, &blk)
         if block_given?
-          val = Support::RunData.new(val, blk)
+          val = Struct::RunData.new(val, blk)
         elsif !val
           return self
         end
@@ -813,8 +821,8 @@ module Squared
           items = as_a(ref, :to_sym)
         end
         items.each do |name|
-          (@script[label][name] ||= {})[task] = val
-          (@events[label][name] ||= {})[task] = on if on.is_a?(Hash)
+          @script[label][name][task] = val
+          @events[label][name][task] = on if on.is_a?(Hash)
         end
         self
       end
@@ -822,24 +830,26 @@ module Squared
       def script_set(data, group: nil, ref: nil)
         data.freeze
         if group
-          as_a(group).each { |val| @script[:group!][val.to_sym] = data }
+          Array(group).each { |val| @script[:group!][val.to_sym] = data }
         elsif ref
-          as_a(ref).each { |val| @script[:ref!][val.to_sym] = data }
+          Array(ref).each { |val| @script[:ref!][val.to_sym] = data }
         else
           @script[:ref!][:''] = data
         end
       end
 
       def data_get(*args, group: nil, ref: nil, target: nil)
-        target[:group][group.to_sym] if group
-        if ref.is_a?(Enumerable)
+        if group && target[:group].key?(key = group.to_sym)
+          target[:group][key]
+        elsif ref.is_a?(Enumerable)
           ref.each do |key|
-            next unless (ret = target[:ref][key])
+            next unless target[:ref].key?(key)
 
+            ret = target[:ref][key]
             return ret if args.empty? || args.any? { |val| ret.key?(val) }
           end
           nil
-        elsif ref
+        elsif ref && target[:ref].key?(ref)
           target[:ref][ref]
         end
       end
@@ -864,7 +874,7 @@ module Squared
         end
         return false if state == :prod && data[:dev] == true && data[:global]
 
-        target && pat.is_a?(Regexp) ? as_a(target).any?(pat) : pat == true
+        target && pat.is_a?(Regexp) ? Array(target).any?(pat) : pat == true
       end
 
       def scriptobj