bblib 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f18d374a5d8b70eb58699917b789c1f4107a0041e7ae771fd7531a22ced204b9
-  data.tar.gz: 5383474dc15df32437bec9a3b940777f781f586595c2952ef893aae4d62bd5e2
+  metadata.gz: debe993c7a7d4324816c660a01fb9befab19a636aaf16ee403924051a12cd838
+  data.tar.gz: 9e8f4aa2c6f6705ae982b086d536c93073e11725ccc8bf137f581c22a355fde5
 SHA512:
-  metadata.gz: 5246e2b4e7bd354aba2ca09497fdc3085be2c889aeb3e4935d3673975cbfebd24b8326cb9d45be64369ed3ff3f75d3f1d39925834941c479565ede2736c060b3
-  data.tar.gz: 6ad50086b5b92077b1aba60c652d17ead4b2304e8a5fb82df9737967f36d48cbea6267fd1a348df48678aa240dad9d4ccb1ff8af7c514be36d3492bc643de8ff
+  metadata.gz: ee2dff5db783cc66d30f0f9254a538014f41fbb58f81d2ec21c721d6900b6a5aa1bc8aee06b45cc3630b6e4d304c635c754a2cb6cc152ed42db61c9298db1f4f
+  data.tar.gz: a24156d985bded501a00d8e4e35764508dcc0a509c638c3fa9f31c528e3befe1d43014b549b4cbeb1ae5a3fbe1de6ad553ce8f489e246dc58f698f143abc7661

data/lib/bblib/all.rb

@@ -3,3 +3,4 @@ require_relative 'cli'
 require_relative 'system'
 require_relative 'html'
 require_relative 'cron'
+require_relative 'fuzzy_matcher'

data/lib/bblib/cli.rb

@@ -1,3 +1,4 @@
 require_relative 'core'
 require_relative 'cli/opts_parser'
 require_relative 'cli/color'
+require_relative 'cli/util'

data/lib/bblib/cli/option.rb

@@ -8,7 +8,7 @@ module BBLib
       attr_str :description, aliases: :desc
       attr_of Object, :default, allow_nil: true, default: nil
       attr_str :placeholder, default_proc: proc { |x| x.name.upcase }
-      attr_ary_of String, :flags, arg_at: 1
+      attr_ary_of String, :flags
       attr_of [String, Regexp], :delimiter, default: nil, allow_nil: true
       attr_str :argument_delimiter, default: ' '
       attr_bool :raise_errors, default: true
@@ -25,7 +25,7 @@ module BBLib
       end
 
       def self.types
-        descendants.map(&:type)
+        descendants.flat_map(&:type)
       end
 
       def retrieve(args, parsed)
@@ -33,7 +33,7 @@ module BBLib
         index = 0
         until index >= args.size
           begin
-            unless flag_match?(args[index], index)
+            unless flag_match?(args[index].to_s, index)
               index += 1
               next
             end

data/lib/bblib/cli/options/basic_option.rb

@@ -5,7 +5,7 @@ module BBLib
       def extract(index, args)
         args.delete_at(index)
         raise MissingArgumentException, "No argument was provided for #{name}" if args[index].nil?
-        format_value(args.delete_at(index))
+        format_value(args.delete_at(index).to_s)
       end
 
       protected

data/lib/bblib/cli/options/command.rb

@@ -1,9 +1,14 @@
 module BBLib
   class OptsParser
     class Command < Option
+      attr_of [Integer, Range], :position, default: nil, allow_nil: true, arg_at: 0
+
+      def self.type
+        [super, :at]
+      end
 
       def extract(index, args)
-        args.delete_at(index)
+        args.delete_at(index).to_s
       end
 
     end

data/lib/bblib/cli/options/toggle.rb

@@ -3,7 +3,7 @@ module BBLib
     class Toggle < Option
 
       def extract(index, args)
-        value = args[index]
+        value = args[index].to_s
         if value =~ /^\-[\w\d]$/ || flags.include?(value)
           args.delete_at(index)
         elsif value =~ /^\-[\w\d]+$/

data/lib/bblib/cli/opts_parser.rb

@@ -1,10 +1,18 @@
 require_relative 'option'
 require_relative 'exceptions/opts_parser'
 require_relative 'options/basic_option'
-
-BBLib.scan_files(File.expand_path('../options', __FILE__), '*.rb') do |file|
-  require_relative file
-end
+require_relative 'options/string'
+require_relative 'options/command'
+require_relative 'options/bool'
+require_relative 'options/date'
+require_relative 'options/time'
+require_relative 'options/float'
+require_relative 'options/integer'
+require_relative 'options/json'
+require_relative 'options/regexp'
+require_relative 'options/symbol'
+require_relative 'options/toggle'
+require_relative 'options/untoggle'
 
 module BBLib
   class OptsParser
@@ -13,11 +21,19 @@ module BBLib
     attr_ary_of Option, :options, add_rem: true
     attr_str :usage, default: nil, allow_nil: true
 
+    def self.build(&block)
+      new(&block)
+    end
+
     def usage(text = nil)
       @usage = text unless text.nil?
       @usage
     end
 
+    def at(position, **opts, &block)
+      add_options(opts.merge(type: :at, position: position, processor: block))
+    end
+
     def on(*flags, **opts, &block)
       opts[:type] = :string unless opts[:type]
       add_options(opts.merge(flags: flags, processor: block))
@@ -28,8 +44,9 @@ module BBLib
     end
 
     def parse!(args = ARGV)
+      args = [args] unless args.is_a?(Array)
       HashStruct.new.tap do |hash|
-        options.each do |option|
+        options.sort_by { |opt| opt.position || 10**100 }.each do |option|
           option.retrieve(args, hash)
         end
       end.merge(arguments: args)

data/lib/bblib/cli/util.rb

@@ -0,0 +1,46 @@
+require 'io/console'
+require 'io/wait'
+
+module BBLib
+  module Console
+
+    DEFAULT_FILE_EDITORS = %w{vim vi notepad++ notepad}.freeze
+
+    # Simple method to open a file in a system text editor. The
+    # text editor can be specified otherwise the first default
+    # editor that can be found in the path will be used
+    def self.edit_file(file, editor = default_editor)
+      pid = spawn("#{editor} \"#{file}\"")
+      Process.wait(pid)
+    end
+
+    def self.default_editor
+      DEFAULT_FILE_EDITORS.find { |editor| OS.which(editor) }
+    end
+
+    def self.confirm?(message = 'Confirm?', yes: 'y', no: 'n', default: true, enter_is_default: true)
+      response = nil
+      until response == yes || response == no
+        # TODO Support carriage return to overwrite line
+        # print "\b" if response
+        print "#{message} [#{default ? 'Y/n' : 'y/N'}]: "
+        response = STDIN.gets.chomp.downcase
+        response = default ? yes : no if enter_is_default && response.empty?
+      end
+      response == yes
+    end
+
+    # TODO Fix this function. Currently requires two hits of enter to move on.
+    def self.get(limit: nil)
+      str = ''
+      loop do
+        char = STDIN.raw(&:getc)
+        STDOUT.print char
+        break if ["\r", "\n", "\r\n"].include?(char)
+        str += char
+      end
+      str.chomp
+    end
+
+  end
+end

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

@@ -27,5 +27,15 @@ module BBLib
         super
       end
     end
+
+    def respond_to_missing?(method, include_private = false)
+      include?(method) || method.to_s =~ /\?|\=/ && include?(method.to_s[0..-2].to_sym) || super
+    end
+  end
+end
+
+class Hash
+  def to_hash_struct
+    BBLib::HashStruct.new.merge(self)
   end
 end

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

@@ -44,7 +44,7 @@ end
 
 module BBLib
   def self.hash_path(hash, *paths, multi_path: false, multi_join: false, multi_join_hash: false)
-    tree = TreeHash.new(hash)
+    tree = TreeHash.new(hash.to_h)
     if multi_path
       tree.find_multi(*paths).map  { |r| r.map { |sr| sr.value } }
     elsif multi_join

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

@@ -69,6 +69,7 @@ module BBLib
 
       def _ancestor_delegate_fast
         ancestors.reverse.find do |anc|
+          next if anc == self
           next unless anc.respond_to?(:delegate_fast)
           return anc.delegate_fast
         end

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

@@ -8,7 +8,18 @@ module BBLib
       base.extend(ClassMethods)
       base.send(:bridge_method, :type)
       base.send(:serialize_method, :type, always: true)
-      base.send(:setup_init_foundation, :type) { |a, b| a && b && a.to_s.to_sym == b.to_s.to_sym }
+      base.send(:setup_init_foundation, :type) do |a, b|
+        if a && b
+          case
+          when a.is_a?(Array)
+            a.include?(b)
+          else
+            a.to_s.to_sym == b.to_s.to_sym
+          end
+        else
+          false
+        end
+      end
     end
 
     module ClassMethods

data/lib/bblib/version.rb

@@ -1,3 +1,3 @@
 module BBLib
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bblib
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Brandon Black
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,7 @@ files:
 - lib/bblib/cli/options/toggle.rb
 - lib/bblib/cli/options/untoggle.rb
 - lib/bblib/cli/opts_parser.rb
+- lib/bblib/cli/util.rb
 - lib/bblib/core.rb
 - lib/bblib/core/classes/hash_struct.rb
 - lib/bblib/core/classes/splitter.rb