minfra-cli 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee7403eb8f3f5f3c9e6dd04d9eeef32035c5d3cf18dde0021eda7212b202ef7
-  data.tar.gz: 692c872591218c5b4b1df9b34795eea7b92d91b916d376a360c81c21d3342b7e
+  metadata.gz: 0d8c4fc413b6865291c1f47e12581c0f11131008f4852742969fb49a8be4272d
+  data.tar.gz: 7e1eb348156ba8adb74bf7f5bb5055853c31a3c2802fa77497c7a529573f9d23
 SHA512:
-  metadata.gz: d647f1d0c84d68c1f2148f7993ee84076a6a2fe73a3b4cd7dfd92c2bda772e4f737eb702c9970d3b9658dbf92faf6d53507b1c4c030f3291c415f02da6933981
-  data.tar.gz: e3cf8822eea02dc932b1308b8f08522a079e15bd648dd121c2724fd7da97db6a5df89345faed1df17bab60beab160a30a8330ba12473afa33df0be21ee932968
+  metadata.gz: efa9ca0853ee602c708770a42cd6c1269f996dbcb70d4170cb630b815df161bc280bd5afb1ce608a4afefa699a6df78fa22c099260bfe3853ce4da7b8a601745
+  data.tar.gz: 28e53a02daacbe1c3ccc33fa2e273a52ac04c7b9189c559a93b7d4fd5840bae0eb837ebbee16e74df533dd574b84eb350805ffca22bad2e4da09b209af7d916a

data/.gitignore

@@ -14,3 +14,5 @@ vendor
 spec/docker-compose.run.yml
 
 minfra-cli-*.gem
+
+.rspec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.5.0
+ * minfra project branch create now supports --prefix, keeps '-' (dash intact) and is config file configurable
+ * Minfra::Cli::Config deep merges personal config (again)
+# 1.4.4
+ * fixing logging on fresh installs
 # 1.4.3
  * fixing exec for kubectl wrapper
  * more logger usage less puts

data/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+#RSpec::Core::RakeTask.new(:spec)
+
+#task :default => :spec

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

@@ -4,12 +4,16 @@ module Minfra
       class Branch < Command
 
         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"
         def create(story_desc)
-          story_desc = story_desc.gsub(/[^0-9a-z]/i, '_')
-          email = `git config user.email`
-          fullname = email.split('@').first
-          name = fullname[0] + fullname.split('.').last
-          Runner.run("git checkout -b #{name}_#{story_desc}_$(date +%Y%m%d)")
+          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  
+          Runner.run("git checkout -b #{prefix}_#{story_desc}_$(date +%Y%m%d)")
         end
       end
     end

data/lib/minfra/cli/config.rb

@@ -6,8 +6,6 @@ module Minfra
   module Cli
     # responsible the read the config file(s) and add a small abstraction layer on top of it
     class Config
-      include Logging
-      
       class ConfigNotFoundError < StandardError
       end
       class EnvironmentNotFoundError < StandardError
@@ -58,6 +56,11 @@ module Minfra
           @config = Hashie::Mash.new({})
         end
         @project = Hashie::Mash.new(JSON.parse(Minfra::Cli::Templater.render(File.read(@project_config_path),{})))
+        @project= @project.
+           deep_merge(@config)
+#           deep_merge(@project.environments[@orch_env]).
+#           deep_merge(@orch_env_config)
+
       end
 
       def load(orch_env)

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.4.3'.freeze
+    VERSION = '1.5.0'.freeze
   end
 end

data/templates/project/dev/bin/runner

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [[ -f "$MINFRA_PATH/config/env_setup" ]]; then
+  source $MINFRA_PATH/config/env_setup
+fi
+
+MINFRA_SHELL=${MINFRA_SHELL:-"/bin/bash"}
+CMD=${@:-$MINFRA_SHELL}
+
+echo "running: '$CMD'"
+
+exec $CMD
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -157,6 +157,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
+- Rakefile
 - bin/build
 - bin/console
 - bin/container_exec
@@ -211,6 +212,7 @@ files:
 - templates/kind.yaml.erb
 - templates/kube_config.yaml.erb
 - templates/minfra_config.json.erb
+- templates/project/dev/bin/runner
 homepage: https://github.com/fixingthenet/minfra-cli
 licenses:
 - MIT