power_stencil 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 925c1cdc265fdddbe244699558bfe8e89bdf28a7
-  data.tar.gz: 66b36b54757cc3593ce06d9da5c608485839b2bf
+  metadata.gz: cc9ed77abcf4685805caa1819d0692724a94dbc4
+  data.tar.gz: f40cf20d9083d1c83f75167750be7986f79353ce
 SHA512:
-  metadata.gz: e253fbedf2d8a29458168238a7b55dc8eb46a2f7c84b2f61cbed7653fc0a6e795f17c47ddf5cd8b4aa7a1a5ba389d3a86c36d55e5b18552350fd73399be4edc8
-  data.tar.gz: cfc7fc77bcbb74cab625c3b8bca40b9502943701e12509810eb41945f2390f7a7f528a1e8f6cec6be84434b55ae64b71ef0a39691fe7e4425b8403fc0a617390
+  metadata.gz: 0484e39c8be5b21407f7223536a8f9295b484414d413e904cee70c0580ac2b716875eaa9cd2ffa8ddca8a3db17b421ff2f1b7ac0f7fae0672c71826f11d29339
+  data.tar.gz: ad786d9773577cf4a9f90e724b06eb5ba8b4687b7fa2f0dc52acdcce18f8913006b30d407aa05ccb06ec7fc65f4c8e5cabe51c29756951e71367bb4e28dd72ab

data/doc/plugins.md

@@ -97,7 +97,7 @@ If you do a `power_stencil info` you see a new part appeared in the report
    - command_line: true
    - processors: true
    - build: true
-   - dsl: false
+   - dsl: true
    - entity_definitions: true
    - templates: true
 ```
@@ -123,7 +123,7 @@ Or with the capabilities information:
    command_line: true
    processors: true
    build: true
-   dsl: false
+   dsl: true
    entity_definitions: true
    templates: true
 ```
@@ -336,7 +336,8 @@ But this is not mandatory. Actually the only mandatory file for a plugin to be v
 :build: post_build_hook
 
 # If a dsl module is declared it will be injected in the DSL available in the shell or templates
-:dsl: null
+:dsl:
+ - Myplugin::Dsl::MypluginDsl
 
 # These are the files (array) defining entity types. These files should not be already 
 # required by the plugin as they will be required by the framework when needed.
@@ -349,7 +350,11 @@ But this is not mandatory. Actually the only mandatory file for a plugin to be v
   - etc/templates
 ```
 
-As it is quite self-documented, I won't too much elaborate on the meaning of each of the fields. But actually a plugin can actually provide ... nothing.
+As it is quite self-documented, I won't too much elaborate on the meaning of each of the fields.
+
+So you see that the plugin generated by the `power_stencil plugin --create` command is actually fully featured, providing all possible extras, in order to demonstrate the possibilities as well as ease your job, as you just have to fill the blanks or remove things you don't wan't.create
+
+But a plugin could also actually provide ... nothing.
 
 Let's create a plugin fully manually instead of using the `power_stencil plugin --create`. From the root of the project, let's create the directory:
 
@@ -375,7 +380,7 @@ Bam ! We just created a more than useless yet valid plugin ! You can check that
    - command_line: false
    - processors: false
    - build: false
-   - dsl: false
+   - dsl: true
    - entity_definitions: false
    - templates: false
 ```

data/etc/meta_templates/plugin_seed/etc/plugin_capabilities.yaml

@@ -19,7 +19,8 @@
 :build: post_build_hook
 
 # If a dsl module is declared it will be injected in the DSL available in the shell or templates
-:dsl: null
+:dsl:
+  - <%= plugin_module_name %>::Dsl::<%= plugin_module_name %>Dsl
 
 # These are the files (array) defining entity types. These files should not be already 
 # required by the plugin as they will be required by the framework when needed.

data/etc/templates/plugin_definition/etc/plugin_capabilities.yaml

@@ -19,7 +19,8 @@
 :build: post_build_hook
 
 # If a dsl module is declared it will be injected in the DSL available in the shell or templates
-:dsl: null
+:dsl:
+  - <%= plugin_module_name %>::Dsl::<%= plugin_module_name %>Dsl
 
 # These are the files (array) defining entity types. These files should not be already 
 # required by the plugin as they will be required by the framework when needed.

data/lib/power_stencil/engine/project_engine.rb

@@ -17,11 +17,18 @@ module PowerStencil
         @project = project
         load_system_entities_definition
         load_plugins_entities_definition
-        load_plugins_dsl_definition
         load_project_entities_definition
         load_entities
       end
 
+      def running_context(universe = root_universe, main_entry_point: nil)
+        context = dsl.new universe
+        apply_plugins_dsl_definition context
+        context.main_entry_point = main_entry_point
+        context.instance_eval do
+          binding
+        end
+      end
       protected
 
       def load_project_entities_definition
@@ -44,13 +51,13 @@ module PowerStencil
 
       def load_plugins_entities_definition
         project.plugins.each do |_, plugin|
-          plugin.require_plugin_entity_definitions if plugin.capabilities[:entity_definitions]
+          plugin.require_plugin_entity_definitions
         end
       end
 
-      def load_plugins_dsl_definition
+      def apply_plugins_dsl_definition(context)
         project.plugins.each do |_, plugin|
-          plugin.require_plugin_dsl if plugin.capabilities[:dsl]
+          plugin.apply_extra_dsl context
         end
       end
 

data/lib/power_stencil/plugins/base.rb

@@ -26,6 +26,7 @@ module PowerStencil
       include PowerStencil::Plugins::EntityDefinitions
       include PowerStencil::Plugins::Templates
       include PowerStencil::Plugins::Build
+      include PowerStencil::Plugins::Dsl
 
       attr_reader :name, :version, :entry_point_path
 

data/lib/power_stencil/plugins/dsl.rb

@@ -3,13 +3,32 @@ module PowerStencil
 
     module Dsl
 
-      def require_plugin_dsl
-        return unless capabilities[:dsl]
-        logger.info "Requiring '#{self.name}' DSL addon definition..."
-        plugin_definition[:dsl].each do |dsl_definition_file_path|
-          securely_require dsl_definition_file_path, fail_on_error: true
+      def dsl_modules_names
+        return [] if plugin_definition[:dsl].nil?
+        case plugin_definition[:dsl]
+        when String
+          [plugin_definition[:dsl]]
+        when Array
+          plugin_definition[:dsl]
+        else
+          raise PowerStencil::Error, "Invalid DSL definition for plugin '#{self.name}' !"
         end
       end
+
+      def dsl_modules
+        dsl_modules_names.map { |dsl_module_name| Object.const_get dsl_module_name }
+      end
+
+      def apply_extra_dsl(dsl_base)
+        dsl_modules.each do |dsl_module|
+          logger.debug "Applying extra DSL '#{dsl_module.name}' to base DSL..."
+          dsl_base.extend dsl_module
+        end
+
+      end
+
+
+
     end
 
   end

data/lib/power_stencil/version.rb

@@ -1,3 +1,3 @@
 module PowerStencil
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_stencil
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Laurent Briais
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -274,7 +274,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.5.0 !\nFrom the command
+post_install_message: "\nThank you for installing PowerStencil 0.5.1 !\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