minfra-cli 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6145d8b76367e739eb7b93bcfdcaf22428004ab45de977215e874c8b59da64b
-  data.tar.gz: 8811fbed0e951e862888428e4370cc10d9c4fa199e9d9fa567b847ec1f689383
+  metadata.gz: 062b08fed3f437e66cba2ea56351bf02e5eb6a7b63d3444be0f1b4251e72f5db
+  data.tar.gz: 0147da78b9f61955e9a5c180a0c6d8a8118c7a66d37cc6c745385e0827de9bfe
 SHA512:
-  metadata.gz: 61359dada17608504dac46c3af40fc94e8a7d53f468ca95f6bcec518c9d7c9b32a7a6ff14540286c1fcc9b14d6eee45df4df336e6156a0a8cea8c986c8188fd5
-  data.tar.gz: 9792bf505ded5f51f4955be00f13fae965aaaadf17caa1606f310ebbb600cc145929ab5e39b31c4c0dc707a1de24912dd830f2c6749077db8d42961539a594ce
+  metadata.gz: b089c62ba6c7ee464f540324eeb8820e4a5ced14a0f06fdd78afa814dc5b3b1a32408933a34e769ed6f4493cb9ffba3b59d0d02c1f3cb5f48bd073b8eb1cc3bf
+  data.tar.gz: 2941ebd620a97afd4294757a3e28b7b49d669e30703609527d11a2b9ad43aab7410593810bfd127e4a91e118677dd9e8ea561676d41e499907c5549853f41381

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.4.0
+ * plugin managment
+ * changed logging (added central logger, and configurable loglevel: MINFRA_LOGGING_LEVEL minfra.logging_level)
+ * hiera main path can be configured (minfra.hiera.env_path)
+ * fixed kube subcommand
 # 1.3.0
  * deep lookup value like "env.cluster.name"
 # 1.2.2

data/README.md

@@ -3,6 +3,7 @@
 Is a KIND (k8s in docker) based development environment.
 
 
+## Setup
 
 ## Expected hiera data
 

data/lib/minfra/cli/commands/plugin.rb

@@ -0,0 +1,21 @@
+module Minfra
+  module Cli
+    class Plugin < Command
+
+      desc "describe","describe plugins"
+      def describe
+        Minfra::Cli.plugins.each do |plugin|
+          puts "#{plugin.name} (#{plugin.version})"
+        end
+      end
+      desc "install", "install plugins"
+      def install
+        Minfra::Cli.plugins.each do |plugin|
+          puts "setup: #{plugin.name}"
+          plugin.install
+        end
+      end
+    end  
+  end    
+end
+Minfra::Cli.register("plugin", "dealing wit plugins", Minfra::Cli::Plugin)

data/lib/minfra/cli/commands/setup.rb

@@ -5,7 +5,7 @@ module Minfra
       include Logging
       include Hook
 
-      desc "setup", "creates a default config file on the host"
+      desc "dev", "creates a default config file on the host"
       def dev
         setup_config
       end

data/lib/minfra/cli/config.rb

@@ -36,7 +36,6 @@ module Minfra
       end
       
       def init!(base_path_str=nil)
-        debug( "Config: initializing" )  
         @base_path = Pathname.new(base_path_str || ENV["MINFRA_PATH"]).expand_path
         @me_path = @base_path.join('me')
         @project_config_path=@base_path.join("config","project.json")
@@ -62,7 +61,6 @@ module Minfra
       end
 
       def load(orch_env)
-        debug( "loading config env: #{orch_env} #{@orch_env}" )
         return self if defined?(@orch_env)
         @orch_env = orch_env
         @orch_env_config=Hashie::Mash.new

data/lib/minfra/cli/logging.rb

@@ -2,7 +2,7 @@ module Minfra
   module Cli
     module Logging
       def error(str)
-        STDERR.puts "Error: #{str}"
+        logger.error str
       end
 
       def exit_error(str)
@@ -11,15 +11,23 @@ module Minfra
       end
 
       def info(str)
-        STDERR.puts str
+        logger.info str
+      end
+
+      def warn(str)
+        logger.warn str
       end
 
       def debug(str)
-        STDERR.puts "Debug: #{str}"
+        logger.debug str
       end
 
       def deprecated(comment)
-        STDERR.puts "DEPRECATED: #{comment}"
+        logger.warn "DEPRECATED: #{comment}"
+      end
+      private
+      def logger
+        Minfra::Cli.logger
       end
     end
   end

data/lib/minfra/cli/main_command.rb

@@ -3,12 +3,11 @@ module Minfra
     class Main < Command
 
       desc 'kube', 'kubectl wrapper and other features'
-      long_desc '
-      '
-      option :environment, required: false, aliases: ['-e']
       option :cluster
+      option :stack, required: true
       def kube(*args)
-          kube.kubectl_command(args)
+        kube = Kube.new(options, @minfra_config)
+        kube.kubectl_command(args)
       end
 
       # tbd: move this to project

data/lib/minfra/cli/plugins.rb

@@ -1,34 +1,108 @@
 module Minfra
   module Cli
     class Plugins
+      class Plugin
+        include Logging
+        attr_reader :name, :version, :opts, :path
+        
+        
+        def initialize(name:, version:, opts:, disabled:)
+          @name= name
+          @version = version
+          @opts = opts.merge(require: false)
+          @disabled= disabled
+          if opts["path"]
+            @path= Minfra::Cli.config.base_path.join(opts["path"])
+          end  
+        end
+        def disabled?
+          @disabled
+        end
+        
+        #adds the plugin to the 
+        def prepare
+          debug("plugin prepare: #{name}, #{version}, disabled: #{disabled?}")
+          return if disabled?
+          if path
+            begin
+              lib_path=path.join('lib')
+              $LOAD_PATH.unshift lib_path
+              require name
+            rescue Gem::Requirement::BadRequirementError, LoadError
+                warn("plugin prepare path: #{name} (#{$!})")
+             end
+          else
+            begin
+              @gem_spec=Gem::Specification.find_by_name(name)
+              gem name, version
+            rescue Gem::MissingSpecError
+              warn("plugin prepare gem: #{name}, #{version} (#{$!})")
+            end
+          end
+        end
+        
+        def setup
+          return if disabled?
+          if path 
+            minfra_path = Pathname.new(path).join("minfracs","init.rb")
+            if minfra_path.exist?
+              begin
+                require minfra_path # this should register the command
+              rescue LoadError
+                 logger.warn("Minfra plugin detected but dependencies not installed: #{minfra_path} (try: minfra plugin install)")
+              end 
+            end  
+          else
+            error("Gem based plugins not supported yet")
+          end    
+        end
+
+        def install
+          return if disabled?
+          if path
+            system("cd #{path}; bundle install")
+          else
+            system("gem install #{name} --version #{version}")
+          end
+        end
+      end
+      
+      def initialize(plugins)
+        @plugins=plugins
+      end
+
+      def prepare
+        @plugins.each(&:prepare)
+      end
+      def setup
+        @plugins.each(&:setup)
+      end
+      
+      def install
+        if path
+          system("cd #{path}; bundle install")
+        else
+          system("gem install #{name} --version #{version}")
+        end
+      end
+      
+      def each(&block)
+        @plugins.each(&block)
+      end
+      
       def self.load
+        found=[]
         [Pathname.new(ENV["MINFRA_PATH"]).join("config","minfra_plugins.json"),
         Pathname.new(ENV["MINFRA_PATH"]).join("me","minfra_plugins.json")].each do |file|
-
           next unless File.exist?(file)
-
           plugins=JSON.parse(File.read(file))
           plugins["plugins"].each do |spec|
-            opts=spec["opts"] || {}
-            opts.merge(require: false)
-            if opts["path"]
-              begin
-                $LOAD_PATH.unshift opts["path"]+"/lib"
-                require spec["name"]
-              rescue Gem::Requirement::BadRequirementError
-                STDERR.puts("Can't load plugin: #{spec["name"]}")
-              end
-            else
-              begin
-                Gem::Specification.find_by_name(spec["name"])
-                gem spec["name"], spec["version"]
-              rescue Gem::MissingSpecError
-                STDERR.puts("Can't load plugin: #{spec["name"]}, #{spec["version"]}; run 'minfra plugin setup'")
-              end
-            end
-          end  
+            found << Plugin.new(name: spec['name'], opts: spec['opts'] || {}, version: spec['version'], disabled: spec['disabled'])
+          end
         end
+        new(found)
       end
+
     end
   end
 end

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

data/lib/minfra/cli.rb

@@ -24,9 +24,13 @@ require "#{ENV['MINFRA_PATH']}/config/preload.rb" if File.exist?("#{ENV['MINFRA_
 
 module Minfra
   module Cli
-    extend Minfra::Cli::Logging
 
+    extend Minfra::Cli::Logging
 
+    def self.logger
+      @logger
+    end
+    
     def self.init(argv)
      @argv = argv
      # we'll set the context very early!
@@ -39,9 +43,15 @@ module Minfra
        @config = Config.load('dev')
      end
 
+     @logger=Logger.new(STDERR)
+     logger.level=ENV["MINFRA_LOGGING_LEVEL"] || @config.project.minfra.logging_level || 'warn'
+     @logger.debug("Minfra: loglevel: #{@logger.level}, env: #{@config.orch_env}")
+     
      hiera_init
 
-     Minfra::Cli::Plugins.load
+     @plugins = Minfra::Cli::Plugins.load
+     @plugins.prepare
+     
      Minfra::Cli.scan
      require_relative 'cli/main_command'
      Minfra::Cli.resolve
@@ -66,7 +76,8 @@ module Minfra
       hiera = Hiera.new(:config => @hiera_root.join('hiera.yaml').to_s)
       Hiera.logger=:noop
       env= @config.orch_env
-      raise("unknown environment #{env}, I expact a file at hiera/hieradata/environments/#{env}.eyaml") unless @hiera_root.join("hieradata/environments/#{env}.eyaml").exist? 
+      hiera_main_path=@hiera_root.join("hieradata/#{config.project.minfra.hiera.env_path}/#{env}.eyaml")
+      raise("unknown environment #{env}, I expact a file at #{hiera_main_path}") unless hiera_main_path.exist? 
 
       scope={ "hieraroot" => @hiera_root.to_s, "env" => env}
       special_lookups=hiera.lookup("lookup_options", {},  scope, nil, :priority)
@@ -88,7 +99,7 @@ module Minfra
        end
 
        result=hiera.lookup(value, default, scope, nil, lookup_type)
-       unless values.empty?
+       if !values.empty? && result.kind_of?(Hash) # we return nil or the scalar value and only drill down on hashes
          result=result.dig(*values)
        end
 
@@ -107,17 +118,17 @@ module Minfra
     def self.config
       @config
     end
+    
     def self.scan
+      #loading built in commands
       root_path.join("lib/minfra/cli/commands").each_child do |command_path|
         require command_path if command_path.to_s.match(/\.rb$/) && !command_path.to_s.match(/\#/)
       end
-      # this is like railties but their called minfracs
-      $LOAD_PATH.each do |path|
-        minfra_path = Pathname.new(path).join("..","minfracs","init.rb")
-        if minfra_path.exist?
-          require minfra_path # this should register the command
-        end
-      end
+      @plugins.setup
+    end
+    
+    def self.plugins
+      @plugins
     end
 
     def self.register(subcommand,info,command)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2022-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -170,6 +170,7 @@ files:
 - lib/minfra/cli/command.rb
 - lib/minfra/cli/commands/dev.rb
 - lib/minfra/cli/commands/kube.rb
+- lib/minfra/cli/commands/plugin.rb
 - lib/minfra/cli/commands/project.rb
 - lib/minfra/cli/commands/project/branch.rb
 - lib/minfra/cli/commands/project/tag.rb