dtk-dsl 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d895f877404ae93dfc322386df042ec6c5708b6
-  data.tar.gz: 8e4bbc8ff03582fdc14619fbca4eaffcdf01600f
+  metadata.gz: 4db375e11320cf9a9876a7e7a75b391ce70bbaad
+  data.tar.gz: 5e099e87ebe915523c5335b1ab331123adc63a4c
 SHA512:
-  metadata.gz: 19a0e962cdfccc33ee683f7817b70d44045a564d4871b9f9c16c400068c9d88236edbc15f60b33683e1850485a6f9d14cc838cbdc0ab03dce3ebd5d4828425ab
-  data.tar.gz: 37484780d4ae0127076c4dc7018edb359da0101b2fe4bc8395613aaf5b7f707f3449bb2180762acb9079acda6b15468bce3236d74fb736418b06fc47c090b24a
+  metadata.gz: 34a65ce990bf137fde39dfbaddd21de67fe4d92906eac6e62fc74db6b3d79f1cc86d7cd52405d86feb944e112932d56bc33cca830f405862601989452aa36b64
+  data.tar.gz: 95603da80fcab656fddec9e99d9349a07662d65d37e8805fac24eac05513af7bc099b87245be06d66327bdf01f1c85742d517d3d31eb8f4539c22af7401633e4

data/lib/dsl/template/v1/assembly.rb

@@ -65,9 +65,9 @@ class DTK::DSL::Template
 
       ### For generation
       def generate!
-        # TODO: add attributes
         set :Description, val(:Description)
         set :Target, val(:Target)
+        set :Attributes, generate_child_elements(:attribute, val(:Attributes))
         set :Components, generate_child_elements(:component, val(:Components))
         set :Nodes, generate_child_elements(:node, val(:Nodes))
         set :Actions, generate_child_elements(:workflow, val(:Workflows))

data/lib/dsl/template/v1/component_link.rb

@@ -85,8 +85,12 @@ module DTK::DSL
         # returns [dependency, external_service_name]; second can be nil
         def parse_value
           dependency = external_service_name = nil
+
           string = input_key_value(:Value)
-          dependency, external_service_name = ExternalServiceName.parse?(string)
+          # only the service instance dsl can have external service name
+          if file_obj.file_type < FileType::ServiceInstance
+            dependency, external_service_name = ExternalServiceName.parse?(string)
+          end
           dependency ||= string
           [dependency, external_service_name]
         end        

data/lib/dsl/version.rb

@@ -1,6 +1,6 @@
 module DTK
   module DSL
-    VERSION="1.1.0"
+    VERSION="1.1.1"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-dsl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies: []
 description: Library for parsing DT DSL files.
 email: support@reactor8.com