dtk-dsl 1.0.2 → 1.0.3

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

@@ -0,0 +1,74 @@
+#
+# 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 ServiceAndComponentInfo
+    class TransformFrom::Parser::TopDSL
+      class Dependencies < self
+        def update_output_hash?
+          module_refs_input_hash = input_file_hash?(:module_refs) || {}
+          unless module_refs_input_hash.empty?
+            existing_module_refs = output_hash['dependencies'] ||= {}
+            merge_in_new_module_refs!(existing_module_refs, module_refs_input_hash)
+          end
+        end
+        
+        private
+        
+        def merge_in_new_module_refs!(module_refs_hash, input_module_refs_hash)
+          ndx_existing_modules = ndx_existing_modules(module_refs_hash)
+          component_module_refs(input_module_refs_hash).each do |module_ref|
+            raise_error_if_conflict(module_ref, ndx_existing_modules)
+            module_refs_hash.merge!(combined_module_form(module_ref))
+          end
+        end
+
+        def component_module_refs(input_module_refs_hash)
+          (input_module_refs_hash['component_modules'] || {}).inject([]) do |a, (name, info)|
+            a + [ModuleRef.new(info['namespace'], name, info['version'])]
+          end
+        end
+
+        
+        NAMESPACE_NAME_DELIM = '/'
+        # indexed by module_name
+        def ndx_existing_modules(module_refs_hash)
+          module_refs_hash.inject({}) do |h, (namespace_name, version)|
+            namespace, name = namespace_name.split(NAMESPACE_NAME_DELIM)
+            h.merge(name => ModuleRef.new(namespace, name,  version))
+          end
+        end
+
+        def combined_module_form(module_ref)
+          { "#{module_ref.namespace}#{NAMESPACE_NAME_DELIM}#{module_ref.module_name}" => module_ref.version }
+        end
+          
+        def raise_error_if_conflict(module_ref, ndx_existing_modules)
+          if matching_module_ref = ndx_existing_modules[@module_name]
+            fail Error::Usage, conflict_error_msg(module_ref, matching_module_ref) unless module_ref.match?(matching_module_ref)
+          end
+        end
+
+
+        def conflict_error_msg(module_ref, matching_module_ref)
+          "Conflicting versions of module '#{module_ref.module_name}': '#{module_ref.print_form}' vs '#{matching_module_ref.print_form}'"
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+#
+# 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 ServiceAndComponentInfo::TransformFrom::Parser
+    class TopDSL
+      class ModuleInfo < self
+        def update_output_hash?
+          # if these attributes are in output_hash, already, they will match
+          output_hash['module']  ||= "#{module_ref.namespace}/#{module_ref.module_name}"
+          output_hash['version'] ||= module_ref.version
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+#
+# 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 ServiceAndComponentInfo::TransformFrom
+    class Parser
+      class TopDSL < self
+        require_relative('top_dsl/module_info')
+        require_relative('top_dsl/assemblies')
+        require_relative('top_dsl/components')
+        require_relative('top_dsl/dependencies')
+      end
+
+      private
+
+      def module_ref
+        info_object.module_ref
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+#
+# 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 ServiceAndComponentInfo::TransformFrom
+    class Parser < ServiceAndComponentInfo::Parser
+      require_relative('parser/top_dsl')
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_from.rb

@@ -0,0 +1,25 @@
+#
+# 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 ServiceAndComponentInfo
+    class TransformFrom < self
+      require_relative('transform_from/info')
+      require_relative('transform_from/parser')
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to/info/component.rb

@@ -0,0 +1,70 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo
+    class Info
+      class Component < self
+        def compute_outputs!
+          set_top_level_dsl_output_hash!
+          set_module_refs_output_hash!
+        end
+        
+        private
+        
+        def info_type
+          :component_info
+        end
+
+        def set_top_level_dsl_output_hash!
+          path   = ComponentModulePath.top_level_dsl
+          parser = component_module_dsl_parser::TopDSL
+          set_output_hash?(parser, path)
+        end
+
+        def set_module_refs_output_hash!
+          path   = ComponentModulePath.module_refs
+          parser = component_module_dsl_parser::ModuleRefs
+          set_output_hash?(parser, path)
+        end
+
+        def set_output_hash?(parser, path)
+          output_hash = output_file_hash(path)
+          if parser.update_output_hash?(output_hash, self) # This conditionally updates output_hash
+            update_or_add_output_hash!(path, output_hash)
+          end
+        end
+
+        def component_module_dsl_parser
+          @component_module_dsl_parser ||= Parser::ComponentModule
+        end
+        
+        module ComponentModulePath
+          TOP_LEVEL_DSL = 'dtk.model.yaml'
+          MODULE_REFS = 'module_refs.yaml'
+          def self.top_level_dsl
+            TOP_LEVEL_DSL
+          end
+          def self.module_refs
+            MODULE_REFS
+          end
+        end
+        
+      end
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to/info/input_files.rb

@@ -0,0 +1,36 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo::Info
+    class InputFiles < ServiceAndComponentInfo::Info::InputFiles
+      def add_canonical_hash_content!(path, canonical_hash_content)
+        raise_error_if_not_canonical_hash(canonical_hash_content)
+        add_hash_content!(path, canonical_hash_content)
+      end
+
+      private
+
+      def raise_error_if_not_canonical_hash(obj)
+        unless obj.kind_of?(InputOutputCommon::Canonical::Hash)
+          raise Error, "Expecting input of type 'InputOutputCommon::Canonical::Hash', but '#{obj.class}' was given" 
+        end
+      end
+
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to/info/service.rb

@@ -0,0 +1,72 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo
+    class Info
+      class Service < self
+        def compute_outputs!
+          set_top_level_dsl_output_hash!
+          set_module_refs_output_hash!
+        end
+
+        private
+
+        def info_type
+          :service_info
+        end
+
+        def set_top_level_dsl_output_hash!
+          parser = service_module_dsl_parser::TopDSL
+          set_output_hash?(parser)
+        end
+
+        def set_module_refs_output_hash!
+          path        = ServiceModulePath.module_refs
+          parser      = service_module_dsl_parser::ModuleRefs
+          output_hash = output_file_hash(path)
+          update_or_add_output_hash!(path, output_hash) if parser.update_output_hash?(output_hash, self)
+        end
+
+        def set_output_hash?(parser)
+          output_hash = {}
+          if parser.update_output_hash?(output_hash, self)
+            if assemblies = output_hash['assemblies'] || output_hash[:assemblies]
+              assemblies.each { |assembly| update_or_add_output_hash!(ServiceModulePath.top_level_dsl(assembly['name']||assembly[:name]), assembly) }
+            end
+          end
+        end
+
+        def service_module_dsl_parser
+          @service_module_dsl_parser ||= Parser::ServiceModule
+        end
+
+        module ServiceModulePath
+          TOP_LEVEL_DSL = 'dtk.assembly.yaml'
+          MODULE_REFS = 'module_refs.yaml'
+          def self.top_level_dsl(assembly_name)
+            "assemblies/#{assembly_name}.#{TOP_LEVEL_DSL}"
+          end
+          def self.module_refs
+            MODULE_REFS
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to/info.rb

@@ -0,0 +1,51 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo
+    class Info < ServiceAndComponentInfo::Info
+      require_relative('info/input_files')
+      require_relative('info/service')
+      require_relative('info/component')
+
+      # This is for mapping to module directories (not service instance directories)
+      INFO_HASH = {
+        :service_info => {
+          :input_files => {
+            :module => {
+              :regexps => [Regexp.new("dtk\.module\.yaml$")]
+            },
+            :assemblies => {
+              :regexps => [Regexp.new("assemblies/(.*)\.dtk\.assembly\.(yml|yaml)$"), ]
+            },
+            :legacy_assemblies => {
+              :regexps => [Regexp.new("assemblies/([^/]+)/assembly\.(yml|yaml)$")]
+            }
+          }
+        },
+        :component_info => {
+          :input_files => {
+            :module => {
+              :regexps => [Regexp.new("dtk\.module\.yaml$")]
+            }
+          }
+        }
+      }
+
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to/parser/component_module/module_refs.rb

@@ -0,0 +1,27 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo
+    class Parser
+      module ComponentModule
+        class ModuleRefs < Parser::ModuleRefs
+        end
+      end
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to/parser/component_module/top_dsl.rb

@@ -0,0 +1,47 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo
+  class Parser
+    module ComponentModule
+      class TopDSL < Parser
+        def update_output_hash?
+          if module_dsl_canonical_hash = input_file_hash?(:module)
+            if component_defs = module_dsl_canonical_hash.val(:ComponentDefs)
+              add_module_info_to_output_hash!
+              add_components_to_output_hash!(component_defs)
+              output_hash
+            end
+          end
+        end
+        
+        private
+        
+        COMPONENT_MODULE_DSL_VERSION = '1.0.0'
+        def add_module_info_to_output_hash!
+          output_hash['module']      = info_object.module_ref.module_name
+          output_hash['dsl_version'] = COMPONENT_MODULE_DSL_VERSION
+        end
+        
+        def add_components_to_output_hash!(component_defs)
+          output_hash['components'] = component_defs
+        end
+        
+      end
+    end
+  end
+end; end

data/lib/dsl/service_and_component_info/transform_to/parser/component_module.rb

@@ -0,0 +1,28 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo
+    class Parser
+      # parse to form component module files
+      module ComponentModule
+        require_relative('component_module/top_dsl')
+        require_relative('component_module/module_refs')
+      end
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to/parser/module_refs.rb

@@ -0,0 +1,54 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo::Parser
+   class ModuleRefs < self
+      def update_output_hash?
+        if module_dsl_canonical_hash = input_file_hash?(:module)
+          if dependencies = module_dsl_canonical_hash.val(:DependentModules)
+            add_dependencies_to_output_hash!(dependencies)
+            output_hash
+          end
+        end
+      end
+      
+      private
+
+      def add_dependencies_to_output_hash!(dependencies_canonical_array)
+        component_modules = dependencies_canonical_array.inject({}) do |h, dependency_canonical_hash|
+          module_name = dependency_canonical_hash.val(:ModuleName)
+          namespace   = dependency_canonical_hash.val(:Namespace)
+          version     = version?(dependency_canonical_hash)
+
+          module_info = { 'namespace' => namespace }
+          module_info.merge!('version' => version) if version
+          h.merge(module_name => module_info)
+        end
+
+        output_hash.merge!('component_modules' => component_modules) unless component_modules.empty?
+      end
+
+      def version?(dependency_canonical_hash)
+        if version = dependency_canonical_hash.val(:ModuleVersion)
+          version == 'master' ? nil : version
+        end
+      end
+
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to/parser/service_module/module_refs.rb

@@ -0,0 +1,27 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo
+    class Parser
+      module ServiceModule
+        class ModuleRefs < Parser::ModuleRefs
+        end
+      end
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to/parser/service_module/top_dsl.rb

@@ -0,0 +1,73 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo
+  class Parser
+    module ServiceModule
+      class TopDSL < Parser
+        def update_output_hash?
+          if module_dsl_canonical_hash = input_file_hash?(:module)
+            if assemblies = module_dsl_canonical_hash.val(:Assemblies)
+              add_module_info_to_output_hash!
+              add_assemblies_to_output_hash!(assemblies)
+              output_hash
+            end
+          end
+        end
+        
+        private
+        
+        DSL_VERSION = '1.0.0'
+        def add_module_info_to_output_hash!
+          output_hash['module']      = info_object.module_ref.module_name
+          output_hash['dsl_version'] = DSL_VERSION
+        end
+        
+        def add_assemblies_to_output_hash!(assemblies)
+          assemblies_yaml_object_array = assemblies.map do |assembly_canonical_hash|
+            parsed_assembly  = FileGenerator.generate_yaml_object(:assembly, assembly_canonical_hash, DSL_VERSION)
+            assembly_content = {}
+
+            if name = parsed_assembly.delete('name') || assembly_canonical_hash[:name]
+              assembly_content['name'] = name
+            end
+
+            if description = parsed_assembly.delete('description')
+              assembly_content['description'] = description
+            end
+
+            assembly_content['dsl_version'] = DSL_VERSION
+            workflows = parsed_assembly.delete('workflows')
+
+            if parsed_assembly && !parsed_assembly.empty?
+              assembly_content['assembly'] = parsed_assembly
+            end
+
+            if workflows
+              assembly_content['workflows'] = workflows
+            end
+
+            assembly_content
+          end
+
+          output_hash['assemblies'] = assemblies_yaml_object_array
+        end
+
+      end
+    end
+  end
+end; end