lita-interrupt 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b15811f72a7f29073b61d5f8bcdcd7cea23e7ed6
-  data.tar.gz: d67e7c6d51bf17ebd58946b48e94e8c02ab21d34
+SHA256:
+  metadata.gz: 6157092dbeea983eb6047ba07c4a44003d0415a1708219d9b9dfeb5ffbfe33f8
+  data.tar.gz: 47e2c176cde96f98dc4c877d3ee764e9490cc51d43f3d262f6f88bf659c58ddd
 SHA512:
-  metadata.gz: fb320ff975a01d83543a859c2c906c470f6b8f8f577e3896213b948ab5e04b714b09f8aefa3d654790da6f87dc72bff3b14c95e12e836f869bea9f94b28c2910
-  data.tar.gz: b265df0952d50b4423fb09eeec78de07b6c3c2f834440ee9f0b37bfb9d920fd646a7ac77cab6bd29548a9b839e05165e6796534ddbf8186cc90d0205d1d2ff66
+  metadata.gz: 054e3b688d95c0c9fe5bb8e20f98dab2e8ef65e4e707a476cd74fb9007dc060f16495c1e9e8dd56cbd0fae07786a970ba999643d5be21bcaeff809a6f10135b5
+  data.tar.gz: 00dc36537fb4ea1c76814fc8613d0649ec27c6da80486c790b0e66bdbe91fc8a17298d076a35124f7c7afc1c491f5ee183f1ffb68afc2cde9d34c2267d840249

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.3.0
 script: bundle exec rake
 before_install:
   - gem update --system

data/lib/interrupt_helper/pager_duty.rb

@@ -5,6 +5,8 @@ require 'pager_duty/connection'
 module InterruptHelper
   module PagerDuty
     def pagerduty(token)
+      token = token.to_s
+      return nil if token.empty?
       @pagerduty_clients ||= Hash.new { |h, k|
         h[k] = ::PagerDuty::Connection.new(k)
       }

data/lib/lita/handlers/interrupt.rb

@@ -162,21 +162,27 @@ module Lita
 
       # @param [Lita::Response] response
       def list_services(response)
-        team_id = response.match_data['team_id']
-        unless team_id.nil? || team_id.empty?
-          response.reply(list_team_services(team_id, response).join("\n"))
-          return
-        end
+        query = response.match_data['query'].to_s.strip
+        team_id = response.match_data['team_id'].to_s
+        team_ids = case team_id
+                   when "" then config.pagerduty_teams.keys.sort
+                   else [team_id]
+                   end
 
         response.reply(
-          config.pagerduty_teams.keys.sort.flat_map do |team_id|
-            [
-              t('service_ls.team', team_id: team_id),
-              *list_team_services(team_id, response)
-            ]
+          team_ids.flat_map do |team_id; services|
+            services = list_team_services(team_id, query)
+            header = t('service_ls.team', team_id: team_id)
+            case services
+            when nil
+              break [t('service_ls.no_team', team_id: team_id)]
+            when []
+              [header, t('service_ls.no_services')]
+            else
+              [header, *services]
+            end
           end.join("\n")
         )
-
       rescue APIError => ae
         log_exception(__callee__, ex)
         response.reply(t('call.api_error', id: alias_id, message: ae.message))
@@ -184,16 +190,12 @@ module Lita
         send_exception(response, __callee__, ex)
       end
 
-      def list_team_services(team_id, response)
+      def list_team_services(team_id, query)
         pd = team(team_id)
-        if pd.nil?
-          response.reply(t('service_ls.no_team', team_id: team_id))
-          return
-        end
+        return nil if pd.nil?
 
-        query = (response.match_data['query'] || '').strip
         params = {
-          query: query || '',
+          query: query,
           include: %w[integrations]
         }
 
@@ -203,7 +205,6 @@ module Lita
         services = (results['services'] || []).select do |svc|
           (svc['integrations'] || []).any? { |i| is_suitable_integration?(i) }
         end
-        return response.reply(t('service_ls.no_services')) if services.empty?
 
         services.sort_by { |svc| svc['name'] }.map { |svc|
           t('service_ls.entry', service_name: svc['name'], service_id: svc['id'])

data/lita-interrupt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-interrupt'
-  spec.version       = '0.1.0'
+  spec.version       = '0.1.1'
   spec.authors       = ['Noel Cower']
   spec.email         = ['ncower@gmail.com']
   spec.description   = 'lita-interrupt interrupts a user by assigning them to a new incident in PagerDuty'
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.3'
 
-  spec.add_runtime_dependency 'lita', '>= 4.7'
+  spec.add_runtime_dependency 'lita', '~> 4.7'
   spec.add_runtime_dependency 'pager_duty-connection', '~> 1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: lita-interrupt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Noel Cower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
 - !ruby/object:Gem::Dependency
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Interrupts people through the power of PagerDuty