dtk-client 0.8.0 → 0.9.0

data/lib/domain/git_error_handler.rb

@@ -15,50 +15,50 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-module DTK
-  module Client
-
-    class GitHandledException < Exception
-      def initialize(msg, backtrace)
-        super(msg)
-        set_backtrace(backtrace)
-      end
-    end
-
-    class GitErrorHandler
-
-      # due to problems with git logging messages which are not user friendly we are going to wrap their error and try to produce more readable results
-      def self.handle(exception)
-        handled_exception = exception
-
-        if exception.is_a? Git::GitExecuteError
-          error_message = user_friendly_message(exception.message)
-          handled_exception = GitHandledException.new(error_message, exception.backtrace)
-        end
-
-        handled_exception
-      end
-
-    private
-
-      def self.user_friendly_message(message)
-        case message
-        when /repository not found/i
-          "Repository not found"
-        when /repository (.*) not found/i
-          "Repository #{$1.strip()} not found"
-        when /destination path (.*) already exists/i
-          "Destination folder #{$1.strip()} already exists"
-        when /Authentication failed for (.*)$/i
-          "Authentication failed for given repository #{$1.strip()}"
-        when /timed out/
-          "Timeout - not able to contact remote"
-        else
-          message
-        end
-      end
-
-    end
-  end
-end
+
+module DTK
+  module Client
+
+    class GitHandledException < Exception
+      def initialize(msg, backtrace)
+        super(msg)
+        set_backtrace(backtrace)
+      end
+    end
+
+    class GitErrorHandler
+
+      # due to problems with git logging messages which are not user friendly we are going to wrap their error and try to produce more readable results
+      def self.handle(exception)
+        handled_exception = exception
+
+        if exception.is_a? Git::GitExecuteError
+          error_message = user_friendly_message(exception.message)
+          handled_exception = GitHandledException.new(error_message, exception.backtrace)
+        end
+
+        handled_exception
+      end
+
+    private
+
+      def self.user_friendly_message(message)
+        case message
+        when /repository not found/i
+          "Repository not found"
+        when /repository (.*) not found/i
+          "Repository #{$1.strip()} not found"
+        when /destination path (.*) already exists/i
+          "Destination folder #{$1.strip()} already exists"
+        when /Authentication failed for (.*)$/i
+          "Authentication failed for given repository #{$1.strip()}"
+        when /timed out/
+          "Timeout - not able to contact remote"
+        else
+          message
+        end
+      end
+
+    end
+  end
+end

data/lib/domain/response/error_handler.rb

@@ -31,11 +31,14 @@ module DTK; module Client
       DefaultErrorMsg = 'Internal DTK Client error, please try again'
 
       Info = Struct.new(:msg,:code,:backtrace)
-      def self.error_info?(response,opts={})
+      def self.error_info?(response, opts={})
         unless errors = response["errors"]
           return (opts[:default_error_if_nil] && error_info_default())
         end
 
+        # special rare case
+        errors = errors.first["errors"] if errors.is_a?(Array) && errors.first["errors"]
+
         error_msg       = ""
         error_internal  = nil
         error_backtrace = nil
@@ -46,24 +49,30 @@ module DTK; module Client
         errors.each do |err|
           error_msg       +=  err["message"] unless err["message"].nil?
           error_msg       +=  err["error"]   unless err["error"].nil?
+          error_msg       +=  OsUtil.remove_html_tags(err["original_exception"].to_s) unless err["original_exception"].nil?
           error_on_server = true unless err["on_client"]
           error_code      = err["code"]||(err["errors"] && err["errors"].first["code"])
           error_internal  ||= (err["internal"] or error_code == "not_found") #"not_found" code is at Ramaze level; so error_internal not set
           error_backtrace ||= err["backtrace"]
         end
 
+        # in case we could not parse error lets log error info
+        if error_msg.empty?
+          DtkLogger.instance.error("Error info could not be extracted from following response: " + response.to_s)
+        end
+
         # normalize it for display
         error_msg = error_msg.empty? ? DefaultErrorMsg : "#{error_msg}"
 
         unless error_code and SpecificErrorCodes.include?(error_code)
-          error_code = 
+          error_code =
             if error_internal
               error_on_server ? :server_error : :client_error
             else
               DefaultErrorCode
             end
         end
-        
+
         error_code = error_code.to_sym
         Info.new(error_msg,error_code,error_backtrace)
       end
@@ -74,4 +83,4 @@ module DTK; module Client
 
     end
   end
-end; end
+end; end

data/lib/domain/response.rb

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

data/lib/dtk-client/version.rb

@@ -15,6 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module DtkClient
-  VERSION="0.8.0"
-end
+module DtkClient
+  VERSION="0.9.0"
+end

data/lib/dtk_client.rb

@@ -28,4 +28,4 @@ require File.expand_path('../commands/thor/account', __FILE__)
 require File.expand_path('../shell/parse_monkey_patch', __FILE__)
 require File.expand_path('../shell/help_monkey_patch', __FILE__)
 require File.expand_path('../execute/cli_pure/cli_rerouter', __FILE__)
-require File.expand_path('../context_router', __FILE__)
+require File.expand_path('../context_router', __FILE__)

data/lib/dtk_constants.rb

@@ -37,4 +37,4 @@ class PPColumns
     return @constants[symbol_identifier.to_s]
   end
 
-end
+end

data/lib/dtk_error.rb

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

data/lib/dtk_logger.rb

@@ -15,99 +15,99 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-##
-# DtkLogger singleton to be used for logging.
-#
-require 'singleton'
-require 'logger'
-require 'colorize'
-require 'pp'
-
-require File.expand_path('./util/os_util', File.dirname(__FILE__))
-
-class DtkLogger
-
-  #
-  LOG_FILE_NAME           = 'client.log'
-  LOG_MB_SIZE             = 2
-  LOG_NUMBER_OF_OLD_FILES = 10
-  DEVELOPMENT_MODE        = DTK::Configuration.get(:development_mode)
-
-  include Singleton
-
-  def initialize
-    log_location_dir = DTK::Client::OsUtil.get_log_location()
-    begin
-      if File.directory?(log_location_dir)
-        file = File.open(file_path(), "a")
-        file.sync = true
-        @logger = Logger.new(file, LOG_NUMBER_OF_OLD_FILES, LOG_MB_SIZE * 1024000)
-
-        @logger.formatter = proc do |severity, datetime, progname, msg|
-          "[#{datetime}] #{severity} -- : #{msg}\n"
-        end
-      else
-        no_log_dir(log_location_dir)
-      end
-     rescue Errno::EACCES
-      no_log_permissions(log_location_dir)
-    end
-  end
-
-  def file_path()
-    "#{DTK::Client::OsUtil.get_log_location()}/#{LOG_FILE_NAME}"
-  end
-
-  def debug(log_text, sttdout_out=false)
-    puts log_text if sttdout_out || DEVELOPMENT_MODE
-    @logger.debug(log_text) if log_created?
-  end
-
-  def info(log_text, sttdout_out=false)
-    puts log_text if sttdout_out || DEVELOPMENT_MODE
-    @logger.info(log_text) if log_created?
-  end
-
-  def warn(log_text, sttdout_out=false)
-    DTK::Client::OsUtil.print(log_text, :yellow) if sttdout_out || DEVELOPMENT_MODE
-    @logger.warn(log_text) if log_created?
-  end
-
-  def error(log_text, sttdout_out=false)
-    DTK::Client::OsUtil.print(log_text, :red) if sttdout_out || DEVELOPMENT_MODE
-    @logger.error(log_text) if log_created?
-  end
-
-  def error_pp(message, backtrace, sttdout_out = true)
-    error(message, sttdout_out)
-    # we do not print this to STDOUT (will be overriden with DEVELOPMENT_MODE)s
-    error("#{message}\n" + PP.pp(backtrace, ""), false) if backtrace
-  end
-
-  def fatal_pp(message, backtrace, sttdout_out = true)
-    fatal(message, sttdout_out)
-    # we do not print this to STDOUT (will be overriden with DEVELOPMENT_MODE)
-    fatal("#{message}\n" + PP.pp(backtrace, ""), false) if backtrace
-  end
-
-
-  def fatal(log_text, sttdout_out=false)
-    puts log_text if sttdout_out || DEVELOPMENT_MODE
-    @logger.fatal(log_text) if log_created?
-  end
-
-  private
-
-  def log_created?
-    #no log found if @logger.nil?
-    return !@logger.nil?
-  end
-
-  def no_log_dir(dir)
-    puts "[WARNING] Log directory (#{dir}) does not exist; please add it manually or re-install DTK client."
-  end
-
-  def no_log_permissions(dir)
-    puts "[WARNING] User (#{DTK::Common::Aux.running_process_user()}) does not have permissions to create a log file in log directory (#{dir})"
-  end
-end
+##
+# DtkLogger singleton to be used for logging.
+#
+require 'singleton'
+require 'logger'
+require 'colorize'
+require 'pp'
+
+require File.expand_path('./util/os_util', File.dirname(__FILE__))
+
+class DtkLogger
+
+  #
+  LOG_FILE_NAME           = 'client.log'
+  LOG_MB_SIZE             = 2
+  LOG_NUMBER_OF_OLD_FILES = 10
+  DEVELOPMENT_MODE        = DTK::Configuration.get(:development_mode)
+
+  include Singleton
+
+  def initialize
+    log_location_dir = DTK::Client::OsUtil.get_log_location()
+    begin
+      if File.directory?(log_location_dir)
+        file = File.open(file_path(), "a")
+        file.sync = true
+        @logger = Logger.new(file, LOG_NUMBER_OF_OLD_FILES, LOG_MB_SIZE * 1024000)
+
+        @logger.formatter = proc do |severity, datetime, progname, msg|
+          "[#{datetime}] #{severity} -- : #{msg}\n"
+        end
+      else
+        no_log_dir(log_location_dir)
+      end
+     rescue Errno::EACCES
+      no_log_permissions(log_location_dir)
+    end
+  end
+
+  def file_path()
+    "#{DTK::Client::OsUtil.get_log_location()}/#{LOG_FILE_NAME}"
+  end
+
+  def debug(log_text, sttdout_out=false)
+    puts log_text if sttdout_out || DEVELOPMENT_MODE
+    @logger.debug(log_text) if log_created?
+  end
+
+  def info(log_text, sttdout_out=false)
+    puts log_text if sttdout_out || DEVELOPMENT_MODE
+    @logger.info(log_text) if log_created?
+  end
+
+  def warn(log_text, sttdout_out=false)
+    DTK::Client::OsUtil.print(log_text, :yellow) if sttdout_out || DEVELOPMENT_MODE
+    @logger.warn(log_text) if log_created?
+  end
+
+  def error(log_text, sttdout_out=false)
+    DTK::Client::OsUtil.print(log_text, :red) if sttdout_out || DEVELOPMENT_MODE
+    @logger.error(log_text) if log_created?
+  end
+
+  def error_pp(message, backtrace, sttdout_out = true)
+    error(message, sttdout_out)
+    # we do not print this to STDOUT (will be overriden with DEVELOPMENT_MODE)s
+    error("#{message}\n" + PP.pp(backtrace, ""), false) if backtrace
+  end
+
+  def fatal_pp(message, backtrace, sttdout_out = true)
+    fatal(message, sttdout_out)
+    # we do not print this to STDOUT (will be overriden with DEVELOPMENT_MODE)
+    fatal("#{message}\n" + PP.pp(backtrace, ""), false) if backtrace
+  end
+
+
+  def fatal(log_text, sttdout_out=false)
+    puts log_text if sttdout_out || DEVELOPMENT_MODE
+    @logger.fatal(log_text) if log_created?
+  end
+
+  private
+
+  def log_created?
+    #no log found if @logger.nil?
+    return !@logger.nil?
+  end
+
+  def no_log_dir(dir)
+    puts "[WARNING] Log directory (#{dir}) does not exist; please add it manually or re-install DTK client."
+  end
+
+  def no_log_permissions(dir)
+    puts "[WARNING] User (#{DTK::Common::Aux.running_process_user()}) does not have permissions to create a log file in log directory (#{dir})"
+  end
+end

data/lib/error.rb

@@ -82,4 +82,4 @@ module DTK
     class ExitSignal < DTK::Client::Error
     end
   end
-end
+end

data/lib/execute/cli_pure/cli_rerouter.rb

@@ -99,4 +99,4 @@ module DTK
       "#{entity_name} #{args.join(' ')}".strip()
     end
   end
-end
+end

data/lib/execute/command/api_call/map.rb

@@ -57,4 +57,4 @@ class DTK::Client::Execute
 
     end
   end
-end
+end

data/lib/execute/command/api_call/service.rb

@@ -88,4 +88,4 @@ class DTK::Client::Execute
       
     end
   end
-end
+end

data/lib/execute/command/api_call/translation_term.rb

@@ -116,4 +116,4 @@ class DTK::Client::Execute
       end
     end
   end
-end
+end

data/lib/execute/command/api_call.rb

@@ -57,4 +57,4 @@ class DTK::Client::Execute
 
     end
   end
-end
+end

data/lib/execute/command/rest_call.rb

@@ -34,4 +34,4 @@ class DTK::Client::Execute
       end
     end
   end
-end
+end

data/lib/execute/command.rb

@@ -37,4 +37,4 @@ class DTK::Client::Execute
       @input_hash[key]
     end
   end
-end
+end

data/lib/execute/command_processor/rest_call.rb

@@ -56,4 +56,4 @@ class DTK::Client::Execute; class CommandProcessor
     end
 
   end
-end; end
+end; end

data/lib/execute/command_processor.rb

@@ -27,4 +27,4 @@ class DTK::Client::Execute
       end
     end
   end
-end
+end

data/lib/execute/execute_context/result_store.rb

@@ -34,4 +34,4 @@ class DTK::Client::Execute
       end
     end
   end
-end
+end

data/lib/execute/execute_context.rb

@@ -83,4 +83,4 @@ class DTK::Client::Execute
     end
 
   end
-end
+end

data/lib/execute/script/add_tenant.rb

@@ -118,4 +118,4 @@ class DTK::Client::Execute::Script
       end
     end
   end
-end
+end

data/lib/execute/script.rb

@@ -61,4 +61,4 @@ class DTK::Client::Execute
     end
     extend OptionParserHelper
   end
-end
+end

data/lib/execute.rb

@@ -26,4 +26,4 @@ module DTK::Client
 
     extend ExecuteContext::ClassMixin
   end
-end
+end

data/lib/parser/adapters/option_parser.rb

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

data/lib/parser/adapters/thor/common_option_defs.rb

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

data/lib/parser/adapters/thor.rb

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