helm-wrapper 1.6.1 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 426d691601f0abf81de0fed973b780d045f280ae57667f1d6568421073949e80
-  data.tar.gz: 29ca573755007d4f3060f468ff81874fb27a59bc62a530a969683c4b1ecec71d
+  metadata.gz: 0aecbab2f1f72005e79c51eac2db8df46aa64213d6ca0202571de8437ee7d293
+  data.tar.gz: a2c91b66ffdccb7210f9086f911b5ea49ed039046c40c77e173bc20cea9bfbfc
 SHA512:
-  metadata.gz: 856ac83c194d9950099ce41db009788068c5bfc3e9a9982b88ec78aeac9ff199f6b435d443fb9f62975affb8703e0d3a803d76aa662c7a123b870865700c5765
-  data.tar.gz: 9f44e3844f86f852042a13ab7da3146d83348083db9ae49f3b772f7c0f8b26accedc939f469beb61e9035837ca874ea4eed30ea8b8601e2c5fa3d95e02f21897
+  metadata.gz: b09d50fd662c1b4904f1425ae43fb91ad1c2fb884d96e2b819ad4c3c88bc4d31fbb84ac7a039a21cb9a7f3bb6d05da4ef565edfe671948885031b2ec03729daf
+  data.tar.gz: 793f72b674d108c36313e60d3ba8359c1f9788dd09f91043377a72e5b01f13b61e5dd983bb256acfdf0e29769e95f69b7cd89f61e10a03c2c5b5022c1c8aac19

data/.gitignore

@@ -21,8 +21,3 @@
 /tmp/
 
 ###############################################################################
-
-/archlinux/
-!/archlinux/PKGBUILD
-
-###############################################################################

data/.gitlab-ci.yml

@@ -1,37 +1,8 @@
 ###############################################################################
 
-image: ruby
-
-###############################################################################
-
-stages:
-  - test
-  - publish
-
-###############################################################################
-
-test:
-  stage : test
-  script:
-    - echo "-- Beginning Test --"
-    - echo "-- Tests not implemented yet --"
-
-###############################################################################
-
-deploy:
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/'
-  stage: publish
-  script:
-    - echo "-- Beginning Publish --"
-    - test -n "${GEM_HOST_API_KEY}"
-    - echo "RubyGems API key found!"
-    - hash rake
-    - hash ruby
-    - hash gem
-    - echo "-- Publishing Gem --"
-    - rake release
-    - echo "-- Listing Sums --"
-    - sha256sum "pkg"/*.gem
+include:
+  - project: 'bitservices/gitlab/ruby'
+    ref: latest
+    file: '/templates/gems.yml'
 
 ###############################################################################

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Gemfile

@@ -4,7 +4,7 @@
 
 ###############################################################################
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 ###############################################################################
 

data/helm-wrapper.gemspec

@@ -4,35 +4,37 @@
 
 ###############################################################################
 
-require_relative "lib/helm-wrapper/version"
+require_relative 'lib/helm-wrapper/version'
 
 ###############################################################################
 
 Gem::Specification.new do |spec|
-  spec.name        = "helm-wrapper"
+  spec.name        = 'helm-wrapper'
   spec.version     = HelmWrapper::VERSION
-  spec.authors     = ["Richard Lees"]
-  spec.email       = ["git0@bitservices.io"]
+  spec.authors     = ['Richard Lees']
+  spec.email       = ['git0@bitservices.io']
 
-  spec.summary     = "A ruby wrapper for managing Helm binaries and chart deployment."
-  spec.description = "A ruby wrapper for managing Helm binaries and chart deployment. Helm Wrapper also supports authenticating with specific Kubernetes clusters."
-  spec.homepage    = "https://gitlab.com/rlees85-ruby/helm-wrapper/"
-  spec.license     = "MIT"
+  spec.summary     = 'A ruby wrapper for managing Helm binaries and chart deployment.'
+  spec.description = 'A ruby wrapper for managing Helm binaries and chart deployment. Helm Wrapper also supports authenticating with specific Kubernetes clusters.'
+  spec.homepage    = 'https://gitlab.com/rlees85-ruby/helm-wrapper/'
+  spec.license     = 'MIT'
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 
-  spec.metadata["homepage_uri"]    = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata['homepage_uri']    = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:archlinux|test|spec|features)/}) or f.match(%r{\Aavatar(?:_group)?\.png\z}) }
   end
 
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'rake', '~> 13.0'
+
+  spec.add_development_dependency 'rspec', '~> 3.10'
 end
 
 ###############################################################################

data/lib/helm-wrapper/shared/auths/azure.rb

@@ -92,7 +92,7 @@ module HelmWrapper
 ###############################################################################
 
         def cli()
-          output  = logger.colour ? "jsonc" : "json"
+          output  = logger.colour ? "yamlc" : "yaml"
           cmdline = "\"#{@@az}\" version --output \"#{output}\""
           return(system(cmdline) || false)
         end

data/lib/helm-wrapper/shared/chart.rb

@@ -14,6 +14,10 @@ module HelmWrapper
 
       include HelmWrapper::Shared::Logging
 
+###############################################################################
+
+      @@chart_metadata_file = "Chart.yaml"
+
 ###############################################################################
 
       attr_reader :artefact
@@ -25,22 +29,24 @@ module HelmWrapper
 ###############################################################################
 
       def initialize(options:)
-        logger.fatal("Chart name must be a string!") unless options["name"].kind_of?(String)
-        logger.fatal("Chart name must not be blank!") if options["name"].strip.empty?
+        if options["path"].nil? then
+          @path = options["path"]
 
-        @name = options["name"]
+          logger.fatal("Chart name must be a string!") unless options["name"].kind_of?(String)
+          logger.fatal("Chart name must not be blank!") if options["name"].strip.empty?
+          @name = options["name"]
 
-        unless options["path"].nil? then
+          logger.fatal("Chart version must be a string!") unless options["version"].kind_of?(String)
+          @version = options["version"]
+        else
           logger.fatal("Chart path must be a string!") unless options["path"].kind_of?(String)
           logger.fatal("Chart path must not be blank!") if options["path"].strip.empty?
           logger.fatal("Chart path must exist!") unless File.directory?(options["path"])
-        end
-
-        @path = options["path"]
 
-        logger.fatal("Chart version must be a string!") unless options["version"].kind_of?(String)
+          @path = options["path"]
 
-        @version = options["version"]
+          load_metadata
+        end
 
         logger.fatal("Chart repos must be a list of hashes!") unless options["repos"].kind_of?(Array)
 
@@ -49,11 +55,7 @@ module HelmWrapper
         @oci      = Array.new
         @artefact = Array.new
 
-        repos.each do |repo|        logger.fatal("Configuration name must be a string!") unless options["name"].kind_of?(String)
-        logger.fatal("Configuration name must not be blank!") if options["name"].strip.empty?
-
-        @name = options["name"]
-
+        repos.each do |repo|
           logger.fatal("All elements of chart repos must be hashes!") unless repo.kind_of?(Hash)
 
           logger.fatal("Chart repo: #{hash["name"]} must have a type attribute!") unless repo.key?("type")
@@ -113,6 +115,39 @@ module HelmWrapper
         oci[index]["active"] = active
       end
 
+###############################################################################
+
+      private
+
+###############################################################################
+
+      def load_metadata
+        file = File.join(@path, @@chart_metadata_file)
+
+        if File.file?(file)
+          logger.info("Loading chart metadata from: #{file}...")
+        else
+          logger.fatal("Chart metadata file: #{file} not found!")
+        end
+
+        yaml = YAML.load(File.read(file))
+        logger.fatal("Invalid YAML in chart metadata file: #{file}") unless yaml.kind_of?(Hash)
+
+        logger.fatal("Chart name is missing from chart metadata file!") unless yaml.key?("name")
+        logger.fatal("Chart name is not a string in chart metadata file!") unless yaml["name"].kind_of?(String)
+        logger.fatal("Chart name is blank in chart metadata file!") if yaml["name"].strip.empty?
+
+        @name = yaml["name"]
+
+        logger.fatal("Chart version is missing from chart metadata file!") unless yaml.key?("version")
+        logger.fatal("Chart version is not a string in chart metadata file!") unless yaml["version"].kind_of?(String)
+        logger.fatal("Chart version is blank in chart metadata file!") if yaml["version"].strip.empty?
+
+        @version = yaml["version"]
+
+        logger.info("Metadata loaded: #{@name} version: #{@version}")
+      end
+
 ###############################################################################
 
     end

data/lib/helm-wrapper/shared/latest.rb

@@ -52,7 +52,12 @@ module HelmWrapper
         logger.fatal("Response body from GitHub API is not permitted!")                if not response.class.body_permitted?
         logger.fatal("Response body from GitHub API is empty!")                        if response.body.nil?
 
-        body = JSON.parse(response.body)
+        begin
+          body = JSON.parse(response.body)
+        rescue JSON::ParserError
+          logger.fatal("Response body from GitHub API is not valid JSON!")
+        end
+
 
         logger.fatal("GitHub API JSON response did not include latest available Helm tag name!") if not body.key?("tag_name")
         logger.fatal("GitHub API indicated the latest available tag name for Helm is blank!")    if body["tag_name"].empty?

data/lib/helm-wrapper/shared/runner.rb

@@ -175,25 +175,29 @@ module HelmWrapper
 
 ###############################################################################
 
-      def push(tag:)
-        logger.fatal("Cannot Helm push before initialising repositories!") unless repos
-
+      def package(destination: ".")
         parameters = Array.new
-        parameters.append("push")
-        parameters.append("\"#{@chart.name}:#{tag}\"")
+        parameters.append("--destination=\"#{destination}\"")
+        parameters.append("\"#{@chart.path}\"")
 
-        logger.fatal("Helm push failed!") unless run(action: "chart", parameters: parameters)
+        logger.fatal("Helm package failed!") unless run(action: "package", parameters: parameters)
       end
 
 ###############################################################################
 
-      def save(tag:)
+      def push(source: ".", destination:)
+        logger.fatal("Cannot Helm push before initialising repositories!") unless repos
+
+        package_name = "#{@chart.name}-#{@chart.version}.tgz"
+        package_path = File.join(source, package_name)
+
+        logger.fatal("Must package before pushing! Package: #{package_path} not found!") unless File.file?(package_path)
+
         parameters = Array.new
-        parameters.append("save")
-        parameters.append("\"#{@chart.path}\"")
-        parameters.append("\"#{@chart.name}:#{tag}\"")
+        parameters.append("\"#{package_path}\"")
+        parameters.append("\"#{destination}\"")
 
-        logger.fatal("Helm save failed!") unless run(action: "chart", parameters: parameters)
+        logger.fatal("Helm push failed!") unless run(action: "push", parameters: parameters)
       end
 
 ###############################################################################

data/lib/helm-wrapper/tasks/push.rb

@@ -18,12 +18,14 @@ module HelmWrapper
 
       @binary
       @chart
+      @destination
 
 ###############################################################################
 
-      def initialize(binary:, chart:)
-        @binary = binary
-        @chart  = chart
+      def initialize(binary:, chart:, destination:)
+        @binary      = binary
+        @chart       = chart
+        @destination = destination
 
         yield self if block_given?
 
@@ -34,8 +36,7 @@ module HelmWrapper
 
       def push_task
         desc "Pushes a Helm chart to an OCI Helm repository."
-        task :push, [:tag, :clean] => :binary do |t, args|
-          tag = (args[:tag].kind_of?(String) and (not args[:tag].strip.empty?)) ? args[:tag].strip : "latest"
+        task :push, [:clean] => :binary do |t, args|
           clean = args[:clean].kind_of?(String) ? args[:clean].downcase == "true" : true
 
           runner = HelmWrapper::Shared::Runner.new(binary: @binary, chart: @chart)
@@ -44,8 +45,8 @@ module HelmWrapper
 
           begin
             runner.init_repos
-            runner.save(tag: tag)
-            runner.push(tag: tag)
+            runner.package
+            runner.push(destination: @destination)
           ensure
             runner.clean(repos: clean)
           end

data/lib/helm-wrapper/version.rb

@@ -4,7 +4,7 @@ module HelmWrapper
 
 ###############################################################################
 
-  VERSION = "1.6.1"
+  VERSION = "1.7.1"
 
 ###############################################################################
 

data/lib/helm-wrapper.rb

@@ -25,6 +25,7 @@ module HelmWrapper
   def self.deployment_tasks(chart:, namespace:, release:, options: Hash.new)
     @logger.info("Building deployment tasks for release: #{release}...")
 
+    @logger.fatal("Chart must be specified as a string!") unless chart.kind_of?(String)
     @logger.fatal("Options must be specified as a hash!") unless options.kind_of?(Hash)
 
     binary_options = Hash.new
@@ -60,9 +61,11 @@ module HelmWrapper
 
 ###############################################################################
 
-  def self.development_tasks(chart:, path:, oci: false, options: Hash.new)
+  def self.development_tasks(path:, destination: String.new, options: Hash.new)
     @logger.info("Building development tasks for path: #{path}...")
 
+    @logger.fatal("Path must be specified as a string!") unless path.kind_of?(String)
+    @logger.fatal("Destination must be specified as a string!") unless destination.kind_of?(String)
     @logger.fatal("Options must be specified as a hash!") unless options.kind_of?(Hash)
 
     binary_options = Hash.new
@@ -70,17 +73,16 @@ module HelmWrapper
     binary_options["version"] = options.key?("binary-version") ? options["binary-version"] : Shared::Latest.instance.version
 
     chart_options = Hash.new
-    chart_options["name"]    = chart
-    chart_options["path"]    = path
-    chart_options["repos"]   = options.key?("chart-repos")   ? options["chart-repos"]   : Array.new
-    chart_options["version"] = String.new
+    chart_options["name"]  = nil
+    chart_options["path"]  = path
+    chart_options["repos"] = options.key?("chart-repos")   ? options["chart-repos"]   : Array.new
 
     binary = HelmWrapper::Shared::Binary.new(options: binary_options)
     chart  = HelmWrapper::Shared::Chart.new(options: chart_options)
 
     tasks = Array.new
     tasks << HelmWrapper::Tasks::Binary.new(binary: binary)
-    tasks << HelmWrapper::Tasks::Push.new(binary: binary, chart: chart) if oci
+    tasks << HelmWrapper::Tasks::Push.new(binary: binary, chart: chart, destination: destination) unless destination.strip.empty?
     tasks << HelmWrapper::Tasks::Validate.new(binary: binary, chart: chart)
     return tasks
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helm-wrapper
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.1
 platform: ruby
 authors:
 - Richard Lees
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
 description: A ruby wrapper for managing Helm binaries and chart deployment. Helm
   Wrapper also supports authenticating with specific Kubernetes clusters.
 email:
@@ -34,9 +48,12 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - Rakefile
+- avatar-0.png
+- avatar-1.png
 - bin/console
 - bin/setup
 - helm-wrapper.gemspec
@@ -83,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A ruby wrapper for managing Helm binaries and chart deployment.