dtk-client 0.10.2 → 0.10.3

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

@@ -0,0 +1,111 @@
+#
+# 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::Client
+  class ServiceAndComponentInfo::TransformTo
+    class Info
+      require_relative('info/service')
+      require_relative('info/component')
+
+      def initialize(content_dir, dtk_dsl_parse_helper, parsed_common_module)
+        @content_dir            = content_dir
+        @dtk_dsl_info_processor = dtk_dsl_parse_helper.info_processor(info_type)
+        @parsed_common_module   = parsed_common_module
+
+        # dynamically computed
+        @directory_file_paths = nil
+      end
+      private :initialize
+
+      def self.create(info_type, content_dir, dtk_dsl_parse_helper, parsed_common_module)
+        case info_type
+        when :service_info then Service.new(content_dir, dtk_dsl_parse_helper, parsed_common_module)
+        when :component_info then Component.new(content_dir, dtk_dsl_parse_helper, parsed_common_module)
+        else
+          fail Error, "Unexpected info_type '#{info_type}'"
+        end
+      end
+
+      def file_path__content_array
+        files_array = @dtk_dsl_info_processor.output_path_text_pairs.inject([]) { |a, (path, content)| a + [{ path: path, content: content }] }
+
+        if info_type == :component_info
+          cmp_files_array = component_info_related_files.inject([]) { |a, (path, content)| a + [{ path: path, content: content, full_path: true }] }
+          files_array.concat(cmp_files_array)
+        end
+
+        files_array
+      end
+
+      def component_info_related_files
+        files = {}
+
+        matches = directory_file_paths.select { |path| !path.include?('dtk.module.yaml') && !path.include?('module_refs.yaml') }
+        matches.each { |file| files.merge!("#{file}" => get_raw_content?(file)) if File.file?(file) }
+
+        files
+      end
+
+      def legacy_assemblies?
+        matches = directory_file_paths.select { |path| legacy_assemblies_input_files_processor.match?(path) }
+        !matches.empty?
+      end
+
+      private
+
+      def add_content!(input_files_processor, path)
+        input_files_processor.add_canonical_hash_content!(path, @parsed_common_module)
+      end
+
+      def input_files_processor(type)
+        @dtk_dsl_info_processor.indexed_input_files[type] || raise_missing_type_error(type)
+      end      
+
+      def module_refs_path
+        matches = directory_file_paths.select { |path| module_ref_input_files_processor.match?(path) }
+        raise Error, "Unexpected that multiple module ref files" if matches.size > 1
+        matches.first
+      end
+
+      def module_ref_input_files_processor
+        @module_ref_input_files_processor = input_files_processor(:module_refs)
+      end
+
+      def assemblies_input_files_processor
+        @assemblies_input_files_processor = input_files_processor(:assemblies)
+      end
+
+      def legacy_assemblies_input_files_processor
+        @legacy_assemblies_input_files_processor = input_files_processor(:legacy_assemblies)
+      end
+
+      def directory_file_paths
+        @directory_file_paths ||= Dir.glob("#{@content_dir}/**/*")
+      end
+
+      def get_raw_content?(file_path)
+        File.open(file_path).read if file_path and File.exists?(file_path)
+      end
+
+      def raise_missing_type_error(type)
+        raise Error, "Unexpected that no indexed_input_files of type '#{type}'"
+      end
+
+    end
+  end
+end

data/lib/client/service_and_component_info/transform_to.rb

@@ -0,0 +1,49 @@
+#
+# 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::Client
+  module ServiceAndComponentInfo
+    # TODO: DTK-2765: methods use wen pushing to dtkn that transform to component and info form
+    # This wil call functions that parse in :DTK::DSL::ServiceAndComponentInfo::TransformTO
+    class TransformTo
+      require_relative('transform_to/info')
+
+      def initialize(content_dir, module_ref, version, parsed_common_module)
+        @content_dir          = content_dir
+        @module_ref           = module_ref
+        @version              = version
+        @dtk_dsl_parse_helper = dtk_dsl_transform_class.new(module_ref.namespace, module_ref.module_name, version)
+        @parsed_common_module = parsed_common_module
+      end
+
+      def info_processor(info_type)
+        Info.create(info_type, @content_dir, @dtk_dsl_parse_helper, @parsed_common_module)
+      end
+
+      def output_path_text_pairs
+        @dtk_dsl_parse_helper.output_path_text_pairs
+      end
+
+      private
+
+      def dtk_dsl_transform_class
+        ::DTK::DSL::ServiceAndComponentInfo::TransformTo
+      end
+    end
+  end
+end
+

data/lib/client/service_and_component_info.rb

@@ -0,0 +1,26 @@
+#
+# 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::Client
+  class ContentGenerator
+    module ServiceAndComponentInfo
+      require_relative('service_and_component_info/transform_from')
+      require_relative('service_and_component_info/transform_to')
+    end
+  end
+end
+

data/lib/client/util/console.rb

@@ -86,6 +86,28 @@ module DTK::Client
       end
     end
 
+    def self.password_prompt(message, options = [])
+      begin
+        while line = (HighLine.ask("#{message}") { |q| q.echo = false})
+          raise Interrupt if line.empty?
+            return line
+          end
+        rescue Interrupt
+          return nil
+        ensure
+          puts "\n" if line.nil?
+        end
+      end
+      
+    def self.version_prompt(versions, message, opts = {})
+      prompt_context(opts) do
+        HighLine.choose do |menu|
+          menu.prompt = message
+          menu.choices(*versions)
+          menu.choice('all') if opts[:add_all]
+        end
+      end
+    end
     # opts can have keys
     #   :disable_ctrl_c - Boolean (default: true)
     def self.prompt_context(opts = {}, &body)

data/lib/client/util/interactive_wizard.rb

@@ -62,6 +62,96 @@ module DTK::Client
 
         return user_provided_params
       end
+      
+      def interactive_user_input(wizard_dsl, recursion_call = false)
+        results = {}
+        wizard_dsl = [wizard_dsl].flatten
+        begin
+          wizard_dsl.each do |meta_input|
+            input_name = meta_input.keys.first
+            display_name = input_name.to_s.gsub(/_/,' ').capitalize
+            metadata = meta_input.values.first
+
+            # default values
+            output = display_name
+            validation = metadata[:validation]
+            is_password = false
+            is_required = metadata[:requried]
+
+            case metadata[:type]
+              when nil
+              when :email
+                validation = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+              when :question
+                output = "#{metadata[:question]}"
+                validation = metadata[:validation]
+              when :password
+                is_password = true
+                is_required = true
+              when :repeat_password
+                is_password = true
+                is_required = true
+                validation  = /^#{results[:password]}$/
+              when :selection
+                options = ""
+                display_field = metadata[:display_field]
+                metadata[:options].each_with_index do |o,i|
+                  if display_field
+                    options += "\t#{i+1}. #{o[display_field]}\n"
+                  else
+                    options += "\t#{i+1}. #{o}\n"
+                  end
+                end
+                options += OsUtil.colorize("\t0. Skip\n", :yellow) if metadata[:skip_option]
+                output = "Select '#{display_name}': \n\n #{options} \n "
+                validation_range_start = metadata[:skip_option] ? 0 : 1
+                validation = (validation_range_start..metadata[:options].size).to_a
+              when :group
+                # recursion call to populate second level of hash params
+                puts " Enter '#{display_name}': "
+                results[input_name] = self.interactive_user_input(metadata[:options], true)
+                next
+            end
+
+            input = text_input(output, is_required, validation, is_password)
+
+            if metadata[:required_options] && !metadata[:required_options].include?(input)
+              # case where we have to give explicit permission, if answer is not affirmative
+              # we terminate rest of the wizard
+              OsUtil.print(" #{metadata[:explanation]}", :red)
+              return nil
+            end
+
+            # post processing
+            if metadata[:type] == :selection
+              input = input.to_i == 0 ? nil : metadata[:options][input.to_i - 1]
+            end
+
+            results[input_name] = input
+          end
+
+          return results
+        rescue Interrupt => e
+          puts
+          raise DtkValidationError, "Exiting the wizard ..."
+        end
+      end
+      
+      def text_input(output, is_required = false, validation_regex = nil, is_password = false)
+        while line = ask("#{output}: ") { |q| q.echo = !is_password }
+          if is_required && line.strip.empty?
+            puts OsUtil.colorize("Field '#{output}' is required field. ", :red)
+            next
+          end
+
+          if validation_regex && !validation_regex.match(line)
+            puts OsUtil.colorize("Input is not valid, please enter it again. ", :red)
+            next
+          end
+
+          return line
+        end
+      end
 
       private
 

data/lib/client/util.rb

@@ -1,3 +1,20 @@
+#
+# 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
   require_relative('util/auxiliary')
   # auxiliary must be loaded first
@@ -6,7 +23,6 @@ module DTK
   require_relative('util/console')
   require_relative('util/dtk_path')
   require_relative('util/disk_cacher')
-  require_relative('util/module_ref')
   require_relative('util/remote_dependency')
 
   # hash_with_optional_keys must go before post_body and query_string
@@ -15,4 +31,4 @@ module DTK
   require_relative('util/query_string_hash')
   require_relative('util/interactive_wizard')
   require_relative('util/validation')
-end
+end

data/lib/dtk_client.rb

@@ -18,7 +18,9 @@
 module DTK
   module Client
     require_relative('client/util')
-    # util must be loaded first
+    require_relative('client/module_ref')
+
+    # util and module_ref must be loaded first
     require_relative('client/logger')
     require_relative('client/error')
     require_relative('client/config')
@@ -30,6 +32,7 @@ module DTK
     require_relative('client/operation')
     require_relative('client/operation_args')
     require_relative('client/render')
-    require_relative('client/content_generator')
+    require_relative('client/service_and_component_info')
+    require_relative('client/load_source')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -98,28 +98,28 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.99.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.99.3
 - !ruby/object:Gem::Dependency
   name: dtk-dsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: Command line tool to interact with a DTK Server and DTK Service Catalog.
@@ -129,8 +129,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".license_header"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/dtk
@@ -145,14 +147,25 @@ files:
 - features/step_definitions/dtk_steps.rb
 - features/support/env.rb
 - lib/cli/command.rb
+- lib/cli/command/account.rb
+- lib/cli/command/account/add_ssh_key.rb
+- lib/cli/command/account/delete_ssh_key.rb
+- lib/cli/command/account/list_ssh_keys.rb
+- lib/cli/command/account/register_catalog_user.rb
+- lib/cli/command/account/set_catalog_credentials.rb
+- lib/cli/command/account/set_password.rb
 - lib/cli/command/mixin.rb
 - lib/cli/command/module.rb
 - lib/cli/command/module/clone.rb
+- lib/cli/command/module/delete_from_remote.rb
 - lib/cli/command/module/install.rb
 - lib/cli/command/module/list.rb
 - lib/cli/command/module/list_assemblies.rb
 - lib/cli/command/module/list_remotes.rb
+- lib/cli/command/module/publish.rb
+- lib/cli/command/module/pull_dtkn.rb
 - lib/cli/command/module/push.rb
+- lib/cli/command/module/push_dtkn.rb
 - lib/cli/command/module/stage.rb
 - lib/cli/command/module/uninstall.rb
 - lib/cli/command/options.rb
@@ -171,7 +184,7 @@ files:
 - lib/cli/command/service/list_attributes.rb
 - lib/cli/command/service/list_component_links.rb
 - lib/cli/command/service/list_components.rb
-- lib/cli/command/service/list_dependent_modules.rb
+- lib/cli/command/service/list_dependencies.rb
 - lib/cli/command/service/list_nodes.rb
 - lib/cli/command/service/list_violations.rb
 - lib/cli/command/service/pull.rb
@@ -195,6 +208,7 @@ files:
 - lib/cli/context.rb
 - lib/cli/context/attributes.rb
 - lib/cli/context/type.rb
+- lib/cli/context/type/account.rb
 - lib/cli/context/type/module.rb
 - lib/cli/context/type/service.rb
 - lib/cli/context/type/top.rb
@@ -211,27 +225,53 @@ files:
 - lib/client/config/default.conf
 - lib/client/configurator.rb
 - lib/client/conn.rb
-- lib/client/content_generator.rb
 - lib/client/error.rb
 - lib/client/error/subclasses.rb
 - lib/client/git_repo.rb
 - lib/client/git_repo/adapter/git_gem.rb
 - lib/client/git_repo/adapter/git_gem/error_handler.rb
+- lib/client/load_source.rb
+- lib/client/load_source/component_info.rb
+- lib/client/load_source/service_info.rb
 - lib/client/logger.rb
+- lib/client/module_ref.rb
 - lib/client/operation.rb
 - lib/client/operation/account.rb
+- lib/client/operation/account/add_ssh_key.rb
+- lib/client/operation/account/delete_ssh_key.rb
+- lib/client/operation/account/list_ssh_keys.rb
+- lib/client/operation/account/register_catalog_user.rb
+- lib/client/operation/account/set_catalog_credentials.rb
+- lib/client/operation/account/set_password.rb
 - lib/client/operation/client_module_dir.rb
 - lib/client/operation/client_module_dir/git_repo.rb
+- lib/client/operation/client_module_dir/git_repo/internal.rb
+- lib/client/operation/client_module_dir/git_repo/internal/dtkn.rb
 - lib/client/operation/module.rb
 - lib/client/operation/module/clone_module.rb
+- lib/client/operation/module/delete_from_remote.rb
 - lib/client/operation/module/install.rb
 - lib/client/operation/module/install/common_module.rb
-- lib/client/operation/module/install/external_module.rb
+- lib/client/operation/module/install/dependent_modules.rb
+- lib/client/operation/module/install/dependent_modules/component_dependency_tree.rb
+- lib/client/operation/module/install/dependent_modules/component_dependency_tree/cache.rb
+- lib/client/operation/module/install/dependent_modules/component_dependency_tree/resolve_modules.rb
+- lib/client/operation/module/install/dependent_modules/component_module.rb
+- lib/client/operation/module/install/dependent_modules/prompt_helper.rb
+- lib/client/operation/module/install/mixin.rb
+- lib/client/operation/module/install/module_ref.rb
+- lib/client/operation/module/install/print_helper.rb
 - lib/client/operation/module/install_from_catalog.rb
 - lib/client/operation/module/list.rb
 - lib/client/operation/module/list_assemblies.rb
 - lib/client/operation/module/list_remotes.rb
+- lib/client/operation/module/publish.rb
+- lib/client/operation/module/pull_dtkn.rb
 - lib/client/operation/module/push.rb
+- lib/client/operation/module/push_dtkn.rb
+- lib/client/operation/module/push_dtkn/convert_source.rb
+- lib/client/operation/module/push_dtkn/convert_source/component_info.rb
+- lib/client/operation/module/push_dtkn/convert_source/service_info.rb
 - lib/client/operation/module/stage.rb
 - lib/client/operation/module/uninstall.rb
 - lib/client/operation/module_service_common.rb
@@ -250,7 +290,7 @@ files:
 - lib/client/operation/service/list_attributes.rb
 - lib/client/operation/service/list_component_links.rb
 - lib/client/operation/service/list_components.rb
-- lib/client/operation/service/list_dependent_modules.rb
+- lib/client/operation/service/list_dependencies.rb
 - lib/client/operation/service/list_nodes.rb
 - lib/client/operation/service/list_violations.rb
 - lib/client/operation/service/pull.rb
@@ -292,6 +332,15 @@ files:
 - lib/client/response/error_handler.rb
 - lib/client/response/render_helper.rb
 - lib/client/response/subclasses.rb
+- lib/client/service_and_component_info.rb
+- lib/client/service_and_component_info/transform_from.rb
+- lib/client/service_and_component_info/transform_from/info.rb
+- lib/client/service_and_component_info/transform_from/info/component.rb
+- lib/client/service_and_component_info/transform_from/info/service.rb
+- lib/client/service_and_component_info/transform_to.rb
+- lib/client/service_and_component_info/transform_to/info.rb
+- lib/client/service_and_component_info/transform_to/info/component.rb
+- lib/client/service_and_component_info/transform_to/info/service.rb
 - lib/client/session.rb
 - lib/client/util.rb
 - lib/client/util/auxiliary.rb
@@ -300,7 +349,6 @@ files:
 - lib/client/util/dtk_path.rb
 - lib/client/util/hash_with_optional_keys.rb
 - lib/client/util/interactive_wizard.rb
-- lib/client/util/module_ref.rb
 - lib/client/util/os_util.rb
 - lib/client/util/os_util/print.rb
 - lib/client/util/post_body.rb
@@ -322,17 +370,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.