kube_cluster 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac52e8ce0c9a435a78497095c22cdc598ccbde6d617247cd25ed00919261e46
-  data.tar.gz: 3e6147a0ab466a2cf0275ded885febb7ea9ec4bc092abdc19c39e2130c2dc517
+  metadata.gz: 34f6c89109b79b6be8137a3997de13bb5b0fce1c1d6b4993c62a9b8c742b0124
+  data.tar.gz: 2788eef6b86900c2e0abcb4a7d41630667da5509d6f8c3a29258e5e833aaf0e0
 SHA512:
-  metadata.gz: d84f7ef217ade440d364d368701e6b4e75aaf4da3628c60f65b2d71dabf33f6764d802a239628831e2107c2fa988c03f337d4615b173b5d66b125ea911c31a3e
-  data.tar.gz: 320623843a7d59d2e8716264211f9e9004bf7984e4b3eebf33bc03762297f8d64b46e4c20103085098a167199922cadb300ad6a852f3ae39ac6e4427b3a2df76
+  metadata.gz: fb9f12348b47e796dfd1d96cdc44200b600b062beee943d4343292f5546e5bd3d4bfa744b99df1eae3c6d5838530d0f4f796eae11746ac05154d0a488677efc7
+  data.tar.gz: be495978b1494e1dd84343de7e1aca23056c3d1b2cba811d42cb8c7a7ce9f5b70d96fae1c055ad26e73c767cfcad4bb68be50e6b043e677fddef738166cbf320

data/.github/workflows/test.yaml

@@ -0,0 +1,22 @@
+name: Test
+
+on: [push, pull_request]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.3"
+          bundler-cache: true
+
+      - run: sudo apt-get install -y ripgrep
+
+      - run: bundle exec scampi

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    kube_cluster (0.4.2)
+    kube_cluster (0.4.4)
       kube_kubectl (~> 2.0.9)
-      kube_schema (~> 1.4.1)
+      kube_schema (~> 1.4.3)
       scampi (~> 0.1)
 
 GEM
@@ -38,7 +38,7 @@ GEM
       rubyshell (~> 1.5)
       shellwords (~> 0.2.2)
       string_builder (~> 1.2.2)
-    kube_schema (1.4.1)
+    kube_schema (1.4.3)
       json_schemer (~> 2.5.0)
       rubyshell (~> 1.5.0)
     language_server-protocol (3.17.0.5)

data/kube_cluster.gemspec

@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rubocop", "~> 1.21"
 
-  spec.add_dependency "kube_schema", "~> 1.4.1"
+  spec.add_dependency "kube_schema", "~> 1.4.3"
   spec.add_dependency "kube_kubectl", "~> 2.0.9"
 end

data/lib/kube/cluster/manifest.rb

@@ -23,6 +23,31 @@ module Kube
     #
     class Manifest < Kube::Schema::Manifest
       attr_reader :resources
+
+      # Override << to automatically upgrade Kube::Schema::Resource
+      # instances into Kube::Cluster::Resource instances. This ensures
+      # resources parsed via Kube::Schema::Manifest (e.g. from Helm
+      # charts or downloaded YAML) gain cluster-level methods like
+      # cluster_scoped?, pod_bearing?, and rebuild when composed into
+      # a cluster manifest.
+      def <<(item)
+        case item
+        when Kube::Cluster::Resource
+          @resources << item
+        when Kube::Schema::Resource
+          @resources << Kube::Cluster[item.kind].new(item.to_h)
+        when Kube::Schema::Manifest
+          item.each { |r| self << r }
+        when Array
+          item.each { |r| self << r }
+        else
+          raise ArgumentError,
+            "Expected a Kube::Schema::Resource or Manifest, got #{item.class}. " \
+            "Use Kube::Schema.parse(hash) to convert hashes."
+        end
+
+        self
+      end
     end
   end
 end

data/lib/kube/cluster/version.rb

@@ -2,6 +2,6 @@
 
 module Kube
   module Cluster
-    VERSION = "0.4.2"
+    VERSION = "0.4.4"
   end
 end

data/lib/kube/helm/repo.rb

@@ -46,13 +46,13 @@ module Kube
       #
       # @return [self]
       def add
-        if endpoint.requires_add?
-          repo_name = @name
-          repo_url = endpoint.url
-          cmd = helm.call { repo.add.(repo_name).(repo_url) }
-          helm.run(cmd.to_s)
+        tap do
+          if endpoint.requires_add?
+            helm.run(
+              helm.call { repo.add.(@name).(endpoint.url) }.to_s
+            )
+          end
         end
-        self
       end
 
       # Update the local chart index for this repo.
@@ -60,12 +60,13 @@ module Kube
       #
       # @return [self]
       def update
-        if endpoint.requires_add?
-          repo_name = @name
-          cmd = helm.call { repo.update.(repo_name) }
-          helm.run(cmd.to_s)
+        tap do
+          if endpoint.requires_add?
+            helm.run(
+              helm.call { repo.update.(@name) }.to_s
+            )
+          end
         end
-        self
       end
 
       # Remove this repo from the local Helm client.
@@ -73,12 +74,13 @@ module Kube
       #
       # @return [self]
       def remove
-        if endpoint.requires_add?
-          repo_name = @name
-          cmd = helm.call { repo.remove.(repo_name) }
-          helm.run(cmd.to_s)
+        tap do
+          if endpoint.requires_add?
+            helm.run(
+              helm.call { repo.remove.(@name) }.to_s
+            )
+          end
         end
-        self
       end
 
       # Fetch a chart from this repo.
@@ -96,12 +98,19 @@ module Kube
 
         ref = endpoint.chart_ref(chart_name, repo_name: @name)
 
-        cmd = helm.call { show.chart.(ref) }
-        cmd = cmd.version(version) if version
-        yaml_output = helm.run(cmd.to_s)
-
-        data = YAML.safe_load(yaml_output, permitted_classes: [Symbol]) || {}
-        Chart.new(data, ref: ref, cluster: @cluster)
+        helm.run(
+          helm.call {
+            if version
+              show.chart.(ref).version(version)
+            else
+              show.chart.(ref)
+            end
+          }.to_s
+        ).then do |yaml_output|
+          (YAML.safe_load(yaml_output, permitted_classes: [Symbol]) || {}).then do |data|
+            Chart.new(data, ref: ref, cluster: @cluster)
+          end
+        end
       end
 
       # Is this an OCI-backed repo?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kube_cluster
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Nathan K
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: kube_kubectl
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ files:
 - ".envrc"
 - ".github/workflows/release.yml"
 - ".github/workflows/tag-gem-version-bump.yml"
+- ".github/workflows/test.yaml"
 - ".gitignore"
 - ".rubocop.yml"
 - Gemfile