tools 0.4.5 → 0.4.6

data/lib/lib/config.rb

@@ -2,10 +2,7 @@ require 'singleton'
 class ToolsConfig
   include Singleton
 
-  def initialize(options = {})
-  end
-
-
+  def initialize(options = {}); end
 
   # Create a Config file in work area
   #
@@ -23,77 +20,60 @@ class ToolsConfig
   # @param config_type
   # @param data
   # @return
-  def self.create_config_file config_name, config_file, config_type = :json, data = {}
-    unless File.exists? config_file
-      case config_type
-      when :json
-        config = File.open(config_file, 'w')
-        config.write JSON.pretty_generate(data)
-        config.close
-        #ToolsLog.tools_info "Json config file '#{config_file}' was created!'"
-        #return true
-      when :yaml
-        config = File.open(config_file, 'w')
-        config.write data.to_yaml
-        config.close
-        #ToolsLog.tools_info "Json config file '#{config_file}' was created!'"
-        #return true
-      end
-    else
-      #ToolsLog.tools_warn "The file #{config_file} really exist. leaving operation...."
-      return false
+  def self.create_config_file(config_name, config_file, config_type = :json, data = {})
+    return false if File.exist? config_file
+
+    case config_type
+    when :json
+      config = File.open(config_file, 'w')
+      config.write JSON.pretty_generate(data)
+      config.close
+    when :yaml
+      config = File.open(config_file, 'w')
+      config.write data.to_yaml
+      config.close
     end
     ToolsUtil.set_variable "#{config_name}_config_file", config_file
     ToolsUtil.set_variable "#{config_name}_config_type", config_type
   end
 
-
-  def self.method_missing(method, *args, &block)
-    #expected call format =>    STRING_LOGGER_TYPE + '_' + LOGGER_TYPE
-    # Ex.:  tools_info
-    config_name   = method.to_s.split('_').first
-    config_method = method.to_s.split('_').last
-    config_file   = ToolsUtil.get_variable "#{config_name}_config_file"
-    config_type   = ToolsUtil.get_variable "#{config_name}_config_type"
+  def self.method_missing(method, *_args)
+    config_name = method.to_s.split('_').first
+    ToolsUtil.get_variable "#{config_name}_config_file"
+    ToolsUtil.get_variable "#{config_name}_config_type"
   end
 
-
   # Test and register a config file in work area
   # @param source
   # @return boolean
-  def self.test_config_type source
-    file        = open(source)
+  def self.test_config_type(source)
+    file        = File.open(source)
     content     = file.read
-    if ToolsUtil.valid_json? content
-      config_type = :json
-    else
-      if ToolsUtil.valid_yaml? content
-        config_type = :yaml
-      else
-        config_type = :invalid
-        ToolsLog.tools_error "Invalid format in config file in '#{source}'.", :light_red
-        ToolsLog.tools_exit
-      end
-    end
+    config_type = if ToolsUtil.valid_json? content
+                    :json
+                  elsif ToolsUtil.valid_yaml? content
+                    :yaml
+                  else
+                    :invalid
+                  end
     ToolsUtil.set_variable 'config_file_type', config_type
   end
 
-
   # Load a content from a config file in work area
   # @param source
   # @return content
-  def self.load_config source
+  def self.load_config(source)
     test_config_type source
     case ToolsUtil.get_variable 'config_file_type'
     when :json
-      file    = open(source)
+      file    = File.open(source)
       json    = file.read
       parsed  = JSON.parse(json)
       ToolsUtil.set_variable 'config_data', parsed
       return parsed
     when :yaml
-      file    = open(source)
-      parsed = YAML.load(file.read)
+      file = File.open(source)
+      parsed = YAML.safe_load(file.read, [Symbol])
       ToolsUtil.set_variable 'config_data', parsed
       return parsed
     end
@@ -102,24 +82,24 @@ class ToolsConfig
   # Merge data in config file in work area
   # @param source
   # @return content
-  def self.insert_in_config source, command
+  def self.insert_in_config(source, command)
     test_config_type source
-    file = open(source)
+    file = File.open(source)
     case ToolsUtil.get_variable 'config_file_type'
     when :json
       json = file.read
       parsed = JSON.parse(json)
       parsed.rmerge!(command)
       file.close
-      file = open(source, 'w')
+      file = File.open(source, 'w')
       file.write JSON.pretty_generate(parsed)
       file.close
     when :yaml
       yaml = file.read
-      parsed = YAML.load(yaml)
+      parsed = YAML.safe_load(yaml, [Symbol])
       parsed.rmerge!(command)
       file.close
-      file = open(source, 'w')
+      file = File.open(source, 'w')
       file.write parsed.to_yaml
       file.close
     end
@@ -127,48 +107,39 @@ class ToolsConfig
 
   # Change data in config file in work area
   # @param args Sequence keys to locate the value in hash
-  def self.change_value_in_config *args
+  def self.change_value_in_config(*args)
     source = args.extract_first
     value  = args.extract_first
     test_config_type source
     case ToolsUtil.get_variable 'config_file_type'
     when :json
-      file = open(source)
+      file = File.open(source)
       json = file.read
       parsed = JSON.parse(json)
       parsed.nested_set(args, value)
       file.close
-      file = open(source, 'w')
+      file = File.open(source, 'w')
       file.write JSON.pretty_generate(parsed)
       file.close
     when :yaml
-      file = open(source)
+      file = File.open(source)
       yaml = file.read
-      parsed = YAML.load(yaml)
+      parsed = YAML.safe_load(yaml, [Symbol])
       parsed.nested_set(args, value)
       file.close
-      file = open(source, 'w')
+      file = File.open(source, 'w')
       file.write parsed.to_yaml
       file.close
     end
   end
 
+  def self.validate_config; end
 
+  def self.check_config; end
 
-  def self.validate_config
-  end
-
-  def self.check_config
-  end
-
-  def self.purge_backup_config
-  end
-
-  def self.config_backup
-  end
-
-  def self.daily_backup_config
-  end
+  def self.purge_backup_config; end
 
+  def self.config_backup; end
 
-end
+  def self.daily_backup_config; end
+end

data/lib/lib/console.rb

@@ -2,138 +2,122 @@ require 'singleton'
 class ToolsConsole
   include Singleton
 
-  def self.exec_console args
+  def self.exec_console(args)
     command_name = args.extract_first
-    cmd = Prompt.application.commands.select {|c| c.name.eql? command_name}.first
-    unless cmd.nil?
-      cmd.run cmd
-      return true
-    else
-      ToolsDisplay.show "Invalid command '#{command_name}'.! Aborting...", :light_yellow
-      return false
-    end
-  end
+    cmd = Prompt.application.commands.select { |c| c.name.eql? command_name }.first
+    return false if cmd.nil?
 
-  def initialize(options = {})
+    cmd.run cmd
+    true
   end
 
-  def self.create_console
-
-      extend Prompt::DSL
+  def initialize(options = {}); end
 
-      group "Console commands"
+  def self.create_console
+    extend Prompt::DSL
 
-      desc "test"
-      command "test" do
-        puts 'Im a test.!'.yellow
-      end
+    group 'Console commands'
 
+    desc 'test'
+    command 'test' do
+      # puts 'Im a test.!'.yellow
+      true
+    end
   end
 
-
   def self.run_console
-      Prompt.application.prompt = "#{Tools.configuration.console_prompt} console > ".light_green
-      @history_file = File.join(File.expand_path(File.dirname(__FILE__)).to_s, ".workin-history")
-      Prompt::Console.start @history_file
+    Prompt.application.prompt = "#{Tools.configuration.console_prompt} console > ".light_green
+    @history_file = File.join(__dir__.to_s, '.workin-history')
+    Prompt::Console.start @history_file
   end
-
 end
 
-
-
-
-
-
-
-
 # class Console
 
-# 	def initialize(options = {})
-# 		commands
-# 	end
+#   def initialize(options = {})
+#     commands
+#   end
 
 #   def commands
 
-#   	extend Prompt::DSL
-
-# 		group "Commands"
-
-# 		desc "config"
-# 		command "config" do ||
-# 			Prompt.application.prompt = " tools > ".light_blue
-# 		end
-
-# 		desc "show"
-# 		command "show :param" do |param|
-# 			case param
-# 			when 'config'
-# 				puts "ROOT      .: #{Tools.root}"
-# 				puts "USER      .: #{Tools.configuration.user}"
-# 				puts "HOME      .: #{Tools.configuration.home}"
-# 				puts "PWD       .: #{Tools.configuration.pwd}"
-# 				puts "ldap_user .: #{Tools.configuration.ldap_user}"
-# 				puts "ldap_pass .: #{Tools.configuration.ldap_pass}"
-# 				Tools.configuration.info.each do |k,v|
-# 					ap k
-# 					ap v
-# 				end
-# 			else
-# 				ap Tools.get_variable param
-# 			end
-# 		end
-
-# 		desc "rsync"
-# 		command "rsync :from :to" do |from, to|
+#     extend Prompt::DSL
+
+#     group "Commands"
+
+#     desc "config"
+#     command "config" do ||
+#       Prompt.application.prompt = " tools > ".light_blue
+#     end
+
+#     desc "show"
+#     command "show :param" do |param|
+#       case param
+#       when 'config'
+#         puts "ROOT      .: #{Tools.root}"
+#         puts "USER      .: #{Tools.configuration.user}"
+#         puts "HOME      .: #{Tools.configuration.home}"
+#         puts "PWD       .: #{Tools.configuration.pwd}"
+#         puts "ldap_user .: #{Tools.configuration.ldap_user}"
+#         puts "ldap_pass .: #{Tools.configuration.ldap_pass}"
+#         Tools.configuration.info.each do |k,v|
+#           ap k
+#           ap v
+#         end
+#       else
+#         ap Tools.get_variable param
+#       end
+#     end
+
+#     desc "rsync"
+#     command "rsync :from :to" do |from, to|
 
 # ap Tools.configuration.info[:directorys_to][from].nil?
 
-# 			unless Tools.configuration.info[:directorys_to][from].nil?
-# 			 from = Tools.configuration.info[:directorys_to][from]
-# 			 from += ask("?? ")
-# 			else
-# 				sourcefiles = File.join("**", from)
-# 				Dir.glob(sourcefiles).each do |source|
-# 					ap source
-# 				end
-# 			end
+#       unless Tools.configuration.info[:directorys_to][from].nil?
+#        from = Tools.configuration.info[:directorys_to][from]
+#        from += ask("?? ")
+#       else
+#         sourcefiles = File.join("**", from)
+#         Dir.glob(sourcefiles).each do |source|
+#           ap source
+#         end
+#       end
 
 # ap from
 
-# 					# if File.file?(source)
-# 					# 	result = Rsync.run(source, dest)
-# 					# 	ap result
-# 					# end
-
-# 		end
-
-# 		desc "connect"
-# 		command "connect :host" do |host|
-# 			if host.split('@').size == 2
-# 				user = host.split('@')[0]
-# 				host = host.split('@')[1]
-# 			else
-# 				unless Tools.configuration.info[:servers][host].nil?
-# 					user = Tools.configuration.info[:servers][host].split('@')[0]
-# 					host = Tools.configuration.info[:servers][host].split('@')[1]
-# 				else
-# 					ap "No hosts selected! Exiting..."
-# 				end
-# 			end
-# 			ssh = Tools.ssh_connect_knowhost host, user
-# 			Tools.set_variable 'ssh', ssh
-# 		end
-
-
-# 		desc "cmd"
-# 		command "cmd :variable :command " do |variable, command|
-# 			ssh = Tools.get_variable 'ssh'
-# 			Tools.set_variable variable, (Tools.ssh_cmd ssh, command).split("\n")
-# 		end
-
-
-# 		Prompt.application.prompt = " tools > ".light_red
-# 		history_file = ".tools-history"
-# 		Prompt::Console.start history_file
+#           # if File.file?(source)
+#           #   result = Rsync.run(source, dest)
+#           #   ap result
+#           # end
+
+#     end
+
+#     desc "connect"
+#     command "connect :host" do |host|
+#       if host.split('@').size == 2
+#         user = host.split('@')[0]
+#         host = host.split('@')[1]
+#       else
+#         unless Tools.configuration.info[:servers][host].nil?
+#           user = Tools.configuration.info[:servers][host].split('@')[0]
+#           host = Tools.configuration.info[:servers][host].split('@')[1]
+#         else
+#           ap "No hosts selected! Exiting..."
+#         end
+#       end
+#       ssh = Tools.ssh_connect_knowhost host, user
+#       Tools.set_variable 'ssh', ssh
+#     end
+
+#     desc "cmd"
+#     command "cmd :variable :command " do |variable, command|
+#       ssh = Tools.get_variable 'ssh'
+#       Tools.set_variable variable, (Tools.ssh_cmd ssh, command).split("\n")
+#     end
+
+#     Prompt.application.prompt = " tools > ".light_red
+#     history_file = ".tools-history"
+#     Prompt::Console.start history_file
 
 #   end
 

data/lib/lib/display.rb

@@ -2,8 +2,7 @@ require 'singleton'
 class ToolsDisplay
   include Singleton
 
-  def initialize(options = {})
-  end
+  def initialize(options = {}); end
 
   # Tools to awesome prints
   #
@@ -14,41 +13,23 @@ class ToolsDisplay
   #
   # @param arguments
   # @return [String] printed
-  def self.show *arguments
+  def self.show(*arguments)
     post = arguments[0]
-    unless (post.class == String)
-      return post.class.to_s
-    end
+    return post.class.to_s unless post.is_a? String
 
     color      = arguments.extract_color
     sameline   = arguments.extract_symbol :sameline
-    #nocolor    = arguments.extract_symbol :nocolor
     colorized  = arguments.extract_symbol :colorized
-
-    unless sameline
-      post += "\n"
-    end
-
-    if colorized
-      printf "#{post}"
-    else
-      printf "#{post}".colorize(color)
-    end
-
-    # unless nocolor
-    #   printf "#{post}".colorize(color)
+    post += "\n" unless sameline
+    colorized ? printf(post.to_s) : printf(post.to_s.colorize(color))
+    # if colorized
+    #   printf post.to_s
     # else
-    #   if colorized
-    #     ap post
-    #   else
-    #     printf "#{post}"
-    #   end
+    #   printf post.to_s.colorize(color)
     # end
-
   end
 
-  def self.show_colorize *arguments
+  def self.show_colorize(*arguments)
     puts arguments.first
   end
-
-end
+end