dtk-client 0.10.7 → 0.11.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2M4YzBhNDk4N2Q5NDM2ZTI5ZGY1NDNlN2VmYWFiMjU1MTRlMzc1Yg==
-  data.tar.gz: !binary |-
-    MzliN2I5MzNjMTFkM2Y0OWRhNjM4ZmE3MTYwZWMyMzUzMTNhMzFmMA==
+SHA1:
+  metadata.gz: 3489e815d77b396a9795163b8ce45dd40b7a5ce8
+  data.tar.gz: de1620b5c1de32244743ff3b6f0eedbc6a5d36dd
 SHA512:
-  metadata.gz: !binary |-
-    MjZmZDgzY2E0ODJhNGM1NTE0YzQ4M2Q0ZTVlNGRlZDVlY2VlZmU0ODllNWJj
-    MDgwNjY3MDE1MzM5NGM5YjBkZGViMTNmZDYyOWE2ZWVhMjQ2ZTk3YjdiNzky
-    YzU1OWU3NmExYjA0NmY5MzRjNDZmMjhiM2MzMWY2OWYzMTY4Y2U=
-  data.tar.gz: !binary |-
-    NWUxNzQ4MWU4NDNiOWQyMDk2NTZkNjE0M2FhYWY2NmE2YjdhOTJhZDA0OGY2
-    YzlhN2E1M2IxYTc3ZDNmM2ViOTVkYWVjY2Y0M2I5ZjBmMzFlMmRlNjU2ZmZj
-    ODc5ZmYyY2RlOTYxM2VlNDFmNmY2ZGRlNzRmYjFlY2U0YzZjNTQ=
+  metadata.gz: 2b9378cf3c0b696f24434c0b0426c2f16a2e319f912d88cfc641d7eb5c826320e3a4d3f5adc8107704260dd5fca51a4a008ce33a4e1a0ef5255fc4ae0e229dfe
+  data.tar.gz: c6cf8079566421eda45d057c9c30ee45a3a1b3a640aa48b751d8490df8e1a8280fc68739fb94684053a9191f03bf27d5c9b629ba0e3a65ed63b07541e981e974

data/dtk-client.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
-  spec.add_dependency 'dtk-common-core','0.10.1'
+  spec.add_dependency 'dtk-common-core','0.11.0'
   spec.add_dependency 'gli', '2.13.4'
   spec.add_dependency 'highline', '1.7.8'
   spec.add_dependency 'colorize', '0.7.7'
   spec.add_dependency 'git', '1.2.9'
   spec.add_dependency 'hirb', '0.7.3'
   spec.add_dependency 'mime-types', '~> 2.99.3'
-  spec.add_dependency 'dtk-dsl', '~> 1.0.0'
+  spec.add_dependency 'dtk-dsl', '~> 1.1.0'
   
 end

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

@@ -23,14 +23,14 @@ module DTK::Client
         command_body c, :install, 'Install a module on the server from a client directory or from the DTK remote catalog (DTKN)' do |sc|
           sc.flag Token.version
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to directory containing content to install'
-          sc.switch Token.skip_prompt
+          sc.switch Token.update_deps
 
           sc.action do |_global_options, options, args|
             directory_path = options[:directory_path]
             version        = options[:version]
-            skip_prompt    = options[:skip_prompt]
-
+            update_deps    = options[:update_deps]
             has_remote_repo = false
+
             if module_name = args[0]
               # reached if installing from dtkn
               # installs content from dtkn (later probably from other remote catalogs) onto client machine
@@ -53,8 +53,8 @@ module DTK::Client
               :module_ref          => module_ref, 
               :base_dsl_file_obj   => @base_dsl_file_obj, 
               :has_directory_param => !options["d"].nil?,
-              :skip_prompt         => skip_prompt,
-              :has_remote_repo     => has_remote_repo
+              :has_remote_repo     => has_remote_repo,
+              :update_deps         => update_deps
             }
             Operation::Module.install(operation_args)
           end

data/lib/cli/command/service/eject.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
+  module CLI::Command
+    module Service
+      subcommand_def 'eject' do |c|
+        c.arg Token::Arg.component_ref
+        command_body c, :eject, 'Unmanage component ref' do |sc|
+          sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory; not need if in the service instance directory'
+          sc.action do |_global_options, options, args|
+          
+            service_instance = service_instance_in_options_or_context(options)
+            
+            component_ref = args[0]
+            directory_path = options[:d] || @base_dsl_file_obj.parent_dir
+            
+            args = {
+              :service_instance => service_instance,
+              :component_ref    => component_ref,
+              :directory_path   => directory_path
+            }
+            
+            Operation::Service.eject(args)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -22,8 +22,9 @@ module DTK::Client; module CLI
         command_body c, 'list-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
           sc.flag Token.component, :desc => 'Filter attributes by component'
-
+          #sc.switch Token.all, :desc => 'Get all attributes'
           sc.switch Token.links, :desc => 'Display attribute links'
 
           sc.action do |_global_options, options, _args|
@@ -33,7 +34,9 @@ module DTK::Client; module CLI
               :service_instance => service_instance,
               :links            => options[:links]||nil,
               :node             => options[:node],
-              :component        => options[:component]
+              :component        => options[:component],
+              #:all              => options[:all],
+              :format           => options[:format]
             }
             Operation::Service.list_attributes(args)
           end

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

@@ -26,10 +26,12 @@ module DTK::Client; module CLI
           sc.switch Token.purge, :desc => 'Delete the service instance directory on the client'
           sc.switch Token.delete, :desc => 'Removes service instance with all nodes and modules'
           sc.switch Token.recursive, :desc => 'Delete dependent service instances'
+          sc.switch Token.force, :desc => 'Ignore errors and delete service instance. This will not terminate aws instances, you will have to do that manually'
           sc.action do |_global_options, options, args|
             directory_path = options[:directory_path]
             purge          = options[:purge]
             delete         = options[:delete]
+            force          = options[:f]
             recursive      = options[:recursive]
             name           = options[:uninstall_name]
 
@@ -49,7 +51,8 @@ module DTK::Client; module CLI
               :directory_path   => directory_path,
               :purge            => purge,
               :delete           => delete,
-              :recursive        => recursive
+              :recursive        => recursive,
+              :force            => force
             }
             Operation::Service.uninstall(args)
           end

data/lib/cli/command/service.rb

@@ -37,17 +37,17 @@ module DTK::Client
           'list-components',
           'list-nodes',
           'list-violations',
-          'start',
-          'stop',
+#          'start',
+#          'stop',
           'cancel-task',
           'ssh',
           'set-required-attributes',
           'set-attribute',
           'exec',
           'exec-sync',
-          'set-default-target'
-          # 'create-workspace'
-        ]
+          'set-default-target',
+          'eject'
+         ]
         command_def :desc => 'Subcommands for creating and interacting with DTK service instances'
         ALL_SUBCOMMANDS.each { |subcommand| require_relative("service/#{subcommand.gsub(/-/,'_')}") } 
       end

data/lib/cli/command/token.rb

@@ -48,7 +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'),
-        
+        :format                  => Flag.new(:format, 'FORMAT', 'Choose in which format to display data (ex. TABLE, YAML)'),
 
         # switches
         # Switch constructor args order: key, desc, opts={}
@@ -62,7 +62,8 @@ module DTK::Client
         :links        => Switch.new(:links, 'Links'),
         :dependencies => Switch.new(:deps, 'Dependencies'),
         :u            => Switch.new([:u, :unset], 'Unset attribute'),
-        :recursive    => Switch.new(:r, 'Recursive')
+        :recursive    => Switch.new(:r, 'Recursive'),
+        :update_deps  => Switch.new('update-deps', "Skip prompt and update all dependencies or skip prompt and don't update all dependencies  (on master)", :negatable => true, :default_value => 'prompt')
       }
 
       ARG_TOKENS = {
@@ -77,7 +78,9 @@ module DTK::Client
         :target_directory => 'TARGET-DIRECTORY',
         :attribute_name   => 'ATTRIBUTE-NAME',
         :keypair_name     => 'KEYPAIR-NAME',
-        :attribute_value  => 'VALUE'
+        :attribute_value  => 'VALUE',
+        :component_ref    => 'COMPONENT-REF',
+        :format           => 'FORMAT'
       }
       
     end

data/lib/cli/version.rb

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

data/lib/client/conn.rb

@@ -90,7 +90,8 @@ module DTK::Client
     end
 
     def connection_refused_error_code?
-      error_code? == 'connection_refused'
+      error_code? == 'connection_refused' or
+        (original_exception? and original_exception?.kind_of?(::Errno::EPIPE))
     end
     
     private
@@ -99,6 +100,10 @@ module DTK::Client
       connection_error['errors'].first['code'] rescue nil
     end
 
+    def original_exception?
+      connection_error['errors'].first['original_exception'] rescue nil
+    end
+
     REST_VERSION = 'v1'
     REST_PREFIX = "rest/api/#{REST_VERSION}"
     # REST_PREFIX = "rest"

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

@@ -26,14 +26,14 @@ module DTK::Client
 
       BaseRoute  = "modules"
       # opts can have keys:
-      #   :skip_prompt
+      #   :update_deps
       def initialize(base_module_ref, component_module_refs, opts = {})
         # TODO: DTK-2766: in an later release will changes this so iterating over module_refs, which could have component and service info, 
         # not just component modules
         @base_module_ref       = base_module_ref
         @component_module_refs = component_module_refs 
         @print_helper          = PrintHelper.new(:module_ref => @base_module_ref, :source => :remote)
-        @prompt_helper         = PromptHelper.new(:update_all => opts[:skip_prompt], :update_none => opts[:update_none])
+        @prompt_helper         = PromptHelper.new(:update_all => opts[:update_deps], :update_none => opts[:update_none] || opts[:no_update_deps])
         @opts                  = opts
       end
       private :initialize

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

@@ -39,8 +39,15 @@ module DTK::Client
           module_ref             = args.required(:module_ref) 
           base_dsl_file_obj      = args.required(:base_dsl_file_obj)
           has_directory_param    = args[:has_directory_param]
-          skip_prompt            = args[:skip_prompt]
           has_remote_repo        = args[:has_remote_repo]
+          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 = args.required(:base_dsl_file_obj).raise_error_if_no_content_flag(:module_ref)
@@ -48,12 +55,13 @@ module DTK::Client
             file_obj = args.required(:base_dsl_file_obj).raise_error_if_no_content
           end
 
-          new(file_obj, module_ref, has_remote_repo).install(:skip_prompt => skip_prompt)
+          new(file_obj, module_ref, has_remote_repo).install(:update_deps => update_deps, :no_update_deps => no_update_deps)
         end
       end
 
       # opts can have keys:
-      #   :skip_prompt
+      #   :update_deps
+      #   :no_update_deps
       def install(opts = {})
         unless @base_module_ref
           raise Error::Usage, "No base module reference #{dsl_path_ref}"
@@ -66,9 +74,9 @@ module DTK::Client
         unless dependent_modules.empty?
           begin
             if @has_remote_repo
-              DependentModules.install(@base_module_ref, dependent_modules, :skip_prompt => opts[:skip_prompt])
+              DependentModules.install(@base_module_ref, dependent_modules, opts)
             else
-              DependentModules.install_with_local(@base_module_ref, dependent_modules, :skip_prompt => opts[:skip_prompt])
+              DependentModules.install_with_local(@base_module_ref, dependent_modules, opts)
             end
           rescue TerminateInstall
             @print_helper.print_terminated_installation

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

@@ -24,10 +24,13 @@ module DTK::Client
         @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
+        @version           = version  || 'master'
         @base_dsl_file_obj = base_dsl_file_obj
         @parsed_module     = base_dsl_file_obj.parse_content(:common_module_summary)
         @print_helper      = Install::PrintHelper.new(:module_ref => module_ref, :source => :remote)
+
+        @module_ref.version ||= @version
+
       end
       private :initialize
 
@@ -68,14 +71,10 @@ module DTK::Client
           :module_name => @module_ref.module_name,
           :namespace   => @module_ref.namespace,
           :rsa_pub_key => SSHUtil.rsa_pub_key_content,
-          :version?    => @version
+          :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
 
         unless dependent_modules.empty?
           begin

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

@@ -26,8 +26,10 @@ module DTK::Client
         @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
+        @version           = version || 'master'
         @base_dsl_file_obj = base_dsl_file_obj
+
+        @module_ref.version ||= @version
       end
       private :initialize
 
@@ -58,16 +60,10 @@ module DTK::Client
           :module_name => @module_ref.module_name,
           :namespace   => @module_ref.namespace,
           :rsa_pub_key => SSHUtil.rsa_pub_key_content,
-          :version?    => @version
+          :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

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

@@ -42,11 +42,12 @@ module DTK::Client
         end
       end
 
+      # TODO: DTK-2938: below need sto be upgraded to be consistent with node as a component
       def self.display_node_info(nodes, message = '')
         if nodes.size > 0
           nodes.each do |node|
-            return if node['admin_op_status'] == 'pending' || node['external_ref']["instance_id"].nil?
-            message += "#{node["display_name"]} - #{ node["external_ref"]["instance_id"]}\n" unless node["display_name"].eql?("node") && node["dtk_client_type"].eql?("node_group") 
+            return if  node['instance_id'].nil?
+            message += "#{node['display_name']} - #{node['instance_id']}\n"
           end
           OsUtil.print("Nodes that will be deleted: \n" + message)
         end

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

@@ -0,0 +1,48 @@
+#
+# 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 Eject < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          component_ref    = args.required(:component_ref)
+          directory_path   = args[:directory_path]
+
+          post_body = PostBody.new(
+            :service_instance => service_instance,
+            :component_ref => component_ref
+          )
+          response = rest_post("#{BaseRoute}/#{service_instance}/eject", post_body)
+
+          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/exec.rb

@@ -28,6 +28,16 @@ module DTK::Client
           # parse params and return format { 'p_name1' => 'p_value1' , 'p_name2' => 'p_value2' }
           task_params = parse_params?(action_params)||{}
 
+          # this is temporary fix to handle new node as component format ec2::node[node_name]/action
+          # will transform ec2::node[node_name]/action to node_name/action
+          action_node, action_name = (action||"").split('/')
+          if action_node && action_name
+            if action_node_match = action_node.match(/^ec2::node\[(.*)\]/)
+              matched_node = $1
+              action = "#{matched_node}/#{action_name}"
+            end
+          end
+
           # match if sent node/component
           if task_action_match = action.match(/(^[\w\-\:]*)\/(.*)/)
             node, action = $1, $2

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

@@ -24,14 +24,29 @@ module DTK::Client
           links            = args[:links]
           node             = args[:node]
           component        = args[:component]
+          all              = args[:all]
+          format           = args[:format] || 'table'
+          format.downcase!
 
           query_string_hash = QueryStringHash.new(
-            :links?           => links,
-            :node_id?         => node,
-            :component_id?    => component
+            :links?            => links,
+            :node_id?          => node,
+            :all               => all,
+            :filter_component? => component,
+            :format            => format
           )
-          rest_get("#{BaseRoute}/#{service_instance}/attributes", query_string_hash)
-        end.set_render_as_table!
+          
+          response = rest_get("#{BaseRoute}/#{service_instance}/attributes", query_string_hash)
+          
+          case format
+          when 'table'
+            response.set_render_as_table!
+          when 'yaml'
+            response
+          else
+            raise Error::Usage, "Please enter valid format: TABLE, YAML"
+          end
+        end
       end
     end
   end

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

@@ -53,28 +53,26 @@ module DTK::Client
       end
 
       def self.get_node_info_for_ssh_login(node_name, service_instance)
-        response = rest_get("#{BaseRoute}/#{service_instance}/info")
+        info_hash = {}
 
-        unless node_info = response.data(:nodes).find{ |node| node_name == node['display_name'] }
+        response = rest_get("#{BaseRoute}/#{service_instance}/nodes")
+        unless node_info = response.data.find{ |node| node_name == node['display_name'] }
           raise Error::Usage, "The node '#{node_name}' does not exist"
         end
 
-        data            = {}
-        node_properties = node_info['node_properties'] || {}
-
-        if public_dns = node_properties['ec2_public_address']
-          data.merge!(:public_dns => public_dns)
+        if dns_address = node_info['dns_address']
+          info_hash.merge!(:dns_address => dns_address)
         end
 
-        if default_login_user = default_login_user?(node_properties)
-          data.merge!(:default_login_user => default_login_user)
+        if default_login_user = default_login_user?(node_info)
+          info_hash.merge!(:default_login_user => default_login_user)
         end
-
-        data
+pp info_hash
+        info_hash
       end
 
-      def self.default_login_user?(node_properties)
-        if os_type = node_properties['os_type']
+      def self.default_login_user?(node_info)
+        if os_type = node_info['os_type']
           DefaultLoginByOSType[os_type]
         end
       end
@@ -85,7 +83,7 @@ module DTK::Client
       }
 
       def self.connect(node_info, identity_file, remote_user)
-        unless public_dns = node_info[:public_dns]
+        unless dns_address = node_info[:dns_address]
           raise Error::Usage, "Not able to resolve instance address, has instance been stopped?"
         end
 
@@ -93,13 +91,13 @@ module DTK::Client
           raise Error::Usage, "Retry command with a specfic login user (a default login user could not be computed)"
         end
 
-        connection_string = "#{remote_user}@#{public_dns}"
+        connection_string = "#{remote_user}@#{dns_address}"
 
         ssh_command =
           if identity_file
             # provided PEM key
             "ssh -o \"StrictHostKeyChecking no\" -o \"UserKnownHostsFile /dev/null\" -i #{identity_file} #{connection_string}"
-          elsif SSHUtil.ssh_reachable?(remote_user, public_dns)
+          elsif SSHUtil.ssh_reachable?(remote_user, dns_address)
             # it has PUB key access
             "ssh -o \"StrictHostKeyChecking no\" -o \"UserKnownHostsFile /dev/null\" #{connection_string}"
           end

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

@@ -23,6 +23,7 @@ module DTK::Client
           service_instance = args.required(:service_instance)
           recursive        = args.required(:recursive)
           delete           = args.required(:delete)
+          force            = args.required(:force)
           path             = args[:directory_path]
           node             = []
 
@@ -33,19 +34,28 @@ module DTK::Client
           post_body = PostBody.new(
             :service_instance => service_instance,
             :recursive?  => recursive,
-            :delete      => delete
+            :delete      => delete,
+            :force       => force
           )
           response = rest_post("#{BaseRoute}/uninstall", post_body)
 
           ClientModuleDir.rm_f(path) if args[:purge]
 
-          info = "DTK module '#{service_instance}' has been uninstalled successfully." 
-          OsUtil.print_info(info)
-          Delete.display_node_info(response.data) if delete
+          if delete
+            if message = response.data(:message)
+              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
+            OsUtil.print_info(msg)
+          end
         end
       end
 
 
     end
   end
-end
+end

data/lib/client/operation/service.rb

@@ -42,7 +42,8 @@ module DTK::Client
         :set_required_attributes,
         :set_attribute,
         :exec,
-        :set_default_target
+        :set_default_target,
+        :eject
         # :create_workspace
       ]
       OPERATIONS.each { |operation| require_relative("service/#{operation}") }

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

@@ -40,12 +40,13 @@ module DTK::Client
       end
 
       def initialize(table_definition)
-        @order_definition = table_definition.order_definition
-        @table_mapping    = table_definition.mapping
-        @evaluated_data = []
-        @error_data     = []
-        @action_data    = []
-        @footnote       = nil
+        @order_definition  = table_definition.order_definition
+        @table_mapping     = table_definition.mapping
+        @evaluated_data    = []
+        @error_data        = []
+        @action_data       = []
+        @footnote          = nil
+        @failed_components = []
       end
       private :initialize
 
@@ -78,6 +79,9 @@ module DTK::Client
             begin
               if print_error_table && k.include?('error')
                 error_message = value_of(structured_element, v)
+                if failed_component = value_of(structured_element, 'failed_component')
+                  @failed_components << "- #{failed_component.gsub('__','::')}"
+                end
 
                 # due to problems with space we have special way of handling error columns
                 # in such a way that those error will be specially printed later on
@@ -165,6 +169,11 @@ module DTK::Client
           printf " \n"
           printf "%15s %s\n", "INFO:".colorize(:yellow), @footnote.colorize(:yellow)
         end
+
+        unless @failed_components.empty?
+          printf " \n"
+          printf "%15s %s\n", "INFO:".colorize(:yellow), "Following components could not be deleted:\n\t#{@failed_components.uniq.join(', ').colorize(:yellow)}\nYou can use the command 'dtk service eject COMPONENT' to remove any of these component(s) from dtk management. However, when using the eject command,  you will need to manually remove the actual resources, such as an ec2 instance.".colorize(:yellow)
+        end
       end
       
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.11.0
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -98,30 +98,30 @@ 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
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 description: Command line tool to interact with a DTK Server and DTK Service Catalog.
 email: support@reactor8.com
 executables:
@@ -130,8 +130,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .license_header
+- ".gitignore"
+- ".license_header"
 - Gemfile
 - LICENSE
 - README.md
@@ -179,6 +179,7 @@ files:
 - lib/cli/command/service/delete.rb
 - lib/cli/command/service/destroy.rb
 - lib/cli/command/service/edit.rb
+- lib/cli/command/service/eject.rb
 - lib/cli/command/service/exec.rb
 - lib/cli/command/service/exec_sync.rb
 - lib/cli/command/service/list.rb
@@ -288,6 +289,7 @@ files:
 - lib/client/operation/service/delete.rb
 - lib/client/operation/service/destroy.rb
 - lib/client/operation/service/edit.rb
+- lib/client/operation/service/eject.rb
 - lib/client/operation/service/exec.rb
 - lib/client/operation/service/list.rb
 - lib/client/operation/service/list_actions.rb
@@ -377,17 +379,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.6.11
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.