minfra-cli 4.3.1 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f391beecc0c949b1d7c1858dc6ccfdcabe22b975fa8e9cd2c610cdd410debc72
-  data.tar.gz: 7bf5463712d8846e987f18c2a28a26972278abc60b5b04014573676a5ff4db37
+  metadata.gz: 07b87ef33ed2dc996e44d256b5a7261ddc450bdb9ec62ff4cf14ee75100fe54d
+  data.tar.gz: affd2f04ae229524d2aca2f27186cc788385071b91d31af715f9852869aafed5
 SHA512:
-  metadata.gz: 69e60f521c841f05498f7fb3d63190058826f8f95ffa9c5fbdb8e17607ef2f165491edad8a4e5c0a8459099706872d2299e0664d0f9daa013825aaead7767170
-  data.tar.gz: 8b84fb6a9c24b756a090f772cf5faa3733b3f3e10109701791e45997cb104f7f43c63799bc6f3a76a816047ae511701a9b606cc09412cc95e99c2114edd4ef45
+  metadata.gz: 93eeee98335ef70bab22772027c2c9d760d3fbb8e8bc0c6bfb84da675df0e5d04913db030012469f3c1092558dbc5b4b642042d5830953b976c4d5cc0b27e419
+  data.tar.gz: 291c28620311e16e4770a0db2a1d8e18a88529c5cf13e87b52dced59fc5e877533d00008d1561ba64713d2c566754e77d2724a62f7b55e054ff2d587dd2e2457

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 4.5.0
+ * removing the env.roles dependency so it's env.stacks only
+# 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

data/README.md

@@ -14,7 +14,7 @@ Is a KIND (k8s in docker) based development environment.
 |   | MINFRA_ARGV_FILE     |                       | --minfra_argv_file [PATH TO A CSV FILE FILE] |   |
 |   | MINFRA_LOGGING_LEVEL | minfra.logging_level  |                                              |   |
 |   |                      | minfra.hiera.env_path |                                              |   |
-|   |                      | default_stacks        |                                              | env.stacks or  env.roles   |
+|   |                      | default_stacks        |                                              | env.stacks |
 |   |                      |                       |                  | infra::allow_insecure_k8s_connections |
 | when set to 'true' all hiera lookups are logged on debug level  | MINFRA_DEBUG_HIERA_LOOKUPS | | | |
 | to override the backends in the hiera file, comma separated | MINFRA_HIERA_BACKENDS | | | |
@@ -22,19 +22,6 @@ Is a KIND (k8s in docker) based development environment.
 ## Expected hiera data
 
  * l("cluster.id"): the k8s name of the cluster
- 
-
-
-
-
-
-
-
-
-
-
-
-
 
 # Orchparty
 

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/commands/stack.rb

@@ -33,14 +33,14 @@ module Minfra
       option :opts
       option :force, type: :boolean
       def deploy(stack_name, message = '')
-        stacks = l('env.roles') || l('env.stacks') || []
+        stacks = l('env.stacks') || []
         default_stacks = minfra_config.project.default_stacks || []
-        stacks = stacks + default_stacks
+        stacks += default_stacks
         if stacks.include?(stack_name) || options[:force] || options[:test]
           kube.deploy(stack_name, message)
         else
-          exit_error("project:default_stacks or hiera:env.roles or hiera:env.stacks has to include '#{stack_name}' or use --force or --test")
-        end  
+          exit_error("project:default_stacks or hiera:env.stacks has to include '#{stack_name}' or use --force or --test")
+        end
       end
 
       desc 'rollback <extraargs>', 'rollback a deployment'

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.1'
+    VERSION = '4.5.0'
   end
 end

metadata

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