lita-stackstorm 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a08d0bd0d5c21c5001b188b581a293ae00d869b9
-  data.tar.gz: 97387dba3afe6cfe9ec05b2d0ae234ef441efbf6
+  metadata.gz: cf8f71a403fa1cf6bf82f1322f7b1f334f03e143
+  data.tar.gz: 3d955d16f7b91237373179b4fca42ec4e392656c
 SHA512:
-  metadata.gz: 153ef37f561ed55df0aba60c02a357b365fae384e32a201ea8ee7cb3dfcb807efdf624ff873bc5b41fcca693117c01c0542c6116960c31fb7b35404dbe819dba
-  data.tar.gz: 0879872781301b5c7fc72befc51a44e8aeb87d0058e69d8362a9f84b7253ab11d4dfe7ad998f7e5eda7a3d5f0a77bff0eb3fa9a68db6474af3c4e983da799679
+  metadata.gz: 1671be84e6ae51b4676dbb6880b8c7a5e3629527c1003a926e588ed8573c0b48220efcd521b9d07e5391dc4be9a70fbda60ce685dbb7a1f3dd7703dcfb0b3767
+  data.tar.gz: 666782d0dd08500f772200706f13d355f4b2c2ff07c66a4f78e037f6b1d3e5e5dc38edbaf73e77978719a4c4afff21a451423d2e66e0cd9b9db07fbcb1557008

data/lib/lita/handlers/stackstorm.rb

@@ -1,5 +1,14 @@
 require 'json'
 
+class Array
+  def swap!(a,b)
+    self[a], self[b] = self[b], self[a]
+    self
+  end
+end
+
+
+
 module Lita
   module Handlers
     class Stackstorm < Handler
@@ -56,13 +65,20 @@ module Lita
           authenticate
         end
         command_array = msg.matches.flatten.first.split
+        command_set = Set.new(command_array)
+
         candidates = redis.scan_each(:match => "#{command_array[0..1].join(' ')}*")
-        p = candidates.take_while {|i| i.split.length == command_array.length}
-        l = candidates.take_while {|i| i.split.length > command_array.length}
-        if p.length == 1
+
+        candidates_set = Set.new(candidates)
+        h = candidates_set.classify do |s|
+          st = Set.new(s.split /(?<=})\s|\s(?={)|\b\s\b/)
+          (st - command_set).length
+        end
+
+        if h[h.keys.min].length == 1
           payload = {
-            name: command_array[0..1].join('_'),
-            format: "#{command_array[0..1].join(' ')} {{pack}}",
+            name: command_array.swap!(command_array.length-2,command_array.length-1).join('_'),
+            format: h[h.keys.min].to_a.join(" "),
             command: msg.matches.flatten.first,
             user: msg.user.name,
             source_channel: 'chatops',
@@ -70,10 +86,14 @@ module Lita
           }
           s = make_post_request("/aliasexecution", payload)
           j = JSON.parse(s.body)
-          msg.reply "Got it! Details available at #{config.url}/#/history/#{j['execution']['id']}/general"
-        elsif l.length > 0
+          if s.success?
+            msg.reply "Got it! Details available at #{config.url}/#/history/#{j['execution']['id']}/general"
+          else
+            msg.reply "Execution failed with message: #{j['faultstring']}"
+          end
+        elsif h[h.keys.min].length > 1
           response_text = "possible matches:"
-          l.each do |match|
+          h[h.keys.min].each do |match|
             response_text+= "\n\t#{match}"
           end
           msg.reply response_text

data/lita-stackstorm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-stackstorm"
-  spec.version       = "0.5.2"
+  spec.version       = "0.5.3"
   spec.authors       = ["Jurnell Cockhren"]
   spec.email         = ["jurnell@sophicware.com"]
   spec.description   = "Stackstorm handler for lita 4+"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-stackstorm
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Jurnell Cockhren