minfra-cli 1.8.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 852b56a96bf9ed6edf769a5ab0f3543a41d0759d81c1bf99b4ecd488ed0467a4
-  data.tar.gz: badd1560a02911fa7a1b15de36eb6ae59abb584f29824247948899ae33ec11a2
+  metadata.gz: 6b6ce82cdaae481dff04fd7af765c0afdf3dd8fbe2c58cb132d0e882bfa04333
+  data.tar.gz: d11ca5d16a40cb3fab6a3d1b1a7b62169fdbebf4a8d089de926b569cc21aff33
 SHA512:
-  metadata.gz: d57dfbd9ac19d4a982ab32f418100ab9f8cdde0419ba20a59a34f0d519a1d9b7ca6f6dfcbb5a4203d659fc3e3ced737454f115668aac796dc44041a9f4062dc3
-  data.tar.gz: 2190a697f7044c2ee18ee722b2ab1a6497d5f90506d084145644e927404328203e8dd80481419a308e597ecc65d041e844d969aff41403baf4a1836b4d187f56
+  metadata.gz: c54299b3398f0b744aff1484c48836077704965cc3ba6d69bee3e3102df844232ac6d6bd6243b55cd2638a649fcffbc0997073788fc360c762c857f41f378d0b
+  data.tar.gz: a13f08bc9f2efedcddb66ef5863ebe95c7892d3e4f801b9c0932b712828eb7022d640893acdf431d8662ac7b21a8aef6cccfde71dfcd239a2451e6159a07a950

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 1.10.0
+ * project.json supports exec_params
+ * helm values are all strings (so helm doesn't convert them)
+# 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

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
@@ -77,7 +77,7 @@ module Minfra
       def exec(cmd='/bin/bash')
         p=ProjectInfo.load(Pathname.pwd)
         run_pre_repo
-        Kernel.exec(%{docker run -ti --rm  -v #{p.app_dir}:/code #{p.repo_name}:latest #{cmd}})
+        Kernel.exec(%{docker run -ti --rm  #{p.exec_params} -v #{p.app_dir}:/code #{p.repo_name}:latest #{cmd}})
       end
 
       desc "push", "push directly to the repo"

data/lib/minfra/cli/runner.rb

@@ -24,7 +24,7 @@ module Minfra
             debug line
           else
             @stderr_lines << line
-            error line
+            info line
           end
         end
 

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.8.0'.freeze
+    VERSION = '1.10.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")
@@ -222,7 +222,7 @@ module Orchparty
               output_chart_path: output_chart_path
             )
             used_vars.each do |variable,value| 
-              helm_values.puts "#{variable}: #{value}"
+              helm_values.puts "#{variable}: \"#{value}\""
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-05-03 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.