dtk-dsl 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 370d7c7d17c932affdcb524cdcf873f4c9173683
-  data.tar.gz: 8ee38d386f92919083cf56498592490d9a231dd8
+  metadata.gz: 2fdec98b2b6ec12ef4c8ea2e0168a9ea95da6fe2
+  data.tar.gz: bffe2e314871bc8f257a61fed9e83623c813425a
 SHA512:
-  metadata.gz: 7a343fc431ca36a39318c80b89133c29930afda5c59e2717289fd4b11272272b5ff05c30be4acd43f34d774ce0c3a70d2caaab1cd254ff5f7af4790ae56b90c7
-  data.tar.gz: a2ff0dd84f2c83be9ef85d5cb3323405f22e75e099c39ec6c2474ccdcf82fd83ee20329d32249a9977facbfa1b81e0b94b35272581b0800cbd427f0ce6761e96
+  metadata.gz: dd49050dca65cde7aa395e8fc6e03db4c5c2c00dcd5fa231106024b7c2f6bd698d9a229114c1866352d63e65a4a366591e3d4587524dee3b0857446a80f1f4f2
+  data.tar.gz: aa03fa92d045244f3ba5b3354f4e5835f698f3d0599e0d19875ce8fb02e53df1ff3a39b38f4483a335136a2544142cc9890019aa70e1a5bcf6f93cc2999c9833

data/.gitignore

@@ -1,3 +1,4 @@
 *.gem
 sftp-config*.json
 .byebug_history
+sftp.json

data/lib/dsl/directory_type.rb

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module DTK::DSL
+  class DirectoryType
+    class ServiceInstance
+      class NestedModule
+        def self.canonical_path
+          'modules'
+        end
+
+        def self.possible_paths
+          [canonical_path, 'dtk-modules']
+        end
+      end
+    end
+  end
+end
+
+

data/lib/dsl/file_type/subclasses.rb

@@ -29,6 +29,17 @@ module DTK::DSL
       end
     end
 
+    class ModuleRefsLock < self
+      def self.top_level_type
+        :module_refs_lock
+      end
+
+      class DSLFile < self
+        class Top < self
+        end
+      end
+    end
+
     class ServiceInstance < self
       def self.top_level_type
         :service_instance

data/lib/dsl/file_type.rb

@@ -36,26 +36,25 @@ module DTK::DSL
       MatchingFiles.matching_files_array?(file_type_classes, file_paths)
     end
 
-    SERVICE_INSTANCE_NESTED_MODULE_DIR = 'modules'
     TYPES = {
       CommonModule::DSLFile::Top => {
         :regexp                => Regexp.new("dtk\.module\.(yml|yaml)"),
         :canonical_path_lambda => lambda { |_params| 'dtk.module.yaml' }, 
         :print_name            => 'module DSL file'
       },
+      ModuleRefsLock::DSLFile::Top => {
+        :regexp                => Regexp.new("dtk\.module\.lock"),
+        :canonical_path_lambda => lambda { |_params| 'dtk\.modules.lock' },
+        :print_name            => 'module refs lock DSL file'
+      },
       ServiceInstance::DSLFile::Top => {
         :regexp                => Regexp.new("dtk\.service\.(yml|yaml)"),
         :canonical_path_lambda => lambda { |_params| 'dtk.service.yaml' }, 
         :print_name            => 'service DSL file'
       },
-      ServiceInstance::NestedModule => {
-        :instance_match_lambda => lambda { |path| path =~ Regexp.new("^#{SERVICE_INSTANCE_NESTED_MODULE_DIR}/([^/]+)/.+$") && { :module_name => $1 } },    
-        :base_dir_lambda       => lambda { |params| "#{SERVICE_INSTANCE_NESTED_MODULE_DIR}/#{params[:module_name]}" },
-        :print_name            => 'nested module file'
-      },
       ServiceInstance::NestedModule::DSLFile::Top => {
-        :regexp                => Regexp.new("#{SERVICE_INSTANCE_NESTED_MODULE_DIR}/[^/]+/dtk\.nested_module\.(yml|yaml)"),
-        :canonical_path_lambda => lambda { |params| "#{SERVICE_INSTANCE_NESTED_MODULE_DIR}/#{params[:module_name]}/dtk.nested_module.yaml" },
+        :regexp                => Regexp.new("dtk\.module\.(yml|yaml)"),
+        :canonical_path_lambda => lambda { |_params| 'dtk.module.yaml' },
         :print_name            => 'nested module DSL file'
       }
     }

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

@@ -0,0 +1,75 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+class DTK::DSL::Template
+  class V1
+    class ModuleRefsLock < self
+      def parser_output_type
+        :array
+      end
+
+      def parse!
+        input_hash.each_pair do |module_ref_term, info_hash|
+          add parse_element(module_ref_term, info_hash)
+        end
+      end
+      
+      private
+      
+      def parse_element(module_ref_term, info_hash)
+        ret = self.class.file_parser_output_hash
+        
+        version                = parse_version(info_hash)
+        namespace, module_name = parse_module_ref_term(module_ref_term)
+        
+        ret.set :Namespace, namespace
+        ret.set :ModuleName, module_name
+        ret.set :ModuleVersion, version
+        ret
+      end
+      
+      def parse_version(info_hash)
+        unless version = info_hash['version']
+          raise parsing_error("The missing version info")
+        end
+        # TODO: check syntax of version
+        version
+      end
+      
+      # returns [namespace, module_name]
+      def parse_module_ref_term(module_ref_term)
+        split = split_by_delim(module_ref_term)
+        unless split.size == 2
+          raise parsing_error("The term '#{module_ref_term}' is an ill-formed module reference")
+        end
+        namespace, module_name = split
+        [namespace, module_name]
+      end
+      
+      MODULE_NAMESPACE_DELIMS = ['/', ':']
+      
+      def split_by_delim(str)
+        if matching_delim = MODULE_NAMESPACE_DELIMS.find { |delim| str =~ Regexp.new(delim) }
+          str.split(matching_delim)
+        else
+          [str]
+        end
+      end
+
+    end
+  end
+end

data/lib/dsl/template/v1.rb

@@ -23,6 +23,7 @@ module DTK::DSL
       # common_module_summary must be before common_module
       require_relative('v1/common_module')
       require_relative('v1/service_instance')
+      require_relative('v1/module_refs_lock')
       require_relative('v1/module_ref')
       require_relative('v1/component_def')
       require_relative('v1/assembly')

data/lib/dsl/version.rb

@@ -1,6 +1,6 @@
 module DTK
   module DSL
-    VERSION="1.1.2"
+    VERSION="1.1.3"
   end
 end
 

data/lib/dtk_dsl.rb

@@ -22,6 +22,7 @@ module DTK
     require_relative('dsl/error')
     require_relative('dsl/dsl_version')
     require_relative('dsl/file_type')
+    require_relative('dsl/directory_type')
     require_relative('dsl/file_obj')
     require_relative('dsl/yaml_helper')
     require_relative('dsl/directory_parser')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-dsl
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies: []
 description: Library for parsing DT DSL files.
 email: support@reactor8.com
@@ -23,6 +23,7 @@ files:
 - lib/dsl/aux.rb
 - lib/dsl/directory_generator.rb
 - lib/dsl/directory_parser.rb
+- lib/dsl/directory_type.rb
 - lib/dsl/dsl_version.rb
 - lib/dsl/error.rb
 - lib/dsl/error/subclasses.rb
@@ -120,6 +121,7 @@ files:
 - lib/dsl/template/v1/component_link/semantic_parse.rb
 - lib/dsl/template/v1/dependency.rb
 - lib/dsl/template/v1/module_ref.rb
+- lib/dsl/template/v1/module_refs_lock.rb
 - lib/dsl/template/v1/node.rb
 - lib/dsl/template/v1/node/semantic_parse.rb
 - lib/dsl/template/v1/node_attribute.rb
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Library for parsing DT DSL files.