dtk-client 0.12.0.1 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b46ba2c42f7639fbca14adb16eccad873b6d80c5
-  data.tar.gz: 2d7ebb90f0f16124f521f604985634e260f375af
+SHA256:
+  metadata.gz: dd3532222d39184fd4e4b3dabe6089082d66997065b60710dac9315669f0bdb1
+  data.tar.gz: 1a596bb53b1fa93c2dfc24a792836a5377fac27947acbaeea54bf069a45dce5b
 SHA512:
-  metadata.gz: 56121c79d08683a8d4d973e31173ab50bb8a0fe43740c51c4b9e1e0c165166c658704af1436515faf801d33eeaa85a8bd357f358c844592639e8fc7515d73a68
-  data.tar.gz: dc4638726dd21687f9590d3ba57f2bc8df26c047a0fd71f510985b19d877a463b1dc8f6ec904f7aef72f5e781db3545728e7748fb490b8753159727411a2d68f
+  metadata.gz: 6be78d166a7b90eddd422a3e39fc2f5cc12ac382a896c5bf6813bc9c85ddfbb8aaac111a6e963eb4bcad14c0d7c2ff569122d204194d8721ef17bcaf9b56a5e1
+  data.tar.gz: 1fad3c04de2c251f96f84a3ba729e1713024d9bdb0891c6ab2b6c8bc0eb25ae3247c0aee258933c4b9ba4aa0daf72d35e026b94db5b949427a804c640cc37c17

data/.gitignore

@@ -10,3 +10,4 @@ doc
 .solargraph.yml
 Gemfile.lock
 sftp.json
+.byebug_history

data/dtk-client.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   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 'git', '~> 1.4.0'
   spec.add_dependency 'hirb', '0.7.3'
   spec.add_dependency 'mime-types', '~> 2.99.3'
-  spec.add_dependency 'dtk-dsl', '1.1.4'
-  spec.add_dependency 'dtk-network-client', '1.0.2'
+  spec.add_dependency 'dtk-dsl', '~> 1.1.4'
+  spec.add_dependency 'dtk-network-client', '1.0.3'
 end

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

@@ -35,7 +35,7 @@ module DTK::Client
               :update_deps         => options[:update_deps]
             }
             Operation::Module.pull_dtkn(operation_args)
-            # Operation::Module.push(operation_args.merge(:method => "pulled"))
+            Operation::Module.push(operation_args.merge(:method => "pulled", context: self))
           end
         end
       end

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

@@ -22,9 +22,18 @@ module DTK::Client
         command_body c, 'push-dtkn', 'Push content from client module directory to dtk network' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to module directory containing updates to push; not need if in the module directory'
           sc.switch Token.update_lock
+          sc.switch Token.force
+
           sc.action do |_global_options, options, _args|
             module_ref = module_ref_object_from_options_or_context(options)
-            Operation::Module.push_dtkn(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj, :directory_path => options[:directory_path], update_lock_file: options['update-lock'])
+            operation_args = {
+              :module_ref        => module_ref,
+              :base_dsl_file_obj => @base_dsl_file_obj,
+              :directory_path    => options[:directory_path],
+              :update_lock_file  => options['update-lock'],
+              :force             => options[:f]
+            }
+            Operation::Module.push_dtkn(operation_args)
           end
         end
       end

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

@@ -24,14 +24,14 @@ module DTK::Client
           sc.switch Token.skip_prompt, :desc => 'Skip prompt that checks if user wants to uninstall module from server'
           sc.flag Token.directory_path
           sc.flag Token.version
-          sc.flag Token.uninstall_name
+          sc.flag Token.uninstall_module_name
           sc.switch Token.force
           sc.action do |_global_options, options, args|
             version = options[:version]
             force   = options["force"]
 
             module_refs_opts = {:ignore_parsing_errors => true}
-            if options[:uninstall_name].nil?
+            if options[:uninstall_module_name].nil?
               module_ref =
                 if module_name = args[0]
                   module_ref_object_from_options_or_context?({:module_ref => module_name, :version => (version)}, module_refs_opts)
@@ -44,7 +44,7 @@ module DTK::Client
 
             raise Error::Usage, "You can use version only with 'namespace/name' provided" if version && module_name.nil?
 
-            Operation::Module.uninstall(:module_ref => module_ref, :force => force, :skip_prompt => options[:skip_prompt], :name => options[:uninstall_name] || module_name, :version => version)
+            Operation::Module.uninstall(:module_ref => module_ref, :force => force, :skip_prompt => options[:skip_prompt], :name => options[:uninstall_module_name] || module_name, :version => version)
           end
         end
       end

data/lib/cli/command/service.rb

@@ -31,7 +31,7 @@ module DTK::Client
           'eject',
           'exec',
           'exec-sync',
-          'link',
+          'add-link',
           'list',
           'list-actions',
           'list-attributes',
@@ -52,8 +52,9 @@ module DTK::Client
 
           'task-status',
           'uninstall',
-          'describe'
-          # 'add'
+          'describe',
+          # 'add',
+          'add-component'
         ]
 
         command_def :desc => 'Subcommands for creating and interacting with DTK service instances'

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

@@ -0,0 +1,42 @@
+#
+# 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 'add-component' do |c|
+        c.arg Token::Arg.component_ref
+        command_body c, 'add-component', 'Add component to service instance' do |sc|
+          sc.flag Token.version
+          sc.flag Token.namespace
+          sc.flag Token.parent
+          sc.action do |_global_options, options, args|
+            args = {
+              service_instance: service_instance_in_options_or_context(options),
+              component_ref: args[0],
+              version: options[:v],
+              namespace: options[:n],
+              parent_node: options[:p],
+              service_instance_dir: @base_dsl_file_obj.parent_dir
+            }
+            Operation::Service.add_component(args)
+          end
+        end
+      end
+    end
+  end
+end; end

data/lib/cli/command/service/{link.rb → add_link.rb}

@@ -18,11 +18,11 @@
 module DTK::Client; module CLI
   module Command
     module Service
-      subcommand_def 'link' do |c|
+      subcommand_def 'add-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|
+        command_body c, 'add-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.switch Token.unlink
 

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

@@ -20,6 +20,7 @@ module DTK::Client; module CLI
     module Service
       subcommand_def 'delete' do |c|
         command_body c, :delete, 'Destroys the running infrastructure associated with the service instance' do |sc|
+          sc.flag Token.delete_service_name
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory associated; not needed if executed in service instance directory'
           # sc.flag Token.path, :desc => "Delete specific part of service instance. Supported paths are 'dependencies/[name]', 'components/[name]', 'actions/[name]'"
 
@@ -31,16 +32,17 @@ module DTK::Client; module CLI
             directory_path   = options[:directory_path]
             recursive        = options[:recursive]
             force            = options[:f]
-            service_instance = service_instance_in_options_or_context(options)
-
+            name             = options[:delete_service_name]
+            service_instance = name ? name : service_instance_in_options_or_context(options)
+            
             args = {
               :service_instance => service_instance,
               :skip_prompt      => options[:skip_prompt],
-              :directory_path   => directory_path || base_dsl_file_obj.parent_dir,
               :recursive        => recursive,
               :force            => force,
               # :path             => options[:path]
             }
+            args[:directory_path] = directory_path || base_dsl_file_obj.parent_dir unless name
             Operation::Service.delete(args)
           end
         end

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

@@ -21,10 +21,12 @@ module DTK::Client; module CLI
       subcommand_def 'describe' do |c|
         command_body c, 'describe', 'Describe service instance content' do |sc|
           sc.flag Token.path, :desc => "supported paths are 'dependencies', 'components/[name]', 'actions/[name]' "
+          sc.switch Token.show_steps, :desc => 'Show steps that will be executed when action is executed'
           sc.action do |_global_options, options, _args|
             args = {
               service_instance: service_instance_in_options_or_context(options),
-              path: options[:path]
+              path: options[:path],
+              show_steps: options['show-steps']
             }
             Operation::Service.describe(args)
           end

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

@@ -19,17 +19,22 @@ module DTK::Client
   module CLI::Command
     module Service
       subcommand_def 'ssh' do |c|
-        c.arg Token::Arg.node_name
+        c.arg Token::Arg.node_name, :optional => true
         command_body c, :ssh, 'SSH into service instance node.' do |sc|
           sc.flag Token.remote_user
           sc.flag Token.identity_file, :desc => 'Identity file used for connection, if not provided default is used'
 
           sc.action do |_global_options, options, args|
-            service_instance = service_instance_in_options_or_context(options)
+            node_name = args[0]
+            if args[0] && args[0].include?('/')
+              service_name, node_name = args[0].split('/')
+            end
+
+            service_name ||= service_instance_in_options_or_context(options)
 
             args = {
-              :service_instance => service_instance,
-              :node_name        => args[0],
+              :service_instance => service_name,
+              :node_name        => node_name,
               :remote_user      => options[:remote_user],
               :identity_file    => options[:identity_file]
             }

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

@@ -21,7 +21,7 @@ module DTK::Client; module CLI
       subcommand_def 'uninstall' do |c|
         command_body c, :uninstall, 'Uninstalls the service instance from the server' do |sc|
         sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory associated; not needed if executed in service instance directory'
-          sc.flag Token.uninstall_name
+          sc.flag Token.uninstall_service_name
           sc.switch Token.skip_prompt, :desc => 'Skip prompt that checks if user wants to delete the service instance'
           sc.switch Token.purge, :desc => 'Delete the service instance directory on the client'
           sc.switch Token.recursive, :desc => 'Delete dependent service instances'
@@ -31,7 +31,7 @@ module DTK::Client; module CLI
             purge          = options[:purge]
             force          = options[:f]
             recursive      = options[:recursive]
-            name           = options[:uninstall_name]
+            name           = options[:uninstall_service_name]
 
             if purge && (!directory_path || (directory_path == @base_dsl_file_obj.parent_dir?))
               raise Error::Usage, "If use option '#{option_ref(:purge)}' then need to call from outside directory and use option '#{option_ref(:directory_path)}'"
@@ -46,11 +46,11 @@ module DTK::Client; module CLI
             args = {
               :service_instance => service_instance,
               :skip_prompt      => options[:skip_prompt],
-              :directory_path   => directory_path,
               :purge            => purge,
               :recursive        => recursive,
               :force            => force
             }
+            args[:directory_path] = directory_path || base_dsl_file_obj.parent_dir unless name
             Operation::Service.uninstall(args)
           end
         end

data/lib/cli/command/token.rb

@@ -47,12 +47,15 @@ module DTK::Client
         :identity_file             => Flag.new(:i, 'PATH-TO-PEM', 'Path to pem file'),
         :mode                      => Flag.new(:mode, 'MODE', 'Mode'),
         :namespace                 => Flag.new(:n, 'NAMESPACE', 'Namespace'),
-        :uninstall_name            => Flag.new(:name, 'NAME', 'Module name to uninstall'),
+        :uninstall_module_name     => Flag.new(:name, 'NAME', 'Module name to uninstall'),
+        :uninstall_service_name    => Flag.new(:name, 'NAME', 'Service instance name to uninstall'),
+        :delete_service_name       => Flag.new(:name, 'NAME', 'Service instance name to delete'),
         :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)'),
         :sleep                     => Flag.new(:sleep, '', ''),
         :attempts                  => Flag.new(:attempts, '', ''),
         :path                      => Flag.new(:path, 'PATH', 'Path'),
+        :parent                    => Flag.new([:p, :parent], 'PARENT', ''),
 
         # switches
         # Switch constructor args order: key, desc, opts={}
@@ -72,13 +75,14 @@ module DTK::Client
         :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'),
         :skip_server  => Switch.new('skip-server', 'Do not install module on server'),
-        :update_lock  => Switch.new([:u, 'update-lock'], 'Update lock file with new dependencies')
+        :update_lock  => Switch.new([:u, 'update-lock'], 'Update lock file with new dependencies'),
+        :show_steps   => Switch.new('show-steps', 'Show steps')
       }
 
       ARG_TOKENS = {
         :assembly_name    => 'ASSEMBLY-NAME',
         :service_instance => flag_token(:service_instance).arg_name,
-        :node_name        => 'NODE',
+        :node_name        => '[[REMOTE_SERVICE-NAME/]NODE]',
         :action           => '[NODE/NODE-GROUP/]ACTION',
         :action_params    => 'ACTION-PARAMS',
         :workspace_name   => 'WORKSPACE-NAME',

data/lib/cli/runner/dtkn_access.rb

@@ -26,26 +26,27 @@ module DTK::Client; module CLI
         
         OsUtil.print_info('Processing ...') if config_existed
         # check to see if catalog credentials are set
-        conn = Session.get_connection
-        response = conn.post 'account/check_catalog_credentials'
+        # conn = Session.get_connection
+        # response = conn.post 'account/check_catalog_credentials'
         
-        # set catalog credentails
-        if response.ok? && !response.data(:catalog_credentials_set)
-          # setting up catalog credentials
-          catalog_creds = Configurator.ask_catalog_credentials
-          unless catalog_creds.empty?
-            post_body = {
-              :username => catalog_creds[:username], 
-              :password => catalog_creds[:password], 
-              :validate => true
-            }
-            response = conn.post 'account/set_catalog_credentials', post_body 
-            unless response.ok?
-              error_message = response.error_message.gsub(/\.[ ]*$/,'')
-              OsUtil.print_error("#{error_message}. You will have to set catalog credentials manually ('dtk account set-catalog-credentials').")
-            end
-          end
-        end
+        # # set catalog credentails
+        # if response.ok? && !response.data(:catalog_credentials_set)
+        #   # setting up catalog credentials
+        #   catalog_creds = Configurator.ask_catalog_credentials
+        #   unless catalog_creds.empty?
+        #     post_body = {
+        #       :username => catalog_creds[:username],
+        #       :password => catalog_creds[:password],
+        #       :validate => true
+        #     }
+        #     response = conn.post 'account/set_catalog_credentials', post_body
+        #     unless response.ok?
+        #       error_message = response.error_message.gsub(/\.[ ]*$/,'')
+        #       OsUtil.print_error("#{error_message}. You will have to set catalog credentials manually ('dtk account set-catalog-credentials').")
+        #     end
+        #   end
+        # end
+
         add_key_opts = {
           :first_registration => true, 
           :name => "#{Session.connection_username}-client"

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.12.0.1"
+      VERSION="0.12.1"
     end
   end
 end

data/lib/client/configurator.rb

@@ -110,6 +110,21 @@ module DTK::Client
       
       true
     end
+
+    def self.remove_current_user_from_direct_access
+      remove_user_from_direct_access(client_username)
+    end
+
+    def self.remove_user_from_direct_access(username)
+      File.open('.temp_direct_access', 'w') do |output_file|
+        File.foreach(DIRECT_ACCESS) do |line|
+          output_file.puts line unless line.strip.eql?(username)
+        end
+      end
+
+      FileUtils.mv('.temp_direct_access', DIRECT_ACCESS)
+      true
+    end
     
     def self.client_username
       parse_key_value_file(CRED_FILE)[:username]

data/lib/client/error.rb

@@ -53,13 +53,13 @@ module DTK::Client
     NO_BACKTRACE = :no_backtarce
 
     def backtrace?
-     if @backtrace
-       @backtrace unless @backtrace == NO_BACKTRACE
-     else
-       backtrace
-     end
+      if @backtrace
+        @backtrace unless @backtrace == NO_BACKTRACE
+      else
+        backtrace
+      end
     end
-    
+
     def self.raise_if_error_info(response, opts = {})
       # check for errors in response
       error = response.error_info?(opts)

data/lib/client/operation.rb

@@ -59,7 +59,12 @@ module DTK::Client
       if response.ok?
         response
       else
-        raise Error::ServerNotOkResponse.new(response)
+        # if errors = response['errors']
+          # error_message = errors.first['message']
+          # raise Error::Server.new(error_message)
+        # else
+          raise Error::ServerNotOkResponse.new(response)
+        # end
       end
     end
 

data/lib/client/operation/account/delete_ssh_key.rb

@@ -34,6 +34,8 @@ module DTK::Client
           OsUtil.print("Warning: We were not able to unregister your key with remote catalog! #{response.data(:repoman_registration_error)}", :yellow)
         end
 
+        Configurator.remove_current_user_from_direct_access
+
         OsUtil.print("SSH key '#{name}' removed successfully!", :yellow)
       end
     end

data/lib/client/operation/client_module_dir/git_repo/internal.rb

@@ -313,7 +313,7 @@ module DTK::Client
 
         def self.checkout_branch_on_service_instance(service_instance, branch, &body)
           repo = git_repo.new(ret_base_path(:service, service_instance), :branch => branch)
-          checkout_branch_in_repo(repo, branch, &block)
+          checkout_branch(repo, branch, {}, &body)
         end
 
         CHECKOUT_LOCK = Mutex.new

data/lib/client/operation/client_module_dir/service_instance.rb

@@ -31,6 +31,25 @@ module DTK::Client
           response_data_hash(:nested_modules => Internal.commit_and_push_nested_modules(args))
         end
       end
+
+      def self.clone_nested_modules(args)
+        wrap_operation(args) do |args|
+          response_data_hash(:target_repo_dir => Internal.clone_nested_modules(args))
+        end
+      end
+
+      def self.modified_service_instance_or_nested_modules?(args)
+        wrap_operation(args) do |args|
+          response_data_hash(:modified => Internal.modified_service_instance_or_nested_modules?(args))
+        end
+      end
+
+      def self.remove_nested_module_dirs(args)
+        wrap_operation(args) do |args|
+          response_data_hash(:deleted_nested_modules => Internal.remove_nested_module_dirs(args))
+        end
+      end
+
     end
   end
 end

data/lib/client/operation/client_module_dir/service_instance/internal.rb

@@ -35,6 +35,16 @@ module DTK::Client
           new(args).clone
         end
 
+        def self.clone_nested_modules(args)
+          new(args).clone_nested_modules
+        end
+
+        def clone_nested_modules
+          @target_repo_dir = self.repo_dir
+          @nested_module_base = self.class.find_nested_modules_dir(self.repo_dir)
+          self.nested_modules.each { |nested_module| clone_nested_module(nested_module) }
+        end
+
         def clone
           @target_repo_dir = clone_base_module
           @nested_module_base = make_nested_module_base
@@ -61,6 +71,37 @@ module DTK::Client
           nested_modules_with_sha
         end
 
+        def self.modified_service_instance_or_nested_modules?(args)
+          service_instance_dir = args.required(:dir)
+          command   = args.required(:command)
+          error_msg = args.required(:error_msg)
+
+          is_modified?(service_instance_dir, command, error_msg)
+
+          nested_modules_dir = find_nested_modules_dir(service_instance_dir)
+          nested_modules     = Dir.glob("#{nested_modules_dir}/*")
+
+          nested_modules.each do |nested_module|
+            nested_module_name = nested_module.split('/').last
+            nested_error_msg = "There are uncommitted changes in nested module '#{nested_module_name}'! #{error_msg}"
+            is_modified?(nested_module, command, nested_error_msg)
+          end
+        end
+
+        def self.remove_nested_module_dirs(args)
+          service_instance     = args[:service_instance]
+          service_instance_dir = args[:service_instance_dir] || ret_base_path(:service, service_instance)
+
+          nested_modules_dir = find_nested_modules_dir(service_instance_dir)
+          nested_modules     = Dir.glob("#{nested_modules_dir}/*")
+
+          args[:nested_modules_to_delete].each do |nested_module|
+            module_to_delete_path = "#{nested_modules_dir}/#{nested_module['display_name']}"
+            FileUtils.remove_dir(module_to_delete_path) if nested_modules.include? module_to_delete_path
+          end
+          args[:nested_modules_to_delete]
+        end
+
         protected
 
         attr_reader :base_module, :nested_modules, :service_instance, :remove_existing, :repo_dir
@@ -121,6 +162,16 @@ module DTK::Client
         def self.possible_nested_module_base_dirs
           @possible_nested_module_base_dirs ||= ::DTK::DSL::DirectoryType::ServiceInstance::NestedModule.possible_paths
         end
+
+        def self.is_modified?(path, command, error_msg)
+          repo_dir = {
+            :path    => path,
+            :branch  => Git.open(path).branches.local,
+            :command => command
+          }
+          message = ClientModuleDir::GitRepo.modified_with_diff(repo_dir)
+          raise Error::Usage, error_msg if message.data(:modified)
+        end
         
       end
     end

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

@@ -64,10 +64,10 @@ module DTK::Client
 
         # OsUtil.print_info("DTK module '#{@module_ref.pretty_print}' has been successfully cloned into '#{ret.required(:target_repo_dir)}'")
         target_repo_dir = ret.required(:target_repo_dir)
-        pull_service_info = check_if_pull_needed
+        # pull_service_info = check_if_pull_needed
         {
-          target_repo_dir: target_repo_dir,
-          pull_service_info: pull_service_info
+          target_repo_dir: target_repo_dir
+          # pull_service_info: pull_service_info
         }
       end
 
@@ -97,6 +97,8 @@ module DTK::Client
           remote_module_info = rest_get "#{BaseRoute}/remote_module_info", query_string_hash
         rescue DTK::Client::Error::ServerNotOkResponse => e
           # ignore if remote does not exist
+        rescue DTK::Client::Error::Server => error
+          # ignore if remote does not exist
         end
 
         if remote_module_info && remote_module_info.data(:service_info)

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

@@ -85,8 +85,12 @@ module DTK::Client
           version:   ref_version,
           repo_dir:  target_repo_dir
         }
-        DtkNetworkClient::Pull.run(module_info)
-
+        begin
+          DtkNetworkClient::Pull.run(module_info, opts)
+        rescue Git::GitExecuteError => e
+          exc = e.to_s << "\nUse '--force' flag to overwrite your changes"
+          raise (e.to_s.include? 'merge') ? exc : e.to_s
+        end
 
         # query_string_hash = QueryStringHash.new(
         #   :module_name => @module_ref.module_name,

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

@@ -52,7 +52,14 @@ module DTK::Client
             version:   module_ref.version,
             repo_dir:  @file_obj.parent_dir
           }
-          dependency_tree = DtkNetworkDependencyTree.get_or_create(repoman_client_module_info, { format: :hash, parsed_module: parsed_module, save_to_file: true, update_lock_file: update_lock_file })
+
+          repoman_client_opts = {
+            format: :hash,
+            save_to_file: true,
+            update_lock_file: update_lock_file
+          }
+          repoman_client_opts.merge!(parsed_module: parsed_module) unless method.eql?('pulled')
+          dependency_tree = DtkNetworkDependencyTree.get_or_create(repoman_client_module_info, repoman_client_opts)
 
           # TODO: need to refactor to use the same code for push and install
           dependency_tree.each do |dependency|
@@ -120,9 +127,11 @@ module DTK::Client
             :commit_sha  => git_repo_response.data(:head_sha)
           )
 
-          response = handle_error @file_obj.parent_dir do
-            rest_post("#{BaseRoute}/update_from_repo", post_body)
-          end
+          # response = handle_error @file_obj.parent_dir do
+          #   rest_post("#{BaseRoute}/update_from_repo", post_body)
+          # end
+
+          response = rest_post("#{BaseRoute}/update_from_repo", post_body)
 
           existing_diffs = nil
           print          = nil

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

@@ -21,7 +21,7 @@ module DTK::Client
       require_relative('push_dtkn/convert_source')
 
       attr_reader :version, :module_ref, :target_repo_dir, :base_dsl_file_obj
-      def initialize(catalog, module_ref, directory_path, version, base_dsl_file_obj, update_lock_file)
+      def initialize(catalog, module_ref, directory_path, version, base_dsl_file_obj, update_lock_file, force)
         @catalog           = catalog
         @module_ref        = module_ref
         @directory_path    = directory_path
@@ -29,7 +29,7 @@ module DTK::Client
         @version           = version || module_ref.version || 'master'
         @base_dsl_file_obj = base_dsl_file_obj
         @update_lock_file  = update_lock_file
-
+        @force             = force
         @module_ref.version ||= @version
       end
       private :initialize
@@ -41,10 +41,11 @@ module DTK::Client
           directory_path    = args[:directory_path]
           base_dsl_file_obj = args[:base_dsl_file_obj]
           update_lock_file  = args[:update_lock_file]
-          new('dtkn', module_ref, directory_path, version, base_dsl_file_obj, update_lock_file).push_dtkn
+          force             = args[:force]
+          new('dtkn', module_ref, directory_path, version, base_dsl_file_obj, update_lock_file, force).push_dtkn
         end
       end
-      
+
       def push_dtkn
         # TODO: DTK-2765: not sure if we need module to exist on server to do push-dtkn
         unless module_version_exists?(@module_ref)
@@ -57,8 +58,9 @@ module DTK::Client
 
         @file_obj     = @base_dsl_file_obj.raise_error_if_no_content
         parsed_module = @file_obj.parse_content(:common_module_summary)
-        # error_msg = "To allow push-dtkn to go through, invoke 'dtk push' to push the changes to server before invoking push-dtkn again"
-        # GitRepo.modified_with_diff?(target_repo_dir, { :error_msg => error_msg, :command => 'push-dtkn' })
+
+        error_msg = "To allow push-dtkn to go through, invoke 'dtk push' to push the changes to server before invoking push-dtkn again"
+        GitRepo.modified_with_diff?(target_repo_dir, { :error_msg => error_msg, :command => 'push-dtkn' })
 
         module_info = {
           name:      module_ref.module_name,
@@ -66,20 +68,55 @@ module DTK::Client
           version:   ref_version,
           repo_dir:  target_repo_dir
         }
-        DtkNetworkClient::Push.run(module_info, parsed_module: parsed_module, update_lock_file: @update_lock_file)
-
-        # query_string_hash = QueryStringHash.new(
-        #   :module_name => @module_ref.module_name,
-        #   :namespace   => @module_ref.namespace,
-        #   :rsa_pub_key => SSHUtil.rsa_pub_key_content,
-        #   :version     => @version
-        # )
-        # remote_module_info = rest_get "#{BaseRoute}/remote_module_info", query_string_hash
 
-        # ConvertSource.transform_and_commit(remote_module_info, self)
+        diffs = DtkNetworkClient::Push.run(module_info, parsed_module: parsed_module, update_lock_file: @update_lock_file, force: @force)
+        output_diffs diffs
         nil
       end
 
+      def output_diffs(diffs)
+
+        file_states = [:added, :deleted, :modified, :renamed, :changed]
+        file_state_arrays = [added = [], deleted = [], modified = [], renamed = [], changed = []]
+        
+        diffs.each do |k, val|
+          case val
+          when "A"
+            file_state_arrays[0].push(k)
+          when "D"
+            file_state_arrays[1].push(k)
+          when "M"
+            file_state_arrays[2].push(k)
+          when "R100"
+            file_state_arrays[3].push(k)
+          else
+            file_state_arrays[4].push(k)
+          end
+        end
+
+        return OsUtil.print_info("No Diffs to be pushed.") if state_arrays_empty?(file_state_arrays)
+
+        OsUtil.print_info("\nDiffs that were pushed:")
+        file_state_arrays.each do | state_array |
+          unless state_array.empty?
+            file_state = file_states[file_state_arrays.index(state_array)].to_s
+            print_diff_array state_array, file_state
+          end
+        end
+      
+      end
+
+      def state_arrays_empty?(file_state_arrays)
+        file_state_arrays.each do | state_array |
+          return false unless state_array.empty?
+        end
+        return true
+      end
+
+      def print_diff_array(diff_array, file_state)
+        print "files_#{file_state}:\n"
+        diff_array.each { |d| print "- path: #{d}\n" }
+      end
     end
   end
 end

data/lib/client/operation/service.rb

@@ -29,7 +29,7 @@ module DTK::Client
         :edit,
         :eject,
         :exec,
-        :link,
+        :add_link,
         :list,
         :list_actions,
         :list_attributes,
@@ -48,7 +48,8 @@ module DTK::Client
         :task_status,
         :uninstall,
         :describe,
-        :add
+        :add,
+        :add_component
       ]
       OPERATIONS.each { |operation| require_relative("service/#{operation}") }
 

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

@@ -0,0 +1,59 @@
+#
+# 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 AddComponent < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance     = args.required(:service_instance)
+          component_ref        = args.required(:component_ref)
+          version              = args[:version]
+          namespace            = args[:namespace]
+          parent_node          = args[:parent_node]
+          service_instance_dir = args[:service_instance_dir]
+
+          query_string_hash = QueryStringHash.new(service_instance: service_instance, component_ref: component_ref, version: version, namespace: namespace, parent_node: parent_node)
+          response = rest_post "#{BaseRoute}/add_component", query_string_hash
+
+          nested_modules = response.required(:nested_modules)
+          if nested_modules && !nested_modules.empty?
+            clone_args = {
+              :base_module      => response.required(:base_module),
+              :nested_modules   => nested_modules,
+              :service_instance => service_instance,
+              :remove_existing  => true,
+              :repo_dir         => service_instance_dir
+            }
+            ClientModuleDir::ServiceInstance.clone_nested_modules(clone_args)
+          end
+
+          repo_info_args = Args.new(
+            :service_instance     => service_instance,
+            :commit_message       => "Updating changes to service instance '#{service_instance}'",
+            :branch               => response.required(:base_module, :branch, :name),
+            :repo_url             => response.required(:base_module, :repo, :url),
+            :service_instance_dir => service_instance_dir
+          )
+          ClientModuleDir::GitRepo.pull_from_service_repo(repo_info_args)
+
+          OsUtil.print_info("Component '#{component_ref}' has been successfully added to service instance '#{service_instance}'")
+        end
+      end
+    end
+  end
+end

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

@@ -63,6 +63,9 @@ module DTK::Client
           print_msgs_of_type(:info_msgs, response)
 
           ClientModuleDir::GitRepo.pull_from_service_repo(repo_info_args) if response.data(:repo_updated)
+          if nested_module_args[:nested_modules_to_delete] = response.data['module_refs_to_delete']
+            ClientModuleDir::ServiceInstance.remove_nested_module_dirs(nested_module_args)
+          end
           process_backup_files(repo_info_args, response.data(:backup_files))
           process_semantic_diffs(response.data(:semantic_diffs))
           nil

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

@@ -28,8 +28,14 @@ module DTK::Client
             :service_instance => service_instance
           )
 
-          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
+          unless force
+            modified_args = Args.new(
+              :dir => module_dir,
+              :error_msg => "To allow converge to go through, invoke 'dtk push' to push the changes to server before invoking converge again",
+              :command => 'converge'
+            )
+            ClientModuleDir::ServiceInstance.modified_service_instance_or_nested_modules?(modified_args)
+          end
 
           rest_post("#{BaseRoute}/#{service_instance}/converge", post_body)
         end

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

@@ -32,8 +32,15 @@ module DTK::Client
               return false unless Console.prompt_yes_no("Are you sure you want to delete the content of service instance '#{@service_instance}' ?", :add_options => true)
             end
 
-            error_msg = "To allow delete to go through, invoke 'dtk push' to push the changes to server before invoking delete again"
-            GitRepo.modified_with_diff?(directory_path || @module_ref.client_dir_path, { :error_msg => error_msg, :command => 'delete' }) unless force
+            if !force && directory_path
+              modified_args = Args.new(
+                :dir => directory_path,
+                :error_msg => "To allow delete to go through, invoke 'dtk push' to push the changes to server before invoking delete again",
+                :command => 'delete'
+              )
+              ClientModuleDir::ServiceInstance.modified_service_instance_or_nested_modules?(modified_args)
+            end
+
             post_body = PostBody.new(
               :service_instance => @service_instance,
               :recursive? => recursive

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

@@ -22,12 +22,25 @@ module DTK::Client
         wrap_operation(args) do |args|
           service_instance  = args.required(:service_instance)
           path              = args[:path]
+          show_steps        = args[:show_steps]
           query_string_hash = QueryStringHash.new
 
+          raise Error, 'Option --show-steps can only be used with actions path' if show_steps && !actions_path_valid?(path)
+
           query_string_hash.merge!(path: path) if path
-          rest_get "#{BaseRoute}/#{service_instance}/describe", query_string_hash
+          query_string_hash.merge!(show_steps: show_steps) if show_steps
+          response = rest_get "#{BaseRoute}/#{service_instance}/describe", query_string_hash
+
+          response.set_render_as_table! if show_steps
+          response
         end
       end
+
+      def self.actions_path_valid?(path)
+        prefix, suffix = (path||'').split('/')
+        prefix.eql? 'actions'
+      end
+
     end
   end
 end

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

@@ -45,9 +45,13 @@ module DTK::Client
             node, action = $1, $2
             task_params.merge!("node" => node)
           end
-          
-          error_msg = "To allow #{args[:command]} to go through, invoke 'dtk push' to push the changes to server before invoking #{args[:command]} again"
-          GitRepo.modified_with_diff?(directory_path, { :error_msg => error_msg, :command => 'exec'})
+
+          modified_args = Args.new(
+            :dir => directory_path,
+            :error_msg => "To allow #{args[:command]} to go through, invoke 'dtk push' to push the changes to server before invoking #{args[:command]} again",
+            :command => 'exec'
+          )
+          ClientModuleDir::ServiceInstance.modified_service_instance_or_nested_modules?(modified_args)
         
           post_body = PostBody.new(
             :task_params? => task_params

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

@@ -56,8 +56,22 @@ module DTK::Client
         info_hash = {}
 
         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"
+
+        if node_name.nil?
+          if response.data.nil?
+            raise Error::Usage, "Service instance does not contain any nodes"
+          end
+
+          if response.data.size == 1
+            node_info = response.data.first
+          else
+            node_names = response.data.map { |node| node['display_name'] }
+            raise Error::Usage, "The service instance '#{service_instance}' has more than one node. Please use 'dtk service ssh' command with a node name. Legal names are: #{node_names.join(', ')}"
+          end
+        else
+          unless node_info = response.data.find{ |node| node_name == node['display_name'] }
+            raise Error::Usage, "The node '#{node_name}' does not exist"
+          end
         end
 
         if dns_address = node_info['dns_address']

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

@@ -47,6 +47,12 @@ module DTK::Client
       DEFAULT_MODE = :snapshot
       LEGAL_MODES  = [:refresh, :snapshot, :stream]
       def self.task_status_with_mode(mode, service_instance, opts = {})
+        Dir.glob("*", File::FNM_DOTMATCH).each do |f|
+          if match = /^(.task_id_)(\d*)/.match(f)
+            opts[:task_id] = match[2] if match[2]
+            break
+          end
+        end
         case mode
         when :refresh
           RefreshMode.new(mode, service_instance).task_status(opts)
@@ -67,7 +73,8 @@ module DTK::Client
         QueryStringHash.new( 
           :form?                  => opts[:form],
           :wait_for?              => opts[:wait_for],
-          :summarize_node_groups? => opts[:summarize]
+          :summarize_node_groups? => opts[:summarize],
+          :task_id?               => opts[:task_id]
         )
       end
       

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

@@ -27,6 +27,15 @@ module DTK::Client
           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 && path
+            modified_args = Args.new(
+              :dir => path || @module_ref.client_dir_path,
+              :error_msg => "To allow uninstall to go through, invoke 'dtk push' to push the changes to server before invoking uninstall again",
+              :command => 'uninstall'
+            )
+            ClientModuleDir::ServiceInstance.modified_service_instance_or_nested_modules?(modified_args)
+          end
+
           if force
             msg.prepend("Note: this will not terminate aws instances, you will have to do that manually!\n")
           end
@@ -46,6 +55,10 @@ module DTK::Client
           ClientModuleDir.rm_f(path) if args[:purge]
 
           if message = response.data(:message) || "DTK service '#{service_instance}' has been uninstalled successfully."
+            Dir.glob("*", File::FNM_DOTMATCH).each do |f|
+              ClientModuleDir.rm_f(f) if f.include? '.task_id_'
+            end
+            ClientModuleDir.create_file_with_content(".task_id_#{response.data(:task_id)}", '') if response.data(:task_id)
             OsUtil.print_info(message)
           end
         end

data/lib/client/util/validation.rb

@@ -35,10 +35,10 @@ module DTK::Client
     private
 
     def self.valid_name?(name)
-      name.to_s.match(/\A[\w\-\.]+\z/)
+      name.to_s.match(/\A[[a-z]\-\.\_\d]+\z/)
     end
 
-    VALID_NAME_CHARACTERS = ['letters', 'numbers', '-', '_', '.']
+    VALID_NAME_CHARACTERS = ['lowercase letters', 'numbers', '-', '_', '.']
     def self.valid_characters
       VALID_NAME_CHARACTERS.join("', '")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.12.0.1
+  version: 0.12.1
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -70,16 +70,16 @@ dependencies:
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
   name: dtk-dsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.4
 - !ruby/object:Gem::Dependency
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 description: Command line tool to interact with a DTK Server and DTK Service Catalog.
 email: support@reactor8.com
 executables:
@@ -195,6 +195,8 @@ files:
 - lib/cli/command/options.rb
 - lib/cli/command/service.rb
 - lib/cli/command/service/add.rb
+- lib/cli/command/service/add_component.rb
+- lib/cli/command/service/add_link.rb
 - lib/cli/command/service/cancel_task.rb
 - lib/cli/command/service/clone.rb
 - lib/cli/command/service/converge.rb
@@ -206,7 +208,6 @@ 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
@@ -318,6 +319,8 @@ files:
 - lib/client/operation/module_service_common.rb
 - lib/client/operation/service.rb
 - lib/client/operation/service/add.rb
+- lib/client/operation/service/add_component.rb
+- lib/client/operation/service/add_link.rb
 - lib/client/operation/service/cancel_task.rb
 - lib/client/operation/service/clone_service.rb
 - lib/client/operation/service/commit_and_push.rb
@@ -329,7 +332,6 @@ 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
@@ -428,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.