bender-bot 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f6f1ca66046526eee7288deb9ea283f59587a76
-  data.tar.gz: b7e9e5364f81483b33dd28f00146f261d0a2baf3
+  metadata.gz: 793607ad14d0ce9b2c1f7ccbb03b3607eb26581a
+  data.tar.gz: 9ea1a900427199fecbc1d15fc6a13240b9838350
 SHA512:
-  metadata.gz: 94ab57468d52086d5602f01e60ef857d0c79a572e332d3090e395f7c39da331e25abed459a6608c913e245c0cfe53d3e3fbf454c9183946342737181fe53a502
-  data.tar.gz: e138fb69f727b8e64eeb42928e1edb7bec532c314443a8d6dfb43737419ef78b7e4c82c882abc0959b51f9dab50b4fd50a9a50ae8ca98a91888805ac9066490b
+  metadata.gz: 21098770d0c695262389ee7bd36395bc316c70cefda86a552e8e41b2d843ee22d4146cc759312642047bf449338a3b3ade20cd3631d02d93aee7681eb4a950f9
+  data.tar.gz: 96527fd4de4d89b68ab83601b7461861476bed30f0c6e0e0a0f975aa5f860089f32813021470dde60c0e6caaa7ec0328bc97f6f2e3220917422bbe1e8baa70a8

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/bender/bot.rb

@@ -32,9 +32,9 @@ class BenderBot
 
   JARO = FuzzyStringMatch::JaroWinkler.create :native
 
-  CLOSE_TRANSITIONS = %w[ 21 41 ]
+  CLOSED_TRANSITIONS = %w[ 61 71 ]
 
-  CLOSE_STATE = /done/i
+  CLOSED_STATE = /close/i
 
   SEVERITIES = {
     1 => '10480',
@@ -220,7 +220,7 @@ class BenderBot
     when /^\s*\/inc\s+close\s+(\d+)\s*$/
       incident = select_incident $1
       if incident
-        reply_html close_incident(incident), :green
+        reply_html *close_incident(incident)
       else
         reply_html 'Sorry, no such incident!', :red
       end
@@ -334,6 +334,14 @@ private
 
 
   def close_incident incident
+    status = normalize_value incident['fields']['status']
+    if status =~ CLOSED_STATE
+      return [
+        "#{incident_link(incident)} is already closed!",
+        :green
+      ]
+    end
+
     req_path = '/rest/api/2/issue/%s/transitions?expand=transitions.fields' % [
       incident['key']
     ]
@@ -345,7 +353,7 @@ private
     req['Content-Type'] = 'application/json'
     req['Accept'] = 'application/json'
 
-    CLOSE_TRANSITIONS.each do |tid|
+    CLOSED_TRANSITIONS.each do |tid|
       req.body = {
         transition: { id: tid }
       }.to_json
@@ -355,13 +363,13 @@ private
     incident = select_incident incident['key'].split('-',2).last
     status = normalize_value incident['fields']['status']
 
-    if status =~ CLOSE_STATE
-      'Closed ' + incident_link(incident)
+    if status =~ CLOSED_STATE
+      [ 'Closed ' + incident_link(incident), :green ]
     else
       [
-        'Failed to close automatically, you might try yourself',
-        (options.jira_site + '/browse/' + incident['key'])
-      ].join("<br />")
+        "Failed to close #{incident_link(incident)} automatically, you might try yourself",
+        :red
+      ]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bender-bot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sean Clemmer