devfile 0.0.16.pre.alpha1-x86_64-linux → 0.0.18.pre.alpha1-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff38ff84a177544e4bd30d98b0f75d6a655daccf0f7b44942160f29ca4d8d143
-  data.tar.gz: 7a460f3565984f03c050919155ab79fcdc13bc8e0ca998af30506cfb2050761e
+  metadata.gz: c0251c943569ae3468a8fbe2d12259cd4a6103558a96291acc416d97d3ff6b58
+  data.tar.gz: 2041d90ca6705805e42c1b6bfd40ecd83924d78f125a6799a610e35c94870e7c
 SHA512:
-  metadata.gz: 943bfb70fa0edc820d4749403208291532a9d11a0252e9a912397cb1879c939f39edd24731390ce55f0e166b1f8bf4cd6219c46eba527d292f8530eee711a7d1
-  data.tar.gz: 748ba009bc1185ecb4c811d518006dc58028743a87cae79dddb04cac9c30101f65f5b9d850be0c25684f3dc06823d040fdba2ad4ea06c0b4e09755995c5f3a15
+  metadata.gz: 805375053437e6884052fb47305325898d5634d33791fe2b52a4341399ee8089c472c6367bfe9835744d6291289d4a3bcb9b550ed10ce4b7ed2b9a87972861a9
+  data.tar.gz: 7a9bf1d5cf7f367b6f43f7195aa70d8a6a1424d39e810f2852a0936edb3e3470adb5d629183a6ea0545efbce26304dd4b372ea546f2c0727d635ca8d5f90a96c

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: x86_64-linux
 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.2.33
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: Parse and generate kubernetes manifests from a Devfile