devfile 0.0.16.pre.alpha1 → 0.0.17.pre.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af061df5dc4adbd766708cbfdc52687345d2cbd1dc71e6398afe6fc311e84447
-  data.tar.gz: e988aed67fc226305bf771902526f241425bca8d916f6b4a4b4f1680051d043e
+  metadata.gz: 0caaa2073d33653ef8b632c083e866dec6f2d29db102cf7426098ae4fb6120d8
+  data.tar.gz: 268b1d8ea8f9f37209129d67de14acb90cb133ac2b1f0e062511e1b5e3de5213
 SHA512:
-  metadata.gz: 3f32aca2b3eaacc7c8f5b20bb3a304470f80a358a808d016ff25a6190c5f4a11b0835ed66a96164ecd890ba4db334da8fa2907b321451f0fdc885d1a5f998641
-  data.tar.gz: 303721a6dc840eb1bc973601d59e58b9b568b654997f7d74686777cd5e3f41ad3d38f07f8e7a63a19b5b4cfc31eaf90169d4dd4d89f4a53c29180f4e7afb02a5
+  metadata.gz: 574fe4a35ba43896753bc97c5dd0a3845bb7669067ddabec583cc913a11a5e97a57f93596e61ccca5eb869f1afda8162bc003a62979c8217e83358b07bbd3a57
+  data.tar.gz: f5d4e53057b98eafc7b7f17abb49cb66cdc827ea43536a93ef2fff27f927a0a49a16cb1ce06c56c03298bfd78ad01e075a04530d8ecc875ad1ee9bd4cf13bf30

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.17.pre.alpha1
 platform: ruby
 authors:
 - GitLab
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies: []
 description: Library used to generate kubernetes manifests from a Devfile.
 email: