lita-stackstorm 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf8f71a403fa1cf6bf82f1322f7b1f334f03e143
-  data.tar.gz: 3d955d16f7b91237373179b4fca42ec4e392656c
+  metadata.gz: 5c6ce0e485828fef1c97a9231ebff3b9421cacdc
+  data.tar.gz: 89b55ca36a0a3948d319cf3c403ed5460da1179c
 SHA512:
-  metadata.gz: 1671be84e6ae51b4676dbb6880b8c7a5e3629527c1003a926e588ed8573c0b48220efcd521b9d07e5391dc4be9a70fbda60ce685dbb7a1f3dd7703dcfb0b3767
-  data.tar.gz: 666782d0dd08500f772200706f13d355f4b2c2ff07c66a4f78e037f6b1d3e5e5dc38edbaf73e77978719a4c4afff21a451423d2e66e0cd9b9db07fbcb1557008
+  metadata.gz: efd097d6aaf2860a6f758c87576ae05be5597c63851b317e6b135c894d29647064e10121fa2e4543155b4a2ecd8978e84768a9fd7e2b92f6e646aaa6800484c0
+  data.tar.gz: bf18120bcdbe8f01c6445a17a2e00af550bad372eade6055ca4c7755a4bafb0217130429197fe616fd79a710fbc8953d62d92c203f4f76ad37e5b9200e1b3def

data/lib/lita/handlers/stackstorm.rb

@@ -30,12 +30,12 @@ module Lita
       end
 
       route /^st2 login$/, :login, command: false, help: { "st2 login" => "login with st2-api" }
-      route /^st2 list$/, :list, command: false, help: { "st2 list" => "list available st2 chatops commands" }
+      route /^st2 (ls|aliases|list)$/, :list, command: false, help: { "st2 list" => "list available st2 chatops commands" }
 
       route /^!(.*)$/, :call_alias, command: false, help: {}
 
       def auth_builder
-        if config.auth_port == '443' and config.url.start_with?('https')
+        if Integer(config.auth_port) == 443 and config.url.start_with?('https')
           "#{config.url}/auth"
         else
           "#{config.url}:#{config.auth_port}/v1"
@@ -43,7 +43,7 @@ module Lita
       end
 
       def url_builder
-        if config.execution_port == '443' and config.url.start_with?('https')
+        if Integer(config.execution_port) == 443 and config.url.start_with?('https')
           "#{config.url}/api"
         else
           "#{config.url}:#{config.execution_port}/v1"
@@ -64,41 +64,31 @@ module Lita
         if expired
           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(' ')}*")
-
-        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
+        command = msg.matches.flatten.first
+        found = ""
+        redis.scan_each do |a|
+          possible = /#{a}/.match(command)
+          if not possible.nil?
+            found = a
+            break
+          end
         end
 
-        if h[h.keys.min].length == 1
-          payload = {
-            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',
-            notification_channel: 'lita'
-          }
-          s = make_post_request("/aliasexecution", payload)
-          j = JSON.parse(s.body)
-          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:"
-          h[h.keys.min].each do |match|
-            response_text+= "\n\t#{match}"
-          end
-          msg.reply response_text
+        jobject = JSON.parse(redis.get(found))
+        payload = {
+          name: jobject['object']['name'],
+          format: jobject['format'],
+          command: command,
+          user: msg.user.name,
+          source_channel: 'chatops',
+          notification_channel: 'lita'
+        }
+        s = make_post_request("/aliasexecution", payload)
+        j = JSON.parse(s.body)
+        if s.success?
+          msg.reply "Got it! Details available at #{config.url}/#/history/#{j['execution']['id']}/general"
         else
-          msg.reply "Failed! No Aliases Found..."
+          msg.reply "Execution failed with message: #{j['faultstring']}"
         end
       end
 
@@ -106,16 +96,21 @@ module Lita
         if expired
           authenticate
         end
+        redis.keys.each {|k| redis.del k }
         s = make_request("/actionalias", "")
         if JSON.parse(s.body).empty?
           msg.reply "No Action Aliases Registered"
         else
           j = JSON.parse(s.body)
           a = ""
+          extra_params = '(\\s+(\\S+)\\s*=("([\\s\\S]*?)"|\'([\\s\\S]*?)\'|({[\\s\\S]*?})|(\\S+))\\s*)*'
           j.take_while{|i| i['enabled'] }.each do |command|
             command['formats'].each do |format|
-              redis.set(format, command['action_ref'])
-              a+= "#{format} -> #{command['action_ref']}\n"
+              f = format.gsub(/(\s*){{\s*\S+\s*=\s*(?:({.+?}|.+?))\s*}}(\s*)/, '\\s*([\\s\\S]+?)?\\s*')
+              f = f.gsub(/\s*{{.+?}}\s*/, '\\s*([\\s\\S]+?)\\s*')
+              f = "^\\s*#{f}#{extra_params}\\s*$"
+              redis.set(f, {format: format, object: command}.to_json)
+              a+= "#{format} -> #{command['description']}\n"
             end
           end
           msg.reply a
@@ -139,9 +134,8 @@ module Lita
 
       def make_request(path, body)
         resp = http.get("#{url_builder()}#{path}") do |req|
-          req.body = {}
           req.headers = headers
-          req.body = body.to_json
+          req.body = body.to_json if not body.empty?
         end
         resp
       end

data/lita-stackstorm.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-stackstorm
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Jurnell Cockhren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Stackstorm handler for lita 4+