power_stencil 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f12907b8b2e2bd5ff7e94f6f1c75241604cfef84
-  data.tar.gz: 66f1296b1df2d83e1f52625f8056d5ec46d17114
+  metadata.gz: a11e9c5260e1929526cc1555923592f3a3fd5041
+  data.tar.gz: 39c54949b912a3cf6aa298207f59cd2d3a4c58ee
 SHA512:
-  metadata.gz: 9c9968f5c422ec59ee0c4a33f184bca64b1501d879b7cc085a0b52a23a13afeeac25d487b373b0fb6d0999e958476962278fbb445aaf44834035623962857c93
-  data.tar.gz: 03bee415e4a53424a12df0aee9e611eea282fef903a4374b7877bf5befd3fa9b7890429430d22765d1836bfbbbe4ddababe1833d7221699fa2f5242b89d244f9
+  metadata.gz: b71ba2925c1f7c09ad2db22bb56d90b4b293114405bc03aac08b583fc9ddb991ca804425ef095ecf7ff548963c87d025912de4d348507de7972e13726983eb46
+  data.tar.gz: 9dc5cc390ea7f3adfa2d25893773b5a67c42a6b0be88e17bc3ed9de28e14fce009df8b913382d3dad35557df0a4132b2c2241553eda495a7435563af99ab5015

data/lib/power_stencil/command_processors/create.rb

@@ -51,17 +51,20 @@ module PowerStencil
 
       def modifications_valid?(modified_path, original_entity)
         test_entity = UniverseCompiler::Entity::Persistence.load modified_path
-        test_entity.valid?
-      rescue => e
-        logger.debug PowerStencil::Error.report_error(e)
-        logger.debug "Modifications applied to '#{original_entity.as_path}' are invalid !"
-        false
+        test_universe = project.engine.root_universe.dup
+        duplicated_entity = test_universe.get_entity *(original_entity.to_composite_key)
+        test_universe.replace duplicated_entity, test_entity
+        test_entity.resolve_fields_references!
+        test_entity.valid? raise_error: true
       end
 
       def edit_before_save(entity)
-        securely_edit_entity entity do |modified_path, _|
+        modified_entity = securely_edit_entity entity do |modified_path, _|
           modifications_valid? modified_path, entity
         end
+        project.engine.root_universe.replace entity, modified_entity
+        modified_entity.resolve_fields_references!
+        modified_entity
       end
 
 

data/lib/power_stencil/command_processors/edit.rb

@@ -28,11 +28,7 @@ module PowerStencil
         duplicated_entity = test_universe.get_entity *(original_entity.to_composite_key)
         test_universe.replace duplicated_entity, test_entity
         test_entity.resolve_fields_references!
-        test_entity.valid?
-      rescue => e
-        logger.debug PowerStencil::Error.report_error(e)
-        logger.debug "Modifications applied to '#{original_entity.as_path}' are invalid !"
-        false
+        test_entity.valid? raise_error: true
       end
 
     end

data/lib/power_stencil/utils/file_edit.rb

@@ -55,22 +55,29 @@ module PowerStencil
         begin
           FileUtils.copy file, tmp_file_path if retry_count == 1
           edit_file tmp_file_path
-          if block_given?
-            unless modifications_validation_block.call tmp_file_path, file
-              raise PowerStencil::Error, "Your modifications to '#{file}' are invalid !"
-            end
-          end
+          modifications_validation_block.call(tmp_file_path, file) if block_given?
           FileUtils.copy tmp_file_path, file
           logger.info "File '#{file}' updated successfully."
           file
         rescue StandardError => e
+          remaining_attempts = nb_max_edit_retries - retry_count
           retry_count += 1
+          msg = "Changes invalid: '#{e.message}'."
+          if remaining_attempts > 0
+            msg << " #{remaining_attempts} remaining attempt"
+            if remaining_attempts == 1
+              msg << '.'
+            else
+              msg << 's.'
+            end
+          end
+          puts_and_logs msg, logs_as: :error, check_verbose: false
           if retry_count > nb_max_edit_retries
-            logger.error "Your modifications are kept in '#{LAST_EDITED_FILE}' as it was invalid !"
             begin
               FileUtils.copy tmp_file_path, LAST_EDITED_FILE
+              puts_and_logs "Your modifications were kept in '#{LAST_EDITED_FILE}' as it was invalid !", logs_as: :error, check_verbose: false
             rescue => ue
-              logger.error 'Cannot keep your modifications !'
+              logger.error 'Ooops, something strange happened while saving your modifications. Cannot keep your modifications !'
               logger.debug PowerStencil::Error.report_error(ue)
             end
           else

data/lib/power_stencil/version.rb

@@ -1,3 +1,3 @@
 module PowerStencil
-  VERSION = '0.8.6'.freeze
+  VERSION = '0.8.7'.freeze
 end

data/power_stencil.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'climatic', '~> 0.2.32'
   spec.add_dependency 'dir_glob_ignore', '~> 0.3'
-  spec.add_dependency 'universe_compiler', '~> 0.5.3'
+  spec.add_dependency 'universe_compiler', '~> 0.5.5'
   spec.add_dependency 'pry'
   spec.add_dependency 'git' , '~> 1.5.0'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_stencil
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Laurent Briais
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +299,7 @@ metadata:
   documentation_uri: https://gitlab.com/tools4devops/power_stencil/blob/master/README.md
   source_code_uri: https://gitlab.com/tools4devops/power_stencil
   homepage_uri: https://powerstencil.brizone.org/
-post_install_message: "\nThank you for installing PowerStencil 0.8.6 !\nFrom the command
+post_install_message: "\nThank you for installing PowerStencil 0.8.7 !\nFrom the command
   line you can run `power_stencil --help`\nIf your shell is not completing the command:\n
   \ If you use rbenv: `rbenv rehash`\n  If you use zsh  : `rehash`\n\nOfficial Website
   \         : https://powerstencil.brizone.org/\nFull documentation here   : https://gitlab.com/tools4devops/power_stencil/blob/master/README.md\nFeel