power_stencil 0.8.5 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e85fced3b94ed8e71fa62e9aa7927e3326261c0
-  data.tar.gz: 45b93aeca4d3fda35ed2041517b78db4d19fe3a7
+  metadata.gz: 5c5b1fcf4935b7c66ff6f969180ff79d034c2895
+  data.tar.gz: 098a44fc1907977f33e078d285f92540d98291dd
 SHA512:
-  metadata.gz: 58666884718c08bfc17995f9d3056089a8e83c80b43bb47ba980eee2fab43a3c1ad5cfc6898db31cfed75661580066e47dc2ff4365edc159ced210841e1bab77
-  data.tar.gz: 3336919a1a5f71c37f536cf56e23fd54d24aeff8977be611ff054afde39d70498929009d6adee80a155ef0eb0b5c40584c2882e65a1bd875464029cbb39af2c5
+  metadata.gz: 60cc2f0ee6884afed9b18e2163ea4e2c9695e5ae05886b542e7fa1a437dd369672e2c133742ed0d18a79761ab8a20a70d1bbb3178a6790eda43d23c58ca6c8b6
+  data.tar.gz: c7645e56558aa929f61282539b9badc472c7f1376b3ec39194ea3f9c33695fd1c7b8245cc0e71aafbb2ff522bff3cc40c72b1b277d17f5e70333a98a05409084

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

@@ -24,11 +24,11 @@ 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
 
     end

data/lib/power_stencil/command_processors/init.rb

@@ -14,7 +14,7 @@ module PowerStencil
 
       def execute
         setup_project_path
-        log_startup_context
+        # log_startup_context
         puts_and_logs "Creating new project structure in '#{config[:'project-path']}'", check_verbose: false
         PowerStencil::Project::Base.create_project_tree config[:'project-path']
         puts_and_logs 'Done.', check_verbose: false

data/lib/power_stencil/initializer.rb

@@ -17,6 +17,7 @@ module PowerStencil
       logger.debug 'Starting PowerStencil initialization...'
       setup_system_processors
       setup_universe_compiler_logger
+      try_to_load_project fail_on_error: false
       logger.debug 'PowerStencil initialization complete'
     end
 
@@ -29,7 +30,12 @@ module PowerStencil
     include PowerStencil::Utils::FileHelper
 
     def try_to_load_project(fail_on_error: true)
-      PowerStencil::Project::Base.instantiate_from_config config
+      begin
+        PowerStencil::Project::Base.instantiate_from_config config
+      rescue => e
+        raise e if fail_on_error
+      end
+
     end
 
     def setup_system_processors

data/lib/power_stencil/project/git.rb

@@ -73,7 +73,6 @@ module PowerStencil
         logger.debug PowerStencil::Error.report_error(e)
         logger.warn 'This project is not managed by git'
         # Ensure Git will not be further used
-        config[:'no-git'] = true
         @git = nil
       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/utils/semantic_version.rb

@@ -76,6 +76,7 @@ module PowerStencil
       def analyze_semantic_version(semantic_version)
         case semantic_version
         when String
+          semantic_version = '0.0.0' if semantic_version.empty?
           version_string_to_hash semantic_version
         when SemanticVersion
           semantic_version.to_hash
@@ -85,6 +86,8 @@ module PowerStencil
             raise_analysis_error semantic_version unless semantic_version[level].is_a? Fixnum
           end
           semantic_version.dup
+        when NilClass
+          version_string_to_hash '0.0.0'
         else
           raise_analysis_error semantic_version
         end

data/lib/power_stencil/version.rb

@@ -1,3 +1,3 @@
 module PowerStencil
-  VERSION = '0.8.5'.freeze
+  VERSION = '0.8.10'.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.1'
+  spec.add_dependency 'universe_compiler', '~> 0.5.5'
   spec.add_dependency 'pry'
   spec.add_dependency 'git' , '~> 1.5.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_stencil
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.10
 platform: ruby
 authors:
 - Laurent Briais
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -299,12 +299,13 @@ 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.5 !\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
-  free to report issues: https://gitlab.com/tools4devops/power_stencil/issues\n\nType
-  'power_stencil adm --zsh-completion' to install auto-completion for zsh.\n\n  "
+post_install_message: "\nThank you for installing PowerStencil 0.8.10 !\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 free to
+  report issues: https://gitlab.com/tools4devops/power_stencil/issues\n\nType 'power_stencil
+  adm --zsh-completion' to install auto-completion for zsh.\n\n  "
 rdoc_options: []
 require_paths:
 - lib