power_stencil 0.8.11 → 0.9.1

data/lib/power_stencil/dsl/plugin_generation.rb

@@ -7,6 +7,10 @@ module PowerStencil
          main_entry_point.underscore
       end
 
+      def plugin_title_name
+        plugin_name.tr('_', ' ').split.map(&:capitalize).join(' ')
+      end
+
       def plugin_module_name
         plugin_name.camelize
       end

data/lib/power_stencil/engine/base.rb

@@ -2,6 +2,7 @@ require 'power_stencil/engine/entities_definitions'
 require 'power_stencil/engine/directory_processor'
 
 require 'power_stencil/engine/renderers/erb'
+require 'power_stencil/engine/renderers/haml'
 require 'power_stencil/dsl/base'
 require 'power_stencil/dsl/plugin_generation'
 require 'power_stencil/dsl/completion'
@@ -18,6 +19,7 @@ module PowerStencil
       include PowerStencil::Engine::DirectoryProcessor
 
       include PowerStencil::Engine::Renderers::Erb
+      include PowerStencil::Engine::Renderers::Haml
 
       attr_accessor :dsl
       attr_reader :root_universe

data/lib/power_stencil/engine/build_handling.rb

@@ -95,8 +95,11 @@ module PowerStencil
 
 
       def build_entity(entity_to_build, target_path)
+        initial_directory = Dir.pwd
         target_plugin_name =  entity_to_build.buildable_by.to_s
         default_build entity_to_build, target_path
+        # Post processing executed from generated directory (#11)
+        Dir.chdir target_path
 
         if target_plugin_name.empty?
           post_build_hook entity_to_build, target_path
@@ -106,6 +109,8 @@ module PowerStencil
           raise PowerStencil::Error, "Plugin '#{target_plugin_name}' has no build capability !" unless target_plugin.capabilities[:build]
           target_plugin.post_build_hook entity_to_build, target_path
         end
+      ensure
+        Dir.chdir initial_directory
       end
 
       def default_build(entity_to_build, target_path)

data/lib/power_stencil/engine/directory_processor.rb

@@ -1,5 +1,7 @@
 require 'fileutils'
 require 'erb'
+require 'haml'
+
 
 module PowerStencil
   module Engine
@@ -30,10 +32,27 @@ module PowerStencil
           end
         end
       ensure
-        @rendering_context = nil
+        @files_not_to_rename = nil
         @files_not_to_render = nil
       end
 
+
+      def render_single_template_file(source_template, destination_file, main_entry_point: nil)
+        compiled_universe = root_universe.compile scenario: config[:scenario]
+        puts_and_logs 'Entities analysis completed.'
+
+        logger.info 'Generating target file...'
+
+        process_file source_template, destination_file,
+                     compiled_universe,
+                     overwrite_files: true,
+                     main_entry_point: main_entry_point
+      ensure
+        @files_not_to_rename = nil
+        @files_not_to_render = nil
+      end
+
+
       private
 
       def detemplatized_file_name(filename, replacement_text)

data/lib/power_stencil/engine/entities_handling.rb

@@ -34,11 +34,11 @@ module PowerStencil
         @available_entities_hash.keys
       end
 
-      def entity(type, name, universe)
+      def entity(type, name, universe = self.root_universe)
         universe.get_entity type, name
       end
 
-      def entities(universe, criterion: nil, value: nil, &filter_block)
+      def entities(universe = self.root_universe, criterion: nil, value: nil, &filter_block)
         universe.get_entities criterion: criterion, value: value, &filter_block
       end
 

data/lib/power_stencil/engine/renderers/haml.rb

@@ -0,0 +1,21 @@
+module PowerStencil
+  module Engine
+    module Renderers
+
+      module Haml
+
+        private
+
+        def render_haml_template(source, context)
+          logger.debug "Using HAML to render file '#{source}'"
+          ::Haml::Engine.new(File.read source).render(context)
+        rescue => e
+          logger.debug PowerStencil::Error.report_error(e)
+          raise PowerStencil::Error, "Error rendering '#{source}': '#{e.message}'"
+        end
+
+      end
+
+    end
+  end
+end

data/lib/power_stencil/initializer.rb

@@ -55,14 +55,19 @@ module PowerStencil
           describe: PowerStencil::CommandProcessors::Describe,
           adm: PowerStencil::CommandProcessors::Adm
       }.each do |command_name, processor|
-        command_line_manager.register_processor command_line_manager.command_by_alias(command_name),
+        command = command_line_manager.command_by_alias(command_name)
+        command_line_manager.register_processor command,
                                                 processor.new
+        command.add_provider self
       end
     end
 
     def setup_climatic(cmd_line_args)
       mngr = Climatic::ConfigLayers::CommandLineLayer.build_command_line_manager base_commands_definition_file
       Climatic.bootstrap cmd_line_args: cmd_line_args, command_manager: mngr
+      mngr.commands.each do |command|
+        command.add_provider PowerStencil
+      end
       begin
         # Fix command line layer priority to allow a bigger number of plugins
         config.command_line_layer.priority = 999

data/lib/power_stencil/plugins/command_line.rb

@@ -10,7 +10,9 @@ module PowerStencil
         clm = PowerStencil.command_line_manager
         plugin_definition[:processors].each do |processors_name, processor|
           processor_class = Object.const_get processor
-          clm.register_processor clm.command_by_alias(processors_name), processor_class.new
+          command = clm.command_by_alias(processors_name)
+          clm.register_processor command, processor_class.new
+          command.add_provider self
         end
       end
 

data/lib/power_stencil/project/completion.rb

@@ -6,17 +6,15 @@ module PowerStencil
       def query_for_completion(query_type)
         case query_type
         when :entities
-          engine.entities(engine.root_universe).map(&:as_path).sort
+          engine.entities.map(&:as_path).sort
         when :'entity-types'
           engine.available_entity_types.sort
         when :scenario
-          engine.entities(engine.root_universe, criterion: :by_type, value: :entity_override) do |entity|
+          engine.entities(criterion: :by_type, value: :entity_override) do |entity|
             !entity.scenario.nil? and !entity.scenario.empty?
           end.map(&:scenario).sort.uniq
         when :buildable
-          engine.entities(engine.root_universe) do |entity|
-            entity.buildable?
-          end.map(&:as_path).sort
+          engine.entities(&:buildable?).map(&:as_path).sort
         else
           raise PowerStencil::Error, "'#{query_type}' is not a valid query type for completion !"
         end

data/lib/power_stencil/ultra_command_line/command_line_manager.rb

@@ -0,0 +1,35 @@
+class UltraCommandLine::Manager::Base
+
+  class << self
+
+    def add_provider_for(command_or_option, provider)
+      providers = providers_for command_or_option
+      providers << provider unless providers.include? provider
+    end
+
+    def providers_for(command_or_option)
+      default_command_data = {options: {}, providers: []}
+      case command_or_option
+      when UltraCommandLine::Commands::SubCommand
+        sc = command_or_option
+        internal_provider_mapping[sc.name] ||= default_command_data
+        internal_provider_mapping[sc.name][:providers]
+      when UltraCommandLine::Commands::OptionDefinition
+        sco = command_or_option
+        internal_provider_mapping[sco.sub_command.name] ||= default_command_data
+        internal_provider_mapping[sco.sub_command.name][:options][sco.name] ||= []
+        internal_provider_mapping[sco.sub_command.name][:options][sco.name]
+      else
+        raise PowerStencil::Error, "Invalid command or option"
+      end
+    end
+
+ #   private
+
+    def internal_provider_mapping
+      @internal_provider_mapping ||= {}
+    end
+
+  end
+
+end

data/lib/power_stencil/ultra_command_line/option_definition.rb

@@ -0,0 +1,5 @@
+class UltraCommandLine::Commands::OptionDefinition
+
+  include PowerStencil::UltraCommandLine::ProvidersManager
+
+end

data/lib/power_stencil/ultra_command_line/providers_manager.rb

@@ -0,0 +1,21 @@
+module PowerStencil
+  module UltraCommandLine
+
+    module ProvidersManager
+
+      def providers_manager
+        PowerStencil.command_line_manager.class
+      end
+
+      def providers
+        providers_manager.providers_for self
+      end
+
+      def add_provider(provider)
+        providers_manager.add_provider_for self, provider
+      end
+
+    end
+
+  end
+end

data/lib/power_stencil/ultra_command_line/sub_command.rb

@@ -0,0 +1,12 @@
+class UltraCommandLine::Commands::SubCommand
+
+  include PowerStencil::UltraCommandLine::ProvidersManager
+
+  def add_provider(provider)
+    super
+    options.each do |option|
+      option.add_provider provider
+    end
+  end
+
+end

data/lib/power_stencil/utils/completion.rb

@@ -3,24 +3,34 @@ module PowerStencil
 
     module Completion
 
-      include PowerStencil::Utils::DirectoryProcessor
+      class FakeIgnoreList
+        attr_accessor :return_value
+        def ignore_file?(file)
+          return_value
+        end
+      end
 
-      def generate_zsh_completion(script_name)
+      include PowerStencil::Utils::DirectoryProcessor
 
-        # Dirty hack
-        config.executable_gem_layer[:file_renaming_patterns] = {'(.+)_power_stencil.sh.erb' => '\1_power_stencil' }
+      def generate_zsh_completion(script_name, target_file, generating_project_completion)
 
-        target_dir = File.expand_path config[:completion_target][:zsh][:completion_dir]
         source_dir = File.join PowerStencil::Project::Paths.system_templates_templates_path, 'zsh_command_line_completion'
+        source_template = File.join source_dir, '_power_stencil.sh.erb'
 
         engine = PowerStencil::Engine::InitEngine.new
         engine.dsl = PowerStencil::Dsl::Completion
         engine.dsl.script_name = script_name
-        engine.render_source source_dir, target_dir, overwrite_files: true
+        engine.dsl.generating_project_completion = generating_project_completion
+
+        engine.instance_eval do
+          @files_not_to_rename = FakeIgnoreList.new
+          files_not_to_rename.return_value = true
+          @files_not_to_render = FakeIgnoreList.new
+          files_not_to_render.return_value = false
+        end
+
+        engine.render_single_template_file source_template, target_file
 
-        puts_and_logs "zsh auto_completion has been installed in '#{File.join target_dir, "_#{script_name}"}'.", check_verbose: false
-        puts "You should ensure you have something like 'fpath=(#{target_dir} $fpath)' in your ~/.zshrc file..."
-        puts 'You may have to relog for changes to be applied.'
       end
 
     end

data/lib/power_stencil/version.rb

@@ -1,3 +1,3 @@
 module PowerStencil
-  VERSION = '0.8.11'.freeze
+  VERSION = '0.9.1'.freeze
 end

data/power_stencil.gemspec

@@ -25,11 +25,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 
-  spec.add_dependency 'climatic', '~> 0.2.33'
+  spec.add_dependency 'climatic', '~> 0.2.34'
   spec.add_dependency 'dir_glob_ignore', '~> 0.3'
   spec.add_dependency 'universe_compiler', '~> 0.5.5'
   spec.add_dependency 'pry'
   spec.add_dependency 'git' , '~> 1.5.0'
+  spec.add_dependency 'haml', '~> 5.1.2'
 
   source_code_uri = 'https://gitlab.com/tools4devops/power_stencil'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_stencil
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.9.1
 platform: ruby
 authors:
 - Laurent Briais
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.33
+        version: 0.2.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.33
+        version: 0.2.34
 - !ruby/object:Gem::Dependency
   name: dir_glob_ignore
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.2
 description: PowerStencil is the Swiss-army knife templating workflow for developers
   and ops.
 email:
@@ -154,6 +168,7 @@ files:
 - doc/plugins.md
 - doc/templates.md
 - etc/base_commands_definition.yml
+- etc/meta_templates/plugin_seed/README.md
 - etc/meta_templates/plugin_seed/etc/command_line.yaml
 - etc/meta_templates/plugin_seed/etc/plugin_capabilities.yaml
 - etc/meta_templates/plugin_seed/etc/plugin_config.yaml
@@ -168,6 +183,9 @@ files:
 - etc/meta_templates/plugin_seed/lib/{entity}/version.rb.erb
 - etc/meta_templates/plugin_seed/lib/{entity}/{entity}_processor.rb.erb
 - etc/meta_templates/plugin_seed/psplugin_{entity}.gemspec
+- etc/meta_templates/plugin_seed/spec/project_helper.rb
+- etc/meta_templates/plugin_seed/spec/spec_helper.rb
+- etc/meta_templates/plugin_seed/spec/{entity}_spec.rb
 - etc/power_stencil.yaml
 - etc/templates/plugin_definition/.gitignore
 - etc/templates/plugin_definition/.rspec
@@ -193,6 +211,7 @@ files:
 - etc/templates/plugin_definition/lib/{entity}/version.rb.erb
 - etc/templates/plugin_definition/lib/{entity}/{entity}_processor.rb.erb
 - etc/templates/plugin_definition/psplugin_{entity}.gemspec
+- etc/templates/plugin_definition/spec/project_helper.rb
 - etc/templates/plugin_definition/spec/spec_helper.rb
 - etc/templates/plugin_definition/spec/{entity}_spec.rb
 - etc/templates/project/.copy_ignore
@@ -242,6 +261,7 @@ files:
 - lib/power_stencil/engine/init_engine.rb
 - lib/power_stencil/engine/project_engine.rb
 - lib/power_stencil/engine/renderers/erb.rb
+- lib/power_stencil/engine/renderers/haml.rb
 - lib/power_stencil/error.rb
 - lib/power_stencil/initializer.rb
 - lib/power_stencil/plugins/base.rb
@@ -279,6 +299,10 @@ files:
 - lib/power_stencil/system_entity_definitions/project_entity.rb
 - lib/power_stencil/system_entity_definitions/simple_exec.rb
 - lib/power_stencil/system_entity_definitions/source_provider.rb
+- lib/power_stencil/ultra_command_line/command_line_manager.rb
+- lib/power_stencil/ultra_command_line/option_definition.rb
+- lib/power_stencil/ultra_command_line/providers_manager.rb
+- lib/power_stencil/ultra_command_line/sub_command.rb
 - lib/power_stencil/utils/completion.rb
 - lib/power_stencil/utils/directory_processor.rb
 - lib/power_stencil/utils/file_edit.rb
@@ -299,13 +323,12 @@ 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.11 !\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.9.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
+  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