minfra-cli 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3130c38b75f95a1e33c187d6b2026ef0eead6ae92855021ef8c52a3d47aefc28
-  data.tar.gz: fe0fbbfee11d712ae34668bd9c5f87696fbf7c08186b409f0e33baf1d24ec449
+  metadata.gz: 06e100d0667dba3e52f6e1f38633a72d47e3ec18ba8f0fb679abf871eabcef50
+  data.tar.gz: da63967be82772cdfe504a59dabc25f38a72ad061ca669e9b695e0c44b5b6629
 SHA512:
-  metadata.gz: 5b52d83585031a954c4db6a632322ecb3077936bed7ffa824d125e5ca6fb6341aead5abf1220671e9e17fcd6c7c0f541ea2a39405d541b51b5c1db11d9c8ffd1
-  data.tar.gz: 46aaa7a2acfe06a6fc190a21e5c7e0c391a55d503eda59618961b77f334203a1efa47d6c0ea337bdccbf2c22d255021ca1f148e9a23ae9f1863e543fa1748e27
+  metadata.gz: 95b34f5effb48354fd5eb02a93317a0cb31d849841c842875d3d58e8575316a7e90b399252e0eb6cc83b71529ecf0f81ec719657ba3ef1fc15c54bd3b9ce49b2
+  data.tar.gz: 0a8cf48b7e6148eb1713383d3ec2292de0436b01e5278fc3a2bd650eedfc01b0c130d8fd3ab33ab46dcdc7ceb4289d32e431f49a830b1819f4197d3063a745e9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 4.4.0
+ * adding test option to runner to not run any command
+ * adding option tag to project branch create to fully override tag generation logic
+ * adding test options to project branch create to not run the final git command
+# 4.3.1
+ * hashie mash hashes for helm values are now type converted correctl
 # 4.3.0
  * raising EnvNotFound when the environment is not found
  * instead of patching yaml we're introducing yeaml backend to lookup eyaml files without decryption

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

@@ -7,15 +7,27 @@ module Minfra
         desc "create 'story desc'", 'create branch'
         option :prefix, type: :string,
                         desc: "don't use your git email address or project.branch.create.prefix or identity.email"
+        option :tag, type: :string, desc: 'overwrite default tag generation'
+        option :test, type: :boolean, default: false, desc: "don't create the tag just show the command"
+        
         def create(story_desc)
-          story_desc = story_desc.gsub(/[^0-9a-z-]/i, '_')
-          prefix = options[:prefix] || Minfra::Cli.config.project.dig('project', 'branch', 'create', 'prefix')
-          unless prefix
-            email = Minfra::Cli.config.project.dig('identity', 'email') || `git config user.email`
-            fullname = email.split('@').first
-            prefix = fullname[0] + fullname.split('.').last
+          if options[:tag]
+            tag = options[:tag]
+          else
+            story_desc = story_desc.gsub(/[^0-9a-z-]/i, '_')
+
+            prefix = options[:prefix] || Minfra::Cli.config.project.dig('project', 'branch', 'create', 'prefix')
+            unless prefix
+              email = Minfra::Cli.config.project.dig('identity', 'email') || `git config user.email`
+              fullname = email.split('@').first
+              prefix = fullname[0] + fullname.split('.').last
+            end
+
+            now = Time.now.utc.strftime('%Y%m%d')
+            tag = options[:tag] || "#{prefix}_#{story_desc}_#{now}"
           end
-          Runner.run("git checkout -b #{prefix}_#{story_desc}_$(date +%Y%m%d)")
+
+          Runner.run("git checkout -b #{tag}", test: options[:test])
         end
       end
     end

data/lib/minfra/cli/runner.rb

@@ -64,16 +64,18 @@ module Minfra
 
       attr_reader :exit_on_error, :runner, :cmd, :on_output
 
-      def initialize(cmd, exit_on_error: true, runner: :popen, on_output: nil)
+      def initialize(cmd, exit_on_error: true, runner: :popen, on_output: nil, test: false)
         @cmd = cmd
         @exit_on_error = exit_on_error
         @runner = runner
         @on_output = on_output
+        @test = test
       end
 
       def run
         debug("running (#{@runner}): #{@cmd}")
         res = Result.new(on_output:)
+        return res if @test
         case @runner
               when :system
                 run_system(res)

data/lib/minfra/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Minfra
   module Cli
-    VERSION = '4.3.0'
+    VERSION = '4.4.0'
   end
 end

data/lib/orchparty/kubernetes_application.rb

@@ -257,6 +257,8 @@ module Orchparty
                   { variable => value.to_s}.to_yaml[4..-1]
                 when yml.match(/!ruby\/array:Hashie::Array/)
                   { variable => value.to_a}.to_yaml[4..-1]
+                when yml.match(/!ruby\/hash:Hashie::Mash/)
+                  { variable => value.to_h}.to_yaml[4..-1]
                 else
                   yml  
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor