HornsAndHooves-slackiq 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62df624090d1e75604db7bbeed49cd4ba4f0ce71a65fa5daae87f0542a4cf873
-  data.tar.gz: c68080713af81feda7f82eb32de41be002fce8d36556bcedc459bec9bf55522a
+  metadata.gz: 4d33511bc1da33236ea8a6b3c03b4d1e2a26305fbc55d9d8db48cd71644c713c
+  data.tar.gz: da45ca5736a952f4f75bced5cfc5c1f3f4858ad7d1a0edb383558785458308c2
 SHA512:
-  metadata.gz: a9eace127b91ddbf98a3e314a4a3aefdb941e8d997726d762545c3627fbdc30b6bb7c1e9f92c099b788e84d2db6a1fa83a83f4eda355baa29bbb1ed1f6b721ea
-  data.tar.gz: b9eb40323fbc169e25569d33560a10ec8697f4483627da2b665403fb5a747465c28313c1b4d030b045d2a1498e4cf1845006ff9303dc800b2093526ce3d6df51
+  metadata.gz: ebe7cbb7a607f79063c21f549ce0a2680ab8c3d96f0da08b00c65110a37aa3eb17228ac21ffc133933d53bb037e3f94b3afd718122e43462e5bd5251b01fdede
+  data.tar.gz: a1907bad4728a9f07d581901a2e3e57b60e8ddd1079a9d631cc84c5e503db42d90dbfde4936b937261ee878062274d276b4ed6b9e5105cea3cc34502238f7df4

data/Gemfile

@@ -1,7 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in slackiq.gemspec
 gemspec
 
 gem "sidekiq"
-gem "gemfury"

data/HornsAndHooves-slackiq.gemspec

@@ -1,28 +1,27 @@
 # -*- encoding: utf-8 -*-
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'slackiq/version'
+require "slackiq/version"
 
 Gem::Specification.new do |s|
   s.name          = "HornsAndHooves-slackiq"
   s.version       = Slackiq::VERSION
   s.authors       = ["HornsAndHooves", "Peter Maneykowski"]
-  s.email         = ['maneyko@integracredit.com']
-  s.summary       = 'HornsAndHooves: Slack and Sidekiq Pro integration'
+  s.email         = ["maneyko@integracredit.com"]
+  s.summary       = "HornsAndHooves: Slack and Sidekiq Pro integration"
   s.description   = "Slackiq (by HornsAndHooves) integrates Slack and Sidekiq so that you can "\
                     "have vital information about your Sidekiq jobs sent directly to your team's Slack."
-  s.homepage      = 'https://github.com/HornsAndHooves/slackiq'
-  s.license       = 'MIT'
+  s.homepage      = "https://github.com/HornsAndHooves/slackiq"
+  s.license       = "MIT"
 
   s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.bindir        = "exe"
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'httparty'
+  s.add_dependency "httparty"
   s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "rspec-sidekiq"
 end

data/README.md

@@ -10,7 +10,7 @@ Slackiq (pronounced *slack-kick*) integrates [Slack](https://slack.com/) and [Si
 Add this line to your Gemfile:
 
 ```ruby
-gem 'slackiq'
+gem "slackiq"
 ```
 
 Then run:
@@ -26,8 +26,8 @@ First, set up any number of Slack Incoming Webhooks [from your Slack](https://sl
 Then, you only need to call the `configure` method when your application launches to configure all of the webhooks to which you want to post. If you're using Rails, create an initializer at `config/initializers/slackiq.rb`. Here's an example:
 
 ```ruby
-Slackiq.configure( web_scrapes: 'https://hooks.slack.com/services/HA298HF2/ALSKF2451/lknsaHHA2323KKDKND',
-                   data_processing: 'https://hooks.slack.com/services/HA298HF2/ALSKF2451/H24dLKAHD22423')
+Slackiq.configure( web_scrapes: "https://hooks.slack.com/services/HA298HF2/ALSKF2451/lknsaHHA2323KKDKND",
+                   data_processing: "https://hooks.slack.com/services/HA298HF2/ALSKF2451/H24dLKAHD22423")
 ```
 
 `:web_scrapes` and `data_processing` are examples of keys. Use whatever keys you want.
@@ -57,7 +57,7 @@ class WebScraper
     # Scrape the first 100 URLs in the database
     def scrape_100
       batch = Sidekiq::Batch.new
-      batch.description = 'Scrape the first 100 URLs!'
+      batch.description = "Scrape the first 100 URLs!"
       batch.on(:complete, self)
 
       batch.jobs do
@@ -72,22 +72,22 @@ class WebScraper
   end
 
   def on_complete(status, options)
-    Slackiq.notify(webhook_name: :web_scrapes, status: status, title: 'Scrape Completed!',
-    'Total URLs in DB' => URL.count.to_s,
-    'Servers' => "#{Server.active_count} active, #{Server.inactive_count} inactive")
+    Slackiq.notify(webhook_name: :web_scrapes, status: status, title: "Scrape Completed!",
+    "Total URLs in DB" => URL.count.to_s,
+    "Servers" => "#{Server.active_count} active, #{Server.inactive_count} inactive")
   end
 
 end
 ```
 
-Note that in this case, `'Total URLs in DB'` and `'Servers'` are custom fields that will also appear in Slack!
+Note that in this case, `"Total URLs in DB"` and `"Servers"` are custom fields that will also appear in Slack!
 
 ### Want to send a message to Slack that isn't Sidekiq-related?
 
 No prob. Just:
 
 ```ruby
-Slackiq.message('Server 5 is overloaded!', webhook_name: :data_processing)
+Slackiq.message("Server 5 is overloaded!", webhook_name: :data_processing)
 ```
 
 ## Contributing

data/Rakefile

@@ -1,8 +1,7 @@
 require "bundler/gem_tasks"
-require "gemfury/tasks"
 
 task :console do
   exec "irb -r slackiq -I ./lib"
 end
 
-task c: :console
+task c: :console

data/lib/slackiq.rb

@@ -1,13 +1,12 @@
-require 'slackiq/version'
+require "slackiq/version"
 
-require 'net/http'
-require 'json'
-require 'httparty'
+require "net/http"
+require "json"
+require "httparty"
 
-require 'slackiq/time_helper'
-require 'slackiq/sidekiq_status'
+require "slackiq/time_helper"
 
-require 'active_support' # For Hash#except
+require "active_support" # For Hash#except
 
 module Slackiq
 
@@ -16,7 +15,7 @@ module Slackiq
     # Configure all of the webhook URLs you're going to use
     # @author Jason Lew
     def configure(webhook_urls={})
-      raise 'Argument must be a Hash' unless webhook_urls.class == Hash
+      raise "Argument must be a Hash" unless webhook_urls.class == Hash
       @@webhook_urls = webhook_urls
     end
 
@@ -48,7 +47,7 @@ module Slackiq
         if created_at
           time_now = Time.now
           duration = Slackiq::TimeHelper.elapsed_time_humanized(created_at, time_now)
-          time_now_title = (status.complete? ? 'Completed' : 'Now')
+          time_now_title = (status.complete? ? "Completed" : "Now")
         end
 
         total_jobs = status.total
@@ -67,44 +66,44 @@ module Slackiq
 
         fields += [
           {
-            'title' => 'Created',
-            'value' => Slackiq::TimeHelper.format(created_at),
-            'short' => true
+            title: "Created",
+            value: Slackiq::TimeHelper.format(created_at),
+            short: true
           },
           {
-            'title' => time_now_title,
-            'value' => Slackiq::TimeHelper.format(time_now),
-            'short' => true
+            title: time_now_title,
+            value: Slackiq::TimeHelper.format(time_now),
+            short: true
           },
           {
-            'title' => "Duration",
-            'value' => duration,
-            'short' => true
+            title: "Duration",
+            value: duration,
+            short: true
           },
           {
-            'title' => "Total Jobs",
-            'value' => total_jobs,
-            'short' => true
+            title: "Total Jobs",
+            value: total_jobs,
+            short: true
           },
           {
-            'title' => "Jobs Run",
-            'value' => jobs_run,
-            'short' => true
+            title: "Jobs Run",
+            value: jobs_run,
+            short: true
           },
           {
-            'title' => "Completion %",
-            'value' => "#{completion_percentage}%",
-            'short' => true
+            title: "Completion %",
+            value: "#{completion_percentage}%",
+            short: true
           },
           {
-            'title' => "Failures",
-            'value' => status.failures,
-            'short' => true
+            title: "Failures",
+            value: status.failures,
+            short: true
           },
           {
-            'title' => "Failure %",
-            'value' => "#{failure_percentage}%",
-            'short' => true
+            title: "Failure %",
+            value: "#{failure_percentage}%",
+            short: true
           },
         ]
       end
@@ -112,19 +111,19 @@ module Slackiq
       # Add extra fields
       fields += extra_fields.map do |title, value|
         {
-          'title' => title,
-          'value' => value,
-          'short' => false
+          title: title,
+          value: value,
+          short: false
         }
       end
 
       attachments = [
         {
-          'fallback' => title,
-          'color' => color,
-          'title' => title,
-          'text' => description,
-          'fields' => fields,
+          fallback: title,
+          color:    color,
+          title:    title,
+          text:     description,
+          fields:   fields,
         }
       ]
 
@@ -137,20 +136,20 @@ module Slackiq
     # @author Jason Lew
     def message(text, options)
       url = @@webhook_urls[options[:webhook_name]]
-      body = { 'text' => text }.to_json
+      body = { text: text }.to_json
       HTTParty.post(url, body: body)
     end
 
   private
     def color_for(status)
       if status.total == 0
-        '#FBBD08'  # yellow
+        "#FBBD08"  # yellow
       elsif status.failures > 0
-        '#FF0000'  # red
+        "#FF0000"  # red
       elsif status.failures == 0
-        '#1C9513'  # green
+        "#1C9513"  # green
       else
-        '#FBBD08'  # yellow
+        "#FBBD08"  # yellow
       end
     end
   end

data/lib/slackiq/time_helper.rb

@@ -1,4 +1,4 @@
-require 'date'
+require "date"
 
 module Slackiq
   module TimeHelper
@@ -26,11 +26,11 @@ module Slackiq
               "#{n.to_i}#{name}"
             end
           end
-        }.compact.reverse.join(' ')
+        }.compact.reverse.join(" ")
       end
 
       def format(time)
-        time.strftime('%D @ %r').gsub('PM', 'pm').gsub('AM', 'am')
+        time.strftime("%D @ %r").gsub("PM", "pm").gsub("AM", "am")
       end
     end
   end

data/lib/slackiq/version.rb

@@ -1,3 +1,3 @@
 module Slackiq
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: HornsAndHooves-slackiq
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - HornsAndHooves
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -67,20 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Slackiq (by HornsAndHooves) integrates Slack and Sidekiq so that you
   can have vital information about your Sidekiq jobs sent directly to your team's
   Slack.
@@ -100,7 +86,6 @@ files:
 - bin/console
 - bin/setup
 - lib/slackiq.rb
-- lib/slackiq/sidekiq_status.rb
 - lib/slackiq/time_helper.rb
 - lib/slackiq/version.rb
 homepage: https://github.com/HornsAndHooves/slackiq
@@ -122,8 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: 'HornsAndHooves: Slack and Sidekiq Pro integration'

data/lib/slackiq/sidekiq_status.rb

@@ -1,24 +0,0 @@
-# RSpec::Sidekiq::Batch::Status does not support batch failures.
-# Here, FailureStatus and SuccessStatus circumvent this problem.
-
-if defined?(RSpec)
-  require 'rspec-sidekiq'
-
-  module RSpec
-    module Sidekiq
-      class Batch
-        class FailureStatus < NullStatus
-          def failures
-            1
-          end
-        end
-
-        class SuccessStatus < NullStatus
-          def failures
-            0
-          end
-        end
-      end
-    end
-  end
-end