more_core_extensions 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b68065b7aadc9963519eeb642c21a30fd9d1e9dc36d382d1a3be6f9c38f1b499
-  data.tar.gz: 7928ae1d052c0848bc9f30c8e2b70f503033d636948303b032c479526c140747
+  metadata.gz: d8d52470776addb4edcca50184d26029d46a6a513cbc51125d539816974c2758
+  data.tar.gz: a0bbdb4f9f454eef6881cc85babc15523dcab44c1d5516f67aeae0037b69491b
 SHA512:
-  metadata.gz: d2cb37b00b2a1b9d8109d2527b6cc84010ff7ae39701419ff10ebbeaf6fd4afbb740a4e1abe3d6643e21943b8a2afa49f290a2fb9092c4add4338d5101d34ac9
-  data.tar.gz: 7e4521d99ffea1646088357448bf3da5009eed637c8c3e53a2fdb5554fea66bfc28baf4de06851f1efc2b6034bf9304c60b6d09f0bcd37be18da3ec37f18e049
+  metadata.gz: f1bc6f58dffd72b60a0746ad568bf9b7a4dbc0c7e0b742f9546ea10b75a54f9a098938726cde53fcfcec1a810b173d20d164ee15c0d570cac2033a785c702ca1
+  data.tar.gz: b301d6ed331a268b9ecf6d5e7b8ea0afdfb4b2a6333dc1eb8886e5a496be807bdc43a9c9335e6f514ac32ba3717bc8e8068cc4cf4feecd007ed8a77f21d27677

data/.travis.yml

@@ -1,21 +1,18 @@
 language: ruby
 rvm:
-  - "2.0"
-  - "2.1.10"
-  - "2.2.10"
-  - "2.3.8"
-  - "2.4.5"
-  - "2.5.3"
-  - "2.6.0"
-  - "2.7.0"
+  - "2.1"
+  - "2.2"
+  - "2.3"
+  - "2.4"
+  - "2.5.8"
+  - "2.6.6"
+  - "2.7.1"
   - ruby-head
   - jruby-head
-sudo: false
 cache: bundler
 after_script: bundle exec codeclimate-test-reporter
 matrix:
   allow_failures:
-    - rvm: "2.6.0"
     - rvm: ruby-head
     - rvm: jruby-head
   fast_finish: true

data/CHANGELOG.md

@@ -4,6 +4,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [4.2.0] - 2020-07-20
+### Added
+- Add bundler-inject allowing developers to override dependencies [[#89](https://github.com/ManageIQ/more_core_extensions/pull/89)]
+- Add Array and Hash #deep_clone and #deep_delete [[#91](https://github.com/ManageIQ/more_core_extensions/pull/91)]
+- Add Digest::UUID.clean to properly format UUID strings [[#81](https://github.com/ManageIQ/more_core_extensions/pull/81)]
+
+###Changed
+- Update ArrayTableize to properly set field width for color text [[#87](https://github.com/ManageIQ/more_core_extensions/pull/87)]
+- Change Array#format_table header output to markdown vs postgres [[#83](https://github.com/ManageIQ/more_core_extensions/pull/83)]
+
 ## [4.1.0] - 2020-04-30
 ### Added
 - Added Ruby 2.7 support [[#79](https://github.com/ManageIQ/more_core_extensions/pull/79)]
@@ -87,7 +97,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Upgraded to RSpec 3 [[#16](https://github.com/ManageIQ/more_core_extensions/pull/16)]
 - Added the Change Log!
 
-[Unreleased]: https://github.com/ManageIQ/more_core_extensions/compare/v3.7.0...HEAD
+[Unreleased]: https://github.com/ManageIQ/more_core_extensions/compare/v4.2.0...HEAD
+[4.2.0]: https://github.com/ManageIQ/more_core_extensions/compare/v4.1.0...v4.2.0
+[4.1.0]: https://github.com/ManageIQ/more_core_extensions/compare/v4.0.0...v4.1.0
+[4.0.0]: https://github.com/ManageIQ/more_core_extensions/compare/v3.8.0...v4.0.0
+[3.8.0]: https://github.com/ManageIQ/more_core_extensions/compare/v3.7.0...v3.8.0
 [3.7.0]: https://github.com/ManageIQ/more_core_extensions/compare/v3.6.0...v3.7.0
 [3.6.0]: https://github.com/ManageIQ/more_core_extensions/compare/v3.5.0...v3.6.0
 [3.5.0]: https://github.com/ManageIQ/more_core_extensions/compare/v3.4.0...v3.5.0

data/Gemfile

@@ -1,8 +1,16 @@
 source 'https://rubygems.org'
 
+plugin 'bundler-inject'
+require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundler-inject") rescue nil
+
 # Specify your gem's dependencies in more_core_extensions.gemspec
 gemspec
 
-# HACK: Rails 5 dropped support for Ruby < 2.2.2
-active_support_version = "< 5" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2")
+# Rails 5 dropped support for Ruby < 2.2.2
+# Rails 6 dropped support for Ruby < 2.4.4
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2")
+  active_support_version = "< 5"
+elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.4.4")
+  active_support_version = "< 6"
+end
 gem 'activesupport', active_support_version

data/README.md

@@ -19,6 +19,7 @@ MoreCoreExtensions are a set of core extensions beyond those provided by ActiveS
 * core_ext/array/deletes.rb
   * `#delete_blanks` - Deletes all items where the value is blank
   * `#delete_nils` - Deletes all items where the value is nil
+  * `#deep_delete` - Deletes nested hash key elements
 * core_ext/array/duplicates.rb
   * `#duplicates` - Returns an Array of the duplicates found
 * core_ext/array/element_counts.rb
@@ -61,6 +62,7 @@ MoreCoreExtensions are a set of core extensions beyond those provided by ActiveS
 * core_ext/hash/deletes.rb
   * `#delete_blanks` - Deletes all keys where the value is blank
   * `#delete_nils` - Deletes all keys where the value is nil
+  * `#deep_delete` - Deletes nested hash key elements
 * core_ext/hash/nested.rb (see [Shared](#shared))
   * `#delete_blank_paths` - Deletes all paths where the value is blank
 * core_ext/hash/sorting.rb (see [Shared](#shared))
@@ -129,6 +131,7 @@ MoreCoreExtensions are a set of core extensions beyond those provided by ActiveS
 #### Shared
 
 * core_ext/shared/nested.rb
+  * `#deep_clone` - Performs a Marshal based deep clone
   * `#delete_path` - Delete the value at the specified nesting
   * `#fetch_path` - Fetch the value at the specified nesting
   * `#find_path` - Detect which nesting holds the specified value

data/lib/more_core_extensions/all.rb

@@ -3,6 +3,7 @@ require 'more_core_extensions/version'
 require 'more_core_extensions/core_ext/array'
 require 'more_core_extensions/core_ext/benchmark'
 require 'more_core_extensions/core_ext/class'
+require 'more_core_extensions/core_ext/digest'
 require 'more_core_extensions/core_ext/hash'
 require 'more_core_extensions/core_ext/math'
 require 'more_core_extensions/core_ext/module'

data/lib/more_core_extensions/core_ext/array/deletes.rb

@@ -15,6 +15,15 @@ module MoreCoreExtensions
     def delete_blanks
       delete_if { |i| i.blank? }
     end
+
+    # Deletes all keys and subkeys that match +key+.
+    #
+    #   [{:a => {:b => 2, :c => 3}}].deep_delete(:b) # => [{:a => {:c => 3}}]
+    #
+    def deep_delete(key)
+      each { |i| i.deep_delete(key) if i.respond_to?(:deep_delete) }
+      self
+    end
   end
 end
 

data/lib/more_core_extensions/core_ext/array/tableize.rb

@@ -53,6 +53,9 @@ module MoreCoreExtensions
 
       private
 
+      ANSI_ESCAPE_SEQUENCE = /\e\[[^m]+m/.freeze
+      ANSI_RESET = "\e[0m".freeze
+
       def tableize_hashes
         # Convert the target to an Array of Arrays
         keys = options[:columns] || columns_from_hash_keys
@@ -102,7 +105,7 @@ module MoreCoreExtensions
       end
 
       def apply_width!(widths, field, field_i)
-        widths[field_i] = [widths[field_i].to_i, field.to_s.length].max
+        widths[field_i] = [widths[field_i].to_i, ansi_strip(field.to_s).length].max
         widths[field_i] = [options[:max_width], widths[field_i].to_i].min if options[:max_width]
       end
 
@@ -118,13 +121,44 @@ module MoreCoreExtensions
       end
 
       def format_field(field, width, justification)
-        field = field.to_s.gsub(/\n|\r/, '').slice(0, width)
+        field = field.to_s.gsub(/\n|\r/, '')
+        field = ansi_truncate(field, width)
         "%0#{justification}#{width}s" % field
       end
 
+      def ansi_escapes?(field)
+        !!field.match(ANSI_ESCAPE_SEQUENCE)
+      end
+
+      def ansi_escapes(field)
+        field.to_enum(:scan, ANSI_ESCAPE_SEQUENCE).map { Regexp.last_match }
+      end
+
+      def ansi_strip(field)
+        field.gsub(ANSI_ESCAPE_SEQUENCE, '')
+      end
+
+      def ansi_truncate(field, width)
+        escapes = ansi_escapes(field)
+        if escapes.none?
+          field.slice(0, width)
+        else
+          escape_widths = 0
+          escapes.each do |e|
+            break if e.offset(0).first - escape_widths >= width
+
+            escape_widths += e[0].size
+          end
+
+          field = field.slice(0, width + escape_widths)
+          field << ANSI_RESET if ansi_escapes?(field) && !field.end_with?(ANSI_RESET)
+          field
+        end
+      end
+
       def format_table(table, widths)
         if options[:header] && table.size > 1
-          header_separator = widths.collect { |w| "-" * (w + 2) }.join("+")
+          header_separator = widths.collect { |w| "-" * (w + 2) }.join("|")
           table.insert(1, header_separator)
         end
         table.join("\n") << "\n"

data/lib/more_core_extensions/core_ext/digest.rb

@@ -0,0 +1 @@
+require 'more_core_extensions/core_ext/digest/uuid'

data/lib/more_core_extensions/core_ext/digest/uuid.rb

@@ -0,0 +1,26 @@
+require 'active_support/core_ext/digest/uuid'
+
+module Digest
+  module UUID
+    UUID_REGEX_FORMAT = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.freeze
+
+    # Takes a UUID string of varying formats and cleans it. It will strip invalid characters,
+    # such as leading and trailing brackets as well as whitespace. The result is a lowercased,
+    # canonical UUID string.
+    #
+    # If the +guid+ argument is nil or blank, then nil is returned. If the +guid+ is already
+    # clean, then no additional cleaning occurs, and it is returned as-is.
+    #
+    # @param guid [String] A string that should more or less represent a UUID.
+    # @return [String] A lowercase v4 UUID string stripped of any extraneous characters.
+    #
+    def self.clean(guid)
+      return nil if guid.nil?
+      g = guid.to_s.downcase
+      return nil if g.strip.empty?
+      return g if g.length == 36 && g =~ UUID_REGEX_FORMAT
+      g.delete!('^0-9a-f')
+      g.sub!(/^([0-9a-f]{8})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{12})$/, '\1-\2-\3-\4-\5')
+    end
+  end
+end

data/lib/more_core_extensions/core_ext/hash/deletes.rb

@@ -15,6 +15,16 @@ module MoreCoreExtensions
     def delete_blanks
       delete_if { |k, v| v.blank? }
     end
+
+    # Deletes all keys and subkeys that match +key+.
+    #
+    #   {:a => {:b => 2, :c => 3}}.deep_delete(:b) # => {:a => {:c => 3}}
+    #
+    def deep_delete(key)
+      key = [key] unless key.kind_of?(Array)
+      key.each { |k| delete(k) }
+      each_value { |v| v.deep_delete(key) if v.respond_to?(:deep_delete) }
+    end
   end
 end
 

data/lib/more_core_extensions/core_ext/shared/nested.rb

@@ -100,6 +100,21 @@ module MoreCoreExtensions
         end
         []
       end
+
+      # Create a deep clone of the object. This is similar to deep_dup
+      # but uses a Marshal based approach instead.
+      #
+      #   h1 = {:a => "hello"}
+      #   h2 = h1.deep_clone
+      #
+      #   h1[:a] << " world"
+      #
+      #   h1[:a] # "hello world"
+      #   h2[:a] # "hello"
+      #
+      def deep_clone
+        Marshal.load(Marshal.dump(self))
+      end
     end
   end
 end

data/lib/more_core_extensions/version.rb

@@ -1,3 +1,3 @@
 module MoreCoreExtensions
-  VERSION = "4.1.0".freeze
+  VERSION = "4.2.0".freeze
 end

data/more_core_extensions.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ">= 3.0"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "sys-proctable", "~> 1.2.2"
   spec.add_development_dependency "timecop"
 
   spec.add_runtime_dependency "activesupport"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: more_core_extensions
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Jason Frey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,20 +81,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sys-proctable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +162,8 @@ files:
 - lib/more_core_extensions/core_ext/benchmark/realtime_store.rb
 - lib/more_core_extensions/core_ext/class.rb
 - lib/more_core_extensions/core_ext/class/hierarchy.rb
+- lib/more_core_extensions/core_ext/digest.rb
+- lib/more_core_extensions/core_ext/digest/uuid.rb
 - lib/more_core_extensions/core_ext/hash.rb
 - lib/more_core_extensions/core_ext/hash/deletes.rb
 - lib/more_core_extensions/core_ext/hash/nested.rb
@@ -224,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: MoreCoreExtensions are a set of core extensions beyond those provided by