devfile 0.0.16.pre.alpha1-arm64-darwin → 0.0.18.pre.alpha1-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56a3c3826a2e29c86391abee17d8f5f94b378038ebcb27518985aeb01dbc2329
-  data.tar.gz: e5e2a94cbe3bbf0465c84db27136db92612cb81013271ba861e9b5475937bb10
+  metadata.gz: 70be282c82980e22632bd965e8ace10b1ff810adcf931b238955dab40e9ef1df
+  data.tar.gz: dfc919ed4500c68fc5988430ca0b257e4436bb1571613e31c29e0f6c4a0b7686
 SHA512:
-  metadata.gz: 45ec260b80c3d17bece4930478cb492e0158bbdd6550d092ef5c7bf08aa23d61be2c322de3945887488def7b41212fe38c5ac63e5715b3053db8fce1f70aabc3
-  data.tar.gz: 632a7f1d8205b83180d24d7cac8fb97c30af0ce57c81e07a29d1acb16874e636ac87bfcacb3ad58955a95150254373782198d11ece9eb258fb5bc543ff602ba7
+  metadata.gz: 733c35cbb03d19d1d066f9a37c03ea5488d3cd4dcb04452573f2ff24ada20acd3f71afb4ccf169b451086893a126e0a5730f7d2ec1b9543edc9b20ccf3175bbc
+  data.tar.gz: 3cd7fd9b834308c64fccefbcec27362d755f586457d2b43a41b38b06904d6cabe9d4d6ed689230b932fed332c647d427fd36bf9b8ca4cb0ee56968ea2692b72e

data/ext/devfile.go

@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"text/template"
 
+	"github.com/devfile/library/v2/pkg/devfile"
 	"github.com/devfile/library/v2/pkg/devfile/generator"
 	"github.com/devfile/library/v2/pkg/devfile/parser"
 	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
@@ -304,7 +305,9 @@ func parseDevfile(content string) (Devfile, error) {
 	parserArgs := parser.ParserArgs{
 		Data: []byte(content),
 	}
-	devfileObj, err := parser.ParseDevfile(parserArgs)
+	// TODO: figure out how to handle warnings
+	// 		https://gitlab.com/gitlab-org/remote-development/devfile-gem/-/issues/6
+	devfileObj, _, err := devfile.ParseDevfileAndValidate(parserArgs)
 	return Devfile{
 		devfileObj: devfileObj,
 	}, err

data/lib/devfile.rb

@@ -10,57 +10,33 @@ module Devfile
 
     class << self
       def get_deployment(devfile, name, namespace, labels, annotations, replicas)
-        stdout, stderr, status = Open3.capture3(
-          "#{FILE_PATH} deployment '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}' #{replicas}"
-        )
-
-        raise stderr unless status.success?
-
-        stdout
+        call('deployment', devfile, name, namespace, labels, annotations, replicas)
       end
 
       def get_service(devfile, name, namespace, labels, annotations)
-        stdout, stderr, status = Open3.capture3(
-          "#{FILE_PATH} service '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}'"
-        )
-
-        raise stderr unless status.success?
-
-        stdout
+        call('service', devfile, name, namespace, labels, annotations)
       end
 
       def get_ingress(devfile, name, namespace, labels, annotations, domain_template, ingress_class)
-        stdout, stderr, status = Open3.capture3(
-          "#{FILE_PATH} ingress '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}' #{domain_template} #{ingress_class}"
-        )
-
-        raise stderr unless status.success?
-
-        stdout
+        call('ingress', devfile, name, namespace, labels, annotations, domain_template, ingress_class)
       end
 
       def get_pvc(devfile, name, namespace, labels, annotations)
-        stdout, stderr, status = Open3.capture3(
-          "#{FILE_PATH} deployment '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}'"
-        )
-
-        raise stderr unless status.success?
-
-        stdout
+        call('deployment', devfile, name, namespace, labels, annotations)
       end
 
       def get_all(devfile, name, namespace, labels, annotations, replicas, domain_template, ingress_class)
-        stdout, stderr, status = Open3.capture3(
-          "#{FILE_PATH} all '#{devfile}' #{name} #{namespace}  '#{labels}' '#{annotations}' #{replicas} #{domain_template} #{ingress_class}"
-        )
-
-        raise stderr unless status.success?
-
-        stdout
+        call('all', devfile, name, namespace, labels, annotations, replicas, domain_template, ingress_class)
       end
 
       def flatten(devfile)
-        stdout, stderr, status = Open3.capture3("#{FILE_PATH} flatten '#{devfile}'")
+        call('flatten', devfile)
+      end
+
+      private
+
+      def call(*cmd)
+        stdout, stderr, status = Open3.capture3({}, FILE_PATH, *cmd.map(&:to_s))
 
         raise stderr unless status.success?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devfile
 version: !ruby/object:Gem::Version
-  version: 0.0.16.pre.alpha1
+  version: 0.0.18.pre.alpha1
 platform: arm64-darwin
 authors:
 - GitLab
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies: []
 description: Library used to generate kubernetes manifests from a Devfile.
 email:
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Parse and generate kubernetes manifests from a Devfile