dtk-client 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 8bab62a8bff9a56a5888fb17f4128a69891786d0
-  data.tar.gz: 1ead8b18d171036edbf6f0633f4da99355b00f07
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGY4MjY3MzI0Mzg2MzVlYWQ5YmE0N2YzZjU1NjNiODA5NzU1MTU5Yw==
+  data.tar.gz: !binary |-
+    ZThiYjk4YThmM2I4OTg2YTRlNzZhNTVlNjkxNWJlY2Q2YjI3Y2YwMQ==
 SHA512:
-  metadata.gz: 11804a4fc9c39c49616b048eaa7a8229b7f0e7a0abeae8a49e9cbaab2bec8e618befe267533ba671473f1c38116381e31a3a00056a2e67945be41034bf0bb456
-  data.tar.gz: 796071c75b5dce8c4377d849f8a955ae2ca5b8a4c67958f604c52edafe4201b9b3f3257f01a53aa68c3e256aba425f0eff86cb845cc64f35e2321ab3e62f2542
+  metadata.gz: !binary |-
+    YjU0OGY2NjhkZmRiMGI1NmM1OTVlNTFmZjkxYjVkNGNlZjMyZjE1MDZlYThm
+    ZjQyMDQzNjZjN2QzMzYwMGFiNGY3MjQ3NjBkMzQxNTQ2NTA0ZDFmNWZlNGZh
+    MmU1YmUwNzI1MzNmN2RhNDdmYjM1ZWY3MTdjNWY1ZDI1MmE3NjM=
+  data.tar.gz: !binary |-
+    ZGQyZDhjOWQ3Njc3ZmM5YmQ3OWJjYTcyNzA5YTRlZTM2ZTU5NTA1ZDU3MmZm
+    NjNmYWVmODFkMTY5NGMwMjM4ODI3ZGQ2YWE5MGI1YzUxNTE1ZGQxMWRlNWNl
+    YzRjZTRjNzFlYmQ1ZTE0NzYyOTBiY2Q4ODU3ZmNhOWM2YjdkODU=

data/dtk-client.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{The DTK Client is a command line tool to interact with your DTK Server and DTK Service Catalog instance(s).}
   gem.summary       = %q{DTK CLI client for DTK server interaction.}
   gem.homepage      = "https://github.com/rich-reactor8/dtk-client"
-  gem.licenses      = ["GPL-3.0"]
+  gem.licenses      = ["Apache-2.0"]
 
   gem.files = %w(README.md Gemfile Gemfile_dev dtk-client.gemspec)
   gem.files += Dir.glob("bin/**/*")
@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'hirb','~> 0.7.0'
   gem.add_dependency 'thor','~> 0.15.4'
   gem.add_dependency 'erubis','~> 2.7.0'
-  gem.add_dependency 'dtk-common-core','0.8.0'
+  gem.add_dependency 'dtk-common-core','0.9.0'
   gem.add_dependency 'git','1.2.9'
   gem.add_dependency 'colorize','~> 0.5.8'
   gem.add_dependency 'highline', '1.6.16'

data/lib/auxiliary.rb

@@ -58,4 +58,4 @@ module DTK
       end
     end
   end
-end
+end

data/lib/client.rb

@@ -55,4 +55,4 @@ begin
 rescue SystemExit, Interrupt
   #puts "DTK Client action canceled."
   exit(1)
-end
+end

data/lib/command_helper.rb

@@ -30,4 +30,4 @@ module DTK; module Client
   #TODO: make all commands helpers a subclass of this
   class CommandHelper              
   end
-end; end
+end; end

data/lib/command_helpers/git_repo/merge.rb

@@ -150,4 +150,4 @@ module DTK; module Client; class CommandHelper
 
     end
   end
-end; end; end
+end; end; end

data/lib/command_helpers/git_repo.rb

@@ -586,4 +586,4 @@ module DTK; module Client; class CommandHelper
       repo.repo_dir.gsub(Regexp.new("/$"),"").split("/").last
     end
   end; end
-end; end; end
+end; end; end

data/lib/command_helpers/jenkins_client/config_xml.rb

@@ -285,4 +285,4 @@ end
 eos
 
   end
-end
+end

data/lib/command_helpers/jenkins_client.rb

@@ -103,4 +103,4 @@ module DTK; module Client
       end
     end
   end
-end; end
+end; end

data/lib/command_helpers/service_importer.rb

@@ -107,7 +107,10 @@ module DTK::Client
         version             = r_module['version']
         full_name           = (version && !version.eql?('master')) ? "#{module_name}(#{version})" : module_name
 
-        print "Using #{module_type.gsub('_', ' ')} '#{full_name}'\n" unless hide_output
+        unless hide_output
+          print "Using #{module_type.gsub('_', ' ')} '#{full_name}'\n" unless update_all
+        end
+
         next if update_none || opts[:update_none]
 
         pull_opts = {:force => true, :do_not_raise => true}
@@ -203,6 +206,7 @@ module DTK::Client
             thor_options["skip_edit"] = true
             thor_options["omit_output"] = true
             thor_options.merge!(:module_type => 'component-module')
+            thor_options.merge!(:service_importer => true)
             new_context_params = ::DTK::Shell::ContextParams.new
             new_context_params.forward_options(thor_options)
             new_context_params.add_context_to_params(formated_name, :"component-module", m['id'])
@@ -244,4 +248,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/command_helpers/service_link.rb

@@ -30,4 +30,4 @@ module DTK; module Client; class CommandHelper
     end
 
   end; end
-end; end; end
+end; end; end

data/lib/command_helpers/test_module_creator.rb

@@ -66,4 +66,4 @@ module DTK::Client
 			end
 		end
 	end
-end
+end

data/lib/commands/common/thor/access_control.rb

@@ -130,4 +130,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands/common/thor/action_result_handler.rb

@@ -15,60 +15,60 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module DTK
-  module Client
-    module ActionResultHandler
-
-      def print_action_results(action_results_id, number_of_retries=8)
-        response = action_results(action_results_id, number_of_retries)
-
-        if response.ok? && response.data['results']
-          response.data['results'].each do |k,v|
-            if v['error']
-              OsUtil.print("#{v['error']} (#{k})", :red)
-            else
-              OsUtil.print("#{v['message']} (#{k})", :yellow)
-            end
-          end
-        else
-          OsUtil.print("Not able to process given request, we apologise for inconvenience", :red)
-        end
-
-        nil
-      end
-
-      def print_simple_results(action_results_id, number_of_retries=8)
-        response = action_results(action_results_id, number_of_retries)
-        pp response
-      end
-
-      def action_results(action_results_id, number_of_retries=8)
-        action_body = {
-          :action_results_id => action_results_id,
-          :return_only_if_complete => true,
-          :disable_post_processing => true
-        }
-        response = nil
-
-        number_of_retries.times do
-          response = post(rest_url("assembly/get_action_results"),action_body)
-
-          # server has found an error
-          unless response.data(:results).nil?
-            if response.data(:results)['error']
-              raise DTK::Client::DtkError, response.data(:results)['error']
-            end
-          end
-
-          break if response.data(:is_complete)
-
-          sleep(1.5)
-        end
-
-        response
-
-      end
-
-    end
-  end
-end
+module DTK
+  module Client
+    module ActionResultHandler
+
+      def print_action_results(action_results_id, number_of_retries=8)
+        response = action_results(action_results_id, number_of_retries)
+
+        if response.ok? && response.data['results']
+          response.data['results'].each do |k,v|
+            if v['error']
+              OsUtil.print("#{v['error']} (#{k})", :red)
+            else
+              OsUtil.print("#{v['message']} (#{k})", :yellow)
+            end
+          end
+        else
+          OsUtil.print("Not able to process given request, we apologise for inconvenience", :red)
+        end
+
+        nil
+      end
+
+      def print_simple_results(action_results_id, number_of_retries=8)
+        response = action_results(action_results_id, number_of_retries)
+        pp response
+      end
+
+      def action_results(action_results_id, number_of_retries=8)
+        action_body = {
+          :action_results_id => action_results_id,
+          :return_only_if_complete => true,
+          :disable_post_processing => true
+        }
+        response = nil
+
+        number_of_retries.times do
+          response = post(rest_url("assembly/get_action_results"),action_body)
+
+          # server has found an error
+          unless response.data(:results).nil?
+            if response.data(:results)['error']
+              raise DTK::Client::DtkError, response.data(:results)['error']
+            end
+          end
+
+          break if response.data(:is_complete)
+
+          sleep(1.5)
+        end
+
+        response
+
+      end
+
+    end
+  end
+end

data/lib/commands/common/thor/assembly_template.rb

@@ -89,4 +89,4 @@ module DTK::Client
        end
     end
   end
-end
+end

data/lib/commands/common/thor/assembly_workspace.rb

@@ -826,10 +826,12 @@ module DTK::Client
       return response unless response.ok?
 
       if r_data = response.data
-        if r_data.is_a?(Hash) && (ambiguous = r_data['ambiguous'])
-          unless ambiguous.empty?
-            msg = "It is ambiguous whether '#{ambiguous.join(', ')}' #{ambiguous.size == 1 ? 'is' : 'are'} node or component attribute(s). Run set-attribute again with one of options -c [--component-attribute] or -n [--node-attribute]."
-            raise DtkError, msg
+        if r_data.is_a?(Hash)
+          if ambiguous = r_data['ambiguous']
+            unless ambiguous.empty?
+              msg = "It is ambiguous whether '#{ambiguous.join(', ')}' #{ambiguous.size == 1 ? 'is' : 'are'} node or component attribute(s). Run set-attribute again with one of options -c [--component-attribute] or -n [--node-attribute]."
+              raise DtkError, msg
+            end
           end
         end
       end
@@ -898,6 +900,14 @@ module DTK::Client
 
     def create_node_group_aux(context_params)
       assembly_or_workspace_id, node_group_name, node_template_identifier = context_params.retrieve_arguments([[:service_id, :workspace_id!],:option_1!,:option_2!],method_argument_names)
+      cardinality = options.cardinality
+
+      # default value for cardinality is 1 (if user does not specify otherwise)
+      # invalid values for cardinality are 0 and any string
+      if cardinality.eql?('0') || !cardinality.to_s.match(/^[0-9]+$/)
+        fail DtkError.new("Invalid cardinality value '#{cardinality}'!")
+      end
+
       post_body = {
         :assembly_id              => assembly_or_workspace_id,
         :cardinality              => options.cardinality,
@@ -1570,4 +1580,4 @@ module DTK::Client
       response = ContextRouter.routeTask(:service_module, "stage", new_context_params, @conn)
     end
   end
-end
+end

data/lib/commands/common/thor/base_command_helper.rb

@@ -56,4 +56,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands/common/thor/clone.rb

@@ -79,4 +79,4 @@ module DTK::Client
       return context_params_for_module
     end
   end
-end
+end

data/lib/commands/common/thor/common.rb

@@ -85,4 +85,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands/common/thor/common_base.rb

@@ -46,4 +46,4 @@ module DTK::Client
       end
     end
   end
-end
+end

data/lib/commands/common/thor/create_target.rb

@@ -67,4 +67,4 @@ module DTK; module Client; module Commands::Common
     end
 
   end
-end; end; end
+end; end; end

data/lib/commands/common/thor/edit.rb

@@ -252,4 +252,4 @@ end
         raise DtkValidationError, "Unsupported format type '#{format.to_s}'!"
       end
     end
-=end
+=end

data/lib/commands/common/thor/inventory_parser.rb

@@ -95,4 +95,4 @@ module DTK::Client
     ValidOsTypes = ['ubuntu', 'centos', 'redhat', 'debian']
 
   end
-end
+end

data/lib/commands/common/thor/list_diffs.rb

@@ -15,114 +15,114 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module DTK::Client
-  module ListDiffsMixin
-  	def list_diffs_aux(module_type,module_id,remote,version=nil)
-  		id_field    = "#{module_type}_id"
-      path_to_key = SSHUtil.default_rsa_pub_key_path()
-      rsa_pub_key = File.file?(path_to_key) && File.open(path_to_key){|f|f.read}.chomp
-
-      post_body = {
-        id_field => module_id,
-        :access_rights => "r",
-        :action => "pull"
-      }
-      post_body.merge!(:version => version) if version
-      post_body.merge!(:rsa_pub_key => rsa_pub_key) if rsa_pub_key
-
-      response = post(rest_url("#{module_type}/get_remote_module_info"),post_body)
-      return response unless response.ok?
-
-      module_name = response.data(:full_module_name)
-
-      opts = {
-        :remote_repo_url => response.data(:remote_repo_url),
-        :remote_repo => response.data(:remote_repo),
-        :remote_branch => response.data(:remote_branch),
-        :local_branch => response.data(:workspace_branch)
-      }
-      version = response.data(:version)
-
-      # response = Helper(:git_repo).get_diffs(module_type,module_name,version,opts)
-      response = Helper(:git_repo).get_remote_diffs(module_type,module_name,version,opts)
-      return response unless response.ok?
-
-      added, deleted, modified = print_diffs(response.data(:status), remote)
-      diffs = response.data(:diffs)
-
-      raise DTK::Client::DtkValidationError, "There are no changes in current workspace!" if(added.empty? && deleted.empty? && modified.empty? && diffs.empty?)
-      puts "#{diffs}" unless (diffs||"").empty?
-
-      unless added.empty?
-        puts "\nNew file(s):"
-        added.each do |a|
-          puts "\t #{a.inspect}"
-        end
-      end
-
-      unless deleted.empty?
-        puts "\nDeleted file(s):"
-        deleted.each do |d|
-          puts "\t #{d.inspect}"
-        end
-      end
-  	end
-
-    def list_remote_diffs_aux(module_type, module_id)
-      id_field = "#{module_type}_id"
-
-      post_body = {
-        id_field => module_id
-      }
-
-      response = post(rest_url("#{module_type}/list_remote_diffs"),post_body)
-      return response unless response.ok?
-
-      raise DTK::Client::DtkValidationError, "There are no diffs between module on server and remote repo!" if response.data.empty?
-      response
-    end
-
-    def list_component_module_diffs(module_id, assembly_name, workspace_branch, commit_sha, module_branch_id, repo_id)
-      post_body = {
-        :module_id => module_id,
-        :assembly_name => assembly_name,
-        :workspace_branch => workspace_branch,
-        :module_branch_id => module_branch_id,
-        :repo_id => repo_id
-      }
-
-      response = post(rest_url("assembly/list_component_module_diffs"),post_body)
-      return response unless response.ok?
-
-      raise DTK::Client::DtkValidationError, "There are no diffs between module in service instance and base module!" if response.data.empty?
-      response
-    end
-
-    def print_diffs(response, remote)
-      added    = []
-      deleted  = []
-      modified = []
-
-      unless response[:files_modified].nil?
-        response[:files_modified].each do |file|
-          modified << file[:path]
-        end
-      end
-
-      unless response[:files_deleted].nil?
-        response[:files_deleted].each do |file|
-          deleted << file[:path]
-        end
-      end
-
-      unless response[:files_added].nil?
-        response[:files_added].each do |file|
-          added << file[:path]
-        end
-      end
-
-      return added, deleted, modified
-    end
-
-  end
-end
+module DTK::Client
+  module ListDiffsMixin
+  	def list_diffs_aux(module_type,module_id,remote,version=nil)
+  		id_field    = "#{module_type}_id"
+      path_to_key = SSHUtil.default_rsa_pub_key_path()
+      rsa_pub_key = File.file?(path_to_key) && File.open(path_to_key){|f|f.read}.chomp
+
+      post_body = {
+        id_field => module_id,
+        :access_rights => "r",
+        :action => "pull"
+      }
+      post_body.merge!(:version => version) if version
+      post_body.merge!(:rsa_pub_key => rsa_pub_key) if rsa_pub_key
+
+      response = post(rest_url("#{module_type}/get_remote_module_info"),post_body)
+      return response unless response.ok?
+
+      module_name = response.data(:full_module_name)
+
+      opts = {
+        :remote_repo_url => response.data(:remote_repo_url),
+        :remote_repo => response.data(:remote_repo),
+        :remote_branch => response.data(:remote_branch),
+        :local_branch => response.data(:workspace_branch)
+      }
+      version = response.data(:version)
+
+      # response = Helper(:git_repo).get_diffs(module_type,module_name,version,opts)
+      response = Helper(:git_repo).get_remote_diffs(module_type,module_name,version,opts)
+      return response unless response.ok?
+
+      added, deleted, modified = print_diffs(response.data(:status), remote)
+      diffs = response.data(:diffs)
+
+      raise DTK::Client::DtkValidationError, "There are no changes in current workspace!" if(added.empty? && deleted.empty? && modified.empty? && diffs.empty?)
+      puts "#{diffs}" unless (diffs||"").empty?
+
+      unless added.empty?
+        puts "\nNew file(s):"
+        added.each do |a|
+          puts "\t #{a.inspect}"
+        end
+      end
+
+      unless deleted.empty?
+        puts "\nDeleted file(s):"
+        deleted.each do |d|
+          puts "\t #{d.inspect}"
+        end
+      end
+  	end
+
+    def list_remote_diffs_aux(module_type, module_id)
+      id_field = "#{module_type}_id"
+
+      post_body = {
+        id_field => module_id
+      }
+
+      response = post(rest_url("#{module_type}/list_remote_diffs"),post_body)
+      return response unless response.ok?
+
+      raise DTK::Client::DtkValidationError, "There are no diffs between module on server and remote repo!" if response.data.empty?
+      response
+    end
+
+    def list_component_module_diffs(module_id, assembly_name, workspace_branch, commit_sha, module_branch_id, repo_id)
+      post_body = {
+        :module_id => module_id,
+        :assembly_name => assembly_name,
+        :workspace_branch => workspace_branch,
+        :module_branch_id => module_branch_id,
+        :repo_id => repo_id
+      }
+
+      response = post(rest_url("assembly/list_component_module_diffs"),post_body)
+      return response unless response.ok?
+
+      raise DTK::Client::DtkValidationError, "There are no diffs between module in service instance and base module!" if response.data.empty?
+      response
+    end
+
+    def print_diffs(response, remote)
+      added    = []
+      deleted  = []
+      modified = []
+
+      unless response[:files_modified].nil?
+        response[:files_modified].each do |file|
+          modified << file[:path]
+        end
+      end
+
+      unless response[:files_deleted].nil?
+        response[:files_deleted].each do |file|
+          deleted << file[:path]
+        end
+      end
+
+      unless response[:files_added].nil?
+        response[:files_added].each do |file|
+          added << file[:path]
+        end
+      end
+
+      return added, deleted, modified
+    end
+
+  end
+end

data/lib/commands/common/thor/module/import.rb

@@ -212,4 +212,4 @@ module DTK::Client
 
     end
   end
-end
+end

data/lib/commands/common/thor/module.rb

@@ -384,9 +384,9 @@ module DTK::Client
       master_response = post rest_url("#{module_type}/prepare_for_install_module"), post_body
       return master_response unless master_response.ok?
 
-      head_installed     = master_response.data(:head_installed)
-      latest_version     = master_response.data(:latest_version)
-      remote_module_name = context_params.retrieve_arguments([:option_1!], method_argument_names)
+      head_installed = master_response.data(:head_installed)
+      latest_version = master_response.data(:latest_version)
+      remote_module_name, param_version = context_params.retrieve_arguments([:option_1!, :option_2], method_argument_names)
 
       if version
         versions = master_response.data(:versions)
@@ -640,7 +640,20 @@ module DTK::Client
       module_name      = context_params.retrieve_arguments(["#{module_type}_name".to_sym],method_argument_names)
       version          = thor_options["version"]||options.version
       internal_trigger = true if thor_options['skip_edit']
-      clone_aux(module_type.to_sym, module_id, version, internal_trigger, thor_options['omit_output'], :use_latest => true)
+      response = clone_aux(module_type.to_sym, module_id, version, internal_trigger, thor_options['omit_output'], :use_latest => true)
+
+      # if error message 'directory exist on client ...' returned print it here
+      # with forward_options[:service_importer] we know it is triggered from auto-importing dependencies so don't want to print
+      if !response.ok? && response.is_a?(Response::Error::Usage) && !forward_options[:service_importer]
+        if errors = response['errors']
+          if error_msg = errors.first['message']
+            OsUtil.print(errors.first['message'], :red)
+            return
+          end
+        end
+      end
+
+      response
     end
 
     def edit_module_aux(context_params)
@@ -995,4 +1008,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands/common/thor/node.rb

@@ -50,4 +50,4 @@ module DTK::Client
       'amazon-linux' => 'ec2-user'
     }
   end
-end
+end

data/lib/commands/common/thor/poller.rb

@@ -62,4 +62,4 @@ module DTK::Client
       end
     end
   end
-end
+end

data/lib/commands/common/thor/pull_clone_changes.rb

@@ -25,4 +25,4 @@ module DTK::Client
       Helper(:git_repo).pull_changes(module_type,module_name,opts_pull)
     end
   end
-end
+end

data/lib/commands/common/thor/pull_from_remote.rb

@@ -149,4 +149,4 @@ module DTK::Client
 
     end
   end
-end
+end