dtk-dsl 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTE2MjU5YTYxMzU4NjA0N2YxNTVhZWYzNzdlYjkxZTU3ZGUwNjg1ZA==
+    ODIxODM3OTNiZmFmM2FhOTg0YzI5OWQ0ZjE5MTk1MmZjN2U3MGI4OQ==
   data.tar.gz: !binary |-
-    NDg5ZjFkYzg5NzNlZTY2MWVlODdiY2ZlM2U3ZmQxZmM1ZWE0ODQ0NA==
+    MGVhNTI3NzIwMGFkOTkyZGUyMjM4ZmUxYWM5MzU1YTRjOTNkOWZkNg==
 SHA512:
   metadata.gz: !binary |-
-    OTgwYjc0NDY1ZGIxZmY4YTBmZDc1NmE1ZTA1MzYwMTgxMzdjZjhmN2RkMTVi
-    MjVhZTNhNDE2MTA2ZWZlZjU4NjIzMzdmM2RkZDk2Y2RmMDE5MzQzZTE2ZGU4
-    OGJkZDcyNmQxM2MyYjczYWU5OWFiNGE2OTA2ZGYxNTJjMjIwNDM=
+    NmQ3YzYxYzEzYzBmZDI5NmZjZTUwM2M1YmMzMTBhMDY4NTYyOTY4NzAwM2Q3
+    M2VmZDA2NjNkMzMxMjIyMzZmNjEyYTI2MTIyMTBmNTMwODdjYThiN2M5MTQ1
+    OWUzMTkzMGU0YWUzNTdjYWJlMmNkZGRhM2YzMmE1N2ZmMDUxZTE=
   data.tar.gz: !binary |-
-    OGVjOTQwNzgwMGRiOGViYzBjNTlhMzVkNzg3NWZlZWI0MjkyNDNjMDZhNjE1
-    NWY0NjUyMzEzMDczNDcyZTFlMTczNzA5YTc3MjQzMWEzZmQ0NGIyZDJkYzNj
-    MGU4MTY3MTliZWExY2NlMjA0YzBkOGUzNTE5ZTI4YjZhYjNkODk=
+    MGE0YjM5MmUwZWRjYzRlNDg4NmYzMWFjN2FmZmI1NTQ3ODQ0YmFlZGU0NDcy
+    Y2FmOTI3NjEyY2Y3ZDY5OWQ5NGYwZjRkNDFkNTQ3Y2IzMDZjYTY2NTAzYWZh
+    NzI5YjAxZGY0MTM4ZDJmMzA4NDRlOTlmNjJhYTczMWMxMTVmODA=

data/lib/dsl/input_output_common/canonical/hash_key.rb

@@ -57,6 +57,7 @@ module DTK::DSL
       Target         = :target
       Components     = :components
       ComponentLinks = :component_links
+      Links          = :links
 
       # meta info
       Import                = :import

data/lib/dsl/service_and_component_info/transform_from/parser/top_dsl/assemblies/workflows.rb

@@ -20,7 +20,7 @@ module DTK::DSL
     class TopDSL::Assemblies 
       module Workflows
         def self.hash_content?(assembly_hash)
-          if workflows = assembly_hash['workflow'] || assembly_hash['workflows']
+          if workflows = assembly_hash['workflow'] || assembly_hash['workflows'] || assembly_hash['actions']
             if workflow_name = workflows['assembly_action']
               # this is legacy workflow
               workflows_without_name = workflows.inject({}) { |h, (k, v)| k == 'assembly_action' ? h : h.merge(k => v) }

data/lib/dsl/service_and_component_info/transform_from/parser/top_dsl/assemblies.rb

@@ -34,7 +34,7 @@ module DTK::DSL
             assembly_content.merge!(assembly_hash)
             
             if workflows = Workflows.hash_content?(input_hash)
-              assembly_content.merge!('workflows' => workflows)
+              assembly_content.merge!('actions' => workflows) 
             end
 
             if node_bindings = input_hash['node_bindings']

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

@@ -29,9 +29,9 @@ class DTK::DSL::Template
         Nodes       = 'nodes'
         Components  = 'components'
         Target      = 'target'
-
+        Actions     = 'actions'
         Workflows   = 'workflows'
-        Variations::Workflows = ['workflows', 'workflow']
+        Variations::Workflows = ['actions', 'workflows', 'workflow']
 
       end
 
@@ -70,7 +70,7 @@ class DTK::DSL::Template
         set :Target, val(:Target)
         set :Components, generate_child_elements(:component, val(:Components))
         set :Nodes, generate_child_elements(:node, val(:Nodes))
-        set :Workflows, generate_child_elements(:workflow, val(:Workflows))
+        set :Actions, generate_child_elements(:workflow, val(:Workflows))
       end
 
     end

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

@@ -29,6 +29,8 @@ module DTK::DSL
 
           Attributes     = 'attributes'
           ComponentLinks = 'component_links'
+          Links          = 'links'
+          Variations::ComponentLinks = ['links','component_links', 'component_link']
         end
 
         ### For parsing
@@ -82,7 +84,7 @@ module DTK::DSL
           ret = {}
 
           set_generation_hash(ret, :Attributes, generate_child_elements(:attribute, val(:Attributes)))
-          set_generation_hash(ret, :ComponentLinks, generate_child_elements(:component_link, val(:ComponentLinks)))
+          set_generation_hash(ret, :Links, generate_child_elements(:component_link, val(:ComponentLinks)))
 
           ret
         end
@@ -119,7 +121,7 @@ module DTK::DSL
           end
 
           if component_links = properties['component_links']
-            set? :ComponentLinks, parse_child_elements?(:component_link, :ComponentLinks, :input_hash => { 'component_links' => component_links})
+            set? :Links, parse_child_elements?(:component_link, :ComponentLinks, :input_hash => { 'component_links' => component_links})
           end
 
           # handle keys not processed

data/lib/dsl/version.rb

@@ -1,6 +1,6 @@
 module DTK
   module DSL
-    VERSION="1.0.5"
+    VERSION="1.0.6"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-dsl
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies: []
 description: Library for parsing DT DSL files.
 email: support@reactor8.com
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Library for parsing DT DSL files.