carioca 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d835f54ee7bbeee2d8536aa2baaee5ea96800e6c044b52ba15a5f9c711dad72
-  data.tar.gz: 3bed4c3fbe420f22f3e4949b5b9c9eae874475f941f9c6ede40c8b72a801f9bc
+  metadata.gz: c4b9f0de3ab110e59c5c5f7f9a37149d0c29dfab987770b4d6e7e6241e9d1845
+  data.tar.gz: 50e15e047298d831a454abfcafedbd69ce54d8b77d2e4c744bbb71e438b389c8
 SHA512:
-  metadata.gz: da28ddf9bc986db91af0ed59825e42753dbe8c1dd86dbf6a0412faa5af64b917624c7a0b12648fadf12f11e8b42b7c81aa74a4e70e4c4c8e50b0a6adbf919304
-  data.tar.gz: b487f45e3a31842aa06994721e5856ba14c0406f2267c08a5184915b737444508bf97031c94d4f0864ef1abf6697e14f887ad594c746b6fa704759c8d3554623
+  metadata.gz: 9fc6a2f28e899dc0a8e5b57ffcf7df165cdf80f369c59c3a250f0584b79d6c613982e54aea1892ccda80a154ec19af46c61e27dc5f8d63d34d5a094f1ada13a5
+  data.tar.gz: 0f00db3ff79e1e668b49fbca89fbe737761db87ce783e0ee9cb4a80bb01b8ff4ce3dae817756f26caf29dfa5a58865e0ddf66fcdae7353cdb3a527e5b9b0cd77

data/.debride_withelist

@@ -44,6 +44,6 @@ install_file
 make_link
 get_processes
 group_root
-is_root?
+root?
 extended
 method_missing

data/.rubocop.yml

@@ -24,6 +24,11 @@ Style/MissingRespondToMissing:
   Enabled: false
 Gemspec/RequireMFA:
   Enabled: false
+Metrics/BlockLength:
+  Enabled: true
+  Exclude:
+    - 'spec/carioca_spec.rb'
+    - 'carioca.gemspec'
 
 
 # to study :

data/VERSION

@@ -1 +1 @@
-2.1.8
+2.1.9

data/carioca.gemspec

@@ -37,14 +37,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tty-prompt', '~>0.23.1'
   spec.add_development_dependency 'bundle-audit', '~> 0.1.0'
   spec.add_development_dependency 'code_statistics', '~> 0.2.13'
+  spec.add_development_dependency 'diff-lcs', '~> 1.5.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.32'
   spec.add_development_dependency 'yard', '~> 0.9.27'
   spec.add_development_dependency 'yard-rspec', '~> 0.1'
-  spec.add_development_dependency 'diff-lcs', '~> 1.5.1'
   spec.metadata['rubygems_mfa_required'] = 'false'
   spec.add_dependency 'version', '~> 1.1'
   spec.add_runtime_dependency 'ps-ruby', '~> 0.0.4'
   spec.add_development_dependency 'cyclonedx-ruby', '~> 1.1'
+  spec.add_development_dependency 'debride', '~> 1.12'
 end

data/lib/carioca/services/finisher.rb

@@ -12,7 +12,6 @@ module Carioca
       end
     end
 
-
     class AlternativeCatcher < StandardError
       attr_reader :return_case, :data
 
@@ -106,15 +105,13 @@ module Carioca
           data = yield if block_given?
           result = structured ? do_return(return_case:).merge({ data: }) : data
         rescue StandardError => e
-          key = :status_ko
-          more = "#{e.class} : #{e.message}"
-          if e.respond_to?(:error_case)
-            result = do_return(return_case: e.error_case, more: e.message)
-          elsif e.respond_to?(:return_case)
-            result = structured ? do_return(return_case: e.return_case, more: e.message).merge({ data: e.data}) : e.data
-          else  
-            result = do_return(return_case: :status_ko, more: "#{e.class.to_s} : #{e.message}")
-          end
+          result = if e.respond_to?(:error_case)
+                     do_return(return_case: e.error_case, more: e.message)
+                   elsif e.respond_to?(:return_case)
+                     structured ? do_return(return_case: e.return_case, more: e.message).merge({ data: e.data }) : e.data
+                   else
+                     do_return(return_case: :status_ko, more: "#{e.class} : #{e.message}")
+                   end
         end
         if status && structured && json
           { status: result[:code], data: JSON.pretty_generate(JSON.parse(result.to_json)) }
@@ -125,11 +122,10 @@ module Carioca
         end
       end
 
-      def secure_alternative(message: , return_case: :accepted, data: )
-        raise AlternativeCatcher.new(message, return_case: return_case, data: data)
+      def secure_alternative(message:, data:, return_case: :accepted)
+        raise AlternativeCatcher.new(message, return_case:, data:)
       end
 
-
       def secure_execute!(exit_case: :success_exit)
         begin
           more = yield

data/lib/carioca/services/output.rb

@@ -183,10 +183,10 @@ module Carioca
               block = proc { save }
               @logger.send target_level, source, &block
             end
-            if @target == :stderr then
-              $stderr.puts message if (@mode == :mono) || (@mode == :dual)
-            else
-              $stdout.puts message if (@mode == :mono) || (@mode == :dual)
+            if @target == :stderr
+              warn message if (@mode == :mono) || (@mode == :dual)
+            elsif (@mode == :mono) || (@mode == :dual)
+              $stdout.puts message
             end
           end
         end

data/samples/test.rb

@@ -152,17 +152,15 @@ sanitycheck = Carioca::Registry.get.get_service name: :sanitycheck
 sanitycheck.run
 
 puts "\nTest 14 : Service SecureStore init or access"
- securestore = Carioca::Registry.get.get_service name: :securestore
+securestore = Carioca::Registry.get.get_service name: :securestore
 
 puts "\nTest 15 : Service SecureStore getting previous data"
- res = (securestore.data.empty?)? "first time" : securestore.data.to_s
- output.info res
-
+res = securestore.data.empty? ? 'first time' : securestore.data.to_s
+output.info res
 
 puts "\nTest 16 : Service SecureStore setting new data"
- securestore.data[:time] = Time.now.to_s
- securestore.save!
-
+securestore.data[:time] = Time.now.to_s
+securestore.save!
 
 puts "\nTest 17 : Service finisher : test all cases"
 output.item 'flat api return, no-json, no-structured'
@@ -175,14 +173,14 @@ puts test
 output.item 'api return, no-json, no-structured but with secure_raise'
 test = finisher.secure_api_return(return_case: :status_ok, structured: false, json: false) do
   finisher.secure_raise message: 'error !', error_case: :status_ko
-    { test: 'test'}
+  { test: 'test' }
 end
 puts test
 
 output.item 'api return, json, structured but with secure_raise'
 test = finisher.secure_api_return(return_case: :status_ok, structured: true, json: true) do
   finisher.secure_raise message: 'error !', error_case: :status_ko
-  test = { test: 'test'}
+  test = { test: 'test' }
   test
 end
 puts test[:status]
@@ -196,34 +194,32 @@ end
 puts test[:status]
 puts test[:data]
 
-
 output.item 'api return, json, structured with alternative'
 test = finisher.secure_api_return(return_case: :status_ok, structured: true, json: true) do
   test = { test: 'test' }
-  finisher.secure_alternative message: "test alernative", return_case: :accepted, data: test
+  finisher.secure_alternative message: 'test alernative', return_case: :accepted, data: test
   test
 end
 puts test[:status]
 puts test[:data]
 
-
 output.item 'api return, json, structured with alternative'
 test = finisher.secure_api_return(return_case: :status_ok, structured: false, json: false) do
   test = { test: 'test' }
-  finisher.secure_alternative message: "test alernative", return_case: :accepted, data: test
+  finisher.secure_alternative message: 'test alernative', return_case: :accepted, data: test
   test
 end
 puts test
 
 output.item 'api return, json, structured with status=false'
 test = finisher.secure_api_return(return_case: :status_ok, structured: true, json: true, status: false) do
-  { test: 'test'}
+  { test: 'test' }
 end
 puts test
 
 output.item 'api return, json, structured but raising unknown case'
 test = finisher.secure_api_return(return_case: :status_ok, structured: true, json: true, status: false) do
-  raise "Boom"
+  raise 'Boom'
 end
 puts test
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carioca
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Romain GEORGES
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.13
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: diff-lcs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: version
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: debride
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
 description: 'Carioca 2: is a complete rewrite who provide a full IoC/DI light Container
   and a services registry, build with logs, config and Internationalization facilities
   for designing your applications'