minfra-cli 1.7.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a48cc8f6178ef5a337fbaa5c7d26b17ae22e699c91c35e4b6835da9ea489183
-  data.tar.gz: fbcc714995a34fd2bf63aa48c09166d0f85c6a5f40495472f1cc7b96f7cf95a2
+  metadata.gz: f850f6ee46b5749af756bfb223e38836a3bc538dc8bcbe4b1f2fb3bc2c3a131a
+  data.tar.gz: e5b4b5b317c1ead81fedae5d78021003c31a55858fe36e040fad59c61d8e8c23
 SHA512:
-  metadata.gz: e37680916acd863645042a241853cbdefef19aeaff358a5196f0068fb3be81604bab7c59a11fff19fa13e5e0b8ed5d153f20c88aebdabbad4e6aea2ddcd1c331
-  data.tar.gz: d395137f217d52837983604bd590c1a2ef813446ff27c7ada4e26575690f42b448d4623fe248825482a8ca569130e87d6ae2c4ee10665a1c9c9fb58a24684398
+  metadata.gz: 26036eb5236bedf5a6cf6f3a39b8ceb272d8242938bf1730c20b0385facb0c1c9c1c8c92335c670562b5bd3dc946eae7e5891963b38643e0144f2b5ed5b8d3d3
+  data.tar.gz: 47cba9834d267496e5411d9d326a3a5d8899cb8a06119bbcafa790fdef48fd22ee620eea43725b706627efc59bdfb0db03fa93a0950de5f913476a81a46054eb

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.9.0
+ * helm template now called with --debug
+ * added "file" to service
+ * ready for ruby 3.2
+ * fixing project build "loading int " typo
+ * changing init sequence (first load minfrarc)
+ * STDERR of external commands is now written as INFO
+
+# 1.8.0
+ * more output which "require" failed when loading dependencies
+ * catching closed stream errors in Minfra::Cli::Runner
+ * stderr of runner goes to info
+ * stdout of runner goes to debug
 # 1.7.1
  * fix plugin install edge cases
 # 1.7.0

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

@@ -40,7 +40,7 @@ module Minfra
         ARGV.delete('project') # ARGV is passed along to `rspec` call
         ARGV.delete('test')
 
-        if File.exists?('./bin/run_tests')
+        if File.exist?('./bin/run_tests')
           # config = Config.load('staging')
           project = ProjectInfo.load(Pathname.pwd)
           # Minfra::Cli::Document.document(config, "Using project specific ./bin/run_tests in #{project.name}")
@@ -68,7 +68,7 @@ module Minfra
         exit(1) if res.error?
         
         unless options[:noload]
-          debug("loading int KIND")
+          debug("loading image into KIND's registry")
           Runner.run(%{kind load docker-image #{p.repo_name}:latest --name #{minfra_config.name}})
         end  
       end

data/lib/minfra/cli/plugins.rb

@@ -49,7 +49,7 @@ module Minfra
               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)")
+                 logger.warn("Minfra plugin detected but dependencies not installed: #{minfra_path} (#{$!}). TRY: minfra plugin install")
               end 
             end  
           else

data/lib/minfra/cli/runner.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'English'
 require 'open3'
 
 module Minfra
@@ -5,26 +8,30 @@ module Minfra
     class Runner
       class Result
         include Logging
-        
+
         attr_writer :status
-        
+
         def initialize
-          @stderr_lines=[]
-          @stdout_lines=[]
-          @status=nil
+          @stderr_lines = []
+          @stdout_lines = []
+          @status = nil
         end
-        
-        def add(line, stream=:stdout)
+
+        def add(line, stream = :stdout)
           line.chomp!
           if stream == :stdout
             @stdout_lines << line
             debug line
           else
             @stderr_lines << line
-            error line
+            info line
           end
         end
-           
+
+        def exitstatus
+          @status.exitstatus
+        end
+        
         def success?
           @status.success?
         end
@@ -36,11 +43,11 @@ module Minfra
         def stdout
           @stdout_lines.join("\n")
         end
-        
+
         def stderr
           @stderr_lines.join("\n")
-        end  
-        
+        end
+
         def to_s
           stdout
         end
@@ -52,39 +59,46 @@ module Minfra
       end
 
       attr_reader :exit_on_error
+
       def initialize(cmd, exit_on_error: true)
-        @cmd=cmd
+        @cmd = cmd
         @exit_on_error = exit_on_error
       end
 
       def run
         debug("running: #{@cmd}")
-        res=nil
+        res = nil
         begin
-          res=Result.new
+          res = Result.new
           # see: http://stackoverflow.com/a/1162850/83386
-          Open3.popen3(@cmd) do |stdin, stdout, stderr, thread|
+          # the whole implementation is problematic as we migth miss some output lines
+          # Open4 might be a solution. Using Select might be a solution. Using Process.fork might be a solution....
+          Open3.popen3(@cmd) do |_stdin, stdout, stderr, thread|
             # read each stream from a new thread
-            { :stdout => stdout, :stderr => stderr }.each do |key, stream|
+            { stdout: stdout, stderr: stderr }.each do |key, stream|
               Thread.new do
-                until (raw_line = stream.gets).nil? do
+                until (raw_line = stream.gets).nil?
+                  #                   stream.each do |raw_line|
                   res.add(raw_line, key)
                 end
+              rescue IOError # happens when you read from a close stream
+                raise unless ['stream closed in another thread', 'closed stream'].include?($ERROR_INFO.message)
+                # warn("Caught: #{$ERROR_INFO.message} for #{@cmd}")
               end
             end
             thread.join # don't exit until the external process is done
             res.status = thread.value
           end
-        rescue
+        rescue StandardError
         end
-        
+
         if res.error?
           error "command failed: #{@cmd}"
-          info  res.stdout
-          error res.stderr
+          debug  res.stdout
+          info  res.stderr
         end
         if exit_on_error && res.error?
-          info "exiting on error"
+          info "command exiting on error (#{res.exitstatus})"
           exit 1
         end
         res

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.7.1'.freeze
+    VERSION = '1.9.0'.freeze
   end
 end

data/lib/minfra/cli.rb

@@ -47,6 +47,12 @@ module Minfra
 
      @logger=Logger.new(STDERR)
      logger.level=ENV["MINFRA_LOGGING_LEVEL"] || @config.project.minfra.logging_level || 'warn'
+
+     project_minfrarc_path = @config.base_path.join("config",'minfrarc.rb')
+     require project_minfrarc_path if project_minfrarc_path.exist?
+     me_minfrarc_path = @config.me_path.join('minfrarc.rb')
+     require @me_minfrarc_path if me_minfrarc_path.exist?
+
      @logger.debug("Minfra: loglevel: #{@logger.level}, env: #{@config.orch_env}")
      
      hiera_init
@@ -58,10 +64,7 @@ module Minfra
      require_relative 'cli/main_command'
      Minfra::Cli.resolve
 
-     project_minfrarc_path = @config.base_path.join("config",'minfrarc.rb')
-     require project_minfrarc_path if project_minfrarc_path.exist?
-     me_minfrarc_path = @config.me_path.join('minfrarc.rb')
-     require @me_minfrarc_path if me_minfrarc_path.exist?
+
      
     end
     

data/lib/orchparty/dsl_parser_kubernetes.rb

@@ -331,6 +331,7 @@ module Orchparty
 
       def initialize(name, type)
         super AST.service(name: name, _type: type)
+        @node.files = {}
       end
 
       # 1. rememebring the secrets in environment_secrets (so these environments can be created differentyly
@@ -340,6 +341,18 @@ module Orchparty
         @node.environment_secrets = result
         self
       end
+
+      def file(name, volume, &block)
+        result = FileBuilder.build(name, volume, block)
+        @node.files[name]=result
+        self
+      end
+    end
+
+    class FileBuilder < CommonBuilder
+      def initialize(name, volume)
+        super AST.service(filename: name, volume: volume)
+      end
     end
 
     class ServiceMixinBuilder < CommonBuilder

data/lib/orchparty/kubernetes_application.rb

@@ -163,7 +163,7 @@ module Orchparty
       def print_install(chart)
         
         build_chart(chart) do |chart_path|
-          cmd="helm template --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}"
+          cmd="helm template --namespace #{namespace} --debug --kube-context #{cluster_name} #{chart.name} #{chart_path}"
           @out_io.puts `$cmd`
           if system("#{cmd} > /dev/null")
             info("helm template check: OK")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: A cli framework for k8s based development and deployment.