power_stencil 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c8c69b2dc3cdadebcdf0899978842ccf2fe9759
-  data.tar.gz: 7381be842bd05452ba6c71f8e6cffb417eb4d9eb
+  metadata.gz: 7f0c8423324989df34f6a82f3d94876049918c72
+  data.tar.gz: cbc370533eacc74d7ab8c3c827c9ac491d233294
 SHA512:
-  metadata.gz: efe862901f45e4c0df84304f5aa41ddf5985f898e85b73d3d8ebe1822478007c59eadb72fcce2adb73dddc0b8394bb4c15899478485e34fcdf50d849dfccad66
-  data.tar.gz: ed7abb218f9551d5bc5732016874db6e34375a2581fdc2b4b69cdff3663af5d1baeb80114b48b35c35cccf1e104dbc0a369a33aef5c21b18bcddbbdfde00b452
+  metadata.gz: df40c5459e352c58ebb6bd8da2c737c21fdb41f09bb4ec9c52f11fdbb2f9fa6d8f75282f9fb16981970625929e594e62e4bd51b8516db7517ee338383bc8210f
+  data.tar.gz: 9490d7ac9be83f7b6993ff201d0ab72f1cc5baa7701a4edfe7dfc81e6bca6d082dc01193cac35bf5ed75d28428629aed806e80b049f838440e3b924bcefb197c

data/etc/meta_templates/plugin_seed/lib/{entity}.rb.erb

@@ -23,7 +23,7 @@ module <%= plugin_module_name %>
         puts File.readlines(generated_file)
       end
     else
-      raise PowerStencil::Error, 'Plugin <%= plugin_name %> doesnt know how handle the build of a <%= plugin_name %>_entity entity type !'
+      raise PowerStencil::Error, "Plugin '<%= plugin_name %>' doesnt know how handle the build of a '#{built_entity.type}' type !"
     end
   end
 

data/etc/templates/plugin_definition/lib/{entity}.rb.erb

@@ -23,7 +23,7 @@ module <%= plugin_module_name %>
         puts File.readlines(generated_file)
       end
     else
-      raise PowerStencil::Error, 'Plugin <%= plugin_name %> doesnt know how handle the build of a <%= plugin_name %>_entity entity type !'
+      raise PowerStencil::Error, "Plugin '<%= plugin_name %>' doesnt know how handle the build of a '#{built_entity.type}' type !"
     end
   end
 

data/lib/power_stencil/command_processors/build.rb

@@ -21,7 +21,7 @@ module PowerStencil
             source_provider = entity_class.entity_type_source_provider
             source_provider_display = if source_provider == PowerStencil
                                         "'#{source_provider.name}'"
-                                      elsif source_provider == project
+                                      elsif source_provider.is_a? project.class
                                         "project '#{source_provider.name}'"
                                       elsif source_provider.is_a? PowerStencil::Plugins::Base
                                         "plugin '#{source_provider.name}'"

data/lib/power_stencil/command_processors/check.rb

@@ -27,7 +27,7 @@ module PowerStencil
           source_provider = entity.class.entity_type_source_provider
           source_provider_display = if source_provider == PowerStencil
                                       "'#{source_provider.name}'"
-                                    elsif source_provider == project
+                                    elsif source_provider.is_a? project.class
                                       "project '#{source_provider.name}'"
                                     elsif source_provider.is_a? PowerStencil::Plugins::Base
                                       "plugin '#{source_provider.name}'"

data/lib/power_stencil/engine/entities_definitions.rb

@@ -1,3 +1,5 @@
+require 'power_stencil/project/require_entity_definitions'
+
 module PowerStencil
   module Engine
 
@@ -21,30 +23,41 @@ module PowerStencil
             next
           end
           # This is a ruby library or there is something wrong
-          securely_require_with_entity_class_detection file_or_dir, source
 
+          # securely_require_with_entity_class_detection file_or_dir, source
+          securely_require_with_entity_class_detection(source) do
+            securely_require file_or_dir, fail_on_error: true
+          end
+
+        end
+        required_files.sort!.each do |file|
+          securely_require_with_entity_class_detection source do
+            securely_require file, fail_on_error: true
+          end
         end
-        required_files.sort!.each { |file| securely_require_with_entity_class_detection file, source }
         required_files
       end
 
       private
 
+      include PowerStencil::Project::RequireEntityDefinition
+
       def load_system_entities_definition
         require_definition_files [SYSTEM_ENTITY_DEFINITION_ENTRY_POINT], PowerStencil
       end
 
-      def securely_require_with_entity_class_detection(entity_definition_file_path, source)
-        before = PowerStencil::Engine::EntitiesHandling.all_types
-        securely_require entity_definition_file_path, fail_on_error: true
-        after = PowerStencil::Engine::EntitiesHandling.all_types
-        after.reject { |k, _| before.keys.include? k }
-            .each do |_, plugin_entity_class|
-          plugin_entity_class.instance_eval do
-            @entity_type_source_provider = source
-          end
-        end
-      end
+    #   def securely_require_with_entity_class_detection(entity_definition_file_path, source)
+    #     before = PowerStencil::Engine::EntitiesHandling.all_types
+    #     securely_require entity_definition_file_path, fail_on_error: true
+    #     after = PowerStencil::Engine::EntitiesHandling.all_types
+    #     after.reject { |k, _| before.keys.include? k }
+    #         .each do |_, plugin_entity_class|
+    #       plugin_entity_class.instance_eval do
+    #         @entity_type_source_provider = source
+    #       end
+    #     end
+    #   end
+
     end
 
   end

data/lib/power_stencil/plugins/entity_definitions.rb

@@ -1,3 +1,5 @@
+require 'power_stencil/project/require_entity_definitions'
+
 module PowerStencil
   module Plugins
 
@@ -6,25 +8,17 @@ module PowerStencil
       def require_plugin_entity_definitions
         return unless capabilities[:entity_definitions]
         logger.info "Requiring '#{self.name}' plugin entity definitions..."
-        securely_require_with_entity_class_detection
-      end
+        securely_require_with_entity_class_detection(self) do
+          plugin_definition[:entity_definitions].each do |entity_definition_file_path|
+            securely_require entity_definition_file_path, fail_on_error: true
+          end
+        end
 
+      end
 
       private
 
-      def securely_require_with_entity_class_detection
-        before = PowerStencil::Engine::EntitiesHandling.all_types
-        plugin_definition[:entity_definitions].each do |entity_definition_file_path|
-          securely_require entity_definition_file_path, fail_on_error: true
-        end
-        after = PowerStencil::Engine::EntitiesHandling.all_types
-        after.reject { |k, _| before.keys.include? k }.each do |_, plugin_entity_class|
-          plugin = self
-          plugin_entity_class.instance_eval do
-            @entity_type_source_provider = plugin
-          end
-        end
-      end
+      include PowerStencil::Project::RequireEntityDefinition
 
     end
 

data/lib/power_stencil/project/base.rb

@@ -9,6 +9,7 @@ require 'power_stencil/project/templates'
 require 'power_stencil/project/plugins'
 require 'power_stencil/project/git'
 require 'power_stencil/project/completion'
+require 'power_stencil/project/require_entity_definitions'
 
 require 'power_stencil/engine/project_engine'
 require 'power_stencil/engine/entity_engine'

data/lib/power_stencil/project/info.rb

@@ -64,7 +64,7 @@ module PowerStencil
           source_provider = klass.entity_type_source_provider
           source_provider_display = if source_provider == PowerStencil
                                       "'#{source_provider.name}'"
-                                    elsif source_provider == self
+                                    elsif source_provider.is_a? self.class
                                       "project '#{source_provider.name}'"
                                     elsif source_provider.is_a? PowerStencil::Plugins::Base
                                       "plugin '#{source_provider.name}'"

data/lib/power_stencil/project/require_entity_definitions.rb

@@ -0,0 +1,21 @@
+module PowerStencil
+  module Project
+
+    module RequireEntityDefinition
+
+      def securely_require_with_entity_class_detection(source, &block)
+        before = PowerStencil::Engine::EntitiesHandling.all_types
+        yield
+        after = PowerStencil::Engine::EntitiesHandling.all_types
+        after.reject { |k, _| before.keys.include? k }.each do |_, defined_entity_class|
+          provider = source
+          defined_entity_class.instance_eval do
+            @entity_type_source_provider = provider
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/power_stencil/version.rb

@@ -1,3 +1,3 @@
 module PowerStencil
-  VERSION = '0.9.4'.freeze
+  VERSION = '0.9.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_stencil
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Laurent Briais
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -288,6 +288,7 @@ files:
 - lib/power_stencil/project/paths.rb
 - lib/power_stencil/project/plugins.rb
 - lib/power_stencil/project/proxy.rb
+- lib/power_stencil/project/require_entity_definitions.rb
 - lib/power_stencil/project/templates.rb
 - lib/power_stencil/project/versioning.rb
 - lib/power_stencil/system_entity_definitions/all.rb
@@ -327,7 +328,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.9.4 !\nFrom the command
+post_install_message: "\nThank you for installing PowerStencil 0.9.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