bblib 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2470d8a875c6066b41bcb55d580db671e5569cfe69c13241f46a7015a4f87d5
-  data.tar.gz: 797a23d1cc99ec3bab8d6945cd03137c1889b96a1ff5279feb07c3e4e445f4a1
+  metadata.gz: bcadfffa41731b8ab5a58b196fca73aea9384e26bfe5e81100cf0bd0033ea3ec
+  data.tar.gz: 5c88fe561fd296d4afd00e45fbf4bc3ef0a00fce97cf856b4147ba3cac355cd6
 SHA512:
-  metadata.gz: bdbf6f7993ad6eea502e05d30d4d97a7997d815459b5816164d2d080d6292f7c3b80c31a04916785ea3afd29e92c45a797dcb728dbbe00c7fa62d26436220149
-  data.tar.gz: 27bfbbc391b6bd4dc92c6681fc239b7350848be6d1c0f6731a384bab266335058909fe19e9463e8c528eb77d24359580652e5f7182e232d2c51467c43ab848c4
+  metadata.gz: 68c2fc30a33000acfd217b9f3059f4df44420dde884169f38c317ecfa9107394b4f87434886bf1fa2cc36131be65e20c3e8d58f74eb5f68923862d797de11dd9
+  data.tar.gz: 83cf1780e76795efa2aeaf20bb41b7b482d13fd25891929e736c5163800ddd3008f919d65d52f07504f24e7942900af1262e86e4c5534d1753cfe275b6d5d250

data/.gitignore

@@ -1,12 +1,12 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/spec/coverage/
-*.gem
-smells.html
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/spec/coverage/
+*.gem
+smells.html

data/.rspec

@@ -1,2 +1,2 @@
---format documentation
---color
+--format documentation
+--color

data/.travis.yml

@@ -1,4 +1,4 @@
-language: ruby
-rvm:
-  - 2.1.6
-before_install: gem install bundler -v 1.10.6
+language: ruby
+rvm:
+  - 2.1.6
+before_install: gem install bundler -v 1.10.6

data/CODE_OF_CONDUCT.md

@@ -1,13 +1,13 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in bblib.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in bblib.gemspec
+gemspec

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Brandon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2015 Brandon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bblib.gemspec

@@ -1,34 +1,34 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'bblib/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "bblib"
-  spec.version       = BBLib::VERSION
-  spec.authors       = ["Brandon Black"]
-  spec.email         = ["d2sm10@hotmail.com"]
-
-  spec.summary       = %q{A library containing many reusable, basic functions.}
-  spec.description   = %q{A library containing many reusable, basic functions.}
-  spec.homepage      = "https://github.com/bblack16/bblib-ruby"
-  spec.license       = "MIT"
-
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  # end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) || f.end_with?('.gem') }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "simplecov"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'bblib/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "bblib"
+  spec.version       = BBLib::VERSION
+  spec.authors       = ["Brandon Black"]
+  spec.email         = ["d2sm10@hotmail.com"]
+
+  spec.summary       = %q{A library containing many reusable, basic functions.}
+  spec.description   = %q{A library containing many reusable, basic functions.}
+  spec.homepage      = "https://github.com/bblack16/bblib-ruby"
+  spec.license       = "MIT"
+
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  # if spec.respond_to?(:metadata)
+  #   spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+  # else
+  #   raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  # end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) || f.end_with?('.gem') }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "simplecov"
+end

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "bblib"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "bblib"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -1,7 +1,7 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/bblib.rb

@@ -1 +1 @@
-require_relative 'bblib/core'
+require_relative 'bblib/core'

data/lib/bblib/all.rb

@@ -1,6 +1,6 @@
-require_relative 'core'
-require_relative 'cli'
-require_relative 'system'
-require_relative 'html'
-require_relative 'cron'
-require_relative 'fuzzy_matcher'
+require_relative 'core'
+require_relative 'cli'
+require_relative 'system'
+require_relative 'html'
+require_relative 'cron'
+require_relative 'fuzzy_matcher'

data/lib/bblib/color.rb

@@ -0,0 +1,2 @@
+require_relative 'core'
+require_relative 'cli/color'

data/lib/bblib/core/classes/tree_hash.rb

@@ -36,7 +36,7 @@ class TreeHash
     case
     when Hash >= node_class
       children.include?(key) || (!symbol_sensitive && children.include?(key.to_s.to_sym))
-    when Array >= node_class
+    when Array >= node_class && key.respond_to?(:to_i)
       [0...children.size] === key.to_i
     else
       false
@@ -44,13 +44,13 @@ class TreeHash
   end
 
   def children?
-    (node_class == Hash || node_class == Array) && !children.empty?
+    (node_class <= Hash || node_class <= Array) && !children.empty?
   end
 
   def descendants
     return [] unless children?
     desc = []
-    children.each do |key, child|
+    children.each do |_key, child|
       desc << child
       desc += child.descendants if child.children?
     end
@@ -198,7 +198,7 @@ class TreeHash
   end
 
   def process(processor, &block)
-    # TODO Add ability to process values or keys in tree hashes
+    # TODO: Add ability to process values or keys in tree hashes
   end
 
   def size
@@ -206,8 +206,7 @@ class TreeHash
   end
 
   def paths
-    case
-    when Array >= node_class, Hash >= node_class
+    if Array >= node_class || Hash >= node_class
       value.squish.keys
     else
       []
@@ -342,10 +341,10 @@ class TreeHash
 
   def build_from(object)
     @children = {}
-    case object
-    when Hash
+    case
+    when object.class <= Hash
       object.each { |k, v| @children[k] = TreeHash.new(v, self) }
-    when Array
+    when object.class <= Array
       object.each_with_index { |a, i| @children[i] = TreeHash.new(a, self) }
     else
       @children = object
@@ -353,7 +352,13 @@ class TreeHash
   end
 
   def add_child(key, child)
-    @children[key] = TreeHash.new(child, self)
+    if Array >= node_class && !key.is_a?(Integer)
+      # If the class was an Array but a hash key was passed we need to replace this
+      # node entirely
+      replace_with(key => child)
+    else
+      @children[key] = TreeHash.new(child, self)
+    end
   end
 
   def process_bridge_part(part)

data/lib/bblib/core/hash_path/part.rb

@@ -17,7 +17,7 @@ class HashPath
     def key_match?(key, object)
       case selector
       when String
-        key.to_s == selector
+        selector == '*' || key.to_s == selector
       when Integer
         key.to_i == selector
       when Range

data/lib/bblib/core/mixins/attrs.rb

@@ -250,9 +250,13 @@ module BBLib
       opts[:default] = [] unless opts.include?(:default) || opts.include?(:default_proc)
       methods.each do |method|
         attr_custom(method, opts) do |arg|
-          args = arg.is_a?(Array) ? arg : [arg]
-          args = args.uniq if opts[:uniq]
-          args
+          if opts[:allow_nil] && arg.nil?
+            arg
+          else
+            args = arg.is_a?(Array) ? arg : [arg]
+            args = args.uniq if opts[:uniq]
+            args
+          end
         end
         attr_array_adder(method, opts[:adder_name], singleton: opts[:singleton]) if opts[:add_rem] || opts[:adder]
         attr_array_remover(method, opts[:remover_name], singleton: opts[:singleton]) if opts[:add_rem] || opts[:remover]

data/lib/bblib/core/mixins/bridge.rb

@@ -6,8 +6,8 @@ module BBLib
 
     def bridge_method(*class_methods)
       class_methods.each do |class_method|
-        define_method(class_method) do |*args|
-          self.class.send(class_method, *args)
+        define_method(class_method) do |*args, &block|
+          self.class.send(class_method, *args, &block)
         end
       end
       true

data/lib/bblib/core/mixins/hooks.rb

@@ -5,12 +5,11 @@ module BBLib
   module Hooks
 
     [:before, :after].each do |hook_type|
-      define_method(hook_type) do |*methods, **opts|
-        raise ArgumentError, 'You must pass in at least one method followed by the name of the hook method.' if methods.size < 2
-        hooks = _hooks[hook_type][methods.pop] ||= { methods: [], opts: {} }
-        hooks[:methods] += methods
+      define_method(hook_type) do |*methods, **opts, &block|
+        raise ArgumentError, 'You must pass in at least one method followed by the name of the hook method or a block.' if methods.size < 2 && block.nil?
+        hooks = _hooks[hook_type][methods.last] ||= { methods: methods[0..-2], opts: { block: block } }
         hooks[:opts] = hooks[:opts].deep_merge(opts)
-        methods.each { |method| _hook_method(method) if method_defined?(method) }
+        methods[0..(block ? -1 : -2)].each { |method| _hook_method(method) if method_defined?(method) }
         true
       end
     end
@@ -34,8 +33,9 @@ module BBLib
     def _hook_method(method, force: false)
       return false if _defining_hook?
       [:before, :after].each do |hook_type|
-        _hooks[hook_type].find_all { |hook, data| data[:methods].include?(method) }.to_h.each do |hook, data|
-          next if !force && _hooked_methods[hook_type] && _hooked_methods[hook_type][hook] && _hooked_methods[hook_type][hook].include?(method)
+        _hooks[hook_type].find_all { |hook, data| data[:methods].include?(method) || data[:opts][:block] && hook == method }.to_h.each do |hook, data|
+          hook = data[:opts][:block] if data[:opts][:block]
+          next if !force && _hooked_methods[hook_type] && _hooked_methods[hook_type][hook.is_a?(Proc) ? hook.object_id : hook] && _hooked_methods[hook_type][hook.is_a?(Proc) ? hook.object_id : hook].include?(method)
           send("_hook_#{hook_type}_method", method, hook, data[:opts])
         end
       end
@@ -69,6 +69,7 @@ module BBLib
     end
 
     def _add_hooked_method(type, hook, method)
+      hook = hook.object_id if hook.is_a?(Proc)
       history = _hooked_methods[type]
       history[hook] = {} unless history[hook]
       history[hook][method] = instance_method(method)
@@ -96,11 +97,11 @@ module BBLib
           margs = args
           margs = [method] + args if opts[:send_method]
           margs = args + [opts[:add_args]].flatten(1) if opts[:add_args]
-          result = method(hook).call(*margs)
+          result = (hook.is_a?(Proc) ? hook : method(hook)).call(*margs)
           return result if result && opts[:try_first]
           args = result if opts[:modify_args]
         else
-          method(hook).call
+          hook.is_a?(Proc) ? hook.call : method(hook).call
         end
         original.bind(self).call(*args, &block)
       end
@@ -125,17 +126,17 @@ module BBLib
       define_method(method) do |*args, &block|
         rtr = original.bind(self).call(*args, &block)
         if opts[:send_args]
-          method(hook).call(*args)
+          (hook.is_a?(Proc) ? hook : method(hook)).call(*args)
         elsif opts[:send_return] || opts[:send_value]
-          result = method(hook).call(rtr)
+          result = (hook.is_a?(Proc) ? hook : method(hook)).call(rtr)
           rtr = result if opts[:modify_value] || opts[:modify_return]
         elsif opts[:send_return_ary] || opts[:send_value_ary]
-          result = method(hook).call(*rtr)
+          result = (hook.is_a?(Proc) ? hook : method(hook)).call(*rtr)
           rtr = result if opts[:modify_value] || opts[:modify_return]
         elsif opts[:send_all]
-          result = method(hook).call(args: args, value: rtr, method: method)
+          result = (hook.is_a?(Proc) ? hook : method(hook)).call(args: args, value: rtr, method: method)
         else
-          method(hook).call
+          (hook.is_a?(Proc) ? hook : method(hook)).call
         end
         rtr
       end

data/lib/bblib/core/util/cases.rb

@@ -2,7 +2,7 @@ module BBLib
   def self.title_case(str, first_only: true)
     str = str.to_s unless str.is_a?(String)
     ignoreables = %w(a an the on upon and but or in with to)
-    regx = /\s+|\-|\_|(?<=\W|^)\"(?=\w|$)|(?<=\W|^)\'(?=\w|$)|\(|\)|\[|\]|\{|\}|\#/
+    regx = /\s+|\-|\_|(?<=[\w\d])\.(?=[\w\d])|(?<=\W|^)\"(?=\w|$)|(?<=\W|^)\'(?=\w|$)|\(|\)|\[|\]|\{|\}|\#/
     spacing = str.scan(regx).to_a
     words = str.split(regx).map do |word|
       if ignoreables.include?(word.downcase)
@@ -15,7 +15,9 @@ module BBLib
     end
     # Always cap the first word
     words[0] = words.first.to_s.slice(0,1).to_s.upcase + words.first.to_s[1..-1].to_s
-    words.interleave(spacing).join
+    combined = words.interleave(spacing).join
+    combined.scan(/(?<=\.)\w(?=\.)/).each { |part| combined.sub!(".#{part}.", ".#{part}.".upcase) }
+    combined
   end
 
   def self.start_case(str, first_only: false)

data/lib/bblib/core/util/file.rb

@@ -135,6 +135,16 @@ class Numeric
   def to_file_size(*args)
     BBLib.to_file_size(self, *args)
   end
+
+  BBLib::FILE_SIZES.each do |name, data|
+    define_method(name) do
+      self * data[:mult]
+    end
+
+    define_method(name.pluralize) do
+      self * data[:mult]
+    end
+  end
 end
 
 # Monkey patches for the String class

data/lib/bblib/version.rb

@@ -1,3 +1,3 @@
 module BBLib
-  VERSION = '2.0.4'.freeze
+  VERSION = '2.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bblib
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Brandon Black
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-26 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - lib/bblib/cli/options/untoggle.rb
 - lib/bblib/cli/opts_parser.rb
 - lib/bblib/cli/util.rb
+- lib/bblib/color.rb
 - lib/bblib/core.rb
 - lib/bblib/core/classes/hash_struct.rb
 - lib/bblib/core/classes/splitter.rb
@@ -177,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A library containing many reusable, basic functions.