dtk-client 0.6.8 → 0.7.0

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

@@ -0,0 +1,48 @@
+module DTK::Client
+  module Poller
+
+    PERIOD_WAIT_TIME = 1
+
+    def poller_response(wait_time = PERIOD_WAIT_TIME)
+      begin
+        response = nil
+        thread   = Thread.new(self) do |main_thread|
+          begin
+            while true
+              messages_response = main_thread.get main_thread.rest_url("messages/retrieve")
+              print_response(messages_response.data) if messages_response.ok?
+              sleep(wait_time)
+            end
+          rescue => e
+            puts e.message
+            pp e.backtrace
+          end
+        end
+
+        response = yield
+      ensure
+        thread.kill
+      end
+      response
+    end
+
+    def print_response(message_array)
+      message_array.each do |msg|
+        DTK::Client::OsUtil.print(msg['message'], resolve_type(msg['type']))
+      end
+    end
+
+    def resolve_type(message_type)
+      case message_type.to_sym
+      when :info
+        :white
+      when :warning
+        :yellow
+      when :error
+        :red
+      else
+        :white
+      end
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 module DTK::Client
   module PuppetForgeMixin
 
+    NAME_REGEX = /\w*\-\w/
+
     def puppet_forge_install_aux(context_params, pf_module_name, module_name, namespace, version, module_type)
       post_body_hash = {
         :puppetf_module_name => pf_module_name,
@@ -9,7 +11,11 @@ module DTK::Client
         :module_namespace?   => namespace
       }
 
-      response = post rest_url("component_module/install_puppet_forge_modules"),PostBody.new(post_body_hash)
+      raise DtkError, "Puppet forge module name should be in format USERNAME-NAME" unless pf_module_name.match(NAME_REGEX)
+
+      response = poller_response do
+        post rest_url("component_module/install_puppet_forge_modules"),PostBody.new(post_body_hash)
+      end
 
       return response unless response.ok?
 

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

@@ -33,7 +33,8 @@ module DTK::Client
 
       if response.ok?
         response.data.each do |cmp_mod|
-          unsaved_modules << "#{cmp_mod['namespace_name']}:#{cmp_mod['display_name']}" if cmp_mod['local_copy_diff']
+          branch_relationship = cmp_mod['branch_relationship']||''
+          unsaved_modules << "#{cmp_mod['namespace_name']}:#{cmp_mod['display_name']}" if (cmp_mod['local_copy_diff'] && branch_relationship.eql?('local_ahead'))
         end
       end
 

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

@@ -1,18 +1,12 @@
 module DTK::Client
   module TaskStatusMixin
-      def task_status_aux(id,type,wait_flag)
-        id_field = "#{type}_id".to_sym
-        if wait_flag
+    def task_status_aux(id,type,opts={})
+        if opts[:wait]
           # there will be infinite loop until intereputed with CTRL+C
           begin
             response = nil
             loop do 
-              post_body = {
-                id_field => id,
-                :format => :table
-              }
-              response = post rest_url("#{type}/task_status"), post_body                                       
-
+              response = task_status_aux_post(id,type,opts)
               raise DTK::Client::DtkError, "[ERROR] #{response['errors'].first['message']}." if response["status"].eql?('notok')
 
               # stop pulling when top level task succeds, fails or timeout
@@ -57,11 +51,7 @@ module DTK::Client
             response.skip_render = true unless response.nil?
           end
         else
-          post_body = {
-            id_field => id,
-            :format => :table
-          }
-          response = post rest_url("#{type}/task_status"), post_body
+          response = task_status_aux_post(id,type,opts)
           response.print_error_table = true
           response.render_table(:task_status)
         end
@@ -80,6 +70,17 @@ module DTK::Client
         response.override_command_class("list_task")
         puts response.render_data
       end
+
+     private
+      def task_status_aux_post(id,type,opts={})
+        id_field = "#{type}_id".to_sym
+        post_body_hash = {
+          id_field                => id,
+          :format                 => :table,
+          :summarize_node_groups? => opts[:summarize]
+        }
+        post rest_url("#{type}/task_status"), PostBody.new(post_body_hash)
+      end
     end
 
 end

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

@@ -0,0 +1,39 @@
+module DTK::Client
+  module TestActionAgent
+
+    def test_agent_aux(context_params)
+      service_id, node_id, bash_command = context_params.retrieve_arguments([:service_id!, :node_id!, :option_1!], method_argument_names)
+
+      post_body = {
+        :assembly_id  => service_id,
+        :node_id      => node_id,
+        :bash_command => bash_command
+      }
+
+      response = post(rest_url("assembly/initiate_action_agent"), post_body)
+      return response unless response.ok?
+
+
+      action_results_id = response.data(:action_results_id)
+      response          = nil
+
+      loop do
+        post_body = {
+          :action_results_id => action_results_id,
+          :return_only_if_complete => true,
+          :disable_post_processing => false
+        }
+
+        response = post(rest_url("assembly/get_action_results"),post_body)
+
+        if response.data(:is_complete) || !response.ok?
+          break
+        else
+          sleep(1)
+        end
+      end
+
+      return response
+    end
+  end
+end

data/lib/commands/thor/component_module.rb

@@ -281,8 +281,8 @@ module DTK::Client
 
     desc "COMPONENT-MODULE-NAME/ID add-collaborators", "Add collabrators users or groups comma seperated (--users or --groups)"
     method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
-    method_option "users",:aliases => "-u", :type => :string, :banner => "USERS", :desc => "User collabrators"
-    method_option "groups",:aliases => "-g", :type => :string, :banner => "GROUPS", :desc => "Group collabrators"
+    method_option "users", :aliases => "-u", :type => :string, :banner => "USERS", :desc => "User collabrators"
+    method_option "groups", :aliases => "-g", :type => :string, :banner => "GROUPS", :desc => "Group collabrators"
     def add_collaborators(context_params)
       add_collaborators_module_aux(context_params)
     end

data/lib/commands/thor/node.rb

@@ -1,5 +1,7 @@
 dtk_require_common_commands('thor/task_status')
 dtk_require_common_commands('thor/set_required_params')
+dtk_require_common_commands('thor/test_action_agent')
+
 module DTK::Client
   class Node < CommandBaseThor
 
@@ -8,6 +10,7 @@ module DTK::Client
     no_tasks do
       include TaskStatusMixin
       include SetRequiredParamsMixin
+      include TestActionAgent
     end
 
     def self.pretty_print_cols()
@@ -29,7 +32,7 @@ module DTK::Client
     end
 
     # using extended_context when we want to use autocomplete from other context
-    # e.g. we are in assembly/apache context and want to create-component we will use extended context to add 
+    # e.g. we are in assembly/apache context and want to create-component we will use extended context to add
     # component-templates to autocomplete
     def self.extended_context()
       {
@@ -52,7 +55,7 @@ module DTK::Client
 
     def self.validation_list(context_params)
       assembly_id, workspace_id = context_params.retrieve_arguments([:service_id, :workspace_id])
-      
+
       if (assembly_id || workspace_id)
         # if assebmly_id is present we're loading nodes filtered by assembly_id
         post_body = {
@@ -81,7 +84,7 @@ module DTK::Client
         }
       })
     end
-    
+
     desc "NODE-NAME/ID info","Info about node"
     def info(context_params)
       node_id = context_params.retrieve_arguments([:node_id!],method_argument_names)
@@ -93,6 +96,39 @@ module DTK::Client
        post rest_url("node/info"), post_body
     end
 
+    desc "NODE-NAME/ID test-action-agent BASH-COMMAND-LINE", "Run bash command on test action agent"
+    def test_action_agent(context_params)
+      response = test_agent_aux(context_params)
+      return response unless response.ok?
+
+      # this I will fix to have more clear output
+      data = response.data(:results)
+
+      datas  = data.values.first['results']
+      errors = data.values.first['errors']
+
+
+      datas.each do |data|
+        OsUtil.print("Command: #{data['description']}, status: #{data['status']}", :yellow)
+        if data['stdout'] && !data['stdout'].empty?
+          print data['stdout']
+        end
+
+        if data['stderr'] && !data['stderr'].empty?
+          print data['stderr']
+        end
+      end
+
+      if errors && !errors.empty?
+        puts; puts;
+        OsUtil.print('Some errors have been detected', :white)
+        errors.each_with_index { |err, index| OsUtil.print("#{index+1}. #{err}", :red) }
+      end
+
+
+      return nil
+    end
+
     desc "NODE-NAME/ID ssh REMOTE-USER [-i PATH-TO-PEM]","SSH into node, optional parameters are path to indentity file."
     method_option "--identity-file",:aliases => '-i',:type => :string, :desc => "Identity-File used for connection, if not provided default is used", :banner => "IDENTITY-FILE"
     def ssh(context_params)
@@ -113,8 +149,12 @@ module DTK::Client
       response = info_aux(context_params)
 
       if response.ok?
-        node_info = response.data['nodes'].find { |n| node_id == n['node_id'] }
-        public_dns = node_info ? node_info['external_ref']['ec2_public_address'] : nil
+        node_info = {}
+        response.data['nodes'].each do |node|
+          properties = node['node_properties']
+          node_info = properties if node_id == properties['node_id']
+        end
+        public_dns = node_info ? node_info['ec2_public_address'] : nil
 
         raise ::DTK::Client::DtkError, "Not able to resolve instance address, has instance been stopped?" unless public_dns
 
@@ -123,7 +163,7 @@ module DTK::Client
         default_identity_file = OsUtil.dtk_identity_file_location()
 
         ssh_command = nil
-        
+
         if identity_file_location
           # provided PEM key
           ssh_command = "ssh -o \"StrictHostKeyChecking no\" -o \"UserKnownHostsFile /dev/null\" -i #{identity_file_location} #{connection_string}"
@@ -165,7 +205,7 @@ module DTK::Client
     method_option :list, :type => :boolean, :default => false
     def list(context_params)
       node_id, about = context_params.retrieve_arguments([:node_id,:option_1],method_argument_names)
-      
+
       if node_id.nil?
         response = post rest_url("node/list")
 
@@ -246,7 +286,7 @@ module DTK::Client
 
     desc "NODE-NAME/ID converge [-m COMMIT-MSG]", "Converges service instance"
     method_option "commit_msg",:aliases => "-m" ,
-      :type => :string, 
+      :type => :string,
       :banner => "COMMIT-MSG",
       :desc => "Commit message"
     def converge(context_params)
@@ -279,7 +319,7 @@ module DTK::Client
     method_option :wait, :type => :boolean, :default => false
     def task_status(context_params)
       node_id = context_params.retrieve_arguments([:node_id!],method_argument_names)
-      task_status_aux(node_id,:node,options.wait?)
+      task_status_aux(node_id,:node,:wait => options.wait?)
     end
 
     desc "NODE-NAME/ID list-task-info", "Task status details of running or last service task"
@@ -334,7 +374,7 @@ module DTK::Client
       # Retrieving assembly_id to stop a node.. TODO create server side method that takes only node id
       #TODO: Rich: took this out; think it is a bug
       #assembly_id, node_id = get_assembly_and_node_id(context_params)
-      
+
       node_stop(node_id)
     end
 
@@ -344,7 +384,7 @@ module DTK::Client
 
       post_body = {
         :node_id => node_id
-      }  
+      }
 
       response = post(rest_url("node/initiate_get_netstats"), post_body)
       return response unless response.ok?
@@ -375,6 +415,7 @@ module DTK::Client
       response.set_data(*response.data(:results))
       response.render_table(:netstat_data)
     end
+
     GETNETSTATSTRIES = 6
     GETNETSTATSSLEEP = 0.5
 
@@ -384,7 +425,7 @@ module DTK::Client
 
       post_body = {
         :node_id => node_id
-      }  
+      }
 
       response = post(rest_url("node/initiate_get_ps"), post_body)
       return response unless response.ok?
@@ -422,7 +463,7 @@ module DTK::Client
     GETPSSLEEP = 0.5
 
     no_tasks do
-      def node_start(node_id)             
+      def node_start(node_id)
         post_body = {
           :node_id  => node_id
         }
@@ -472,7 +513,7 @@ module DTK::Client
         response = info(context_params)
         unless response.ok?
           raise DTK::Client::DtkError, "Unable to retrive node information, please try again."
-        end      
+        end
 
         return response.data(:assembly_id), response.data(:id)
       end

data/lib/commands/thor/node_group.rb

@@ -15,15 +15,6 @@ module DTK::Client
       return :node_group, "node_group/list", nil
     end
 
-    # desc "list","List Node groups"
-    # def list(context_params)
-    #   search_hash = SearchHash.new()
-    #   search_hash.cols = pretty_print_cols()
-    #   search_hash.filter = [:oneof, ":type", ["node_group_instance"]]
-    #   response = post rest_url("node_group/list"), search_hash.post_body_hash()
-    #   response.render_table(:node_group)
-    # end
-
     desc "NODE-GROUP-NAME/ID set ATTRIBUTE-ID VALUE", "Set node group attribute value"
     def set(context_params)
       node_group_id, attr_id, value = context_params.retrieve_arguments([:node_group_id!, :option_1!, :option_2!],method_argument_names)
@@ -69,7 +60,7 @@ module DTK::Client
       node_group_id = context_params.retrieve_arguments([:option_1!],method_argument_names)
       unless options.force?
         # Ask user if really want to delete node group, if not then return to dtk-shell without deleting
-        return unless Console.confirmation_prompt("Are you sure you want to delete node group '#{node_group_id}'?")
+        return unless Console.confirmation_prompt("Are you sure you want to delete node group '#{node_group_id}'"+'?')
       end
 
       post_body = {:node_group_id => node_group_id}
@@ -188,23 +179,8 @@ module DTK::Client
     method_option :wait, :type => :boolean, :default => false
     def task_status(context_params)
       node_group_id = context_params.retrieve_arguments([:node_group_id!],method_argument_names)
-      task_status_aux(node_group_id,:node_group,options.wait?)
-    end
-
-    #TODO: may deprecate
-=begin
-    desc "set-profile NODE-GROUP-ID TEMPLATE-NODE-ID", "Set node group's default node template"
-    def set_profile(node_group_id,template_node_id)
-      post_body_hash = {:node_group_id => node_group_id, :template_node_id => template_node_id}
-      post rest_url("node_group/set_default_template_node"),post_body_hash
-    end
-
-    desc "add-template-node NODE-GROUP-ID", "Copy template node from library and add to node group"
-    def add_template_node(node_group_id)
-      post_body_hash = {:node_group_id => node_group_id}
-      post rest_url("node_group/clone_and_add_template_node"),post_body_hash
+      task_status_aux(node_group_id,:node_group,:wait => options.wait?)
     end
-=end
 
   end
 end

data/lib/commands/thor/service.rb

@@ -121,7 +121,7 @@ module DTK::Client
     # :identifier_only => only on identifier level for given entity (command)
     #
     def self.override_allowed_methods()
-      return DTK::Shell::OverrideTasks.new({
+      override_methods = {
         :all => {
           # :node => [
             # ['delete-component',"delete-component COMPONENT-ID","# Delete component from assembly's node"],
@@ -130,10 +130,6 @@ module DTK::Client
           # ],
           :component => [
             ['list-attributes',"list-attributes","# List attributes associated with given component."]
-=begin
-TODO: overlaps with different meaning
-            ['create-attribute',"create-attribute SERVICE-TYPE DEP-ATTR ARROW BASE-ATTR","# Create an attribute to service link."],
-=end
           ]
         },
         :command_only => {
@@ -161,7 +157,6 @@ TODO: overlaps with different meaning
             ['add-component',"add-component COMPONENT","# Add a component to the node."],
             ['delete-component',"delete-component COMPONENT-NAME [-y]","# Delete component from service's node"],
             ['info',"info","# Return info about node instance belonging to given workspace."],
-            # ['link-attributes', "link-attributes TARGET-ATTR-TERM SOURCE-ATTR-TERM", "# Set TARGET-ATTR-TERM to SOURCE-ATTR-TERM."],
             ['list-attributes',"list-attributes","# List attributes associated with service's node."],
             ['list-components',"list-components","# List components associated with service's node."],
             ['set-attribute',"set-attribute ATTRIBUTE-NAME [VALUE] [-u]","# (Un)Set attribute value. The option -u will unset the attribute's value."],
@@ -169,10 +164,14 @@ TODO: overlaps with different meaning
             ['stop', "stop", "# Stop node instance."],
             ['ssh', "ssh REMOTE-USER [-i PATH-TO-PEM]","# SSH into node, optional parameters are path to identity file."]
           ],
+          :node_group => [
+            ['start', "start", "# 2Start node instance."],
+            ['stop', "stop", "# 2Stop node instance."],
+            ['ssh', "ssh REMOTE-USER [-i PATH-TO-PEM]","# 2SSH into node, optional parameters are path to identity file."]
+          ],
           :component => [
             ['info',"info","# Return info about component instance belonging to given node."],
             ['edit',"edit","# Edit component module related to given component."],
-            # ['edit-dsl',"edit-dsl","# Edit component module dsl file related to given component."],
             ['link-components',"link-components ANTECEDENT-CMP-NAME [DEPENDENCY-NAME]","#Link components to satisfy component dependency relationship."],
             ['list-component-links',"list-component-links","# List component's links to other components."],
             ['unlink-components',"unlink-components SERVICE-TYPE","# Delete service link on component."]
@@ -181,7 +180,13 @@ TODO: overlaps with different meaning
             ['info',"info","# Return info about attribute instance belonging to given component."]
           ]
         }
-      }, [:utils])
+      }
+
+      if ::DTK::Configuration.get(:development_mode)
+        override_methods[:identifier_only][:node] << ['test-action-agent', "test-action-agent BASH-COMMAND-LINE", "Run bash command on test action agent"]
+      end
+
+      return DTK::Shell::OverrideTasks.new(override_methods, [:utils])
     end
 
     desc "SERVICE-NAME/ID destroy-and-reset-nodes [-y]", "Terminates all nodes, but keeps config state so they can be spun up from scratch."
@@ -207,7 +212,10 @@ TODO: overlaps with different meaning
       cancel_task_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID create-assembly [NAMESPACE:]SERVICE-MODULE-NAME ASSEMBLY-NAME", "Create a new assembly from this service instance in the designated service module."
+    desc "SERVICE-NAME/ID create-assembly [NAMESPACE:]SERVICE-MODULE-NAME ASSEMBLY-NAME [-m DESCRIPTION]", "Create a new assembly from this service instance in the designated service module."
+    method_option "description",:aliases => "-m" ,
+      :type => :string,
+      :banner => "DESCRIPTION"
     def create_assembly(context_params)
       assembly_id, service_module_name, assembly_template_name = context_params.retrieve_arguments([:service_id!,:option_1!,:option_2!],method_argument_names)
 
@@ -216,7 +224,9 @@ TODO: overlaps with different meaning
       return resp unless resp.ok?
       default_namespace = resp.data
 
-      response = promote_assembly_aux(:create,assembly_id,service_module_name,assembly_template_name,{:default_namespace=>default_namespace})
+      opts = {:default_namespace => default_namespace}
+      opts.merge!(:description => options.description) if options.description
+      response = promote_assembly_aux(:create,assembly_id,service_module_name,assembly_template_name,opts)
       return response unless response.ok?
 
       @@invalidate_map << :assembly
@@ -318,12 +328,17 @@ TODO: will put in dot release and will rename to 'extend'
     end
 =end
 
-    desc "SERVICE-NAME/ID task-status [--wait]", "Get the task status of the running or last running service task."
+    desc "SERVICE-NAME/ID task-status [--wait] [--summarize]", "Get the task status of the running or last running service task."
     method_option :wait, :type => :boolean, :default => false
+    method_option :summarize, :type => :boolean, :default => false, :aliases => '-s'
     def task_status(context_params)
       task_status_aw_aux(context_params)
     end
 
+    desc "SERVICE-NAME/ID task-action-detail", "Get the task info of the running or last running service task."
+    def task_action_detail(context_params)
+      task_action_detail_aw_aux(context_params)
+    end
 
     desc "SERVICE-NAME/ID list-nodes","List nodes associated with service."
     def list_nodes(context_params)
@@ -364,6 +379,11 @@ TODO: will put in dot release and will rename to 'extend'
       list_violations_aux(context_params)
     end
 
+    desc "SERVICE-NAME/ID print-includes", "Finds includes in the service."
+    def print_includes(context_params)
+      print_includes_aux(context_params)
+    end
+
     desc "SERVICE-NAME/ID workflow-info", "Get the structure of the workflow associated with service."
     def workflow_info(context_params)
       workflow_info_aux(context_params)

data/lib/commands/thor/service_module.rb

@@ -7,6 +7,7 @@ dtk_require_from_base("commands/thor/assembly")
 dtk_require_from_base('command_helpers/service_importer')
 dtk_require_common_commands('thor/common')
 dtk_require_common_commands('thor/module')
+dtk_require_common_commands('thor/poller')
 
 module DTK::Client
   class ServiceModule < CommandBaseThor
@@ -17,6 +18,7 @@ module DTK::Client
       include ReparseMixin
       include ServiceImporter
       include ModuleMixin
+      include Poller
 
       def get_service_module_name(service_module_id)
         get_name_from_id_helper(service_module_id)
@@ -144,7 +146,7 @@ module DTK::Client
         end
         response = post rest_url("service_module/#{action}"), { :service_module_id => service_module_id }
       end
-      return response unless response.ok?
+
       response.render_table(data_type) unless response.nil?
 
       response

data/lib/commands/thor/workspace.rb

@@ -198,9 +198,12 @@ module DTK::Client
       Response::Ok.new()
     end
 
-    desc "WORKSPACE-NAME/ID create-assembly [NAMESPACE:]SERVICE-MODULE-NAME ASSEMBLY-NAME [-p]", "Create a new assembly from the workspace instance in the designated service module."
+    desc "WORKSPACE-NAME/ID create-assembly [NAMESPACE:]SERVICE-MODULE-NAME ASSEMBLY-NAME [-p] [-m DESCRIPTION]", "Create a new assembly from the workspace instance in the designated service module."
    # The option -p will purge the workspace after assembly creation." 
     method_option :purge, :aliases => '-p', :type => :boolean, :default => false
+    method_option "description",:aliases => "-m" ,
+      :type => :string,
+      :banner => "DESCRIPTION"
     def create_assembly(context_params)
       workspace_id, service_module_full_name, assembly_template_name = context_params.retrieve_arguments([:workspace_id!,:option_1!,:option_2!],method_argument_names)
 
@@ -209,7 +212,9 @@ module DTK::Client
       return resp unless resp.ok?
       default_namespace = resp.data
 
-      response = promote_assembly_aux(:create,workspace_id,service_module_full_name,assembly_template_name,{:default_namespace=>default_namespace})
+      opts = {:default_namespace => default_namespace}
+      opts.merge!(:description => options.description) if options.description
+      response = promote_assembly_aux(:create,workspace_id,service_module_full_name,assembly_template_name,opts)
       return response unless response.ok?
 
       if options.purge?
@@ -475,12 +480,17 @@ module DTK::Client
       tail_aux(context_params)
     end
 
-    desc "WORKSPACE-NAME/ID task-status [--wait]", "Get the task status of the running or last running workspace task."
+    desc "WORKSPACE-NAME/ID task-status [--wait] [--summarize]", "Get the task status of the running or last running workspace task."
     method_option :wait, :type => :boolean, :default => false
+    method_option :summarize, :type => :boolean, :default => false, :aliases => '-s'
     def task_status(context_params)
       task_status_aw_aux(context_params)
     end
 
+    desc "WORKSPACE-NAME/ID task-action-detail", "Get the task info of the running or last running workspace task."
+    def task_action_detail(context_params)
+      task_action_detail_aw_aux(context_params)
+    end
   end
 end
 

data/lib/core.rb

@@ -6,6 +6,10 @@ require 'restclient'
 require 'colorize'
 require 'json'
 require 'pp'
+
+if ::DTK::Configuration.get(:development_mode)
+  require 'ap'
+end
 #TODO: for testing; fix by pass in commadn line argument
 #RestClient.log = STDOUT
 
@@ -134,7 +138,10 @@ def resolve_direct_access(params, config_exists=nil)
     # setting up catalog credentials
     catalog_creds = DTK::Client::Configurator.ask_catalog_credentials()
     unless catalog_creds.empty?
-      response = conn.post DTK::Client::CommandBase.class, conn.rest_url("account/set_catalog_credentials"), { :username => catalog_creds[:username], :password => catalog_creds[:password]}
+      response = conn.post DTK::Client::CommandBase.class, conn.rest_url("account/set_catalog_credentials"), { :username => catalog_creds[:username], :password => catalog_creds[:password], :validate => true}
+      if errors = response['errors']
+        DTK::Client::OsUtil.print("#{errors.first['message']} You will have to set catalog credentials manually ('dtk account set-catalog-credentials').", :yellow)
+      end
     end
   end
 
@@ -446,11 +453,14 @@ module DTK
       end
 
       def get_credentials()
-        cred_file = Config::CRED_FILE
-        raise DTK::Client::DtkError,"Authorization configuration file (#{cred_file}) does not exist" unless File.exists?(cred_file)
-        ret = parse_key_value_file(cred_file)
-        [:username,:password].each{|k|raise DTK::Client::DtkError,"cannot find #{k}" unless ret[k]}
-        ret
+        unless @parsed_credentials
+          cred_file = Config::CRED_FILE
+          raise DTK::Client::DtkError,"Authorization configuration file (#{cred_file}) does not exist" unless File.exists?(cred_file)
+          ret = parse_key_value_file(cred_file)
+          [:username,:password].each{ |k| raise DTK::Client::DtkError,"cannot find #{k}" unless ret[k] }
+          @parsed_credentials = ret
+        end
+        @parsed_credentials
       end
 
       ####

data/lib/domain/git_adapter.rb

@@ -140,9 +140,6 @@ module DTK
           when :remote_branch
             @git_repo.branches.remote.find { |r| "#{r.remote}/#{r.name}" == ref }
           when :local_branch
-            # DEBUG SNIPPET >>>> REMOVE <<<<
-            #  TODO: HARIS LOOK INTO THIS
-            # raise "Invalid ref #{ref}"
             @git_repo.branches.find { |b| b.name == ref }
           else
             raise Error.new("Illegal type parameter (#{type}) passed to merge_relationship")