dtk-client 0.5.12 → 0.5.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTZhMDBlMWM1ZWUzYjFiNWFlNTg2NDJmZTE2MjQ2ZGU4YmFjYmZiMQ==
+    NmJlZDdmMWJjOGQ1ZGQ3YWFiMjE0N2RiZmUyOGQzMTQ1NGM2ZmI0Ng==
   data.tar.gz: !binary |-
-    NWNkODg5NjU2NWJmN2Q4YzkzNDZmZTE1NzU1OTE5YWExZmJhNzVmZA==
+    NzAzNTJiNDNhYmE4NTNlZGJlYWFiYjBhNGQ1MjQxMWUxMTJiZWM0ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MzQ0ZmVmYmM0NmY4NmJlMGZiYWFmODY0NWYyOTI5YWFmYmJjZWViZDliNGY5
-    YTFlMjRmZTZlZTI0NWI3OTFlNDIyZGNkZmIyYTZlODgyMWZhNGRmZDNlNDZj
-    NzRmMzMyYzgzMTllOWMyOTZlZTFhMWJkNGQwM2VhZjI1NmIyZGQ=
+    ZmM1MzkxMzEwNDVlYzZiNzQwZDAyYTM5N2VhZjEzZmQzNDJiNDhkOWVmNTI0
+    NWQyNTYzNDkzNWViM2Q0MDRjZWQ3NjU1YTQxZjQ0ZmU5YjNjMzgwOTA4OWJh
+    MThkNzBhN2RlZDQxZDg1YTRhOWNiMGRiMTdiYjZiMDMyMTFlYjA=
   data.tar.gz: !binary |-
-    MTUwYzA1Y2E0NzEwY2Y0ZGZkMDcwNzRkNTVlOWNmZDBkZTkwY2M5NjQ3NzUz
-    MWY5ZTEzMmNlOGQ5NGNlY2EwYzg3ZTU3ZjQ2M2ExNTcyNzA0YmZmOGY5ZmIy
-    YTkxNzQ0OGVkMTYxZmI3MDZiZmRkYzk1Y2I3YjM5M2M3N2RkYTQ=
+    MWJmYjViNmE2MmQwNWY4NTFkYWU3NzVlNWY5M2MwNzg2ODU1MTNlYWFjMjVl
+    MjA5NDdmOWY2ZWE4OWFmOTllMjdmYTQzOTQ0OTc4ZjlhOGQ3MGVlNWEwZTI1
+    OGEzNzA3OWRhYmQ2ZjVlYTEzMzk0NmU3MWRiY2EyMjE2NjY5N2Y=

data/lib/command_helpers/git_repo.rb

@@ -277,7 +277,8 @@ module DTK; module Client; class CommandHelper
         repo.fetch(remote(opts[:remote_repo]))
       end
 
-      local_branch      = repo.branch 
+      local_branch      = repo.current_branch_name
+
       remote_branch_ref = remote_branch_ref(local_branch, opts)
 
       commit_shas = Hash.new

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

@@ -13,6 +13,7 @@ LOG_SLEEP_TIME_W   = DTK::Configuration.get(:tail_log_frequency)
 module DTK::Client
   module AssemblyWorkspaceMixin
     REQ_ASSEMBLY_OR_WS_ID = [:service_id!, :workspace_id!]
+
     def get_name(assembly_or_workspace_id)
       get_name_from_id_helper(assembly_or_workspace_id)
     end
@@ -722,10 +723,18 @@ module DTK::Client
     end
 
     def execute_tests_aux(context_params)
-      execute_test_tries = 10
+      assembly_or_workspace_id,node_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:node_id],method_argument_names)
+
+      execute_test_tries = 30
       execute_test_sleep = 1
 
-      assembly_or_workspace_id,node_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:node_id],method_argument_names)
+      if !options['timeout'].nil?
+        begin
+          execute_test_tries = Integer(options['timeout'])
+        rescue
+          raise DTK::Client::DtkValidationError, "Timeout value is not valid"
+        end
+      end
 
       #Get list of components on particular node
       post_body = {
@@ -755,10 +764,7 @@ module DTK::Client
             end
           end
       end
-
-      if components.empty?
-        components = nil 
-      end
+      components = nil if components.empty?
 
       post_body = {
         :assembly_id => assembly_or_workspace_id,
@@ -767,6 +773,7 @@ module DTK::Client
       }  
 
       response = post(rest_url("assembly/initiate_execute_tests"),post_body)
+
       raise DTK::Client::DtkValidationError, response.data(:errors).first if response.data(:errors)
       return response unless response.ok?
 
@@ -783,6 +790,13 @@ module DTK::Client
         response = post(rest_url("assembly/get_action_results"),post_body)
         count += 1
         if count > execute_test_tries or response.data(:is_complete)
+          error_msg = ""
+          response.data(:results).each do |k,v|
+            unless v.nil?
+              error_msg << v['test_error'] if v.to_s.include?('test_error')
+            end
+          end
+          raise DTK::Client::DtkError, "Error while executing test script:\n" + error_msg + "Please fix test script with edit-component-module command and try again." unless error_msg.empty?
           end_loop = true
         else
           #last time in loop return whetever is there
@@ -793,8 +807,14 @@ module DTK::Client
         end
       end
 
-      response.set_data(*response.data(:results))
-      response.render_table(:execute_tests_data)
+      if (response.data(:results).empty? && options['timeout'].nil?)
+        raise DTK::Client::DtkValidationError, "Could not finish execution of tests in default timeframe (#{execute_test_tries} seconds). Try again with passing --timeout TIMEOUT parameter" 
+      elsif (response.data(:results).empty? && !options['timeout'].nil?)
+        raise DTK::Client::DtkValidationError, "Could not finish execution of tests in set timeframe (#{execute_test_tries} seconds). Try again with increasing --timeout TIMEOUT parameter"
+      else
+        response.set_data(*response.data(:results))
+        response.render_table(:execute_tests_data)
+      end
     end
 
     def get_ps_aux(context_params)

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

@@ -56,6 +56,11 @@ module DTK::Client
         Console.unix_shell(module_location, module_id, module_type, version)
       end
 
+      unless grit_adapter.repo_exists?
+        puts "Local module has been removed, skipping changes."
+        return Response::Ok.new()
+      end
+
       unless grit_adapter.changed?
         puts "No changes to repository"
         return Response::Ok.new()
@@ -79,15 +84,19 @@ module DTK::Client
           end
         confirmed_ok = Console.confirmation_prompt(confirm_msg)
       end
-
       if (auto_commit || confirmed_ok)
         if auto_commit 
           puts "[NOTICE] You are using auto-commit option, all changes you have made will be commited."
         end
         commit_msg = user_input("Commit message")
+
+        # remove qoutes if they are not closed properly in commit_msg
+        commit_msg.gsub!(/\"/,'') unless commit_msg.count('"') % 2 ==0
+
         internal_trigger=true
         reparse_aux(module_location)
         response = push_clone_changes_aux(module_type,module_id,version,commit_msg,internal_trigger,opts)
+        
         # if error return
         return response unless response.ok?
       end

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

@@ -21,7 +21,7 @@ module DTK::Client
       remote_params = response.data_hash_form(:remote_repo_url,:remote_repo,:remote_branch)
       remote_params.merge!(:version => version) if version
 
-      #check and import component module dependencies before importing service itself
+      # check and import component module dependencies before importing service itself
       if (module_type == :service_module)
         import_module_component_dependencies(module_id,remote_namespace) 
       end

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

@@ -11,6 +11,16 @@ module DTK::Client
       module_name,repo_url,branch,not_ok_response = workspace_branch_info(module_type,module_id,version,opts)
       return not_ok_response if not_ok_response
 
+      module_location  = OsUtil.module_location(module_type,module_name,version,opts)
+      
+      unless File.directory?(module_location)
+        if Console.confirmation_prompt("Push not possible, module '#{module_name}#{version && "-#{version}"}' has not been cloned. Would you like to clone module now"+'?')
+          clone_aux(module_type,module_id, version, true, true, opts)
+        else
+          return
+        end
+      end
+
       push_opts = opts.merge(:commit_msg => commit_msg, :local_branch => branch)
       response = Helper(:git_repo).push_changes(module_type,module_name,version,push_opts)
       return response unless response.ok?

data/lib/commands/thor/account.rb

@@ -138,7 +138,7 @@ module DTK::Client
       response = post rest_url("account/remove_user_direct_access"), post_body
       return response unless response.ok?
 
-      OsUtil.print("Ssh key '#{name}' removed successfully!", :yellow)
+      OsUtil.print("SSH key '#{name}' removed successfully!", :yellow)
       nil
     end
 

data/lib/commands/thor/component_module.rb

@@ -171,7 +171,7 @@ module DTK::Client
       Response::Ok.new()
     end
 
-=begin
+
     desc "COMPONENT-MODULE-NAME/ID set-attribute ATTRIBUTE-ID VALUE", "Set value of component module attributes"
     def set_attribute(context_params)
       if context_params.is_there_identifier?(:attribute)
@@ -184,12 +184,13 @@ module DTK::Client
 
       post_body = {
         :attribute_id => attribute_id,
-        :attribute_value => value
+        :attribute_value => value,
+        :component_module_id => component_module_id
       }
       
       post rest_url("attribute/set"), post_body
     end
-=end
+
     #### end: create and delete commands ###
 
 =begin
@@ -584,26 +585,28 @@ TODO: might deprecate
       :type => :string, 
       :banner => "NAMESPACE",
       :desc => "Remote namespace"
-
     def pull_dtkn(context_params)     
       component_module_id, component_module_name = context_params.retrieve_arguments([:component_module_id!,:component_module_name,:option_1],method_argument_names)
       catalog = 'dtkn'
       version = options["version"]
+
       raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PullCatalogs}" unless catalog
 
+      if component_module_name.to_s =~ /^[0-9]+$/
+        component_module_id = component_module_name
+        component_module_name = get_module_name(component_module_id)
+      end
+
+      modules_path    = OsUtil.module_clone_location()
+      module_location = "#{modules_path}/#{component_module_name}#{version && "-#{version}"}"
+
       if catalog.to_s.eql?("dtkn")
+        clone_aux(:component_module, component_module_id, version, true, true) unless File.directory?(module_location)
+
         opts = {:version => version, :remote_namespace => options.namespace}
         response = pull_from_remote_aux(:component_module,component_module_id,opts)
         return response unless response.ok?
 
-        if component_module_name.to_s =~ /^[0-9]+$/
-          component_module_id = component_module_name
-          component_module_name = get_module_name(component_module_id)
-        end
-
-        modules_path    = OsUtil.module_clone_location()
-        module_location = "#{modules_path}/#{component_module_name}#{version && "-#{version}"}"
-
         push_clone_changes_aux(:component_module,component_module_id,version,nil,true) if File.directory?(module_location)
         Response::Ok.new()
       #elsif catalog.to_s.eql?("origin")

data/lib/commands/thor/service.rb

@@ -143,8 +143,8 @@ TODO: overlaps with different meaning
             ['delete',"delete COMPONENT-NAME/ID [-y] ","# Delete component from workspace."],
             ['list-components',"list-components","# List components."]
           ],
-          :utils => [
-            ['execute-tests',"execute-tests [--component COMPONENT-NAME]","# Execute tests. --component filters results per component."],
+          :utils => [ 
+            ['execute-tests',"execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]","# Execute tests. --component filters execution per component, --timeout changes default execution timeout."],
             ['get-netstats',"get-netstats","# Get netstats."],
             ['get-ps',"get-ps [--filter PATTERN]","# Get ps."],
             ['grep',"grep LOG-PATH NODE-ID-PATTERN GREP-PATTERN [--first]","# Grep log from multiple nodes. --first option returns first match (latest log entry)."],
@@ -635,8 +635,9 @@ TODO: will put in dot release and will rename to 'extend'
     end
 
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
-    desc "HIDE_FROM_BASE execute-tests [--component COMPONENT-NAME]", "Execute tests. --component filters results per component"
+    desc "HIDE_FROM_BASE execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]", "Execute tests. --component filters execution per component, --timeout changes default execution timeout"
     method_option :component, :type => :string, :desc => "Component name" 
+    method_option :timeout, :type => :string, :desc => "Timeout"
     def execute_tests(context_params)
       execute_tests_aux(context_params)
     end

data/lib/commands/thor/service_module.rb

@@ -360,19 +360,21 @@ module DTK::Client
       
       raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PullCatalogs}" unless catalog
 
+      if service_module_name.to_s =~ /^[0-9]+$/
+        service_module_id   = service_module_name
+        service_module_name = get_service_module_name(service_module_id)
+      end
+
+      modules_path    = OsUtil.service_clone_location()
+      module_location = "#{modules_path}/#{service_module_name}#{version && "-#{version}"}"
+
       if catalog.to_s.eql?("dtkn")
+        clone_aux(:service_module, service_module_id, version, true, true) unless File.directory?(module_location)
+
         opts = {:version => version, :remote_namespace => options.namespace}
         response = pull_from_remote_aux(:service_module,service_module_id,opts)
         return response unless response.ok?
 
-        if service_module_name.to_s =~ /^[0-9]+$/
-          service_module_id   = service_module_name
-          service_module_name = get_service_module_name(service_module_id)
-        end
-
-        modules_path    = OsUtil.service_clone_location()
-        module_location = "#{modules_path}/#{service_module_name}#{version && "-#{version}"}"
-
         # server repo needs to be sync with local clone, so we will use push-clone-changes when pull changes from remote to local
         # to automatically sync local with server repo
         push_clone_changes_aux(:service_module,service_module_id,version,nil,true) if File.directory?(module_location)

data/lib/commands/thor/workspace.rb

@@ -116,7 +116,7 @@ module DTK::Client
             ['list-components',"list-components","# List components."]
           ],
           :utils => [
-            ['execute-tests',"execute-tests [--component COMPONENT-NAME]","# Execute tests. --component filters results per component."],
+            ['execute-tests',"execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]","# Execute tests. --component filters execution per component, --timeout changes default execution timeout."],
             ['get-netstats',"get-netstats","# Get netstats."],
             ['get-ps',"get-ps [--filter PATTERN]","# Get ps."],
             ['grep',"grep LOG-PATH NODE-ID-PATTERN GREP-PATTERN [--first]","# Grep log from multiple nodes. --first option returns first match (latest log entry)."],
@@ -315,8 +315,9 @@ module DTK::Client
     end
 
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/workspace>)
-    desc "HIDE_FROM_BASE execute-tests [--component COMPONENT-NAME]", "Execute tests. --component filters results per component"
-    method_option :component, :type => :string, :desc => "Component name"
+    desc "HIDE_FROM_BASE execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]", "Execute tests. --component filters execution per component, --timeout changes default execution timeout"
+    method_option :component, :type => :string, :desc => "Component name" 
+    method_option :timeout, :type => :string, :desc => "Timeout"
     def execute_tests(context_params)
       execute_tests_aux(context_params)
     end

data/lib/core.rb

@@ -199,7 +199,7 @@ module DTK
               raise DTK::Client::DtkError.new("[#{where} INTERNAL ERROR] #{error_msg}", :backtrace => error_backtrace)
             else
               # if usage error occurred, display message to console and display that same message to log
-              raise DTK::Client::DtkError, "[ERROR] #{error_msg}." 
+              raise DTK::Client::DtkError, "[ERROR] #{error_msg}"
             end
           end
         end

data/lib/domain/git_adapter.rb

@@ -191,6 +191,10 @@ module DTK
         @git_repo.dir.path
       end
 
+      def repo_exists?
+        Dir.exists?(repo_dir)
+      end
+
       def current_branch_name
         current_branch.name
       end

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.5.12"
+  VERSION="0.5.13"
 end

data/lib/util/console.rb

@@ -82,12 +82,14 @@ module DTK::Client
           Dir.chdir(path)
           puts "[NOTICE] You are switching to unix-shell, to path #{path}"
 
-          prompt = DTK::Client::OsUtil.colorize("$dtk:unix-shell ", :yellow)
+          # prompt = DTK::Client::OsUtil.colorize("$dtk:unix-shell ", :yellow)
+          prompt = DTK::Client::OsUtil.colorize("$:", :yellow)
+
           Readline.completion_append_character = ""
           Readline.completion_proc = Proc.new do |str|
             Dir[str+'*'].grep(/^#{Regexp.escape(str)}/)
           end
-          while line = Readline.readline("#{prompt}#{Dir.getwd()}>", true)
+          while line = Readline.readline("#{prompt}#{OsUtil.current_dir}>", true)
             begin
               line = line.chomp()
               break if line.eql?('exit')

data/lib/util/os_util.rb

@@ -79,6 +79,11 @@ module DTK
           return (is_windows? ? "#{genv(:homedrive)}#{genv(:homepath)}" : "#{genv(:home)}")
         end
 
+        def current_dir
+          current_dir = Dir.getwd()
+          current_dir.gsub(home_dir, '~')
+        end
+
         def genv(name)
           return ENV[name.to_s.upcase].gsub(/\\/,'/')
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,21 +187,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - Gemfile
 - Gemfile_dev
-- dtk-client.gemspec
+- README.md
 - bin/dtk
 - bin/dtk-shell
+- dtk-client.gemspec
 - lib/auxiliary.rb
 - lib/bundler_monkey_patch.rb
 - lib/client.rb
 - lib/command_helper.rb
 - lib/command_helpers/git_repo.rb
-- lib/command_helpers/jenkins_client/config_xml.rb
 - lib/command_helpers/jenkins_client.rb
+- lib/command_helpers/jenkins_client/config_xml.rb
 - lib/command_helpers/service_importer.rb
 - lib/command_helpers/service_link.rb
+- lib/commands.rb
 - lib/commands/common/thor/action_result_handler.rb
 - lib/commands/common/thor/assembly_workspace.rb
 - lib/commands/common/thor/clone.rb
@@ -239,7 +240,6 @@ files:
 - lib/commands/thor/task.rb
 - lib/commands/thor/utils.rb
 - lib/commands/thor/workspace.rb
-- lib/commands.rb
 - lib/config/cacert.pem
 - lib/config/client.conf.header
 - lib/config/configuration.rb
@@ -257,10 +257,11 @@ files:
 - lib/error.rb
 - lib/git-logs/git.log
 - lib/parser/adapters/option_parser.rb
-- lib/parser/adapters/thor/common_option_defs.rb
 - lib/parser/adapters/thor.rb
+- lib/parser/adapters/thor/common_option_defs.rb
 - lib/require_first.rb
 - lib/search_hash.rb
+- lib/shell.rb
 - lib/shell/context.rb
 - lib/shell/context_aux.rb
 - lib/shell/domain.rb
@@ -269,16 +270,15 @@ files:
 - lib/shell/interactive_wizard.rb
 - lib/shell/parse_monkey_patch.rb
 - lib/shell/status_monitor.rb
-- lib/shell.rb
 - lib/util/console.rb
 - lib/util/dtk_puppet.rb
 - lib/util/os_util.rb
 - lib/util/ssh_util.rb
+- lib/view_processor.rb
 - lib/view_processor/augmented_simple_list.rb
 - lib/view_processor/hash_pretty_print.rb
 - lib/view_processor/simple_list.rb
 - lib/view_processor/table_print.rb
-- lib/view_processor.rb
 - puppet/manifests/init.pp
 - puppet/manifests/params.pp
 - puppet/r8meta.puppet.yml
@@ -327,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.