tools 0.4.5 → 0.4.6

data/lib/lib/object.rb

@@ -3,33 +3,35 @@ class Object
   #
   # @return   boolean
   def boolean?
-    self.is_a?(TrueClass) || self.is_a?(FalseClass)
+    is_a?(TrueClass) || is_a?(FalseClass)
   end
 
   # Self test Trueclass.
   #
   # @return   boolean
   def true?
-    self.is_a?(TrueClass)
+    is_a?(TrueClass)
   end
+
   # Self test Falseclass.
   #
   # @return   boolean
   def false?
-    self.is_a?(FalseClass)
+    is_a?(FalseClass)
   end
 
   # Self test Symbol class.
   #
   # @return   boolean
   def symbol?
-    self.is_a?(Symbol)
+    is_a?(Symbol)
   end
+
   # Self test String class.
   #
   # @return   boolean
   def string?
-    self.is_a?(String)
+    is_a?(String)
   end
 
   # Self test nil Object class.
@@ -38,5 +40,4 @@ class Object
   # def nil?
   #   return '' if self == nil
   # end
-
-end
+end

data/lib/lib/prompt.rb

@@ -2,53 +2,51 @@ require 'singleton'
 class ToolsPrompt
   include Singleton
 
-  def initialize(options = {})
-  end
+  def initialize(options = {}); end
 
-  def self.yes? *args
+  def self.yes?(*args)
     prompt = TTY::Prompt.new
-    prompt.yes? *args
+    prompt.yes?(*args)
   end
 
-  def self.no? *args
+  def self.no?(*args)
     prompt = TTY::Prompt.new
-    prompt.no? *args
+    prompt.no?(*args)
   end
 
-  def self.ask *args
+  def self.ask(*args)
     prompt = TTY::Prompt.new
-    result = prompt.ask *args
-    return result
+    result = prompt.ask(*args)
+    result
   end
 
-  def self.mask *args
+  def self.mask(*args)
     prompt = TTY::Prompt.new
-    result = prompt.mask *args
-    return result
+    result = prompt.mask(*args)
+    result
   end
 
-  def self.select *args
+  def self.select(*args)
     prompt = TTY::Prompt.new
-    result = prompt.select *args
-    return result
+    result = prompt.select(*args)
+    result
   end
 
-  def self.multi_select *args
+  def self.multi_select(*args)
     prompt = TTY::Prompt.new
-    result = prompt.multi_select *args
-    return result
+    result = prompt.multi_select(*args)
+    result
   end
 
-  def self.enum_select *args
+  def self.enum_select(*args)
     prompt = TTY::Prompt.new
-    result = prompt.enum_select *args
-    return result
+    result = prompt.enum_select(*args)
+    result
   end
 
-  def self.expand *args
+  def self.expand(*args)
     prompt = TTY::Prompt.new
-    result = prompt.expand *args
-    return result
+    result = prompt.expand(*args)
+    result
   end
-
-end
+end

data/lib/lib/string.rb

@@ -1,5 +1,4 @@
 class String
-
   # Justity relative left or right position filled with a espefific char in String.
   #
   # sample:
@@ -10,12 +9,12 @@ class String
   # @param    size to justify.
   # @param    pattern pattern do justify
   # @return   formated string
-  def fix(size, pattern=' ')
+  def fix(size, pattern = ' ')
     if size >= 0
       self[0...size].rjust(size, pattern)
     else
       diff = size.abs - self.size
-      self + ''.fix(diff,pattern)
+      self + ''.fix(diff, pattern)
     end
   end
 
@@ -45,39 +44,40 @@ class String
   #
   # @return   boolean
   def numeric?
-    Float(self) != nil rescue false
+    !Float(self).nil?
+  rescue StandardError
+    false
   end
 
   # Self test digits String class.
   #
   # @return   boolean
   def num?
-    !!match(/^[[:digit:]]+$/)
+    !match(/^[[:digit:]]+$/).nil?
   end
 
   # Self test alphanum String class.
   #
   # @return   boolean
   def alnum?
-    !!match(/^[[:alnum:]]+$/)
+    !match(/^[[:alnum:]]+$/).nil?
   end
 
   # Self test alpha String class.
   #
   # @return   boolean
   def alpha?
-    !!match(/^[[:alpha:]]+$/)
+    !match(/^[[:alpha:]]+$/).nil?
   end
 
   def help?
-    if self.eql? '?'      or
-       self.eql? '-h'     or
-       self.eql? '--help' or
-       self.eql? 'help'
-       return true
+    if eql?('?') ||
+       eql?('-h')     ||
+       eql?('--help') ||
+       eql?('help')
+      true
     else
-      return false
+      false
     end
   end
-
-end
+end

data/lib/lib/utils.rb

@@ -25,123 +25,147 @@ class ToolsUtil
   # @param  hash
   # return  hash symbolized
   def self.symbolize_keys(hash)
-    hash.inject({}){|result, (key, value)|
-      new_key = case key
-                when String then key.to_sym
-                else key
-                end
-      new_value = case value
-                  when Hash then symbolize_keys(value)
-                  else value
-                  end
-      result[new_key] = new_value
-      result
-    }
+    {}.tap do |h|
+      hash.each { |key, value| h[key.to_sym] = map_value(value) }
+    end
+    # hash.each_with_object({}) do |(key, value), result|
+    #   new_key = case key
+    #             when String then key.to_sym
+    #             else key
+    #             end
+    #   new_value = case value
+    #               when Hash then symbolize_keys(value)
+    #               else value
+    #               end
+    #   result[new_key] = new_value
+    # end
   end
 
-
+  def self.map_value(thing)
+    case thing
+    when Hash
+      symbolize_keys(thing)
+    when Array
+      thing.map { |v| map_value(v) }
+    else
+      thing
+    end
+  end
 
   # Test a valid json string.
   #
   # @param  source Json string to be tested
   # @return boolean
-  def self.valid_json? source
-    begin
-      !!JSON.parse(source)
-    rescue JSON::ParserError
-      false
-    end
+  def self.valid_json?(source)
+    JSON.parse(source) && true
+  rescue JSON::ParserError
+    false
   end
 
   # Test a valid yaml string.
   #
   # @param  source Yaml string to be tested
   # @return boolean
-  def self.valid_yaml? source
-    begin
-      !!YAML.parse(source)
-    rescue Psych::SyntaxError
-      false
-    end
+  def self.valid_yaml?(source)
+    YAML.parse(source) && true
+  rescue Psych::SyntaxError
+    false
   end
 
   # Return a formated DateTime.
   #
   # @param format with a DateTime format default are: 12 Outubro 2018, 08:29
   # @return [String] formated date
-  def self.get_date format='%e %B %Y, %H:%M'
-    return I18n.l(DateTime.now, :format => format)
+  def self.get_date(format = '%e %B %Y, %H:%M')
+    I18n.l(DateTime.now, format: format)
   end
 
-
   # Modify the class variable.. String => change value, Hash => merge, Array => insert
   #
   # @param variable name variable
   # @param value    value veriable
   # @return []
-  def self.set_variable_ext variable, value
-    if self.instance_variable_defined? ("@#{variable}")
-      aux = self.get_variable variable
-      case aux.class.to_s
-      when 'String'
-         self.set_variable variable, value
-      when 'Hash'
-         begin
-          aux.merge! value
-          self.set_variable variable, aux
-        rescue
-          ToolsDisplay.show "\tToolsDisplay error [set_variable_ext]. Attempt insert #{variable.class} into Hash variable....".light_red
-        end
-      when 'Array'
-        aux.insert(-1,value)
-        self.set_variable variable, aux
-      end
+  def self.set_variable_ext(variable, value)
+    return unless instance_variable_defined? "@#{variable}"
+
+    aux = get_variable variable
+    case aux.class.to_s
+    when 'String'
+      set_string_variable variable, value
+    when 'Hash'
+      set_hash_variable variable, value, aux
+    when 'Array'
+      set_array_variable variable, value, aux
     end
   end
 
+  def self.set_string_variable(variable, value)
+    set_variable variable, value
+  end
+
+  def self.set_hash_variable(variable, value, aux)
+    aux.merge! value
+    set_variable variable, aux
+  rescue StandardError
+    ToolsDisplay.show "\tToolsDisplay error [set_variable_ext].".light_red
+    ToolsDisplay.show "\tAttempt insert #{variable.class} into Hash variable....".light_red
+  end
+
+  def self.set_array_variable(variable, value, aux)
+    aux.insert(-1, value)
+    set_variable variable, aux
+  end
+
   # Set a new class variable.
   #
   # @param variable   variable name to set
   # @param value      value for variable
   # @return []
-  def self.set_variable variable, value
-    self.instance_variable_set("@#{variable}", value)
+  def self.set_variable(variable, value)
+    instance_variable_set("@#{variable}", value)
   end
 
   # Get a existent class variable.
   #
   # @param variable   variable name to retrive
   # @return     variable value
-  def self.get_variable variable
-    return self.instance_variable_get("@#{variable}")
+  def self.get_variable(variable)
+    instance_variable_get("@#{variable}")
   end
 
   # Get all existent class variablea.
   #
   # @return     variables
   def self.get_variables
-    return self.instance_variables
+    instance_variables
   end
 
   # Return a plain text for content of String or Hash or Array.
   #
   # @param   value  Content of variable to translate to Plaint text
   # @return  plain text content
-  def self.get_plain_text value
-   case value.class.to_s
-      when 'String'
-        return  "\t#{value.yellow}"
-      when 'Hash','Array'
-        old_stdout = $stdout
-        captured_stdio = StringIO.new('', 'w')
-        $stdout = captured_stdio
-        ap value, {:plain => true}
-        $stdout = old_stdout
-        value = captured_stdio.string
-        return value
-      else
-        return value
-      end
+  def self.get_plain_text(value)
+    case value
+    when String then "\t#{value.yellow}"
+    when Hash, Array
+      # old_stdout = $stdout
+      # captured_stdio = StringIO.new('', 'w')
+      #   $stdout = captured_stdio
+      #   ap value, plain: true
+      # $stdout = old_stdout
+      # captured_stdio.string
+      get_plain_text_if_hash_or_array value
+    else
+      value
+    end
   end
 
-end
+  def self.get_plain_text_if_hash_or_array(value)
+    old_stdout = $stdout
+    captured_stdio = StringIO.new('', 'w')
+    $stdout = captured_stdio
+    ap value, plain: true
+    $stdout = old_stdout
+    captured_stdio.string
+  end
+end

data/lib/tools.rb

@@ -1,4 +1,4 @@
-require "tools/version"
+require 'tools/version'
 
 # Basic models
 require 'lib/utils'
@@ -18,6 +18,7 @@ require 'lib/prompt'
 require 'lib/console'
 
 load __dir__ + '/files/requireds.rb'
+include Dnsruby
 
 module Tools
 
@@ -32,10 +33,8 @@ module Tools
       self.configuration ||= Configuration.new
       yield(configuration)
     end
-
   end
 
-
   def self.root
     File.dirname __dir__
   end
@@ -71,15 +70,11 @@ module Tools
   def self.gem_path
     ENV['GEM_PATH']
   end
-
 end
 
 Tools.configure do |config|
   config.console_prompt = Tools::VERSION
   I18n.load_path = Dir[Tools.files + '/pt-BR.yml']
   I18n.locale    = 'pt-BR'.to_sym
- #ToolsUtil.instance
+  # ToolsUtil.instance
 end
-
-
-