ectoplasm 1.2.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b230ff4690f41e1e3f4d5a474adaa97f1160c35b2b2c492eb096b1e0f787d8f0
-  data.tar.gz: 3d3734fef7909506527a45c6fe62afb03b6072557d3d2461484341f2f20099b8
+  metadata.gz: b1630a2531a6f313b0784aa55fd2fa28df0b6445719d307ec51db1c12f8bd4c2
+  data.tar.gz: a562e611642e7a54b116db6e1269b64fc6c5a674b7fbdad0ae9de0381cfb225b
 SHA512:
-  metadata.gz: 163dab80bab2fcb6538e7d0055f32649d8d4a5be44b3df0099ab7a28b220d11e343b143cc4016f93705b5f0ccd5b072ab20c3ba3a298a05a1916140a022ad689
-  data.tar.gz: 1ce583df511099699f66f45da3921818e36d8d7bb37d28bbbbade9f120f47410a8b168e3800b9d0338e6f3d19ab4721b27716c78af8e247e150b3bd35b4c6ff9
+  metadata.gz: ea685cded5068288055c2b83c7f0fbbea3e139aa455eff83dfaa2f1dbe2b23f2df77ea4e23cd6e3d6e5d6f26eddca0af066048ec067e8fcfff904d9f639f0c96
+  data.tar.gz: 15976b94b9fcce27ef02c2c40d8cc3a380b984f4550d6dc68909d59acc543672f4b071f0c9a553ac2e478d4208fa4b9ff80191b0f74a249d8b24ada84ee99b3e

data/lib/ectoplasm.rb

@@ -1,246 +1,239 @@
-require 'ostruct'
-
-module Ectoplasm
-  module Version
-    MAJOR = 1
-    MINOR = 2
-    TINY  = 3
-  end
-
-  VERSION = [Version::MAJOR, Version::MINOR, Version::TINY].compact * '.'
-
-  DEFAULT_SECURE_KEYS = ['password', 'secret', 'token', 'secure', 'pass', 'cert', 'key']
-
-  class ::String
-    @@colored = false
-
-    def self.colored!
-      @@colored = true
-    end
-
-    def white;   self; end
-    def red; colored '31'; end
-    def green; colored '32'; end
-    def yellow; colored '33'; end
-    def blue; colored '34'; end
-    def magenta; colored '35'; end
-    def cyan; colored '36'; end
-    def grey; colored '90'; end
-
-    alias ok green
-    alias error red
-    alias warn yellow
-    alias info blue
-    alias dim grey
-
-    def indent amount, char: ' '
-      self.split("\n").map { |line| char * amount + line }.join "\n"
-    end
-
-    def length
-      m = /\e\[\d{2}m(.*)\e\[0m/.match self
-      return self.chars.count - 9 if m
-      self.chars.count
-    end
-
-    def frmt props, prefix_suffix=['<', '>']
-      str = self
-
-      props.keys.each do |key|
-        placeholder = prefix_suffix[0] + key.to_s + prefix_suffix[1]
-        str = str.gsub(placeholder, props[key])
-      end
-
-      str
-    end
-
-    private
-
-    def colored ansi_color
-      return self if !@@colored
-      "\e[#{ansi_color}m#{self}\e[0m"
-    end
-  end
-
-
-  class ::Object
-    def pretty width: nil
-      self.to_s
-    end
-
-    def obfuscate! secure_keys
-      self
-    end
-  end
-
-
-  class ::TrueClass
-    def pretty width: nil
-      'yes'.green
-    end
-  end
-
-
-  class ::FalseClass
-    def pretty width: nil
-      'no'.yellow
-    end
-  end
-
-
-  class ::NilClass
-    def pretty width: nil
-      'n/a'.grey
-    end
-  end
-
-
-  class ::Array
-    def pretty width: 25
-      return 'empty'.grey if self.length == 0
-
-      list_length = self.map { |x| x.to_s.length }.reduce(:+)
-      return self.join ', ' if list_length && list_length < 30
-
-      self
-        .select { |x| x != nil && x != '' }
-        .map do |x|
-          ' - ' + x.pretty(width: width-3).strip.gsub(/\n/, "\n   ")
-        end
-        .join "\n"
-    end
-
-    def table header: nil, mappings: {}, with_index: false, limit: 50
-      header = self[0].keys if header == nil
-      heading = header.is_a?(Array) ? header : self[0].keys
-
-      table_data = self.slice(0, limit).map do |row|
-        heading.map do |key|
-          mappings.has_key?(key) ? mappings[key][row, row[key]] : row[key]
-        end
-      end
-
-      table_data.insert(0, heading) if header != false
-
-      data_sizes = table_data.map do |row|
-        row.map { |data| data.to_s.length }
-      end
-
-      column_sizes = data_sizes[0]
-        .zip(*data_sizes[1..-1])
-        .map { |row| row.max }
-
-      table = table_data.map { |row| column_sizes.zip row }
-
-      table_str = ''
-      table.each_with_index do |row, index|
-        if with_index
-          if index == 0
-            table_str += '     '
-          else
-            table_str += "[#{index}]  "
-          end
-        end
-
-        row.each do |col_size, data|
-          table_str += (data.to_s + ' ' * (col_size - data.to_s.length)) + '    '
-        end
-
-        table_str += "\n"
-      end
-      table_str += '[...]' if self.count > limit
-      print table_str
-    end
-
-    def obfuscate! secure_keys = DEFAULT_SECURE_KEYS
-      self.map { |x| x.obfuscate!(secure_keys) }
-    end
-  end
-
-
-  class ::Hash
-    def pretty indent: 0, width: 25
-      s = ''
-
-      self
-        .select { |key, value| value != nil || value != '' }
-        .map do |key, value|
-          value = true if value == 'true'
-          value = false if value == 'false'
-          value = '********' if /password|pwd|pass|passwd|secret/ =~ key.to_s
-
-          if value.is_a? Hash
-            s += key.to_s.cyan.indent(indent) + "\n"
-            s += value.pretty(width: width-indent-2).indent(indent+2)
-            s += "\n"
-            next
-          end
-
-          s += ' ' * indent
-
-          if value.is_a? Array
-            list = value.pretty(width: width)
-
-            if list.split("\n").count > 1
-              s += key.to_s.cyan + "\n"
-              s += value.pretty(width: width).indent(indent)
-              s += "\n"
-              next
-            end
-
-            value = list
-          end
-
-          s += key.to_s.cyan
-          s += ' ' + '.' * (width-key.to_s.length-indent) if width-key.to_s.length > indent
-          s += ': '
-          s += value.pretty + "\n"
-        end
-
-      s
-    end
-
-    def obfuscate! secure_keys = DEFAULT_SECURE_KEYS
-      self.each do |k, v|
-        if v.is_a? Hash
-          v.obfuscate!(secure_keys)
-        elsif v.is_a? Array
-          v.each { |x| v.obfuscate!(secure_keys) }
-        elsif secure_keys.any? { |x| k.to_s.downcase.include? x.downcase  }
-          self[k] = '*****'
-        end
-      end
-    end
-  end
-
-
-  class ::OpenStruct
-    def obfuscate! secure_keys = DEFAULT_SECURE_KEYS
-      OpenStruct.new(self.to_h.obfuscate! secure_keys)
-    end
-  end
-
-
-  class ::Float
-    def duration
-      seconds = self
-
-      if seconds > 60
-        seconds = seconds.to_i
-        minutes = seconds / 60
-        seconds = seconds % 60
-      end
-
-      if minutes && minutes > 60
-        hours = minutes / 60
-        minutes = minutes % 60
-      end
-
-      duration_str = "#{seconds}s"
-      duration_str = "#{minutes}m #{duration_str}" if minutes
-      duration_str = "#{hours}h #{duration_str}" if hours
-
-      duration_str
-    end
-  end
-end
+require 'ostruct'
+
+module Ectoplasm
+  module Version
+    MAJOR = 1
+    MINOR = 4
+    TINY  = 0
+  end
+
+  VERSION = [Version::MAJOR, Version::MINOR, Version::TINY].compact * '.'
+
+  DEFAULT_SECURE_KEYS = ['password', 'secret', 'token', 'secure', 'pass', 'cert', 'key', 'auth']
+
+  class ::String
+    def white; self; end
+    def red; colored '31'; end
+    def green; colored '32'; end
+    def yellow; colored '33'; end
+    def blue; colored '34'; end
+    def magenta; colored '35'; end
+    def cyan; colored '36'; end
+    def grey; colored '90'; end
+
+    def bold; colored '1'; end
+    def underline; colored '4'; end
+
+    alias ok green
+    alias error red
+    alias warn yellow
+    alias info blue
+    alias dim grey
+
+    def indent amount, char: ' '
+      self.split("\n").map { |line| char * amount + line }.join "\n"
+    end
+
+    def length
+      m = /\e\[\d{2}m(.*)\e\[0m/.match self
+
+      return self.chars.count - 9 if m
+
+      self.chars.count
+    end
+
+    def frmt props, prefix_suffix=['<', '>']
+      str = self
+
+      props.keys.each do |key|
+        placeholder = prefix_suffix[0] + key.to_s + prefix_suffix[1]
+        str = str.gsub(placeholder, props[key])
+      end
+
+      str
+    end
+
+    private
+
+    def colored ansi_color
+      return self unless $stdout.tty?
+
+      "\e[#{ansi_color}m#{self}\e[0m"
+    end
+  end
+
+  class ::Object
+    def pretty(*)
+      self.to_s
+    end
+
+    def obfuscate! _secure_keys = nil
+      self
+    end
+  end
+
+  class ::TrueClass
+    def pretty(*)
+      'yes'.green
+    end
+  end
+
+  class ::FalseClass
+    def pretty(*)
+      'no'.yellow
+    end
+  end
+
+  class ::NilClass
+    def pretty(*)
+      'n/a'.grey
+    end
+  end
+
+  class ::Array
+    def pretty width: 25
+      return 'empty'.grey if self.empty?
+      return self.first.pretty if self.count == 1 and not self.first.is_a? Hash
+
+      list_length = self.map { |x| x.to_s.length }.reduce(:+)
+      return self.join ', ' if list_length && list_length < 30
+
+      self
+        .select { |x| x != nil && x != '' }
+        .map do |x|
+          ' - ' + x.pretty(width: width-3).strip.gsub(/\n/, "\n   ")
+        end
+        .join "\n"
+    end
+
+    def table header: nil, mappings: {}, with_index: false, limit: 50
+      header = self[0].keys if header == nil
+      heading = header.is_a?(Array) ? header : self[0].keys
+
+      table_data = self.slice(0, limit).map do |row|
+        heading.map do |key|
+          mappings.key?(key) ? mappings[key][row, row[key]] : row[key]
+        end
+      end
+
+      table_data.insert(0, heading) if header != false
+
+      data_sizes = table_data.map do |row|
+        row.map { |data| data.to_s.length }
+      end
+
+      column_sizes = data_sizes[0]
+        .zip(*data_sizes[1..-1])
+        .map { |row| row.max }
+
+      table = table_data.map { |row| column_sizes.zip row }
+
+      table_str = ''
+      table.each_with_index do |row, index|
+        if with_index
+          if index == 0
+            table_str += '     '
+          else
+            table_str += "[#{index}]  "
+          end
+        end
+
+        row.each do |col_size, data|
+          table_str += (data.to_s + ' ' * (col_size - data.to_s.length)) + '    '
+        end
+
+        table_str += "\n"
+      end
+      table_str += '[...]' if self.count > limit
+      print table_str
+    end
+
+    def obfuscate! secure_keys = DEFAULT_SECURE_KEYS
+      self.map { |x| x.obfuscate!(secure_keys) }
+    end
+  end
+
+  class ::Hash
+    def pretty indent: 0, width: 25
+      s = ''
+
+      self
+        .select { |_, value| value != nil || value != '' }
+        .map do |key, value|
+          value = true if value == 'true'
+          value = false if value == 'false'
+          value = '********' if Regexp.new(DEFAULT_SECURE_KEYS.join '|') =~ key.to_s
+
+          if value.is_a? Hash
+            s += key.to_s.cyan.indent(indent) + "\n"
+            s += value.pretty(width: width-indent-2).indent(indent+2)
+            s += "\n"
+            next
+          end
+
+          s += ' ' * indent
+
+          if value.is_a? Array
+            list = value.pretty(width: width)
+
+            if list.split("\n").count > 1
+              s += key.to_s.cyan + "\n"
+              s += value.pretty(width: width).indent(indent)
+              s += "\n"
+              next
+            end
+
+            value = list
+          end
+
+          s += key.to_s.cyan
+          s += ' ' + '.' * (width-key.to_s.length-indent) if width-key.to_s.length > indent
+          s += ': '
+          s += value.pretty + "\n"
+        end
+
+      s
+    end
+
+    def obfuscate! secure_keys = DEFAULT_SECURE_KEYS
+      self.each do |k, v|
+        if v.is_a? Hash
+          v.obfuscate!(secure_keys)
+        elsif v.is_a? Array
+          v.each { |_| v.obfuscate!(secure_keys) }
+        elsif secure_keys.any? { |x| k.to_s.downcase.include? x.downcase }
+          self[k] = '*****'
+        end
+      end
+    end
+  end
+
+  class ::OpenStruct
+    def obfuscate! secure_keys = DEFAULT_SECURE_KEYS
+      OpenStruct.new(self.to_h.obfuscate! secure_keys)
+    end
+  end
+
+  class ::Float
+    def duration
+      seconds = self
+
+      if seconds > 60
+        seconds = seconds.to_i
+        minutes = seconds / 60
+        seconds = seconds % 60
+      end
+
+      if minutes && minutes > 60
+        hours = minutes / 60
+        minutes = minutes % 60
+      end
+
+      duration_str = "#{seconds}s"
+      duration_str = "#{minutes}m #{duration_str}" if minutes
+      duration_str = "#{hours}h #{duration_str}" if hours
+
+      duration_str
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ectoplasm
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Christian Neubauer
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies: []
 description: Adds some extension methods to build in types to add prettier console
   output
@@ -18,27 +18,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/build.yml"
-- ".github/workflows/gem-push.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- CHANGELOG.md
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- bin/console
-- bin/setup
-- ectoplasm.gemspec
 - lib/ectoplasm.rb
-homepage: https://bitbucket.org/cneubaur/ectoplasm-ruby
+homepage: https://github.com/cneubauer/ectoplasm
 licenses:
-- MIT
+- GPL-3.0-or-later
 metadata:
-  homepage_uri: https://bitbucket.org/cneubaur/ectoplasm-ruby
-  source_code_uri: https://bitbucket.org/cneubaur/ectoplasm-ruby
-  changelog_uri: https://bitbucket.org/cneubaur/ectoplasm-ruby/src/master/CHANGELOG.md
-post_install_message:
+  homepage_uri: https://github.com/cneubauer/ectoplasm
+  source_code_uri: https://github.com/cneubauer/ectoplasm
+  changelog_uri: https://github.com/cneubauer/ectoplasm/blob/main/CHANGELOG.md
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -46,15 +34,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: A helper library for console output
 test_files: []

data/.github/workflows/build.yml

@@ -1,27 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-      - develop
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    name: Test and Build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.1'
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Style check
-      run: bundle exec rubocop
-    - name: Run tests
-      run: bundle exec rspec spec
-    - name: Build gem
-      run: bundle exec rake build

data/.github/workflows/gem-push.yml

@@ -1,44 +0,0 @@
-name: Ruby Gem
-
-on:
-  push:
-    tags:
-      - 'v*.*.*'
-
-jobs:
-  build:
-    name: Build and Publish
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: '3.1'
-
-    - name: Publish to GPR
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
-      env:
-        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
-        OWNER: ${{ github.repository_owner }}
-
-    - name: Publish to RubyGems
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem
-      env:
-        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.gitignore

@@ -1,3 +0,0 @@
-vscode/
-*.lock
-*.gem