dtk-dsl 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4d895f877404ae93dfc322386df042ec6c5708b6
4
- data.tar.gz: 8e4bbc8ff03582fdc14619fbca4eaffcdf01600f
3
+ metadata.gz: 4db375e11320cf9a9876a7e7a75b391ce70bbaad
4
+ data.tar.gz: 5e099e87ebe915523c5335b1ab331123adc63a4c
5
5
  SHA512:
6
- metadata.gz: 19a0e962cdfccc33ee683f7817b70d44045a564d4871b9f9c16c400068c9d88236edbc15f60b33683e1850485a6f9d14cc838cbdc0ab03dce3ebd5d4828425ab
7
- data.tar.gz: 37484780d4ae0127076c4dc7018edb359da0101b2fe4bc8395613aaf5b7f707f3449bb2180762acb9079acda6b15468bce3236d74fb736418b06fc47c090b24a
6
+ metadata.gz: 34a65ce990bf137fde39dfbaddd21de67fe4d92906eac6e62fc74db6b3d79f1cc86d7cd52405d86feb944e112932d56bc33cca830f405862601989452aa36b64
7
+ data.tar.gz: 95603da80fcab656fddec9e99d9349a07662d65d37e8805fac24eac05513af7bc099b87245be06d66327bdf01f1c85742d517d3d31eb8f4539c22af7401633e4
@@ -65,9 +65,9 @@ class DTK::DSL::Template
65
65
 
66
66
  ### For generation
67
67
  def generate!
68
- # TODO: add attributes
69
68
  set :Description, val(:Description)
70
69
  set :Target, val(:Target)
70
+ set :Attributes, generate_child_elements(:attribute, val(:Attributes))
71
71
  set :Components, generate_child_elements(:component, val(:Components))
72
72
  set :Nodes, generate_child_elements(:node, val(:Nodes))
73
73
  set :Actions, generate_child_elements(:workflow, val(:Workflows))
@@ -85,8 +85,12 @@ module DTK::DSL
85
85
  # returns [dependency, external_service_name]; second can be nil
86
86
  def parse_value
87
87
  dependency = external_service_name = nil
88
+
88
89
  string = input_key_value(:Value)
89
- dependency, external_service_name = ExternalServiceName.parse?(string)
90
+ # only the service instance dsl can have external service name
91
+ if file_obj.file_type < FileType::ServiceInstance
92
+ dependency, external_service_name = ExternalServiceName.parse?(string)
93
+ end
90
94
  dependency ||= string
91
95
  [dependency, external_service_name]
92
96
  end
data/lib/dsl/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module DTK
2
2
  module DSL
3
- VERSION="1.1.0"
3
+ VERSION="1.1.1"
4
4
  end
5
5
  end
6
6
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dtk-dsl
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Reactor8
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-05-23 00:00:00.000000000 Z
11
+ date: 2017-06-22 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Library for parsing DT DSL files.
14
14
  email: support@reactor8.com