dtk-client 0.10.2 → 0.10.3

data/lib/client/operation/module/push_dtkn.rb

@@ -0,0 +1,79 @@
+#
+# 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 Operation::Module
+    class PushDtkn < self
+      require_relative('push_dtkn/convert_source')
+
+      attr_reader :version, :module_ref, :target_repo_dir, :base_dsl_file_obj
+      def initialize(catalog, module_ref, directory_path, version, base_dsl_file_obj)
+        @catalog           = catalog
+        @module_ref        = module_ref
+        @directory_path    = directory_path
+        @target_repo_dir   = directory_path || base_dsl_file_obj.parent_dir
+        @version           = version # if nil wil be dynamically updated
+        @base_dsl_file_obj = base_dsl_file_obj
+      end
+      private :initialize
+
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          module_ref        = args.required(:module_ref)
+          version           = args[:version]
+          directory_path    = args[:directory_path]
+          base_dsl_file_obj = args[:base_dsl_file_obj]
+          new('dtkn', module_ref, directory_path, version, base_dsl_file_obj).push_dtkn
+        end
+      end
+      
+      def push_dtkn
+        # TODO: DTK-2765: not sure if we need module to exist on server to do push-dtkn
+        unless module_version_exists?(@module_ref, :type => :common_module)
+          raise Error::Usage, "Module #{@module_ref.print_form} does not exist on server"
+        end
+
+        if ref_version = @version || module_ref.version
+          raise Error::Usage, "You are not allowed to push module version '#{ref_version}'!" unless ref_version.eql?('master')
+        end
+
+        error_msg = "To allow push-dtkn to go through, invoke 'dtk push' to push the changes to server before invoking push-dtkn again"
+        GitRepo.modified_with_diff?(@target_repo_dir, { :error_msg => error_msg })
+
+        query_string_hash = QueryStringHash.new(
+          :module_name => @module_ref.module_name,
+          :namespace   => @module_ref.namespace,
+          :rsa_pub_key => SSHUtil.rsa_pub_key_content,
+          :version?    => @version
+        )
+
+        remote_module_info = rest_get "#{BaseRoute}/remote_module_info", query_string_hash
+
+        unless @version
+          @version = remote_module_info.required(:version)
+          @module_ref.version = @version
+        end
+
+        ConvertSource.transform_and_commit(remote_module_info, self)
+        nil
+      end
+
+    end
+  end
+end
+
+

data/lib/client/operation/module/stage.rb

@@ -34,8 +34,9 @@ module DTK::Client
             :target_service? => args[:target_service],
             :is_target?      => args[:is_target]
           )
-
-          DTK::Client::GitRepo.modified?(directory_path || OsUtil.current_dir) unless force
+          
+          error_msg = "To allow stage to go through, invoke 'dtk push' to push the changes to server before invoking stage again"
+          GitRepo.modified_with_diff?(directory_path || module_ref.client_dir_path, { :error_msg => error_msg }) unless force
           service_name ||= rest_post("#{BaseRoute}/generate_service_name", post_body).data
           base_path = ClientModuleDir.ret_base_path(:service, service_name)
           

data/lib/client/operation/module/uninstall.rb

@@ -21,7 +21,42 @@ module DTK::Client
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
           module_ref  = args.required(:module_ref)
+          name        = args.required(:name)
+          version     = args.required(:version)
+
+          unless name.nil?
+            query_string_hash = QueryStringHash.new(
+              :detail_to_include => ['remotes', 'versions']
+            )
+            response = rest_get("#{BaseRoute}/list", query_string_hash)
+            installed_modules = response.data
+
+            name.gsub!("/", ":")
+            installed_modules.each do |module_val| 
+              if module_val["display_name"].eql? name
+                val = name.split(":")
+                if version.nil?
+                  versions = module_val["versions"].split(",").map(&:strip) 
+                  if versions.size > 1
+                    version = Console.version_prompt(versions, "Select which module version to uninstall: ", { :add_all => true})
+                    module_val["versions"] if version.eql? "all"
+                  else
+                    version = module_val["versions"]
+                  end
+                end
+
+                module_opts = {
+                  :module_name => val[1],
+                  :namespace   => val[0],
+                  :version     => version
+                }
+                module_ref = ModuleRef.new(module_opts)
+              end
+            end
+          end 
           
+          raise Error::Usage, "Invalid module name." if module_ref.nil?
+
           opts = {
             :namespace => module_ref.namespace,
             :version   => module_ref.version
@@ -36,6 +71,7 @@ module DTK::Client
             :namespace   => module_ref.namespace,
             :version?    => module_ref.version
           )
+
           rest_post("#{BaseRoute}/delete", post_body)
           OsUtil.print_info("DTK module '#{DTK::Common::PrettyPrintForm.module_ref(module_ref.module_name, opts)}' has been deleted successfully.")
           nil

data/lib/client/operation/module.rb

@@ -18,7 +18,21 @@
 module DTK::Client
   class Operation
     class Module < self
-      OPERATIONS = [:install, :list, :list_assemblies, :list_remotes, :push, :uninstall, :clone_module, :install_from_catalog, :stage]
+      OPERATIONS = [
+        :install,
+        :list,
+        :list_assemblies,
+        :list_remotes,
+        :push,
+        :uninstall,
+        :clone_module,
+        :install_from_catalog,
+        :push_dtkn,
+        :stage,
+        :pull_dtkn,
+        :publish,
+        :delete_from_remote
+      ]
       OPERATIONS.each { |operation| require_relative("module/#{operation}") }
 
       BaseRoute = 'modules'
@@ -27,13 +41,18 @@ module DTK::Client
         
       private
 
-      def module_exists?(module_ref, opts = {})
-        self.class.module_exists?(module_ref, opts)
+      def module_version_exists?(module_ref, opts = {})
+        self.class.module_version_exists?(module_ref, opts)
       end
 
-      def self.module_exists?(module_ref, opts = {})
+      def self.module_version_exists?(module_ref, opts = {})
         type = opts[:type] || :common_module
         query_string_hash = QueryStringHash.new(module_ref_hash(module_ref).merge(:module_type => type))
+
+        if ret_remote_info = opts[:remote_info]
+          query_string_hash.merge!(:remote_info => ret_remote_info, :rsa_pub_key => opts[:rsa_pub_key])
+        end
+
         response = rest_get(BaseRoute, query_string_hash)
         response.data.empty? ? nil : response
       end

data/lib/client/operation/service/converge.rb

@@ -21,14 +21,15 @@ module DTK::Client
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
           service_instance = args.required(:service_instance)
+          module_dir   = args.required(:module_dir)
           force            = args[:force]
-          directory_path   = args[:directory_path]
 
           post_body = PostBody.new(
             :service_instance => service_instance
           )
 
-          DTK::Client::GitRepo.modified?(directory_path || OsUtil.current_dir) unless force
+          error_msg = "To allow converge to go through, invoke 'dtk push' to push the changes to server before invoking converge again"
+          GitRepo.modified_with_diff?(module_dir, { :error_msg => error_msg }) unless force
           violations = find_violations(service_instance)
           return violations if violations
 

data/lib/client/operation/service/delete.rb

@@ -29,7 +29,8 @@ module DTK::Client
             return false unless Console.prompt_yes_no("Are you sure you want to delete the content of service instance '#{service_instance}' ?", :add_options => true)
           end
 
-          DTK::Client::GitRepo.modified?(directory_path || OsUtil.current_dir) unless force
+          error_msg = "To allow delete to go through, invoke 'dtk push' to push the changes to server before invoking delete again"
+          GitRepo.modified_with_diff?(directory_path || @module_ref.client_dir_path, { :error_msg => error_msg }) unless force
           post_body = PostBody.new(
             :service_instance => service_instance,
             :recursive? => recursive

data/lib/client/operation/service/destroy.rb

@@ -29,7 +29,7 @@ module DTK::Client
           post_body = PostBody.new(:service_instance => service_instance)
           rest_post("#{BaseRoute}/delete", post_body)
 
-          ClientModuleDir.purge_service_instance_dir(args[:directory_path]) if args[:purge]
+          ClientModuleDir.rm_f(args[:directory_path]) if args[:purge]
 
           OsUtil.print_info("DTK module '#{service_instance}' has been deleted successfully.")
         end

data/lib/client/operation/service/exec.rb

@@ -23,6 +23,7 @@ module DTK::Client
           service_instance = args.required(:service_instance)
           action           = args.required(:action)
           action_params    = args[:action_params]
+          directory_path   = args[:directory_path]
 
           # parse params and return format { 'p_name1' => 'p_value1' , 'p_name2' => 'p_value2' }
           task_params = parse_params?(action_params)||{}
@@ -33,6 +34,9 @@ module DTK::Client
             task_params.merge!("node" => node)
           end
           
+          error_msg = "To allow #{args[:command]} to go through, invoke 'dtk push' to push the changes to server before invoking #{args[:command]} again"
+          GitRepo.modified_with_diff?(directory_path, { :error_msg => error_msg })
+
           post_body = PostBody.new(
             :task_params? => task_params
           )

data/lib/client/operation/service/{list_dependent_modules.rb → list_dependencies.rb}

@@ -17,7 +17,7 @@
 #
 module DTK::Client
   class Operation::Service
-    class ListDependentModules < self
+    class ListDependencies < self
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
           service_instance = args.required(:service_instance)

data/lib/client/operation/service/stage.rb

@@ -35,7 +35,7 @@ module DTK::Client
             :is_target?      => args[:is_target]
           )
 
-          DTK::Client::GitRepo.modified?(directory_path || OsUtil.current_dir) unless force
+          GitRepo.modified?(directory_path || OsUtil.current_dir) unless force
           service_name ||= rest_post("#{BaseRoute}/generate_service_name", post_body).data
           base_path = ClientModuleDir.ret_base_path(:service, service_name)
           

data/lib/client/operation/service/uninstall.rb

@@ -22,7 +22,7 @@ module DTK::Client
         wrap_operation(args) do |args|
           service_instance = args.required(:service_instance)
           recursive        = args.required(:recursive)
-          force            = args.required(:force)
+          delete            = args.required(:delete)
 
           unless args[:skip_prompt]
             return false unless Console.prompt_yes_no("Are you sure you want to uninstall the infrastructure associated with '#{service_instance}' and delete this service instance from the server?", :add_options => true)
@@ -31,11 +31,11 @@ module DTK::Client
           post_body = PostBody.new(
             :service_instance => service_instance,
             :recursive? => recursive,
-            :force      => force
+            :delete      => delete
           )
           rest_post("#{BaseRoute}/uninstall", post_body)
 
-          ClientModuleDir.purge_service_instance_dir(args[:directory_path]) if args[:purge]
+          ClientModuleDir.rm_f(args[:directory_path]) if args[:purge]
 
           OsUtil.print_info("DTK module '#{service_instance}' has been uninstalled successfully.")
         end

data/lib/client/operation/service.rb

@@ -31,7 +31,7 @@ module DTK::Client
         :list_actions,
         :list_attributes,
         :list_component_links,
-        :list_dependent_modules,
+        :list_dependencies,
         :list_components,
         :list_nodes,
         :list_violations,

data/lib/client/service_and_component_info/transform_from/info/component.rb

@@ -0,0 +1,57 @@
+#
+# 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::TransformFrom::Info
+    class Component < self
+      def read_inputs_and_compute_outputs!
+        # Input component dsl file and module_ref filedslpdslp
+        if component_dsl_path = component_dsl_path()
+          add_content!(component_dsl_input_files_processor, component_dsl_path)
+        end
+
+        if module_refs_path = module_refs_path()
+          add_content!(module_ref_input_files_processor, module_refs_path)
+        end
+
+        # compute and cache outputs
+        dtk_dsl_component_info_processor.compute_outputs!
+      end
+
+      private
+
+      def info_type
+        :component_info
+      end
+
+      def dtk_dsl_component_info_processor
+        @dtk_dsl_info_processor
+      end
+
+      def component_dsl_path
+        matches = directory_file_paths.select { |path| component_dsl_input_files_processor.match?(path) }
+        raise Error, "Unexpected that there is not a unique component dsl file" if matches.size != 1
+        matches.first
+      end
+
+      def component_dsl_input_files_processor
+        @component_dsl_input_files_processor ||= input_files_processor(:component_dsl_file)
+      end
+
+    end
+  end
+end

data/lib/client/service_and_component_info/transform_from/info/service.rb

@@ -0,0 +1,53 @@
+#
+# 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::TransformFrom::Info
+    class Service < self
+      def read_inputs_and_compute_outputs!
+        # Input assemblies and module_ref file
+        assembly_file_paths.each { |path| add_content!(assembly_input_files_processor, path) }
+
+        if module_refs_path = module_refs_path()
+          add_content!(module_ref_input_files_processor, module_refs_path)
+        end
+
+        # compute and cache outputs
+        dtk_dsl_service_info_processor.compute_outputs!
+      end
+
+      private
+
+      def info_type
+        :service_info
+      end
+
+      def dtk_dsl_service_info_processor
+        @dtk_dsl_info_processor
+      end
+
+      def assembly_file_paths
+        directory_file_paths.select { |path| assembly_input_files_processor.match?(path) }
+      end
+      
+      def assembly_input_files_processor 
+        @assembly_input_files_processor ||= input_files_processor(:assemblies)
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,84 @@
+#
+# 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::TransformFrom
+    class Info
+      require_relative('info/service')
+      require_relative('info/component')
+
+      attr_reader :input_file_paths
+      def initialize(content_dir, dtk_dsl_parse_helper)
+        @content_dir            = content_dir
+        @dtk_dsl_info_processor = dtk_dsl_parse_helper.info_processor(info_type)
+
+        # dynamically computed
+        @input_file_paths     = [] 
+        @directory_file_paths = nil # this will be all paths in module
+      end
+      private :initialize
+
+      def self.create(info_type, content_dir, dtk_dsl_parse_helper)
+        case info_type
+        when :service_info then Service.new(content_dir, dtk_dsl_parse_helper)
+        when :component_info then Component.new(content_dir, dtk_dsl_parse_helper)
+        else
+          fail Error, "Unexpected info_type '#{info_type}'"
+        end
+      end
+
+      private
+
+      def add_content!(input_files_processor, path)
+        @input_file_paths << path
+        input_files_processor.add_content!(path, get_raw_content?(path))
+      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 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
+
+      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
+
+    end
+  end
+end

data/lib/client/service_and_component_info/transform_from.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::Client
+  module ServiceAndComponentInfo
+    class TransformFrom
+      require_relative('transform_from/info')
+
+      def initialize(content_dir, module_ref, version)
+        @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)
+      end
+      
+      def info_processor(info_type)
+        Info.create(info_type, @content_dir, @dtk_dsl_parse_helper)
+      end
+
+      def output_path_text_pairs
+        @dtk_dsl_parse_helper.output_path_text_pairs
+      end
+
+      private
+
+      def dtk_dsl_transform_class
+        ::DTK::DSL::ServiceAndComponentInfo::TransformFrom
+      end
+      
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+#
+# 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::Info
+    class Component < self
+      def read_inputs_and_compute_outputs!
+        # Input component dsl file and module_ref filedslpdslp
+        if component_dsl_path = component_dsl_path()
+          add_content!(component_dsl_input_files_processor, component_dsl_path)
+        end
+
+        # compute and cache outputs
+        dtk_dsl_component_info_processor.compute_outputs!
+      end
+
+      private
+
+      def info_type
+        :component_info
+      end
+
+      def dtk_dsl_component_info_processor
+        @dtk_dsl_info_processor
+      end
+
+      def component_dsl_path
+        matches = directory_file_paths.select { |path| component_dsl_input_files_processor.match?(path) }
+        # raise Error, "Unexpected that there is not a unique component dsl file" if matches.size != 1
+        matches.first
+      end
+
+      def component_dsl_input_files_processor
+        @component_dsl_input_files_processor ||= input_files_processor(:module)
+      end
+
+    end
+  end
+end

data/lib/client/service_and_component_info/transform_to/info/service.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
+  class ServiceAndComponentInfo::TransformTo::Info
+    class Service < self
+      def read_inputs_and_compute_outputs!
+        # Input assemblies and module_ref file
+        module_file_paths.each { |path| add_content!(module_input_files_processor, path) }
+
+        # compute and cache outputs
+        dtk_dsl_service_info_processor.compute_outputs!
+      end
+
+      private
+
+      def info_type
+        :service_info
+      end
+
+      def dtk_dsl_service_info_processor
+        @dtk_dsl_info_processor
+      end
+
+      def module_file_paths
+        directory_file_paths.select { |path| module_input_files_processor.match?(path) }
+      end
+      
+      def module_input_files_processor
+        @module_input_files_processor ||= input_files_processor(:module)
+      end
+
+    end
+  end
+end