minfra-cli 4.5.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b87ef33ed2dc996e44d256b5a7261ddc450bdb9ec62ff4cf14ee75100fe54d
-  data.tar.gz: affd2f04ae229524d2aca2f27186cc788385071b91d31af715f9852869aafed5
+  metadata.gz: cb4250a44a0505fb93907ee8271ded65daa44bb0e2fc146384b89ef24b83dc40
+  data.tar.gz: 5bc3dcf010537de7ee9dc2f5e8811992dd9413ed12ecd11b05f31ef7da63c777
 SHA512:
-  metadata.gz: 93eeee98335ef70bab22772027c2c9d760d3fbb8e8bc0c6bfb84da675df0e5d04913db030012469f3c1092558dbc5b4b642042d5830953b976c4d5cc0b27e419
-  data.tar.gz: 291c28620311e16e4770a0db2a1d8e18a88529c5cf13e87b52dced59fc5e877533d00008d1561ba64713d2c566754e77d2724a62f7b55e054ff2d587dd2e2457
+  metadata.gz: 3bc9d6f86b09feabb50d4e2e322ae92dce6c24473f0d9fbc4f0746984de6242e9e947311727d6d4e30f9f79d0ae52efff35f3ba34d7e83dc5d89e9a1f081a996
+  data.tar.gz: a8fb7b4720877e13e96fe200cb61399afbc3491bba423df07a6af9310bb0c7e2e321c91cdc579f1fdc063ee2994f3574d62a7e79fba0eac769a9335ef90ee750

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 5.0.0
+ * plugins install removed
+ * minfra uses a usual gemfile
+ * minfra binary has to be in your path in your project see README
+# 4.6.0
+ * loosening dependency versions
 # 4.5.0
  * removing the env.roles dependency so it's env.stacks only
 # 4.4.0

data/README.md

@@ -36,3 +36,24 @@ an application can have
  * variables
  * configurations
  * secrets
+
+# Upgrades
+
+## 4. to 5.
+
+Create a Gemfile and Gemfile.lock in your $MINFRA_PATH with minfra-cli AND
+your plugins.
+
+Create a "minfra" executable in your $PATH with the content
+```
+#!/usr/bin/env ruby
+path = File.expand_path('Gemfile', ENV['MINFRA_PATH'])
+ENV["BUNDLE_GEMFILE"] ||= path
+require "bundler/setup"
+require 'minfra/cli'
+
+exit Minfra::Cli.exec(ARGV)
+```
+
+remove the files config/minfra_plugins.json
+

data/lib/minfra/cli/cli_starter.rb

@@ -120,8 +120,7 @@ module Minfra
       end
 
       def init_plugins
-        @plugins = Minfra::Cli::Plugins.load(@base_path)
-        @plugins.prepare
+        @plugins = Minfra::Cli::Plugins.load
       end
 
       def init_logger

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

@@ -11,10 +11,7 @@ module Minfra
       end
       desc 'install', 'install plugins'
       def install
-        Minfra::Cli.cli.plugins.each do |plugin|
-          puts "setup: #{plugin.name}"
-          plugin.install
-        end
+        puts "deprecated, use bundle install"
       end
     end
   end

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

@@ -3,37 +3,14 @@
 module Minfra
   module Cli
     class Project < Command
-      class Tag < Command
-        desc 'update', 'update stack tag file'
-        option 'environment', aliases: ['-e'], required: true
-        def update(domain, new_tag)
-          tags = JSON.parse(File.read(tags_path))
-
-          raise ArgumentError, "#{path} doesn't contain #{domain}" unless tags[options[:environment]].key?(domain)
-
-          tags[options[:environment]][domain] = new_tag
-          pretty_tags = JSON.pretty_unparse(tags)
-          File.write(tags_path, "#{pretty_tags}\n")
-          puts "#{tags_path} - UPDATED"
-          puts pretty_tags
-        end
-
-        private
-
-        def tags_path
-          apps_path.join('stacks', stack_name, 'tags.json')
-        end
-
-        def apps_path
-          minfra_config.base_path
-        end
-
-        def stack_name
-          current_directory.split('/').last.gsub('_', '-')
-        end
-
-        def current_directory
-          Dir.getwd
+      class TagCli < Command
+        default_command :create
+        # tbd: move this to project
+        desc 'create', 'tag current commit for deployment - triggers CI'
+        option :message, default: 'release', aliases: ['-m']
+        option :format, required: false, aliases: ['-f']
+        def create
+          puts Tag.new.tag_current_commit_for_deploy(options[:message], options[:format])
         end
       end
     end

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

@@ -39,7 +39,7 @@ module Minfra
       subcommand 'branch', Branch
 
       desc 'tag', 'manage tags'
-      subcommand 'tag', Tag
+      subcommand 'tag', TagCli
 
       desc 'test', 'run tests'
       def test
@@ -60,11 +60,8 @@ module Minfra
       option 'target', aliases: ['-t']
       def build
         p = ProjectInfo.load(Pathname.pwd)
-        run_pre_repo
-        target = options[:target] || p.docker.dev_target
-
-        cmd = %(docker build #{"--target #{target}" if target} -t #{p.repo_name}:latest #{p.app_dir})
-        res = Runner.run(cmd)
+        target = options[:target]
+        res=docker_build(target)
         exit(1) if res.error?
 
         return if options[:noload]
@@ -83,17 +80,18 @@ module Minfra
       desc 'push', 'push directly to the repo'
       option 'tag', aliases: ['-t']
       option 'registry', aliases: ['-r']
+      option 'build', type: :boolean, default: true
       def push
         tag = options[:tag] || `date +%Y%m%d%H%M`
         p = ProjectInfo.load(Pathname.pwd)
-
+        
         repo_name = if options[:registry]
                       "#{options[:registry]}/#{p.repo_name}"
                     else
                       p.repo_name
                     end
 
-        Runner.run(%(docker build -t #{p.repo_name}:latest #{p.app_dir}))
+        docker_build(nil) if options[:build]
         #        Runner.run(%{docker push #{p.repo_name}})
         Runner.run(%(docker tag #{p.repo_name}:latest #{repo_name}:#{tag}))
         Runner.run(%(docker push #{repo_name}:#{tag}))
@@ -101,6 +99,24 @@ module Minfra
 
       private
 
+      def docker_build(target)
+        p = ProjectInfo.load(Pathname.pwd)
+        run_pre_repo
+        args=[]
+        if p.build&.args
+          p.build&.args.each_pair do |arg, val|
+            args << "--build-arg #{arg}=#{l!(val)}"
+          end
+        end
+        if target
+          target = "--target #{target}"
+        else
+          traget = ''  
+        end
+        
+        Runner.run(%(docker build #{args.join(' ')} #{target} -t #{p.repo_name}:latest #{p.app_dir} ))
+      end
+      
       def run_pre_repo
         Runner.run(minfra_config.base_path.join('hooks', 'pre_repo.sh').to_s)
       end

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

@@ -17,6 +17,7 @@ module Minfra
         info 'Creating tag.'
         run_cmd(cmd_tag_commit(message), :system)
         run_cmd(cmd_push_tag, :system)
+        tag_name
       end
 
       def ensure_commit_is_pushed
@@ -59,7 +60,7 @@ module Minfra
 
       # TBD: this should be more flexible
       def tag_name
-        "#{git_current_branch}-REL-#{@now.strftime(@format)}"
+        @tag_name ||= "#{git_current_branch}-REL-#{@now.strftime(@format)}"
       end
 
       def run_cmd(cmd, _how = :system)

data/lib/minfra/cli/plugin.rb

@@ -5,68 +5,25 @@ module Minfra
     class Plugins
       class Plugin
         include Logging
-        attr_reader :name, :version, :opts, :path
 
-        def initialize(name:, version:, opts:, disabled:)
-          @name = name
-          @version = version
-          @opts = opts.merge(require: false)
-          @disabled = disabled
-          return unless opts['path']
-
-          @path = Minfra::Cli.config.base_path.join(opts['path'])
-        end
-
-        def disabled?
-          @disabled
+        def name
+          @spec.name
         end
-
-        def install
-          if path
-            system("cd #{path}; bundle install")
-          else
-            system("gem install #{name} --version #{version}")
-          end
+        
+        def version
+          @spec.version
         end
 
-        # adds the plugin to the
-        def prepare
-          debug("plugin prepare: #{name}, #{version}, disabled: #{disabled?}")
-          return if disabled?
-
-          if path
-            begin
-              lib_path = path.join('lib')
-              $LOAD_PATH.unshift lib_path
-              require name
-            rescue Gem::Requirement::BadRequirementError, LoadError
-              warn("plugin prepare path: #{name} (#{$ERROR_INFO})")
-            end
-          else
-            begin
-              @gem_spec = Gem::Specification.find_by_name(name)
-              gem name, version
-            rescue Gem::MissingSpecError
-              warn("plugin prepare gem: #{name}, #{version} (#{$ERROR_INFO})")
-            end
-          end
+        def initialize(spec)
+          @spec = spec
+          @minfracs_path = Pathname.new(spec.full_gem_path).join('minfracs', 'init.rb')
+          raise "no init.rb file in #{@minfracs_path}" unless @minfracs_path.exist?
         end
 
         def setup
-          return if disabled?
-
-          if path
-            minfra_path = Pathname.new(path).join('minfracs', 'init.rb')
-            if minfra_path.exist?
-              begin
-                require minfra_path # this should register the command
-              rescue LoadError
-                logger.warn("Minfra plugin detected but dependencies not installed: #{minfra_path} (#{$ERROR_INFO}). TRY: minfra plugin install")
-              end
-            end
-          else
-            error('Gem based plugins not supported yet')
-          end
+          require @minfracs_path # this should register the command
+        rescue LoadError
+          logger.warn("Minfra plugin detected but dependencies not installed: #{minfra_path} (#{$ERROR_INFO}). TRY: minfra plugin install")
         end
       end
     end

data/lib/minfra/cli/plugins.rb

@@ -8,10 +8,6 @@ module Minfra
         @plugins = plugins
       end
 
-      def prepare
-        @plugins.each(&:prepare)
-      end
-
       def setup
         @plugins.each(&:setup)
       end
@@ -20,17 +16,10 @@ module Minfra
         @plugins.each(&)
       end
 
-      def self.load(base_path)
+      def self.load
         found = []
-        [base_path.join('config', 'minfra_plugins.json'),
-         base_path.join('me', 'minfra_plugins.json')].each do |file|
-          next unless File.exist?(file)
-
-          plugins = JSON.parse(File.read(file))
-          plugins['plugins'].each do |spec|
-            found << Plugin.new(name: spec['name'], opts: spec['opts'] || {}, version: spec['version'],
-                                disabled: spec['disabled'])
-          end
+        definition = Bundler.definition.specs.each do |spec|
+           found << Plugin.new(spec) if Pathname.new(spec.full_gem_path).join('minfracs').exist?
         end
         new(found)
       end

data/lib/minfra/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Minfra
   module Cli
-    VERSION = '4.5.0'
+    VERSION = '5.0.0'
   end
 end

data/minfra-cli.gemspec

@@ -28,14 +28,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   
   spec.add_runtime_dependency 'thor', '~> 1.0', '>= 1.0.0'
-  spec.add_runtime_dependency "table_print", "1.5.6"
+  spec.add_runtime_dependency "table_print", "~> 1.5"
   spec.add_runtime_dependency "rest-client", "~>2.0"
   spec.add_runtime_dependency "hashie", "~>3.5"
-  spec.add_runtime_dependency "activesupport", "= 7.0.7.2"
+  spec.add_runtime_dependency "activesupport", ">= 7"
   spec.add_runtime_dependency "erubis", "~> 2.7"
-  spec.add_runtime_dependency "hiera", "3.9.0"
-  spec.add_runtime_dependency "hiera-eyaml", "3.3.0"
-  spec.add_runtime_dependency "hiera-eyaml-gpg", "0.7.4"
-  spec.add_runtime_dependency "gpgme", "~>2.0.0"
+  spec.add_runtime_dependency "hiera", "~> 3.9"
+  spec.add_runtime_dependency "hiera-eyaml", "~> 3.3"
+  spec.add_runtime_dependency "hiera-eyaml-gpg", "~> 0.7"
+  spec.add_runtime_dependency "gpgme", "~>2.0"
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-29 00:00:00.000000000 Z
+date: 2026-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -34,16 +34,16 @@ dependencies:
   name: table_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +76,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.7.2
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.7.2
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -104,58 +104,58 @@ dependencies:
   name: hiera
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: hiera-eyaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: hiera-eyaml-gpg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: gpgme
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 description: A cli framework for k8s based development and deployment.
 email:
 - peter.schrammel@gmx.de
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: A cli framework for k8s based development and deployment.