cog-rb 0.3.7 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5dddbe2bed2066466215effb2940091a6d55692
-  data.tar.gz: 9f2d2c85e2d06f54499bc5084359c46ee2c3f5a5
+  metadata.gz: 5744ebdbff62117795615423fdf91979144923e0
+  data.tar.gz: 08b1acf07b9b2ac2c11caf3058564f0958a28366
 SHA512:
-  metadata.gz: dd8e55bd8f0b1c8f88ba9ab7e0aba8a92365a7f744c4a23c0879f151c2f24dbd668ccc63247f4d558e55ca37fce5f56a586314c4fed844b171ce7628364abe93
-  data.tar.gz: cd31b8d6cadd2424e60fca4c66b04bd9f5172a2e41b64c781fc12ae0d4cce42afaf58c708683773b876431e3cb448a383012d3c4b9ceb3cfa75b4318171ae102
+  metadata.gz: ee86e1b20780e65b553bdd6c5d4dd5169253778ab43895936ab18eca19f6b1a3cf6852cc6d451d91b62b1fb2a4018166a51e6d0c96c447ccf804eb6630628391
+  data.tar.gz: 1bed07fff46d61ba59291ec66f03626c7a3d496c8d6a144d4da2bab23e8c41b313fc9e1dbd9fdc85c136b035588cbd5212979225f435895f84e1a54593dd1a27

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+
+## 0.4.1
+
+* Add exception handling support. You can now define a regular expression and a
+  block to be called when an exception whose class matches the pattern is
+  received. This should generally be defined in your `cog-command`. The block
+  will be called with the exception and `Cog::Command` instance that was
+  executing. Exceptions that are not matched by a pattern will be handled
+  normally. Here's an example:
+
+  ```
+  Cog.error_handler.add(/Aws::.*/) do |exception, command|
+    Cog.return_error("#{command.name} error: #{exception.message}")
+  end
+  ```
+
 ## 0.3.5
 
 * Bugfix for "warning: toplevel constant RSpec referenced by Cog::RSpec"

data/lib/cog.rb

@@ -2,6 +2,7 @@
 require_relative 'cog/bundle'
 require_relative 'cog/config'
 require_relative 'cog/command'
+require_relative 'cog/exception_handler'
 require_relative 'cog/request'
 require_relative 'cog/response'
 require_relative 'cog/version'
@@ -14,6 +15,24 @@ class Cog
   def self.bundle(name)
     bundle = Cog::Bundle.new(name)
     yield bundle if block_given?
-    bundle.run_command
+
+    begin
+      bundle.run_command
+    rescue Exception => ex
+      error_handler.handle_exception(
+        exception: ex,
+        command: bundle.command
+      )
+    end
+  end
+
+  def self.error_handler
+    @@handler ||= Cog::ExceptionHandler.new
+  end
+
+  def self.return_error(message)
+    puts "COGCMD_ACTION: abort"
+    puts message
+    exit(0)
   end
 end

data/lib/cog/bundle.rb

@@ -20,6 +20,10 @@ class Cog
       end
     end
 
+    def command
+      @command ||= command_instance(ENV['COG_COMMAND'])
+    end
+
     def command_instance(command_name)
       command_path = command_name.split('-')
       require File.join(@base_dir, 'lib', 'cog_cmd', @name, *command_path)
@@ -35,9 +39,7 @@ class Cog
     end
 
     def run_command
-      command = ENV['COG_COMMAND']
-      target = command_instance(command)
-      target.execute
+      command.execute
     rescue Cog::Abort => exception
       # Abort will end command execution and abort the pipeline
       response = Cog::Response.new

data/lib/cog/command.rb

@@ -5,6 +5,10 @@ class Cog
   class Command
     attr_writer :memory_key, :config
 
+    def name
+      ENV['COG_COMMAND']
+    end
+
     def request
       @request ||= Cog::Request.new
     end

data/lib/cog/exception_handler.rb

@@ -0,0 +1,34 @@
+class Cog::ExceptionHandler
+  attr_accessor :handlers
+
+  def initialize
+    @handlers = {}
+  end
+
+  def add(pattern, &block)
+    @handlers[pattern] = block
+  end
+
+  def handle_exception(exception:, command:)
+    handlers.keys.each do |pattern|
+      if pattern.match(exception.class.to_s)
+        log_exception(exception, command)
+        handlers[pattern].call(exception, command)
+        return
+      end
+    end
+
+    raise exception
+  end
+
+  private
+
+  def log_exception(exception, command)
+    log_message = {
+      command_name: command.name,
+      message: exception.message,
+      stack_trace: exception.backtrace
+    }
+    puts "COGCMD_ERROR: #{log_message.to_json}"
+  end
+end

data/lib/cog/version.rb

@@ -1,3 +1,3 @@
 class Cog
-  VERSION = "0.3.7"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cog-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.1
 platform: ruby
 authors:
 - Mark Imbriaco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -62,6 +62,7 @@ files:
 - lib/cog/bundle.rb
 - lib/cog/command.rb
 - lib/cog/config.rb
+- lib/cog/exception_handler.rb
 - lib/cog/exceptions.rb
 - lib/cog/request.rb
 - lib/cog/response.rb