power_stencil 0.8.13 → 0.9.3

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/plugins/require.rb

@@ -7,12 +7,6 @@ module PowerStencil
 
       include PowerStencil::Utils::SecureRequire
 
-      private
-
-      def module_short_name
-        name.split(/[-_]+/).map(&:capitalize).join.to_sym
-      end
-
       def require_entry_point
         @entry_point_path = File.join plugin_path, 'lib', "#{name.underscore}.rb"
         logger.debug "Plugin '#{name}' entry point: '#{entry_point_path}'"
@@ -27,6 +21,12 @@ module PowerStencil
         end
       end
 
+      private
+
+      def module_short_name
+        name.split(/[-_]+/).map(&:capitalize).join.to_sym
+      end
+
       def setup_version
         @version = PowerStencil::Utils::SemanticVersion.new plugin_module::VERSION
         capabilities[:version] = true

data/lib/power_stencil/project/base.rb

@@ -1,3 +1,5 @@
+require 'power_stencil/utils/dependency_solver'
+
 require 'power_stencil/project/paths'
 require 'power_stencil/project/create'
 require 'power_stencil/project/config'

data/lib/power_stencil/project/plugins.rb

@@ -18,13 +18,37 @@ module PowerStencil
 
       end
 
+      def plugins_sorted_by_dependency
+        solver = PowerStencil::Utils::DependencySolver.new
+        plugin_names = plugins.keys
+
+        plugins.each do |_, plugin|
+          unless plugin.dependencies.nil?
+            plugin.dependencies.each do |dependency_name|
+              raise PowerStencil::Error, "Invalid dependency '#{dependency_name}'declared for plugin '#{plugin.name}' !" unless plugin_names.include? dependency_name
+            end
+          end
+          solver[plugin.name] = plugin.dependencies.nil? ? [] : plugin.dependencies
+        end
+        solver.tsort.map { |plugin_name| plugins[plugin_name] }
+      rescue TSort::Cyclic => e
+        PowerStencil::Error.report_error e
+        raise PowerStencil::Error, 'Plugins cyclical dependency error !'
+      end
+
+
       private
 
       def bootstrap_plugins
         @plugins = {}
         initialize_gem_plugins
         initialize_local_plugins
+        require_plugins_entry_points
         command_line_manager.definition_hash_to_commands
+        register_plugins_processors
+      end
+
+      def register_plugins_processors
         plugins.each do |_, plugin|
           if plugin.capabilities[:processors]
             plugin.register_processors
@@ -32,6 +56,12 @@ module PowerStencil
         end
       end
 
+      def require_plugins_entry_points
+        plugins_sorted_by_dependency.each do |plugin|
+          plugin.require_entry_point
+        end
+      end
+
       def initialize_gem_plugins
         if config[:project_plugins].empty?
           PowerStencil.logger.info 'No gem plugin found in project'
@@ -42,7 +72,8 @@ module PowerStencil
           (gem_name, gem_req) = PowerStencil::Plugins::Base.plugin_definition_to_name_and_req plugin_definition
           raise PowerStencil::Error, "Plugin '#{gem_name}' already exists !" unless plugins[gem_name].nil?
 
-          plugins[gem_name] = PowerStencil::Plugins::Base.new(gem_name, self, type: :gem, gem_req: gem_req)
+          plugin = PowerStencil::Plugins::Base.new(gem_name, self, type: :gem, gem_req: gem_req)
+          plugins[plugin.name] = plugin
         end
       end
 
@@ -55,10 +86,12 @@ module PowerStencil
         Dir.entries(project_local_plugins_path)
             .select { |e| File.directory? File.join(project_local_plugins_path, e) }
             .reject { |d| %w(. ..).include? d }
+            .sort
             .each do |candidate|
           begin
             raise PowerStencil::Error, "Plugin '#{candidate}' already exists !" unless plugins[candidate].nil?
-            plugins[candidate] = PowerStencil::Plugins::Base.new(candidate, self)
+            plugin = PowerStencil::Plugins::Base.new(candidate, self)
+            plugins[plugin.name] = plugin
           rescue PowerStencil::Error => pse
             logger.puts_and_logs pse.message, logs_as: :error
             logger.puts_and_logs "Discarding invalid plugin '#{candidate}'.", logs_as: :error

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/utils/dependency_solver.rb

@@ -0,0 +1,19 @@
+require 'tsort'
+
+module PowerStencil
+  module Utils
+
+    class DependencySolver < Hash
+
+      include TSort
+
+      alias tsort_each_node each_key
+
+      def tsort_each_child(node, &block)
+        fetch(node).each(&block)
+      end
+
+    end
+
+  end
+end

data/lib/power_stencil/version.rb

@@ -1,3 +1,3 @@
 module PowerStencil
-  VERSION = '0.8.13'.freeze
+  VERSION = '0.9.3'.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.13
+  version: 0.9.3
 platform: ruby
 authors:
 - Laurent Briais
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-11-13 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,8 @@ files:
 - doc/plugins.md
 - doc/templates.md
 - etc/base_commands_definition.yml
+- etc/meta_templates/plugin_seed/.gitignore
+- etc/meta_templates/plugin_seed/.gitlab-ci.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
@@ -169,10 +185,12 @@ 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/.gitlab-ci.yml
 - etc/templates/plugin_definition/.rspec
 - etc/templates/plugin_definition/.travis.yml
 - etc/templates/plugin_definition/CODE_OF_CONDUCT.md
@@ -196,6 +214,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
@@ -245,6 +264,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
@@ -282,7 +302,12 @@ 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/dependency_solver.rb
 - lib/power_stencil/utils/directory_processor.rb
 - lib/power_stencil/utils/file_edit.rb
 - lib/power_stencil/utils/file_helper.rb
@@ -302,13 +327,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.13 !\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.3 !\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