HornsAndHooves-slackiq 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6be2c0415ea2952f65a89e6730c6ad4106574f5334144ca9787df8f9a42414fb
-  data.tar.gz: bae386ccff64e20dfe68cbd4dc1817a93c891d34b138d5e6083770323661a57e
+  metadata.gz: 9895155fe16201d8268cf950f52524fd74392ce78f6f46f2843b0e7a5f42543c
+  data.tar.gz: 06636c6315630f03db1054f5d98146e64c40b59b79e75765abdb26d75b498072
 SHA512:
-  metadata.gz: 1696e9a0f2c26a528163a1955f84967a90ed06500446afeb07e5aa01722fe1b40f386e1f544adc38ec23875d966c4dbfb5521bcfee3e715b229ad7b8764d0dd8
-  data.tar.gz: 515305b5906a2c5a9d9edf63044806d1a58da14406db87084f0a589f7bdd368f8638cd9ec9ab97e70f6ac8be08baf6ee94ff68fa08103de587cacaf7ff4d5bca
+  metadata.gz: 7f1d1b2532e291a8a47e16c9fc189c1d9d98bf744001fc5c2c903aefcb47c983cc7cb539d5442b730c1fc609ebf6c39631f8af796533c3bf424b99a98cf6efaa
+  data.tar.gz: 6c6a850505ae42891f871e5fb85281ff4b20dbc301979b34812197c74c92926e8c1c3ebf8dcffc3460459f39582e006f60c41dcdb3283f6d13bdc018daa2c396

data/lib/slackiq.rb

@@ -26,13 +26,14 @@ module Slackiq
       title = options[:title]
       # description = options[:description]
       status = options[:status]
-      color = options[:color] || color_for(status)
 
       if (bid = options[:bid]) && status.nil?
         raise "Sidekiq::Batch::Status is not defined. Are you sure Sidekiq Pro is set up correctly?" unless defined?(Sidekiq::Batch::Status)
         status = Sidekiq::Batch::Status.new(bid)
       end
 
+      color = options[:color] || color_for(status)
+
       extra_fields = options.except(:webhook_name, :title, :description, :status)
 
       fields = []
@@ -138,10 +139,14 @@ module Slackiq
 
   private
     def color_for(status)
-      case status
-      when :success then '#1C9513'
-      when :failure then '#FF0000'
-      else               '#FBBD08'
+      if status.total == 0
+        '#FBBD08'  # yellow
+      else if status.failures > 0
+        '#FF0000'  # red
+      else if status.failures == 0
+        '#1C9513'  # green
+      else
+        '#FBBD08'  # yellow
       end
     end
   end

data/lib/slackiq/time_helper.rb

@@ -4,17 +4,17 @@ module Slackiq
   module TimeHelper
 
     class << self
-    
+
       def elapsed_time_humanized(t0, t1)
         humanize(elapsed_seconds(t0, t1))
       end
-  
+
       def elapsed_seconds(t0, t1)
         dt0 = t0.to_datetime
         dt1 = t1.to_datetime
         ((dt1-dt0)*24*60*60).to_i
       end
-  
+
       # http://stackoverflow.com/questions/4136248/how-to-generate-a-human-readable-time-range-using-ruby-on-rails
       def humanize(secs)
         [[60, :s], [60, :m], [24, :h], [1000, :d]].map{ |count, name|
@@ -24,16 +24,10 @@ module Slackiq
           end
         }.compact.reverse.join(' ')
       end
-      
+
       def format(time)
         time.strftime('%D @ %r').gsub('PM', 'pm').gsub('AM', 'am')
       end
-  
-    
     end
-    
   end
 end
-
-
-

data/lib/slackiq/version.rb

@@ -1,3 +1,3 @@
 module Slackiq
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: HornsAndHooves-slackiq
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - HornsAndHooves