lita-salt 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32a71e95af2cb55ec8129c49bb78fc272d728d60
-  data.tar.gz: 7f1004de3ccab842d8c6b5ee367a6d0859f67e28
+  metadata.gz: c3ccf194e0ee7613b7474562c352762bbf83f350
+  data.tar.gz: 5520f5836a453d87aa101dc9dfe4e4c02afc4a37
 SHA512:
-  metadata.gz: 86a334eec6d6aa1bddcc1114bff5d4e6254b9ebb1b9c88a7ffa74222e8ed1a0d70309fc5362fd455fe28df0ff9f63b0deb17651de22c997f26da244959c806ee
-  data.tar.gz: 68739e1ae83a6fcdfc444ac6196d53c8ab4119f3a56da6f930d00708c41a0e868deb4f20b423b5dc64f95c085c21f86f5a335ddf4b4fe4d732a703bd1881c41d
+  metadata.gz: 074650e4ff5724041abdb37c8ba01023a9520b5edd558648f4a8521be62b92e128b7b71586a592815e66bdf9d3b39250033049c01f1a29186c5b002f516be285
+  data.tar.gz: 4474a2794230a0e672896c61da09340e9904f67f49ecdc66b70b6050adaed5f763ce8a9a018e0953e56ea052a0dabb93fb187cc4668478d1c8ac6f8d42f66c20

data/README.md

@@ -39,7 +39,6 @@ Commands are called in the with the `salt` prefix what can be optionally with th
 ```shell
 lita: salt minion service.restart nginx
 @lita s minion schedule.run_job apt
-lita: salt pillar get "some_key"
 ```
 
 ### Example

data/lib/lita/handlers/salt.rb

@@ -61,15 +61,6 @@ module Lita
         'salt minion supervisord.(status|start|stop|restart|add|remove)' => 'Execute supervisor action'
       }
 
-      route /^#{abbreviate("salt")} pillar(?: #{abbreviate("help")})$/i, :pillar, command: true, help: {
-        'salt pillar get "some_key"' => 'get a pillar value'
-      }
-
-      route /^#{abbreviate("salt")} pillar (get|show)$/i, :pillar, command: true, help: {
-        'salt pillar get "some_key"' => 'get a pillar value',
-        'salt pillar show "some_minion"' => 'show pillar for given minion'
-      }
-
       def authenticate
         resp = http.post("#{config.url}/login") do |req|
           req.body = {}
@@ -108,11 +99,11 @@ module Lita
         task = msg.matches.flatten[1]
         what = msg.matches.flatten[2]
         if what.nil?
-          msg.reply "Missing data"
+          msg.reply(render_template("layout", response: "Missing data"))
         else
           body = build_local(where, "#{__callee__}.#{task}", what, returner)
           response = make_request('/', body)
-          msg.reply process_response(response)
+          msg.reply(render_template("layout", response: process_response(response)))
         end
       end
 
@@ -126,7 +117,7 @@ module Lita
         if response.status == 200
           msg.reply response.body
         else
-          msg.reply "Failed to run command: #{body}\nError: #{response.body}"
+          msg.reply(render_template("example", response: "Failed to run command: #{body}\nError: #{response.body}"))
         end
       end
 
@@ -139,7 +130,7 @@ module Lita
         if response.status == 200
           msg.reply response.body
         else
-          msg.reply "Failed to run command: #{body}\nError: #{response.body}"
+          msg.reply(render_template("example", response: "Failed to run command: #{body}\nError: #{response.body}"))
         end
       end
 
@@ -151,11 +142,11 @@ module Lita
         task = msg.matches.flatten[1]
         what = msg.matches.flatten[2]
         if what.nil?
-          msg.reply "Missing service name"
+          msg.reply(render_template("layout", response: "Missing service name"))
         else
           body = build_local(where, "#{__callee__}.#{task}", what, returner)
           response = make_request('/', body)
-          msg.reply process_response(response)
+          msg.reply(render_template("layout", response: process_response(response)))
         end
       end
 
@@ -167,11 +158,11 @@ module Lita
         task = msg.matches.flatten[1]
         what = msg.matches.flatten[2]
         if what.nil?
-          msg.reply "Missing job name"
+          msg.reply(render_template("layout", response: "Missing job name"))
         else
           body = build_local(where, "#{__callee__}.#{task}", what, returner)
           response = make_request('/', body)
-          msg.reply process_response(response)
+          msg.reply(render_template("layout", response: process_response(response)))
         end
       end
 
@@ -183,11 +174,11 @@ module Lita
         task = msg.matches.flatten[1]
         what = msg.matches.flatten[2]
         if what.nil?
-          msg.reply "Missing job name"
+          msg.reply(render_template("layout", response: "Missing job name"))
         else
           body = build_local(where, "#{__callee__}.#{task}", what, returner)
           response = make_request('/', body)
-          msg.reply process_response(response)
+          msg.reply(render_template("layout", response: process_response(response)))
         end
       end
 
@@ -204,22 +195,6 @@ module Lita
         out
       end
 
-      def pillar(msg)
-        if expired
-          authenticate
-        end
-        where = msg.matches.flatten.first
-        task = msg.matches.flatten[1]
-        what = msg.matches.flatten[2]
-        if what.nil?
-          msg.reply "Missing job name"
-        else
-          body = build_local(where, "#{__callee__}.#{task}", what, returner)
-          response = make_request('/', body)
-          msg.reply_privately process_response(response)
-        end
-      end
-
       def expired
         self.class.token.nil? || Time.now >= Time.at(self.class.expires)
       end

data/lita-salt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-salt"
-  spec.version       = "0.5.0"
+  spec.version       = "1.0.0"
   spec.authors       = ["Jurnell Cockhren"]
   spec.email         = ["jurnell@sophicware.com"]
   spec.description   = %q{Salt handler for lita 4+}

data/spec/lita/handlers/salt_spec.rb

@@ -2,11 +2,12 @@ require "spec_helper"
 
 describe Lita::Handlers::Salt, lita_handler: true do
 
+  let(:robot) { Lita::Robot.new(registry) }
   let(:response) {double("Faraday::Response")}
   let(:reply) {""}
   let(:vals) { {url: "https://example.com", username: "timmy", password: "12345"} }
   let(:token) {"122938u98j9r82u3r"}
-  let(:salt) { described_class.new }
+  let(:salt) { described_class.new(robot) }
 
   describe "config" do
     before do
@@ -157,26 +158,4 @@ describe Lita::Handlers::Salt, lita_handler: true do
 
   end
 
-  describe "#pillar_get" do
-    before do
-      stub_request(:post, "#{vals[:url]}/login").
-        with(body: {eauth: "pam", password: vals[:password], username: vals[:username]}).
-        to_return(status: 200,
-                  body: JSON.dump(return: [{token: token, expire: 1424352200.50011}]),
-                  headers: {'X-Auth-Token' => token}
-        )
-      stub_request(:post, vals[:url]).
-        to_return(status: 200,
-                  body: JSON.dump(return: [[:main, :silly]])
-        )
-    end
-
-    #it { is_expected.to route_command('salt pillar').to(:pillar) }
-    it { is_expected.to route_command('salt pillar help').to(:pillar) }
-    it { is_expected.to route_command('salt pillar h').to(:pillar) }
-    it { is_expected.to route_command('s pillar help').to(:pillar) }
-    it { is_expected.to route_command('s pillar h').to(:pillar) }
-    
-  end
-
 end

data/templates/layout.slack.erb

@@ -0,0 +1 @@
+```<%= @response %>```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-salt
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jurnell Cockhren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -183,6 +183,8 @@ files:
 - lita-salt.gemspec
 - spec/lita/handlers/salt_spec.rb
 - spec/spec_helper.rb
+- templates/.gitkeep
+- templates/layout.slack.erb
 homepage: https://github.com/sophicware/lita-salt
 licenses:
 - MIT