kube_cluster 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac52e8ce0c9a435a78497095c22cdc598ccbde6d617247cd25ed00919261e46
-  data.tar.gz: 3e6147a0ab466a2cf0275ded885febb7ea9ec4bc092abdc19c39e2130c2dc517
+  metadata.gz: 29db1c6f54de40e913ebbf0698353380446c782e040e7eed7cefe2953f77bcb6
+  data.tar.gz: 346218c60144c14a826e2a96f622aefdd099f1ac86d339a25d7d331f27ca799d
 SHA512:
-  metadata.gz: d84f7ef217ade440d364d368701e6b4e75aaf4da3628c60f65b2d71dabf33f6764d802a239628831e2107c2fa988c03f337d4615b173b5d66b125ea911c31a3e
-  data.tar.gz: 320623843a7d59d2e8716264211f9e9004bf7984e4b3eebf33bc03762297f8d64b46e4c20103085098a167199922cadb300ad6a852f3ae39ac6e4427b3a2df76
+  metadata.gz: c1a5e8987a539b0d47395ee463cbfce25dec2694898ffecdab4b238d1f4d14e85946bf1c39907bd63932973f80cdc79d6034ae4bac540a3ffcaa196c33811436
+  data.tar.gz: b5ce0e7cb7fe198569bf2b15d265785ad97c2e512ec5a2ecbb92eabea8b994be621f486ffd9bdf8b6843e861a672518420721cb19e02463153548632a4b86a9b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kube_cluster (0.4.2)
+    kube_cluster (0.4.3)
       kube_kubectl (~> 2.0.9)
       kube_schema (~> 1.4.1)
       scampi (~> 0.1)

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.3"
   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.3
 platform: ruby
 authors:
 - Nathan K