dtk-client 0.10.0.2 → 0.10.1

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

@@ -23,7 +23,6 @@ module DTK::Client
           module_ref       = args.required(:module_ref)
           module_name      = args.required(:module_name)
           target_directory = args[:target_directory]
-
           unless module_info = module_exists?(module_ref, :type => :common_module)
             raise Error::Usage, "DTK module '#{module_ref.print_form}' does not exist on server."
           end

data/lib/client/operation/module/install/external_module.rb

@@ -21,25 +21,79 @@ module DTK::Client
       BaseRoute = "modules"
 
       def self.install_dependent_modules(module_refs, opts = {})
+        # if skip_prompt option is sent it means user wants to update_all
+        @update_all  = opts[:skip_prompt]
+        @update_none = false
+        @print_dependency_newline = false
+
         module_refs.each do |module_ref|
           if module_exists?(module_ref, { :type => :component_module })
-            OsUtil.print("Using module '#{module_ref.namespace}:#{module_ref.module_name}'" + (module_ref.version.nil? ? "" : " version: #{module_ref.version} "))
-            # If component module is imported, still check to see if it's dependencies are imported
-            find_and_install_component_module_dependency(module_ref, opts.merge(:skip_if_no_remote => true))
+            print_using_message(module_ref, opts)
+            pull_module?(module_ref, opts)
+            find_and_install_component_module_dependency(module_ref, opts.merge(:skip_if_no_remote => true, indent: "  "))
           else
             install_module(module_ref, opts)
           end
         end
       end
 
+      def self.pull_dependent_modules?(module_refs, opts = {})
+        module_refs.each do |module_ref|
+          print_using_message(module_ref, opts)
+          pull_module?(module_ref, opts)
+        end
+      end
+
       private
 
+      def self.pull_module?(component_module, opts = {})
+        namespace   = component_module.namespace
+        module_name = component_module.module_name
+        version     = component_module.version
+        full_module_name = "#{namespace}:#{module_name}"
+
+        return if @update_none
+        options = %w(all none)
+        unless @update_all
+          update = Console.confirmation_prompt_additional_options("#{opts[:indent]}Do you want to update dependent module '#{full_module_name}' from the catalog?", options) 
+
+          return unless update
+
+          if update.eql?('all')
+            @update_all = true
+          elsif update.eql?('none')
+            @update_none = true
+            return
+          end
+        end
+
+        print "#{opts[:indent]}Pulling component module content for '#{full_module_name}' ... "
+
+        post_body = {
+          :module_name => module_name,
+          :namespace   => namespace,
+          :rsa_pub_key => SSHUtil.rsa_pub_key_content,
+          :version?    => version,
+          :full_module_name => full_module_name,
+          :json_diffs  => ""
+        }
+        response = rest_post "#{BaseRoute}/update_dependency_from_remote", PostBody.new(post_body)
+
+        if custom_message = response.data[:custom_message]
+          OsUtil.print(custom_message)
+        elsif (response.data[:diffs].nil? || response.data[:diffs].empty?)
+          OsUtil.print("No changes to pull from remote.", :yellow) unless response['errors']
+        else
+          OsUtil.print("Changes pulled from remote", :green)
+        end
+      end
+
       def self.install_module(component_module, opts = {})
         namespace   = component_module.namespace
         module_name = component_module.module_name
         version     = component_module.version
 
-        import_msg = "Importing module '#{namespace}:#{module_name}"
+        import_msg = "#{opts[:indent]}Importing module '#{namespace}:#{module_name}"
         import_msg += "(#{version})" if version && !version.eql?('master')
         import_msg += "' ... "
 
@@ -50,12 +104,12 @@ module DTK::Client
         post_body = {
           :module_name => module_name,
           :namespace   => namespace,
-          :rsa_pub_key => SSHUtil.rsa_pub_key_content(),
+          :rsa_pub_key => SSHUtil.rsa_pub_key_content,
           :version?    => version
         }
 
         unless opts[:skip_dependencies]
-          find_and_install_component_module_dependency(component_module, opts.merge(:add_newline => true))
+          find_and_install_component_module_dependency(component_module, opts.merge(:add_newline => true, indent: "  "))
         end
 
         response = rest_post "#{BaseRoute}/install_component_module", PostBody.new(post_body)
@@ -65,11 +119,16 @@ module DTK::Client
           :repo_url    => response.required(:repo_url),
           :branch      => response.required(:workspace_branch),
           :module_name => response.required(:full_module_name)
-          # :remove_existing  => remove_existing
         }
-        ClientModuleDir::GitRepo.clone_module_repo(clone_args)
 
-        OsUtil.print_info('Done.')
+        if opts[:add_newline]
+          print OsUtil.colorize("Done.", :yellow)
+          @print_dependency_newline = true
+        else
+          print "\n" if @print_dependency_newline
+          OsUtil.print('Done.', :yellow)
+          @print_dependency_newline = false
+        end
 
         response
       end
@@ -105,14 +164,29 @@ module DTK::Client
           return false unless Console.prompt_yes_no("Do you still want to proceed with import?", :add_options => true)
         end
 
-        if missing_modules = dependencies.data(:missing_module_components)
-          unless missing_modules.empty?
-            dep_module_refs = (missing_modules || []).map do |ref_hash|
-              ModuleRef.new(:namespace => ref_hash['namespace'], :module_name => ref_hash['name'], :version => ref_hash['version']) 
-            end
-            install_dependent_modules(dep_module_refs, opts.merge(:skip_dependencies => true))
+        if (missing_modules = dependencies.data(:missing_module_components)) && !missing_modules.empty?
+          dep_module_refs = (missing_modules || []).map do |ref_hash|
+            ModuleRef.new(:namespace => ref_hash['namespace'], :module_name => ref_hash['name'], :version => ref_hash['version']) 
+          end
+          install_dependent_modules(dep_module_refs, opts.merge(:skip_dependencies => true))
+        end
+
+        if (required_modules = dependencies.data(:required_modules)) && !required_modules.empty?
+          dep_module_refs = (required_modules || []).map do |ref_hash|
+            required_modules.uniq!
+            ModuleRef.new(:namespace => ref_hash['namespace'], :module_name => ref_hash['name'], :version => ref_hash['version']) 
           end
+          pull_dependent_modules?(dep_module_refs, opts.merge(:skip_dependencies => true))
+        end
+      end
+
+      def self.print_using_message(module_ref, opts = {})
+        # special case where, after importing dependencies of dependency, comes a using message
+        if opts[:add_newline]
+          print "\n"
+          @print_dependency_newline = false
         end
+        OsUtil.print("#{opts[:indent]}Using module '#{module_ref.namespace}:#{module_ref.module_name}'" + (module_ref.version.nil? ? "" : " version: #{module_ref.version} "))
       end
 
     end

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

@@ -23,17 +23,17 @@ module DTK::Client
 
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
-          base_module_ref = args.required(:module_ref)
           if args[:flag]
-              file_obj = args.required(:base_dsl_file_obj).raise_error_if_no_content_flag(:module_ref)
+            file_obj = args.required(:base_dsl_file_obj).raise_error_if_no_content_flag(:module_ref)
           else
-              file_obj = args.required(:base_dsl_file_obj).raise_error_if_no_content
+            file_obj = args.required(:base_dsl_file_obj).raise_error_if_no_content
           end
-          new(file_obj, base_module_ref).install
+
+          new(file_obj, args.required(:module_ref)).install(:skip_prompt => args[:skip_prompt])
         end
       end
       
-      def install
+      def install(opts = {})
         unless @base_module_ref
           raise Error::Usage, "No base module reference #{dsl_path_ref}"
         end
@@ -44,7 +44,7 @@ module DTK::Client
 
         unless dependent_modules.empty?
           OsUtil.print_info('Auto-importing dependencies')
-          ExternalModule.install_dependent_modules(dependent_modules)
+          ExternalModule.install_dependent_modules(dependent_modules, opts)
           OsUtil.print_info("Successfully imported '#{@base_module_ref.namespace}:#{@base_module_ref.module_name}' version #{@base_module_ref.version}")
         end
 

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

@@ -52,7 +52,7 @@ module DTK::Client
         git_repo_args = {
           :repo_dir      => target_repo_dir,
           :repo_url      => module_info.required(:remote_repo_url),
-          :remote_branch => @version ? "v#{@version}" : 'master'
+          :remote_branch => (@version && !@version.eql?('master')) ? "v#{@version}" : 'master'
         }
         ClientModuleDir::GitRepo.create_add_remote_and_pull(git_repo_args)
 

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

@@ -24,7 +24,7 @@ module DTK::Client
           if module_ref  = args[:module_ref]
             query_string_hash = module_ref_query_string_hash(module_ref)
           end
-          rest_get("#{BaseRoute}/list_assemblies", query_string_hash)
+          rest_get("#{BaseRoute}/assemblies", query_string_hash)
         end.set_render_as_table!
       end
 

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

@@ -0,0 +1,37 @@
+#
+# 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 ListRemotes < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |_args|
+
+          query_string_hash = QueryStringHash.new(
+            :detail_to_include => ['remotes', 'versions'],
+            :rsa_pub_key => SSHUtil.rsa_pub_key_content,
+            :module_namespace? => args[:module_namespace]
+          )
+          
+          rest_get("#{BaseRoute}/remote_modules", query_string_hash)
+        end.set_render_as_table!
+      end
+    end
+  end
+end
+
+

data/lib/client/operation/module.rb

@@ -18,7 +18,7 @@
 module DTK::Client
   class Operation
     class Module < self
-      OPERATIONS = [:install, :list, :list_assemblies, :push, :uninstall, :clone_module, :install_from_catalog]
+      OPERATIONS = [:install, :list, :list_assemblies, :list_remotes, :push, :uninstall, :clone_module, :install_from_catalog]
       OPERATIONS.each { |operation| require_relative("module/#{operation}") }
 
       BaseRoute = 'modules'

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

@@ -0,0 +1,50 @@
+#
+# 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::Service
+    class CloneService < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_ref       = args.required(:service_ref)
+          service_name      = args.required(:service_name)
+          target_directory = args[:target_directory]
+          unless service_info = service_exists?(service_ref)
+            raise Error::Usage, "DTK service '#{service_ref}' does not exist on server."
+          end
+
+          branch    = service_info.required(:branch, :name)
+          repo_url  = service_info.required(:repo, :url)
+          repo_name = service_info.required(:repo, :name)
+
+          clone_args = {
+            :repo_url    => service_info.required(:repo, :url),
+            :branch      => service_info.required(:branch, :name),
+            :service_instance => service_name,
+            #:service_name => service_name,
+            :repo_dir    => target_directory || ClientModuleDir.ret_path_with_current_dir(service_name)
+          }
+
+          ret = ClientModuleDir::GitRepo.clone_service_repo(clone_args)
+          OsUtil.print_info("DTK service '#{service_ref}' has been successfully cloned into '#{ret.required(:target_repo_dir)}'")
+        end
+      end
+    end
+  end
+end
+
+

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

@@ -0,0 +1,44 @@
+#
+# 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::Service
+    class Delete < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          recursive        = args.required(:recursive)
+
+          unless args[:skip_prompt]
+            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
+
+          post_body = PostBody.new(
+            :service_instance => service_instance,
+            :recursive? => recursive
+          )
+          rest_post("#{BaseRoute}/delete", post_body)
+
+          OsUtil.print_info("DTK module '#{service_instance}' has been deleted successfully.")
+        end
+      end
+
+    end
+  end
+end
+
+

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

@@ -51,6 +51,11 @@ module DTK::Client
             return Response::Ok.new('empty_workflow' => true) 
           end
 
+          if response.data(:violations)
+            OsUtil.print_error("Cannot execute an action or workflow if there are violations:")
+            return response.set_render_as_table!
+          end
+
           response
         end
       end

data/lib/client/operation/service/set_attribute.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
+  class Operation::Service
+    class SetAttribute < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          attribute_name   = args[:attribute_name]
+          attribute_value  = args[:attribute_value]
+          
+          query_string_hash = QueryStringHash.new(
+            :pattern?  => attribute_name,
+            :value?    => attribute_value
+          )
+          response = rest_post("#{BaseRoute}/#{service_instance}/set_attribute", query_string_hash)
+
+          if repo_updated = response.data["repo_updated"] 
+            repo_info_args = Args.new(
+             :service_instance => service_instance,
+             :branch           => response.required(:branch, :name),
+             :repo_url         => response.required(:repo, :url)
+           )
+
+           ClientModuleDir::GitRepo.pull_from_service_repo(repo_info_args)
+         end
+         nil
+        end
+      end
+    end
+  end
+end

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

@@ -28,11 +28,21 @@ module DTK::Client
             OsUtil.print_info("No parameters to set.")
           else
             param_bindings = InteractiveWizard.resolve_missing_params(required_attributes)
+
             post_body = PostBody.new(
               :service_instance => service_instance,
               :av_pairs_hash    => param_bindings.inject(Hash.new){|h,r|h.merge(r[:id] => r[:value])}
             )
-            rest_post "#{BaseRoute}/#{service_instance}/set_attributes", post_body
+            response = rest_post "#{BaseRoute}/#{service_instance}/set_attributes", post_body
+
+            repo_info_args = Args.new(
+              :service_instance => service_instance,
+              :branch           => response.required(:branch, :name),
+              :repo_url         => response.required(:repo, :url)
+            )
+            ClientModuleDir::GitRepo.pull_from_service_repo(repo_info_args)
+
+            nil
           end
         end
       end

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

@@ -22,16 +22,23 @@ module DTK::Client
         wrap_operation(args) do |args|
           module_ref      = args.required(:module_ref)
           remove_existing = args[:remove_existing]
+          service_name    = args[:service_name] 
 
           post_body = PostBody.new(
             :namespace       => module_ref.namespace,
             :module_name     => module_ref.module_name,
             :assembly_name?  => args.required(:assembly_name),
-            :service_name?   => args[:service_name],
             :version?        => args[:version],
             :target_service? => args[:target_service],
             :is_target?      => args[:is_target]
           )
+
+          service_name ||= rest_post("#{BaseRoute}/generate_service_name", post_body).data
+          path = ClientModuleDir.ret_base_path(:service, service_name)
+          
+          raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or removed before retrying the command" if ClientModuleDir.local_dir_exists?(:service, service_name) 
+          
+          post_body.merge!(:service_name => service_name)
           response = rest_post("#{BaseRoute}/create", post_body)
 
           service_instance = response.required(:service, :name)
@@ -42,7 +49,7 @@ module DTK::Client
             :branch           => response.required(:branch, :name),
             :service_instance => service_instance,
             :remove_existing  => remove_existing
-          } 
+          }
           message = ClientModuleDir::GitRepo.clone_service_repo(clone_args)
           target_dir = message.data(:target_repo_dir)
 

data/lib/client/operation/service/task_status/refresh_mode.rb

@@ -41,6 +41,7 @@ module DTK::Client
                 system('clear')
                 # response.print_error_table = true
                 # response.render_table(:task_status)
+                response.print_error_table!(true)
                 return response.set_render_as_table!
               end
             end

data/lib/client/operation/service/task_status/snapshot_mode.rb

@@ -20,6 +20,7 @@ module DTK::Client
     class SnapshotMode < self
       def task_status(opts = {})
         response = rest_call(opts)
+        response.print_error_table!(true)
         response.set_render_as_table!
       end
     end

data/lib/client/operation/service/task_status/stream_mode/element/hierarchical_task/result.rb

@@ -27,6 +27,10 @@ module DTK::Client; class Operation::Service::TaskStatus::StreamMode::Element
         @errors = hash['errors'] || []
       end
 
+      # This can be over-written
+      def action_results
+        []
+      end
 
       def self.render(element, stage_subtasks)
         results_per_node = base_subtasks(element, stage_subtasks)

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

@@ -35,7 +35,9 @@ module DTK::Client
           if task_status_mode
             task_status_with_mode(task_status_mode.to_sym, service_instance)
           else
-            rest_call(service_instance).set_render_as_table!
+            response = rest_call(service_instance)
+            response.print_error_table!(true)
+            response.set_render_as_table!
           end
         end
       end

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

@@ -0,0 +1,46 @@
+#
+# 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::Service
+    class Uninstall < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          recursive        = args.required(:recursive)
+
+          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)
+          end
+
+          post_body = PostBody.new(
+            :service_instance => service_instance,
+            :recursive? => recursive
+          )
+          rest_post("#{BaseRoute}/uninstall", post_body)
+
+          ClientModuleDir.purge_service_instance_dir(args[:directory_path]) if args[:purge]
+
+          OsUtil.print_info("DTK module '#{service_instance}' has been uninstalled successfully.")
+        end
+      end
+
+    end
+  end
+end
+
+

data/lib/client/operation/service.rb

@@ -20,7 +20,9 @@ module DTK::Client
     class Service < self
       OPERATIONS = [
         :commit_and_push,
-        :destroy,
+        :clone_service,
+        :delete,
+        :uninstall,
         :edit,
         :pull,
         :stage,
@@ -39,6 +41,7 @@ module DTK::Client
         :cancel_task,
         :ssh,
         :set_required_attributes,
+        :set_attribute,
         :exec,
         :set_default_target
         # :create_workspace
@@ -49,6 +52,12 @@ module DTK::Client
 
       extend ModuleServiceCommon::ClassMixin
 
+      private
+
+      def self.service_exists?(service_ref, opts = {})
+        response = rest_get("#{BaseRoute}/#{service_ref}/repo_info")
+        response.data.empty? ? nil : response
+      end
     end
   end
 end

data/lib/client/render/view/table/processor.rb

@@ -97,7 +97,7 @@ module DTK::Client
                   # original table takes that index
                   evaluated_element.send("#{k}=", error_index)
                   # we set new error element
-                  set_error_element!(error_element)
+                  set_error_element!(error_element, error_index, error_type, error_message)
                   
                   # add it with other
                   @error_data << error_element
@@ -122,7 +122,7 @@ module DTK::Client
         end
       end
       
-      def set_error_element!(error_element)
+      def set_error_element!(error_element, error_index, error_type, error_message)
         error_element.id = error_index
         case error_type
         when 'user_error'

data/lib/client/response/render_helper.rb

@@ -60,6 +60,10 @@ module DTK::Client
         @skip_render = skip
       end
 
+      def print_error_table!(value)
+        @print_error_table = value
+      end
+
       private
 
       def semantic_datatype_in_payload

data/lib/client/util/console.rb

@@ -63,6 +63,29 @@ module DTK::Client
 
     private
 
+    # Display confirmation prompt and repeat message until expected answer is given
+    # options should be sent as array ['all', 'none']
+    def self.confirmation_prompt_additional_options(message, options = [])
+      raise DTK::Client::DtkValidationError, "Options should be sent as array: ['all', 'none']" unless options.is_a?(Array)
+
+      # used to disable skip with ctrl+c
+      trap("INT", "SIG_IGN")
+      message += " (yes/no#{options.empty? ? '' : ('/' + options.join('/'))})"
+
+      while line = Readline.readline("#{message}: ", true)
+        if line.eql?("yes") || line.eql?("y")
+          trap("INT",false)
+          return true
+        elsif line.eql?("no") || line.eql?("n")
+          trap("INT",false)
+          return false
+        elsif options.include?(line)
+          trap("INT",false)
+          return line
+        end
+      end
+    end
+
     # opts can have keys
     #   :disable_ctrl_c - Boolean (default: true)
     def self.prompt_context(opts = {}, &body)