carioca 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23b95a753d4b358bde71f7d1e9f59ba9456b40302ef9a028a5e791a00c2c7d07
-  data.tar.gz: cb29906d32001f5eecf0b7f78e161cf86436b11cec67377a9efacd2ecf63a469
+  metadata.gz: 99fbf2409631fe5afb97b9807059612f5eaa0e237bf44685a8f9aa993db1b87b
+  data.tar.gz: 36636acf529dc8610985e3bd96310482a0e0f9003836c6a902411cf908735166
 SHA512:
-  metadata.gz: b105358ef95e063ffdeea22f81eff91dc0a9044b6dcc941fb0449b0d5f6a9b8106d2cdead2d6fd81223b5863d3a2e8ec902d0ce339c24b6c350f84dbcbd4fb4c
-  data.tar.gz: ccd2744676d47b0dd3e6e25acf29194441c2217018d7b1ca1266b55ad598a942b23ae219c26277b6b2986c67c1dcce1b1dc74ee041e4b32f1fab1ec4ed21c567
+  metadata.gz: c9dccd95e578ea578f226c273c132f6021a23b856a25606557044cbaa0aea3403e0522b236c87a581a69653fc0264c8c3c38eb643baf4e9538db5534ffe0a316
+  data.tar.gz: b64096695a61f14423ca8d90363b3fd1d09317aa3eac742e4e9aef4b4ff0381cfd0f443fca2d498092673fd122d639e8b93f182ba1854d38fe138e742e19dc5d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    carioca (2.0.2)
+    carioca (2.0.3)
       deep_merge (~> 1.2)
       i18n (~> 1.10)
       locale (~> 2.1)

data/config/locales/en.yml

@@ -17,3 +17,7 @@ en:
   config:
     load:
       error: "Config file ignored, error : %{message}"
+      success: "Configuration Service successfully initialized from : %{from}"
+  output: 
+    load:
+      context: "Output service initialized in mode : %{confset}"

data/config/locales/fr.yml

@@ -16,4 +16,8 @@ fr:
       success: "Registre initialisé avec succès"
   config:
     load:
-      error: "Fichier de configuration ignoré, erreur : %{message}"
+      error: "Fichier de configuration ignoré, erreur : %{message}"
+      success: "Service de configuration initialisé avec succès depuis : %{from}"
+  output: 
+    load:
+      context: "Service output initialisé en mode : %{confset}"

data/lib/carioca/configuration.rb

@@ -2,7 +2,7 @@ module Carioca
     class Configuration
         include Carioca::Constants
         include Carioca::Helpers
-        attr_accessor :filename, :name, :builtins, :log_target, :default_locale, :locales_load_path
+        attr_accessor :filename, :name, :builtins, :log_target, :default_locale, :locales_load_path, :debugger_tracer
         attr_accessor :config_file, :config_root, :environment, :supported_environment, :output_mode, :log_level
         attr_writer :debug, :init_from_file,  :output_colors, :output_emoji
         attr_reader :log_file, :locales_availables
@@ -30,6 +30,7 @@ module Carioca
             Dir[path + '/*.yml'].sort.each do |file|
                 @locales_availables.push File::basename(file,'.yml').to_sym
             end
+            @debugger_tracer = DEFAULT_DEBUGGER_TRACER.dup
         end
 
         def debug? 

data/lib/carioca/constants.rb

@@ -1,7 +1,7 @@
 module Carioca
     module Constants
 
-        VERSION = '2.0.2'
+        VERSION = '2.0.3'
         DEFAULT_REGISTRY_FILE  = './config/carioca.registry'
         DEFAULT_CONFIG_FILE = './config/settings.yml'
         DEFAULT_ENVIRONMENT = :development
@@ -14,6 +14,9 @@ module Carioca
         DEFAULT_COLORS_STATUS = true
         DEFAULT_LOG_LEVEL = :info
 
+
+        DEFAULT_DEBUGGER_TRACER = :output
+
         # service definitions specs
         SERVICES_MANDATORY_SPECS = {type: Symbol, service: String}
         SERVICES_FULL_LIST_SPECS = SERVICES_MANDATORY_SPECS.merge({depends: Array, description: String, resource: String })
@@ -53,6 +56,11 @@ module Carioca
                                 colors: Carioca::Registry.config.output_colors?,
                                 level: Carioca::Registry.config.log_level
             )"
+          },
+          debugger:{
+            type: :internal,
+            description: "The Debugger Service of Carioca",
+            service: "Carioca::Services::Debugger"
           }
         }
 

data/lib/carioca/rake/manage.rb

@@ -2,6 +2,9 @@
 require 'rake'
 require 'rubygems'
 require 'carioca'
+require "tty-prompt"
+require "pastel"
+
 
 $VERBOSE = nil
 if Gem::Specification.respond_to?(:find_by_name)

data/lib/carioca/rake/tasks/config.tasks

@@ -0,0 +1,46 @@
+namespace :carioca do
+     namespace :services do
+         namespace :config do 
+            desc "Initialise Service configuration file ./config/settings.yml file"
+            task :init do 
+                begin
+                    prompt = TTY::Prompt.new
+                    pastel = ::Pastel.new
+
+                    if File::exist? "./config/settings.yml" then 
+                        puts pastel.yellow "WARNING : config file already exist, if you continue, you will destroy it !"
+                        continue = prompt.yes?("continue ? ") do |q|
+                            q.default false
+                        end
+                        print "Carioca : "                            
+                        unless continue then 
+                            puts pastel.yellow "canceled"
+                            exit 5
+                        else
+                            File::unlink "./config/settings.yml"
+                            puts pastel.cyan "Reset File"
+                        end
+                    end
+
+                    unless File::exist? "./config" then
+                        puts pastel.red "Carioca is not initialized for Gem usage, perhaps need to run :"
+                        puts pastel.red "$ rake carioca:gem:init_path"
+                        exit 10
+                    end
+                    puts "Carioca : initializing default config file (./config/settings.yml): "
+                    root = prompt.ask("Root config name ? (like your gem/App name)") { |q| 
+                        q.modify :down
+                        q.required true }.to_sym
+                    print "Carioca : Generating config file : "
+                    structure = {root => {:production => {}, :staging => {}, :development => {}, :test => {}, :default => {}}}
+                    File.open('./config/settings.yml', 'w') { |file| file.write(structure.to_yaml) } 
+                    puts pastel.green 'done'
+                rescue TTY::Reader::InputInterrupt
+                    print "Carioca : "
+                    puts pastel.yellow 'interrupted'
+                   exit 5
+                end
+            end
+        end
+    end
+end

data/lib/carioca/rake/tasks/gem.tasks

@@ -0,0 +1,15 @@
+namespace :carioca do
+     namespace :gem do
+        desc "prepare Gem vitals path for Carioca"
+        task :init_path do 
+            pastel = Pastel.new
+            if File::exist? "./config/locales"
+                puts pastel.yellow "Carioca path already initialized"
+            else
+                print 'Carioca : Initialising vitals gem path : '
+                FileUtils.mkdir_p "./config/locales"
+                puts pastel.green "done"
+            end
+        end
+    end
+end

data/lib/carioca/rake/tasks/registry.tasks

@@ -1,15 +1,18 @@
-require "tty-prompt"
-require "pastel"
-
 namespace :carioca  do
     namespace :registry do 
         desc "Adding service to Carioca Registry file"
         task :add_service do
+        prompt = TTY::Prompt.new
+            pastel = ::Pastel.new
             begin 
+                unless File::exist? "./config" then
+                
+                    puts pastel.yellow "Carioca is not initialized for Gem usage, perhaps need to run :"
+                    puts pastel.yellow "$ rake carioca:gem:init_path"
+                    exit unless prompt.yes?("Do you want to continue, with a standalone registry (not recommanded). ? ")
+                end
                 puts "Carioca : registering service :"
                 config = Carioca::Configuration::new
-                prompt = TTY::Prompt.new
-                pastel = Pastel.new
                 filename = prompt.ask("Registry File path ?", default: config.filename)
                 registry_file = Carioca::RegistryFile::new filename: filename
                 name = prompt.ask("Service name ?") { |q| q.required true }.to_sym
@@ -36,22 +39,26 @@ namespace :carioca  do
                 end
                 is_correct = prompt.yes?("Is it correct ? ")
             rescue TTY::Reader::InputInterrupt
-                puts 'Carioca : interrupted'
+                print "Carioca : "
+                puts pastel.yellow 'interrupted'
                 exit 5
             end
+             print "Carioca : Registry saving : "
             if is_correct then 
                 begin
                     registry_file.add service: name, definition: definition
                     registry_file.save!
                 rescue => e 
-                    puts "Carioca: Can't save : #{e}"
+                    print pastel.red "failed" 
+                    puts " error : #{e}"
                     exit 10
                 end
 
-                puts "Carioca : Registry saved"
+                puts pastel.green "done"
             else
-                puts 'Carioca : Nothing saved'
+                puts pastel.yellow 'canceled'
             end
         end
     end
-  end
+  
+end

data/lib/carioca/registry.rb

@@ -25,7 +25,7 @@ module Carioca
 
           raise "Service not found: #{name}" unless @services.include? name
           if @active_services.include? name then 
-            debug message: i18n.t('service.getting', name: name) if @active_services.include? :logger and ![:logger, :i18n].include? name and @@config.debug?
+            debug message: i18n.t('service.getting', name: name) if @active_services.include? :logger and ![:logger, :i18n, :output].include? name and @@config.debug?
           else
             service = @services[name]
             service[:depends].each do|dep|

data/lib/carioca/services/config.rb

@@ -85,7 +85,7 @@ class Hash
                     registry = Carioca::Registry.get
                     @logger = registry.get_service name: :logger
                     @i18n = registry.get_service name: :i18n
-                    
+                    @debug = Carioca::Registry.config.debug?
                     @stage = stage
                     @root = root
                     @config_file = Carioca::Services::Config::ConfigFile::new filename: config_filename
@@ -101,7 +101,7 @@ class Hash
                 private
                 def initconf
                     newsets = {}
-                    @logger.debug("Carioca->Config") { @i18n.t('config.load.error', message: @config_file.error) } if @config_file.error? 
+                    @logger.debug("Carioca->Config") { @i18n.t('config.load.error', message: @config_file.error) } if @config_file.error? and @debug
                     @content = @config_file.data
 
                     unless @stage then
@@ -112,6 +112,7 @@ class Hash
                         self.deep_merge! data
 
                     end
+                    @logger.debug("Carioca->Config") { @i18n.t('config.load.success', from: @config_file.filename) } if @debug
 
 
                 end

data/lib/carioca/services/debug.rb

@@ -0,0 +1,58 @@
+module Carioca
+    module Services
+        class Debugger
+
+            def Debugger.get(service:, trace: Carioca::Registry.config.debugger_tracer)
+                return ProxyDebug::new service: service, trace: trace
+            end
+
+
+        end
+
+        class ProxyDebug
+            def initialize(service:, trace:)
+                registry = Carioca::Registry.get
+                @service = registry.get_service name: service
+                @tracers = [:output, :logger]
+                raise "Debugger :trace is not valid : #{trace}, must be in : #{@tracers.to_s}" unless @tracers.include? trace
+                @tracer = registry.get_service name: trace
+                @tracer_type = trace
+            end
+
+            def method_missing(methodname, *args, **keywords,&block)
+                
+                trace message: "BEGIN CALL for service #{@service} "
+                trace message: "Method called: #{methodname} " 
+                trace message: "args : #{args.join " "}" 
+                trace message:  "keywords : #{keywords.to_s}"
+                if block_given? then
+                    trace message: "block given" 
+                    a = @service.send(methodname, *args, **keywords,&block)
+                else
+                    a = @service.send(methodname, *args, **keywords)
+                end
+                trace message: "=> method returned: #{a} " 
+                trace message: 'END CALL' 
+               
+                return a
+            end
+
+            def trace(message: )
+                if @tracer_type == :output then 
+                    save = @tracer.mode
+                    @tracer.mode = :mono 
+                    @tracer.debug message 
+                    @tracer.mode = save
+                else
+                    @tracer.debug("Carioca->ProxyDebug") { message }
+                end
+
+            end
+
+            
+
+
+        end
+
+    end
+end

data/lib/carioca/services/output.rb

@@ -70,13 +70,13 @@ module Carioca
                 MODE = [:mono, :dual]
                 
                 LEVELS.each do |method|
-                    define_method(method) do |message, session = ''|
-                        self.display(level: method, message:  message, session: session)
+                    define_method(method) do |message, session = '', source = 'Carioca->Output'|
+                        self.display(level: method, message:  message, session: session, source: source)
                     end
                 end
                 @@alias.keys.each do |method|
-                    define_method(method) do |message, session = ''|
-                        self.display( level: method, message: message, session: session)
+                    define_method(method) do |message, session = '',source = 'Carioca->Output'|
+                        self.display( level: method, message: message, session: session, source: source)
                     end
                 end
                 
@@ -104,14 +104,16 @@ module Carioca
                 
                 # constructor
                 def initialize(level: :debug, mode: :mono , emoji: true, colors: true)
+                    registry = Carioca::Registry.get
+                    @logger = registry.get_service name: :logger
+                    @i18n = registry.get_service name: :i18n
+                    @debug = Carioca::Registry.config.debug?
                     self.level = level
                     @mode = mode
-                    @emoji = emoji
+                    @emoji = (check_unicode_term)? emoji : false
                     @color = colors
-                    if @mode == :dual then 
-                        registry = Carioca::Registry.get
-                        @logger = registry.get_service name: :logger
-                    end
+                    set = []; set.push mode; set.push :emoji if @emoji ; set.push :colors if @color
+                    @logger.debug("Carioca->Output") { @i18n.t('output.load.context', confset: set.to_s ) } if  @debug
                     raise "Unknown output mode : #{@mode}" unless MODE.include? @mode
                 end
                 
@@ -136,12 +138,23 @@ module Carioca
                     @active_levels.shift(LEVELS.index(level))
                 end
                 
+                # check if unicode must be used with term ENV
+                # @return [Boolean]
+                def check_unicode_term
+                    return false unless ENV.include? "TERM"
+                    if ENV.values_at("LC_ALL","LC_CTYPE","LANG").compact.first.include?("UTF-8") and ENV.values_at('TERM').first.include? "xterm" then
+                    return true
+                    else
+                    return false
+                    end
+                end
+
                 
                 # abstract method for log wrapper
                 # @param [Hash] params
                 # @option params [Symbol] :level, a valid level in LEVELS or ALIAS
                 # @option params [String] :message text
-                def display(level: , message: , session:)
+                def display(level: , message: , session:, source:)
                     save = message.dup
                     target_level = (@@alias.keys.include? level)?  @@alias[level] : level
                     if @active_levels.include? target_level then
@@ -160,7 +173,8 @@ module Carioca
                             unless LEVELS.include? level
                                 save  =  "#{@@emoji[level][:text]} #{save}" if @@emoji[level].include? :text
                             end 
-                            @logger.send target_level, save
+                            block = Proc::new {save}
+                            @logger.send target_level, source, &block
                         end
                         puts message
                     end

data/samples/test.rb

@@ -4,7 +4,7 @@ require 'carioca'
 
 Carioca::Registry.configure do |spec|
     spec.filename = './config/carioca.registry'
-    spec.debug = false
+    spec.debug = true
     spec.init_from_file = true
     #    spec.log_file = '/tmp/test.rge'
     spec.config_file = './config/settings.yml'
@@ -13,8 +13,10 @@ Carioca::Registry.configure do |spec|
     spec.default_locale = :fr
     spec.log_level = :debug
     spec.output_mode = :mono
-
+    spec.output_emoji = true
+    spec.output_colors = true
     spec.locales_load_path << Dir[File.expand_path('./config/locales') + "/*.yml"]
+    spec.debugger_tracer = :output
 end
 
 
@@ -29,6 +31,12 @@ class MyService
     def hello
         logger.info(self.class.to_s) {'Hello World'}
     end
+
+    def method_test(titi, tutu: )
+        yield if block_given?
+        return "result"
+    end     
+
 end
 
 
@@ -62,6 +70,7 @@ class MonAppli < Carioca::Container
     logger.info(self.to_s) { uuid.generate }
 
     inject service: :output
+    inject service: :debugger
 
     def test2
         cycle = [:unknown,:fatal,:error,:ko,:warn,:info,:item,:arrow,:scheduling,:trigger,:sending, :calling,:receive,:ok,:success,:debug,:flat]
@@ -83,6 +92,13 @@ class MonAppli < Carioca::Container
 
     end
 
+    def test3
+        proxy = debugger.get service: :myservice
+        proxy.method_test "param", tutu: "keyword" do 
+            puts 'titi'
+        end
+    end
+
 end
 
 
@@ -91,7 +107,11 @@ end
 
 appli = MonAppli::new
 appli.test
-appli.test2
+#appli.test2
+appli.test3
+
+
+
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carioca
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -137,10 +137,13 @@ files:
 - lib/carioca/helpers.rb
 - lib/carioca/mixin.rb
 - lib/carioca/rake/manage.rb
+- lib/carioca/rake/tasks/config.tasks
+- lib/carioca/rake/tasks/gem.tasks
 - lib/carioca/rake/tasks/registry.tasks
 - lib/carioca/registry.rb
 - lib/carioca/registry_file.rb
 - lib/carioca/services/config.rb
+- lib/carioca/services/debug.rb
 - lib/carioca/services/i18n.rb
 - lib/carioca/services/init.rb
 - lib/carioca/services/output.rb