power_stencil 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa24834795adfb76db8e36bc7bd3ac199be9a3e4
-  data.tar.gz: ecec159f500c0f333d4cb7252a11be862dffed44
+  metadata.gz: 4ab7d833b0c353a7f1a1d1cd240bd89b7e1d6920
+  data.tar.gz: 61a22b0e88f7fe4072f241619174a231407e52e5
 SHA512:
-  metadata.gz: 4d564ec96787b00c3628bc9bba61f0b55f46e538f2726ec28684f6256d07f67952dce7d5207c6c190d6717c9b5bd389d95b160cecee0ab72200351222f017d3d
-  data.tar.gz: 368d8b0a6f9a91688218a9594b1c90cd5ef35caddb2e01b1fb93abae44ec4a70ca64386f5504d37b968174dfe163eaccc14bd9867532e1e6420ffd55cd932457
+  metadata.gz: 5754fd517225f6b0f17100e9129a7eb55b1be226cffeec5f69b4f16fbc26755d7911137d7cfef9d7a408d12cd0aceff13bcda261e707a622574b853e41f8c8a8
+  data.tar.gz: 26ffefc937dd522b7c8834f31d4d2a06fc3800e6576a4f5512878396956ddf49f25723bad7ea24ab0458b75493554ec1a711a4e58bc9ba2dc9d394d3c3a647ee

data/lib/power_stencil.rb

@@ -21,6 +21,7 @@ require 'power_stencil/utils/gem_utils'
 require 'power_stencil/utils/file_edit'
 require 'power_stencil/utils/graphviz'
 require 'power_stencil/utils/completion'
+require 'power_stencil/utils/entity_helper'
 
 require 'climatic/script/unimplemented_processor'
 require 'power_stencil/project/proxy'

data/lib/power_stencil/command_processors/create.rb

@@ -19,15 +19,19 @@ module PowerStencil
                 if md = property_def.match(/^\s*(?<prop_name>[^:=]+)\s*[:=]\s*(?<prop_val>.*)\s*$/)
                   property_value = md['prop_val']
                   logger.debug "Using extra properties from command line '#{md['prop_name']}' = '#{property_value}'"
-                  if pmd =  property_value.match(/^\s*!entity\s+(?<entity_type>[^\/]+)\/(?<entity_name>.*)\s*$/)
-                    type = pmd['entity_type'].to_sym
-                    name = pmd['entity_name']
-                    referenced_entity = project.engine.entity(type, name)
-                    property_value = referenced_entity.to_reference unless referenced_entity.nil?
-                    puts_and_logs "Could not find entity '#{type.to_s}/#{name}' !", logs_as: :error, check_verbose: false if referenced_entity.nil?
+                  if pd = property_value.match(/^\s*!entity\s+(?<entity_id>.+)\s*$/)
+                    property_value = pd['entity_id']
+                    esr = PowerStencil::Utils::EntityHelper::EntitySearchReference.from_string property_value
+                    if esr
+                      type, name = esr.to_a
+                      referenced_entity = project.engine.entity(type, name)
+                      property_value = referenced_entity.to_reference unless referenced_entity.nil?
+                      puts_and_logs "Could not find entity '#{type.to_s}/#{name}' !", logs_as: :error, check_verbose: false if referenced_entity.nil?
+                    end
                   end
-
                   entity_as_hash[md['prop_name'].to_sym] = property_value
+
+
                 else
                   raise PowerStencil::Error, "Invalid command line property definition: '#{property_def}'"
                 end

data/lib/power_stencil/command_processors/entity_helper.rb

@@ -3,11 +3,7 @@ module PowerStencil
 
     module EntityHelper
 
-      EntitySearchReference = Struct.new(:type, :name) do
-        def as_path
-          [type, name].map(&:to_s).join '/'
-        end
-      end
+      include PowerStencil::Utils::EntityHelper
 
       def describe_entity_types(entity_types)
         report = {}
@@ -132,9 +128,9 @@ module PowerStencil
           criteria = stack
         else
           stack.each do |param|
-            if md = param.match(/^\s*(?<type>[^\/]+)\/(?<name>.+)\s*$/)
-              next_entity_reference.type = md[:type].to_sym
-              next_entity_reference.name = md[:name]
+            esr = EntitySearchReference.from_string param
+            if esr
+              esr.fill next_entity_reference
             else
               if next_entity_reference.type.nil? or next_entity_reference.type.empty?
                 next_entity_reference.type =  param.to_sym

data/lib/power_stencil/dsl/entities.rb

@@ -19,9 +19,9 @@ module PowerStencil
 
       def entity(type_or_path, name = nil)
         type, name = if name.nil?
-                       md = type_or_path.match /^(?<type>[^\/]+)\/(?<name>.*)$/
-                       if md
-                         [md['type'].to_sym, md['name']]
+                       esr = PowerStencil::Utils::EntityHelper::EntitySearchReference.from_string type_or_path
+                       if esr
+                         esr.to_a
                        else
                          raise PowerStencil::Error, "Invalid entity id: '#{type_or_path}'"
                        end

data/lib/power_stencil/engine/project_engine.rb

@@ -56,7 +56,7 @@ module PowerStencil
       end
 
       def apply_plugins_dsl_definition(context)
-        project.plugins.each do |_, plugin|
+        project.plugins_sorted_by_dependency.each do |plugin|
           plugin.apply_extra_dsl context
         end
       end

data/lib/power_stencil/initializer.rb

@@ -17,12 +17,12 @@ module PowerStencil
       logger.debug 'Starting PowerStencil initialization...'
       setup_system_processors
       setup_universe_compiler_logger
-      try_to_load_project fail_on_error: false
+      project fail_on_error: false
       logger.debug 'PowerStencil initialization complete'
     end
 
-    def project
-      @project ||= try_to_load_project
+    def project(fail_on_error: true)
+      @project ||= try_to_load_project fail_on_error: fail_on_error
     end
 
     private

data/lib/power_stencil/plugins/base.rb

@@ -67,7 +67,7 @@ module PowerStencil
       attr_reader :project
 
       def setup_plugin
-        load_capabilities
+        determine_capabilities
         load_plugin_specific_config
         load_yaml_command_definition
       end

data/lib/power_stencil/plugins/capabilities.rb

@@ -19,7 +19,7 @@ module PowerStencil
 
       private
 
-      def load_capabilities
+      def determine_capabilities
         yaml_file = plugin_capabilities_definition_file
         unless File.exists? yaml_file and File.file? yaml_file and File.readable? yaml_file
           raise PowerStencil::Error, "Plugin '#{self.name}' has no definition file !"

data/lib/power_stencil/utils/entity_helper.rb

@@ -0,0 +1,35 @@
+module PowerStencil
+  module Utils
+
+    module EntityHelper
+
+      EntitySearchReference = Struct.new(:type, :name) do
+
+        def self.from_string(string)
+          if md = string.match(/^\s*(?<type>[^\/]+)\/\s*(?<name>.+)\s*$/)
+            return new md[:type].to_sym, md[:name]
+          end
+
+          false
+        end
+
+        def as_path
+          to_a.map(&:to_s).join '/'
+        end
+
+        def to_a
+          [type, name]
+        end
+
+        def fill(something)
+          something.type = type
+          something.name = name
+        end
+
+      end
+
+
+    end
+
+  end
+end

data/lib/power_stencil/version.rb

@@ -1,3 +1,3 @@
 module PowerStencil
-  VERSION = '0.9.6'.freeze
+  VERSION = '0.9.7'.freeze
 end

data/power_stencil.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_stencil
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Laurent Briais
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2019-11-20 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.5
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -310,6 +310,7 @@ files:
 - lib/power_stencil/utils/completion.rb
 - lib/power_stencil/utils/dependency_solver.rb
 - lib/power_stencil/utils/directory_processor.rb
+- lib/power_stencil/utils/entity_helper.rb
 - lib/power_stencil/utils/file_edit.rb
 - lib/power_stencil/utils/file_helper.rb
 - lib/power_stencil/utils/gem_utils.rb
@@ -328,7 +329,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.6 !\nFrom the command
+post_install_message: "\nThank you for installing PowerStencil 0.9.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