dtk-client 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3489e815d77b396a9795163b8ce45dd40b7a5ce8
-  data.tar.gz: de1620b5c1de32244743ff3b6f0eedbc6a5d36dd
+  metadata.gz: 254aaacc97b6cc8dde9c36ad4b06d0af2cda66b1
+  data.tar.gz: bb1fe62fcd2014f790ecab9a9b13aecbda698cd8
 SHA512:
-  metadata.gz: 2b9378cf3c0b696f24434c0b0426c2f16a2e319f912d88cfc641d7eb5c826320e3a4d3f5adc8107704260dd5fca51a4a008ce33a4e1a0ef5255fc4ae0e229dfe
-  data.tar.gz: c6cf8079566421eda45d057c9c30ee45a3a1b3a640aa48b751d8490df8e1a8280fc68739fb94684053a9191f03bf27d5c9b629ba0e3a65ed63b07541e981e974
+  metadata.gz: a7c6b9d6679aa46239b60d9db561a1532c658a10f19b1df5eb963f7f7d62ff3996944a8a33a13fddcd63b3525be8f4f008e238bea58d77533148e21a6157c68e
+  data.tar.gz: 18961ad5eb9205cfd73207d605469eeda4c0e16086a1fcbe630865cd9de40843db4871e768b8cc7034889701f8db686249cc6e7db0ad48cff765e4a013c9cf35

data/bin/dtk-puppet

@@ -25,7 +25,7 @@ module DTK
   #dtk_dsl must be loaded after GlobalForDSL set
   require 'dtk_dsl'
 
-  Client::Error.top_level_trap_error do
+  return_code = Client::Error.top_level_trap_error do
     begin
       require 'puppet'
     rescue LoadError => e
@@ -35,4 +35,5 @@ module DTK
     require_relative '../lib/dtk_puppet'
     Puppet::Parser.parse(ARGV)
   end
-end
+  exit return_code
+end

data/lib/cli/command/module/delete_from_remote.rb

@@ -20,7 +20,7 @@ module DTK::Client
     module Module 
       subcommand_def 'delete-from-remote' do |c|
         c.arg Token::Arg.module_name
-        command_body c, 'delete-from-remote', 'Delete module from the DTK remote catalog (DTKN)' do |sc|
+        command_body c, 'delete-from-dtkn', 'Delete module from the DTK remote catalog (DTKN)' do |sc|
           sc.flag Token.version
           sc.switch Token.skip_prompt
           

data/lib/cli/command/module/list_assemblies.rb

@@ -19,7 +19,7 @@ module DTK::Client
   module CLI::Command
     module Module 
       subcommand_def 'list-assemblies' do |c|
-        command_body c, 'list-assemblies', 'List assemblies from all modules or specified module' do |sc|
+        command_body c, 'assemblies', 'List assemblies from all modules or specified module' do |sc|
           sc.switch Token.all, :desc => 'List assemblies from all modules'
           sc.flag Token.directory_path
           sc.action do |_global_options, options, _args| 

data/lib/cli/command/module/list_remotes.rb

@@ -19,7 +19,7 @@ module DTK::Client
   module CLI::Command
     module Module
       subcommand_def 'list-remotes' do |c|
-        command_body c, 'list-remotes', 'List remote modules' do |sc|
+        command_body c, 'dtkn', 'List remote modules' do |sc|
           sc.flag Token.namespace
           sc.action do |_global_options, options, args|
             arg = {}

data/lib/cli/command/module/pull_dtkn.rb

@@ -21,8 +21,8 @@ module DTK::Client
       subcommand_def 'pull-dtkn' do |c|
         command_body c, 'pull-dtkn', 'Pull content from repo manager to client module directory and push to server' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to module directory containing content to update; not need if in the module directory'
-          sc.switch Token.skip_prompt
           sc.switch Token.force
+          sc.switch Token.update_deps
           sc.action do |_global_options, options, _args|
             module_ref = module_ref_object_from_options_or_context(options)
             operation_args = {
@@ -30,8 +30,9 @@ module DTK::Client
               :base_dsl_file_obj   => @base_dsl_file_obj,
               :has_directory_param => !options["d"].nil?,
               :directory_path      => options[:directory_path],
-              :skip_prompt         => options[:skip_prompt],
-              :force               => options[:f]
+              #:skip_prompt         => options[:skip_prompt],
+              :force               => options[:f],
+              :update_deps         => options[:update_deps]
             }
             Operation::Module.pull_dtkn(operation_args)
             Operation::Module.push(operation_args.merge(:method => "pulled"))

data/lib/cli/command/service.rb

@@ -19,6 +19,8 @@ module DTK::Client
   module CLI
     module Command
       module Service
+        require_relative('service/violation')
+
         include Command::Mixin
         ALL_SUBCOMMANDS = [
           'clone',
@@ -37,6 +39,7 @@ module DTK::Client
           'list-components',
           'list-nodes',
           'list-violations',
+          'link',
 #          'start',
 #          'stop',
           'cancel-task',

data/lib/cli/command/service/converge.rb

@@ -30,7 +30,12 @@ module DTK::Client; module CLI
               :force            => force,
               :module_dir       => @base_dsl_file_obj.parent_dir
             }
-            Operation::Service.converge(args)
+            response = Operation::Service.converge(args)
+            if violation_response = Violation.process_violations?(response)
+              violation_response
+            end
+            nil
+
           end
         end
       end

data/lib/cli/command/service/delete.rb

@@ -29,7 +29,7 @@ module DTK::Client; module CLI
             directory_path   = options[:directory_path]
             purge            = options[:purge]
             recursive        = options[:recursive]
-            force            = options[:force]
+            force            = options[:f]
             service_instance = service_instance_in_options_or_context(options)
 
             args = {

data/lib/cli/command/service/exec.rb

@@ -41,11 +41,11 @@ module DTK::Client
             
             response = Operation::Service.exec(args)
 
-            if violations = response.data(:violations)
-              response.set_data(violations)
-              response.data.flatten!
-              response.set_render_as_table!
+            if violation_response = Violation.process_violations?(response)
+              violation_response
             end
+            nil
+
           end
         end
       end

data/lib/cli/command/service/exec_sync.rb

@@ -42,14 +42,10 @@ module DTK::Client
             unless response.ok?
               response
             else
-              # TODO: break if any exceptions
-
               if response.data(:empty_workflow)
                 Response::Ok.new
-              elsif violations = response.data(:violations)
-                response.set_data(violations)
-                response.data.flatten!
-                response.set_render_as_table!
+              elsif violation_response = Violation.process_violations?(response)
+                violation_response
               else
                 Operation::Service.task_status(args.merge(:mode => 'stream'))
               end

data/lib/cli/command/service/link.rb

@@ -0,0 +1,52 @@
+#
+# 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 CLI
+  module Command
+    module Service
+      subcommand_def 'link' do |c|
+        c.arg Token::Arg.base_cmp
+        c.arg Token::Arg.deps_on_cmp
+        c.arg Token::Arg.service, :optional => true
+        command_body c, 'link', 'List component links in the service instance.' do |sc|
+          sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
+          sc.flag Token.link_name
+          sc.switch Token.unlink
+
+          sc.action do |_global_options, options, _args|
+            base_component      = _args[0]
+            dependent_component = _args[1]
+            service             = _args[2]
+            service_instance    =  service_instance_in_options_or_context(options) 
+            link_name           = options[:l] unless options[:l].nil?
+
+            args = {
+              :service_instance    => service_instance,
+              :unlink              => options["u"],
+              :base_component      => base_component,
+              :dependent_component => dependent_component,
+              :service             => service,
+              :link_name           => link_name
+            }
+
+            Operation::Service.link(args)
+          end
+        end
+      end
+    end
+  end
+end; end

data/lib/cli/command/service/list_actions.rb

@@ -19,7 +19,7 @@ module DTK::Client; module CLI
   module Command
     module Service
       subcommand_def 'list-actions' do |c|
-        command_body c, 'list-actions', 'List the actions defined on components in the service instance.' do |sc|
+        command_body c, 'actions', 'List the actions defined on components in the service instance.' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
           sc.flag Token.type, :desc => 'Filter actions based on type (service, component)'
 

data/lib/cli/command/service/list_attributes.rb

@@ -19,7 +19,7 @@ module DTK::Client; module CLI
   module Command
     module Service
       subcommand_def 'list-attributes' do |c|
-        command_body c, 'list-attributes', 'List attributes associated with service instance.' do |sc|
+        command_body c, 'attributes', 'List attributes associated with service instance.' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
           sc.flag Token.node, :desc => 'Filter attributes by node'
           sc.flag Token.format

data/lib/cli/command/service/list_component_links.rb

@@ -19,7 +19,7 @@ module DTK::Client; module CLI
   module Command
     module Service
       subcommand_def 'list-component-links' do |c|
-        command_body c, 'list-component-links', 'List component links in the service instance.' do |sc|
+        command_body c, 'links', 'List component links in the service instance.' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
 
           sc.action do |_global_options, options, _args|

data/lib/cli/command/service/list_components.rb

@@ -19,7 +19,7 @@ module DTK::Client; module CLI
   module Command
     module Service
       subcommand_def 'list-components' do |c|
-        command_body c, 'list-components', 'List components associated with the service instance.' do |sc|
+        command_body c, 'components', 'List components associated with the service instance.' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
           sc.switch Token.dependencies, :desc => 'Show dependencies'
 

data/lib/cli/command/service/list_dependencies.rb

@@ -19,7 +19,7 @@ module DTK::Client; module CLI
   module Command
     module Service
       subcommand_def 'list-dependencies' do |c|
-        command_body c, 'list-dependencies', 'List dependent modules associated with service instance.' do |sc|
+        command_body c, 'dependencies', 'List dependent modules associated with service instance.' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
 
           sc.action do |_global_options, options, _args|

data/lib/cli/command/service/list_nodes.rb

@@ -19,7 +19,7 @@ module DTK::Client; module CLI
   module Command
     module Service
       subcommand_def 'list-nodes' do |c|
-        command_body c, 'list-nodes', 'List nodes associated with the service instance.' do |sc|
+        command_body c, 'nodes', 'List nodes associated with the service instance.' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
 
           sc.action do |_global_options, options, _args|

data/lib/cli/command/service/list_violations.rb

@@ -19,7 +19,7 @@ module DTK::Client; module CLI
   module Command
     module Service
       subcommand_def 'list-violations' do |c|
-        command_body c, 'list-violations', ' Finds violations that must be corrected before converging the service instance or running the specified action.' do |sc|
+        command_body c, 'violations', ' Finds violations that must be corrected before converging the service instance or running the specified action.' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
 
           sc.action do |_global_options, options, _args|

data/lib/cli/command/service/violation.rb

@@ -0,0 +1,33 @@
+#
+# 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 CLI::Command::Service
+    module Violation
+      def self.process_violations?(response)
+        if violations = response.data(:violations)
+          OsUtil.print_error("Cannot execute an action or workflow if there are violations:")
+          response.set_data(violations)
+          response.data.flatten!
+          response.set_render_as_table!.render_data
+          Response::NotOk.new
+        end
+      end
+
+    end
+  end
+end

data/lib/cli/command/token.rb

@@ -48,6 +48,7 @@ module DTK::Client
         :mode                    => Flag.new(:mode, 'MODE', 'Mode'),
         :namespace               => Flag.new(:n, 'NAMESPACE', 'Namespace'),
         :uninstall_name          => Flag.new(:name, 'NAME', 'Module name to uninstall'),
+        :link_name               => Flag.new([:l, :link_name], 'link-name', 'Specify link name'),
         :format                  => Flag.new(:format, 'FORMAT', 'Choose in which format to display data (ex. TABLE, YAML)'),
 
         # switches
@@ -60,6 +61,7 @@ module DTK::Client
         :skip_prompt  => Switch.new(:y, 'Skip prompt'),
         :target       => Switch.new(:target, 'Create target service instance'),
         :links        => Switch.new(:links, 'Links'),
+        :unlink       => Switch.new([:u, :unlink], 'unlink'),
         :dependencies => Switch.new(:deps, 'Dependencies'),
         :u            => Switch.new([:u, :unset], 'Unset attribute'),
         :recursive    => Switch.new(:r, 'Recursive'),
@@ -80,7 +82,10 @@ module DTK::Client
         :keypair_name     => 'KEYPAIR-NAME',
         :attribute_value  => 'VALUE',
         :component_ref    => 'COMPONENT-REF',
-        :format           => 'FORMAT'
+        :format           => 'FORMAT',
+        :base_cmp         => 'BASE-COMPONENT',
+        :deps_on_cmp      => 'DEPENDS-ON-COMPONENT',
+        :service          => 'SERVICE'
       }
       
     end

data/lib/cli/runner.rb

@@ -22,7 +22,8 @@ module DTK::Client
       require_relative('runner/dtkn_access')
       
       def self.run(argv)
-        Error.top_level_trap_error do
+        return_code = Error.top_level_trap_error do
+          ret = 0
           Configurator.check_git
           Configurator.create_missing_client_dirs
           
@@ -39,8 +40,12 @@ module DTK::Client
           if response_obj = context.run_and_return_response_object(argv)
             # render_response will raise Error in case of error response
             render_response(response_obj)
+            # response_obj can have not ok stateto signal to exit with error
+            ret = Error::GENERIC_ERROR_RETURN_CODE if response_obj.notok?
           end
+          ret
         end
+        exit return_code
       end
       
       private
@@ -72,7 +77,7 @@ module DTK::Client
       end
 
       def self.render_response(response_obj)
-        Response::ErrorHandler.raise_if_error(response_obj)
+        Response::ErrorHandler.raise_if_error_info(response_obj)
         response_obj.render_data
       end
 

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.11.0"
+      VERSION="0.11.1"
     end
   end
 end

data/lib/client/error.rb

@@ -26,22 +26,27 @@ module DTK::Client
       @backtrace = opts[:backtrace] 
     end
 
+    GENERIC_ERROR_RETURN_CODE = 1
+    # returns return code
     def self.top_level_trap_error(&body)
       begin
         yield
       rescue InvalidConnection => e
         e.print_warning
         puts "\nDTK will now exit. Please set up your connection properly and try again."
-        rescue Error => e
+        GENERIC_ERROR_RETURN_CODE
+      rescue Error => e
         # If vanilla error treat like client error
         if e.class == Error
           e = convert_to_client_error(e)
         end
         Logger.instance.error_pp(e.message, e.backtrace?)
+        GENERIC_ERROR_RETURN_CODE
       rescue Exception => exception
         # If treat like client error
         e = convert_to_client_error(exception)
         Logger.instance.error_pp(e.message, e.backtrace?)
+        GENERIC_ERROR_RETURN_CODE
       end
     end
 
@@ -55,7 +60,7 @@ module DTK::Client
      end
     end
     
-    def self.raise_if_error(response, opts = {})
+    def self.raise_if_error_info(response, opts = {})
       # check for errors in response
       error = response.error_info?(opts)
       return unless error

data/lib/client/operation/client_module_dir.rb

@@ -41,9 +41,9 @@ module DTK::Client
             #  FileUtils.mv(target_repo_dir, backup_dir)
             #  OsUtil.print_warning("Backup of existing module directory moved to '#{backup_dir}'")
             # else
-            # raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or removed before retrying the command"
+            # raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or moved before retrying the command"
             #end
-            raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or removed before retrying the command" unless (Dir.entries(path) - %w{ . .. }).empty?
+            raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or moved before retrying the command" unless (Dir.entries(path) - %w{ . .. }).empty?
             return path
           end
         end
@@ -71,7 +71,7 @@ module DTK::Client
           if opts[:remove_existing]
             FileUtils.rm_rf(path)
           else
-            raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or removed before retrying the command" unless (Dir.entries(path) - %w{ . .. }).empty?
+            raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or moved before retrying the command" unless (Dir.entries(path) - %w{ . .. }).empty?
             return path
           end
         end
@@ -85,7 +85,7 @@ module DTK::Client
           if opts[:remove_existing]
             FileUtils.rm_rf(path)
           else
-            raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or removed before retrying the command" unless (Dir.entries(path) - %w{ . .. }).empty?
+            raise Error::Usage, "Directory '#{path}' is not empty; it must be deleted or moved before retrying the command" unless (Dir.entries(path) - %w{ . .. }).empty?
             return path
           end
         end

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

@@ -56,12 +56,12 @@ module DTK::Client
       end
 
       def install
-        @print_helper.print_getting_dependencies
+        @print_helper.print_getting_dependencies unless @prompt_helper.update_none
         unified_module_refs = get_unified_dependent_module_refs
         unless unified_module_refs.empty?
           case @opts[:mode]
           when 'pull'
-            @print_helper.print_pulling_dependencies
+            @print_helper.print_pulling_dependencies unless @prompt_helper.update_none
           else
             @print_helper.print_installing_dependencies
           end

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

@@ -43,6 +43,14 @@ module DTK::Client
           has_directory_param = args[:has_directory_param]
           skip_prompt         = args[:skip_prompt]
           force               = args[:force]
+          update_deps         = args[:update_deps]
+
+          case update_deps
+          when "prompt"
+            update_deps          = nil
+          when false 
+            no_update_deps       = true
+          end
 
           if has_directory_param
             file_obj = base_dsl_file_obj.raise_error_if_no_content_flag(:module_ref)
@@ -50,7 +58,7 @@ module DTK::Client
             file_obj = base_dsl_file_obj.raise_error_if_no_content
           end
 
-          new('dtkn', module_ref, directory_path, version, file_obj).pull_dtkn(:skip_prompt => skip_prompt, :force => force)
+          new('dtkn', module_ref, directory_path, version, file_obj).pull_dtkn(:update_deps => update_deps, :no_update_deps => no_update_deps, :force => force)
         end
       end
       
@@ -78,7 +86,7 @@ module DTK::Client
 
         unless dependent_modules.empty?
           begin
-            Install::DependentModules.install(@module_ref, dependent_modules, :skip_prompt => opts[:skip_prompt], :mode => 'pull')
+            Install::DependentModules.install(@module_ref, dependent_modules, :update_deps => opts[:update_deps], :no_update_deps => opts[:no_update_deps] , :mode => 'pull')
             # Install::DependentModules.install(@module_ref, dependent_modules, :skip_prompt => false, :mode => 'pull')
           rescue Install::TerminateInstall
             @print_helper.print_terminated_pulling

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

@@ -54,7 +54,10 @@ module DTK::Client
 
           response = rest_post("#{BaseRoute}/update_from_repo", post_body)
 
+          existing_diffs = nil
+          print          = nil
           if missing_dependencies = response.data(:missing_dependencies)
+            force_parse = false
             unless missing_dependencies.empty?
               dependent_modules = missing_dependencies.map { |dependency| Install::ModuleRef.new(:namespace => dependency['namespace_name'], :module_name => dependency['display_name'], :version => dependency['version_info']) }
               begin
@@ -63,10 +66,18 @@ module DTK::Client
                 @print_helper.print_terminated_installation
                 return nil
               end
+              existing_diffs = response.data(:existing_diffs)
+              force_parse = true
             end
-            response = rest_post("#{BaseRoute}/update_from_repo", post_body.merge(:skip_missing_check => true))
+            response = rest_post("#{BaseRoute}/update_from_repo", post_body.merge(:skip_missing_check => true, force_parse: force_parse))
+          end
+
+          diffs = response.data(:diffs)
+          if diffs && !diffs.empty?
+            print = process_semantic_diffs(diffs, method)
+          else
+            print = process_semantic_diffs(existing_diffs, method)
           end
-          print = process_semantic_diffs(response.data(:diffs), method)
 
           # if diffs is nil then indicate no diffs, otherwise render diffs in yaml
           OsUtil.print_info("No Diffs to be #{method}.") if response.data(:diffs).nil? || !print

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

@@ -40,7 +40,7 @@ module DTK::Client
           service_name ||= rest_post("#{BaseRoute}/generate_service_name", post_body).data
           base_path = ClientModuleDir.ret_base_path(:service, service_name)
           
-          raise Error::Usage, "Directory '#{base_path}' is not empty; it must be deleted or removed before retrying the command" if ClientModuleDir.local_dir_exists?(:service, service_name) 
+          raise Error::Usage, "Directory '#{base_path}' is not empty; it must be deleted or moved before retrying the command" if ClientModuleDir.local_dir_exists?(:service, service_name) 
 
           post_body.merge!(:service_name => service_name)
           response = rest_post("#{BaseRoute}/stage", post_body)
@@ -62,4 +62,4 @@ module DTK::Client
       end
     end
   end
-end
+end

data/lib/client/operation/service.rb

@@ -35,6 +35,7 @@ module DTK::Client
         :list_components,
         :list_nodes,
         :list_violations,
+        :link,
         :start,
         :stop,
         :cancel_task,

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

@@ -30,25 +30,10 @@ module DTK::Client
 
           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, :command => 'converge' }) unless force
-          violations = find_violations(service_instance)
-          return violations if violations
 
           rest_post("#{BaseRoute}/#{service_instance}/converge", post_body)
         end
       end
-
-      private
-
-      def self.find_violations(service_instance)
-        violations_response = rest_get("#{BaseRoute}/#{service_instance}/violations")
-
-        if violations_response.data and violations_response.data.size > 0
-          OsUtil.print_error("The following violations were found; they must be corrected before workspace can be converged")
-          return violations_response.set_render_as_table!
-        end
-
-        nil
-      end
     end
   end
 end

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

@@ -66,11 +66,6 @@ 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/link.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::Client
+  class Operation::Service
+    class Link < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          unlink           = args.required(:unlink)
+          base_component   = args.required(:base_component)
+          dependent_component = args.required(:dependent_component)
+          service          = args[:service]
+          link_name        = args[:link_name]
+
+          query_string_hash = QueryStringHash.new(
+            :unlink         => unlink,
+            :base_component => base_component,
+            :dep_component  => dependent_component,
+            :service        => service,
+            :link_name      => link_name
+          )
+
+          response = rest_post("#{BaseRoute}/#{service_instance}/link", query_string_hash)
+
+          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
+  end
+end

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

@@ -39,7 +39,7 @@ module DTK::Client
           service_name ||= rest_post("#{BaseRoute}/generate_service_name", post_body).data
           base_path = ClientModuleDir.ret_base_path(:service, service_name)
           
-          raise Error::Usage, "Directory '#{base_path}' is not empty; it must be deleted or removed before retrying the command" if ClientModuleDir.local_dir_exists?(:service, service_name) 
+          raise Error::Usage, "Directory '#{base_path}' is not empty; it must be deleted or moved 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)

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

@@ -26,9 +26,14 @@ module DTK::Client
           force            = args.required(:force)
           path             = args[:directory_path]
           node             = []
+          msg              = "Are you sure you want to uninstall the infrastructure associated with '#{service_instance}' and delete this service instance from the server?"
+          
+          if force
+            msg.prepend("Note: this will not terminate aws instances, you will have to do that manually!\n")
+          end
 
           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)
+            return false unless Console.prompt_yes_no(msg, :add_options => true)
           end
 
           post_body = PostBody.new(
@@ -46,10 +51,7 @@ module DTK::Client
               OsUtil.print_info(message)
             end
           else
-            msg = "DTK module '#{service_instance}' has been uninstalled successfully."
-            if force
-              msg += "\nNote: this will not terminate aws instances, you will have to do that manually!"
-            end
+            msg = "DTK service '#{service_instance}' has been uninstalled successfully."
             OsUtil.print_info(msg)
           end
         end

data/lib/client/render.rb

@@ -49,26 +49,43 @@ module DTK::Client
     # 
     # value returned is Boolean indicating whether any additional print needed
     def self.render(ruby_obj, opts = {})
-      render_type = opts[:render_type]
-      if render_type == Type::TABLE
-        render_opts = {
-          :print_error_table => opts[:print_error_table],
-          :footnote          => opts[:footnote]
-        }
-        get_adapter(Type::TABLE, opts).render(ruby_obj, render_opts)
-      elsif ruby_obj.kind_of?(Hash)
-        get_adapter(render_type, opts).render(ruby_obj)
-      elsif ruby_obj.kind_of?(Array)
-        get_adapter(render_type, opts).render(ruby_obj)
-      elsif ruby_obj.kind_of?(String)
-        ruby_obj
-      else
-        raise Error.new('ruby_obj has unexpected type')
+      wrap_to_handle_warning_message(ruby_obj) do |ruby_obj|
+        render_type = opts[:render_type]
+        if render_type == Type::TABLE
+          render_opts = {
+            :print_error_table => opts[:print_error_table],
+            :footnote          => opts[:footnote]
+          }
+          get_adapter(Type::TABLE, opts).render(ruby_obj, render_opts)
+        elsif ruby_obj.kind_of?(::Hash)
+          get_adapter(render_type, opts).render(ruby_obj)
+        elsif ruby_obj.kind_of?(::Array)
+          get_adapter(render_type, opts).render(ruby_obj)
+        elsif ruby_obj.kind_of?(::String)
+          ruby_obj
+        else
+          raise Error.new('ruby_obj has unexpected type')
+        end
       end
     end
     
     private
 
+    WARNING_KEY = 'warn'
+    def self.wrap_to_handle_warning_message(ruby_obj, &body)
+      warning_message =  nil
+      passed_ruby_obj = ruby_obj
+
+      if ruby_obj.kind_of?(::Hash)
+        if warning_message = ruby_obj[WARNING_KEY]
+          # remove warning key
+          passed_ruby_obj = ruby_obj.inject({}) { |h, (k, v)| h.merge(k == WARNING_KEY ? {} : { k => v }) }
+        end
+      end
+      body.call(passed_ruby_obj)
+      OsUtil.print_warning(warning_message) if warning_message
+    end
+
     def render_text(text)
       STDOUT << text
     end

data/lib/client/response.rb

@@ -52,6 +52,10 @@ module DTK::Client
       end
     end
 
+    def notok?
+      kind_of?(NotOk)
+    end
+
     def index_data(*indexes)
       index_common(*indexes) { |_indexes| nil }
     end

data/lib/client/response/error_handler.rb

@@ -18,8 +18,8 @@
 module DTK::Client
   class Response
     module ErrorHandler
-      def self.raise_if_error(response)
-        Error.raise_if_error(response)
+      def self.raise_if_error_info(response)
+        Error.raise_if_error_info(response)
       end
 
       def self.check_for_session_expiried(response)

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

@@ -54,11 +54,21 @@ module DTK::Client
       end      
 
       def module_refs_path
-        matches = directory_file_paths.select { |path| module_ref_input_files_processor.match?(path) }
+        matches = dsl_file_matches { |path| module_ref_input_files_processor.match?(path) }
         raise Error, "Unexpected that multiple module ref files" if matches.size > 1
         matches.first
       end
 
+      def dsl_file_matches(&block)
+        # TODO: maybe better to solve by restricting directory_file_paths to be least_nested_pos of 2
+        matches = directory_file_paths.select { |path| block.call(path) }
+        if matches.size > 1
+          least_nested_pos = matches.map { |match| match.split('/').size }.min
+          matches.reject! { |match| match.split('/').size != least_nested_pos }
+        end
+        matches
+      end
+
       def module_ref_input_files_processor
         @module_ref_input_files_processor ||= input_files_processor(:module_refs)
       end

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

@@ -43,7 +43,7 @@ module DTK::Client
       end
 
       def component_dsl_path
-        matches = directory_file_paths.select { |path| component_dsl_input_files_processor.match?(path) }
+        matches = dsl_file_matches { |path| component_dsl_input_files_processor.match?(path) }
         raise Error::MissingDslFile, "Unexpected that there is not a unique component dsl file" if matches.size != 1
         matches.first
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -182,6 +182,7 @@ files:
 - lib/cli/command/service/eject.rb
 - lib/cli/command/service/exec.rb
 - lib/cli/command/service/exec_sync.rb
+- lib/cli/command/service/link.rb
 - lib/cli/command/service/list.rb
 - lib/cli/command/service/list_actions.rb
 - lib/cli/command/service/list_attributes.rb
@@ -201,6 +202,7 @@ files:
 - lib/cli/command/service/stop.rb
 - lib/cli/command/service/task_status.rb
 - lib/cli/command/service/uninstall.rb
+- lib/cli/command/service/violation.rb
 - lib/cli/command/subcommand.rb
 - lib/cli/command/token.rb
 - lib/cli/command/token/arg.rb
@@ -291,6 +293,7 @@ files:
 - lib/client/operation/service/edit.rb
 - lib/client/operation/service/eject.rb
 - lib/client/operation/service/exec.rb
+- lib/client/operation/service/link.rb
 - lib/client/operation/service/list.rb
 - lib/client/operation/service/list_actions.rb
 - lib/client/operation/service/list_attributes.rb