little_monster 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e963a48a5e6dfa41ef6109a3dc38cfef6d208e3
-  data.tar.gz: 242f5d372cb7b4510e78dd27dac47ee61062ce80
+  metadata.gz: 283b4365cbdbc25750ad3f5aba02c12ab76ea0e9
+  data.tar.gz: 1f844883d60194fc20cfb0c0a6bd86bdcf2f344f
 SHA512:
-  metadata.gz: bcf5528912eb1e8f8b2642eb154c981a4e43a8d27584de22cc445a78511197613140eaa9c24ec43f202e7704a403f9a05df984d21b3a0ad31b268742a6c94cc7
-  data.tar.gz: 546ff26503cdc738c5c8ff6b3c2c8706e5686c2a46ab51b16fa588b1612af68c5f3d6e770a09d5454ffcdb1f91cd258eafae807b51f732db32fe2f7236aabdf0
+  metadata.gz: bf94d31a48de77055bcd28297e05c4f9aa28523b04333fa0a7f2e7073204b1fcde83c15c177032ec895218137693e383b43c41e505f8936c2b0ff1ac90780c78
+  data.tar.gz: 4993daa4219fd9c31c9869f4228810a3e86c6e6280a92f73916a5972979b8ec087e0a2049ca5a323449ee9747a714cff934994f517542fceccac3196bd654c0e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    little_monster (0.1.3)
+    little_monster (0.1.5)
       activesupport
       multi_json
       thor
@@ -14,19 +14,19 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.0)
+    activesupport (5.0.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
     ast (2.3.0)
-    aws-sdk (2.5.2)
-      aws-sdk-resources (= 2.5.2)
-    aws-sdk-core (2.5.2)
+    aws-sdk (2.6.2)
+      aws-sdk-resources (= 2.6.2)
+    aws-sdk-core (2.6.2)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.2)
-      aws-sdk-core (= 2.5.2)
+    aws-sdk-resources (2.6.2)
+      aws-sdk-core (= 2.6.2)
     byebug (9.0.5)
     codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
@@ -38,7 +38,7 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    ethon (0.9.0)
+    ethon (0.9.1)
       ffi (>= 1.3.0)
     ffi (1.9.14)
     hashdiff (0.3.0)
@@ -48,8 +48,8 @@ GEM
     method_source (0.8.2)
     minitest (5.9.0)
     multi_json (1.12.1)
-    oj (2.17.1)
-    parser (2.3.1.2)
+    oj (2.17.4)
+    parser (2.3.1.4)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.4)
@@ -57,13 +57,13 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rainbow (2.1.0)
-    rake (11.2.2)
+    rake (11.3.0)
     require_all (1.3.3)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
+    rspec-core (3.5.3)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -72,7 +72,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.42.0)
+    rubocop (0.43.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -89,7 +89,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.5)
-    toiler (0.4.1)
+    toiler (0.4.2)
       aws-sdk (~> 2.2, >= 2.2.10)
       concurrent-ruby (~> 1.0, >= 1.0.0)
       concurrent-ruby-edge (~> 0.2.0, >= 0.2.0)
@@ -97,7 +97,7 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.0)
+    unicode-display_width (1.1.1)
     vcr (3.0.3)
     webmock (2.1.0)
       addressable (>= 2.3.6)

data/lib/little_monster/core/job.rb

@@ -42,6 +42,7 @@ module LittleMonster::Core
     attr_accessor :retries
     attr_accessor :current_action
     attr_accessor :data
+    attr_accessor :error
 
     attr_reader :orchrestator
 
@@ -60,6 +61,7 @@ module LittleMonster::Core
               end
 
       @status = options.fetch(:status, :pending)
+      @error= options.fetch(:error, {})
 
       @orchrestator = Job::Orchrestator.new(self)
 
@@ -91,9 +93,11 @@ module LittleMonster::Core
 
     def notify_task(status, options = {})
       params = { body: { tasks: [{ name: @current_action, status: status }] } }
+
       params[:body][:data] = options[:data] if options[:data]
+      params[:body][:tasks].first[:exception] = serialize_error(options[:exception]) if options[:exception]
 
-      params[:body][:tasks].first.merge!(options.except(:data))
+      params[:body][:tasks].first.merge!(options.except(:data, :exception))
 
       notify_job params, retries: LittleMonster.task_requests_retries,
                          retry_wait: LittleMonster.task_requests_retry_wait
@@ -102,7 +106,10 @@ module LittleMonster::Core
     def notify_callback(status, options = {})
       return true unless should_request?
       params = { body: { name: @current_action, status: status } }
-      params[:body].merge!(options)
+
+      params[:body][:exception] = serialize_error(options[:exception]) if options[:exception]
+
+      params[:body].merge!(options.except(:exception))
 
       resp = LittleMonster::API.put "/jobs/#{id}/callbacks/#{@current_action}", params,
                                     retries: LittleMonster.task_requests_retries,
@@ -180,6 +187,14 @@ module LittleMonster::Core
       !(mock? || LittleMonster.disable_requests?)
     end
 
+    def serialize_error(error)
+      {
+        message: error.message,
+        type: error.class.to_s,
+        retry: @retries
+      }
+    end
+
     # callbacks definition
     def on_error ; end
     def on_success ; end

data/lib/little_monster/core/job_factory.rb

@@ -73,19 +73,20 @@ module LittleMonster::Core
       resp.success? ? resp.body : nil
     end
 
-    def calculate_status
-      return :pending if @api_attributes[:tasks].blank?
+    def calculate_status_and_error
+      return [:pending, {}] if @api_attributes[:tasks].blank?
 
-      @api_attributes[:tasks].sort_by! { |task| task[:order] }.each do |task|
-        return task[:status].to_sym if task[:status].to_sym != :success
+      #FIRST we check if any callback has failed to set error status
+      @api_attributes.fetch(:callbacks, []).each do |callback|
+        return [:error, callback[:exception] || {}] if callback[:status].to_sym == :error
       end
 
-      # check if any callback failed
-      @api_attributes.fetch(:callbacks, []).each do |callback|
-        return :error if callback[:status].to_sym == :error
+      #if no callback has fail we get the status from the tasks
+      @api_attributes[:tasks].sort_by! { |task| task[:order] }.each do |task|
+        return [task[:status].to_sym, task[:exception] || {}] if task[:status].to_sym != :success
       end
 
-      :success
+      [:success, {}]
     end
 
     def find_current_action_and_retries
@@ -124,11 +125,14 @@ module LittleMonster::Core
 
       return attributes if LittleMonster.disable_requests?
 
-      status = calculate_status
+      # these two attribute retrival methods are arranged in this way
+      # because each one filters the tasks based on different statuses
+      status, error = calculate_status_and_error
       current_action, retries = find_current_action_and_retries
 
       attributes.merge(status: status,
                        current_action: current_action,
+                       error: error,
                        retries: retries)
     end
 

data/lib/little_monster/core/job_orchrestator.rb

@@ -124,12 +124,12 @@ module LittleMonster::Core
 
     # Methods that work both on tasks and callbacks
 
-    def abort_job(_e)
+    def abort_job(error)
       logger.debug 'notifiying abort...'
 
       if @job.callback_running?
         logger.info "[type:finish_callback] [status:error] data: #{@job.data.to_h[:outputs]}"
-        @job.notify_callback :error
+        @job.notify_callback :error, exception: error
 
         # if callback is not on_error, raise exception to run on_error
         if @job.current_action != :on_error
@@ -138,26 +138,28 @@ module LittleMonster::Core
           raise CallbackFailedError, '[type:callback_fail_error]'
         end
       else
-        @job.notify_task :error
+        @job.notify_task :error, exception: error
         logger.info "[type:finish_task] [status:error] data: #{@job.data.to_h[:outputs]}"
       end
 
       @job.status = :error
     end
 
-    def handle_error(e)
-      raise e if LittleMonster.env.development?
-      logger.error "[type:error] [error_type:#{e.class}][message:#{e.message}] \n #{e.backtrace.to_a.join("\n\t")}"
+    def handle_error(error)
+      raise error if LittleMonster.env.development?
+      logger.error "[type:error] [error_type:#{error.class}][message:#{error.message}] \n #{error.backtrace.to_a.join("\n\t")}"
 
-      if e.is_a?(FatalTaskError) || e.is_a?(NameError)
+      @job.error = @job.serialize_error error
+
+      if error.is_a?(FatalTaskError) || error.is_a?(NameError)
         logger.debug 'error is fatal, aborting run'
-        return abort_job(e)
+        return abort_job(error)
       end
 
-      do_retry
+      do_retry(error)
     end
 
-    def do_retry
+    def do_retry(error)
       if @job.retry?
         logger.debug "Retry ##{@job.retries} of #{@job.max_retries}"
 
@@ -165,10 +167,10 @@ module LittleMonster::Core
 
         logger.debug 'notifiying retry'
         if @job.callback_running?
-          @job.notify_callback :pending, retries: @job.retries
+          @job.notify_callback :pending, retries: @job.retries, exception: error
           logger.info '[type:callback_retry]'
         else
-          @job.notify_task :pending, retries: @job.retries
+          @job.notify_task :pending, retries: @job.retries, exception: error
           logger.info '[type:task_retry]'
         end
 
@@ -186,7 +188,7 @@ module LittleMonster::Core
         end
 
         logger.info "[type:job_max_retries] [retries:#{@job.max_retries}]"
-        abort_job(MaxRetriesError.new)
+        abort_job(error)
       end
     end
   end

data/lib/little_monster/generators/templates/config/application.rb

@@ -8,7 +8,7 @@ LittleMonster.configure do |conf|
   # conf.worker_queue = 'my_sqs_queue'
 end
 
-require_relative "enviroments/#{LittleMonster.env}"
+require_relative "environments/#{LittleMonster.env}"
 
 Dir["#{Dir.pwd}/lib/**/*.rb"].each { |file| require_relative file }
 Dir["#{Dir.pwd}/jobs/**/*.rb"].each { |file| require_relative file }

data/lib/little_monster/generators/templates/jobs_spec_temp.erb

@@ -6,6 +6,6 @@ describe '<%=@job_name.camelize%>' do
       expect(run_job(:<%=job_name%>)).to have_run(<%=@task_names.map{|v|":#{v}"}.join(", ")%>)
     end
 
-    it 'has to run' 
+    it 'has to run'
   end
 end

data/lib/little_monster/generators/templates/jobs_temp.erb

@@ -1,11 +1,11 @@
 class <%= @job_name.camelize %> < LittleMonster::Job
   task_list :<%= @task_names.join(", :") %>
-  
+
   # Callbacks
   # def on_cancel
   #   #Code me!
   # end
-  # 
+  #
   # def on_error
   #   #code me
   # end

data/lib/little_monster/generators/templates/spec_helper_temp.erb

@@ -10,13 +10,12 @@ require_rel '../tasks'
 RSpec.configure do |conf|
   conf.color = true
   conf.formatter = :documentation
-  
+
   conf.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true
-  end 
-    
+  end
+
   conf.before :each do
     allow_any_instance_of(Kernel).to receive(:sleep)
-  end 
+  end
 end
-

data/lib/little_monster/generators/templates/tasks_spec_temp.erb

@@ -6,6 +6,6 @@ describe <%= "#{@job_name.camelize}::#{@current_task_name.camelize}" %> do
   end
 
   describe '.run' do
-    it 'tell me how to run <%=@current_task_name.underscore%>!' 
+    it 'tell me how to run <%=@current_task_name.underscore%>!'
   end
 end

data/lib/little_monster/version.rb

@@ -1,3 +1,3 @@
 module LittleMonster
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: little_monster
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - arq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -295,9 +295,9 @@ files:
 - lib/little_monster/generators/conf_gen.rb
 - lib/little_monster/generators/generate.rb
 - lib/little_monster/generators/templates/config/application.rb
-- lib/little_monster/generators/templates/config/enviroments/development.rb
-- lib/little_monster/generators/templates/config/enviroments/production.rb
-- lib/little_monster/generators/templates/config/enviroments/test.rb
+- lib/little_monster/generators/templates/config/environments/development.rb
+- lib/little_monster/generators/templates/config/environments/production.rb
+- lib/little_monster/generators/templates/config/environments/test.rb
 - lib/little_monster/generators/templates/config/toiler.yml
 - lib/little_monster/generators/templates/jobs_spec_temp.erb
 - lib/little_monster/generators/templates/jobs_temp.erb