lita-salt 0.2.1.pre.beta → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38bbf17d0221465533511be02e3d4ff0c91996fe
-  data.tar.gz: 50b763e665c535666d2fbe2a9e611cde83ddd7c9
+  metadata.gz: 2c0e502b9058427844ca0c6d731c0ec96d547632
+  data.tar.gz: bff383bb61e3ac850fc3792bd74916863d898ed4
 SHA512:
-  metadata.gz: 1a8cf9ad80f7741da52c89053b1bc37c298d0c085c226fed0c3c3efa91bdcad0ba61c0d7326ee32e360ebc7d8490ad1035f309050a9c07481bf5b3c3df8ee3d4
-  data.tar.gz: 335e4d043681e34e49beb925bc12063ed544d93f6f3b1f5b92f4f1c3bbf7af8e7820b899a9cee115037709da29dc91cac34411383b894e8ad896de5b0f7786cd
+  metadata.gz: 4b2dcf48e6a38488da1d058a848e6f2c1f0e84737ccb6e71bb143b978c8da067fdc0102e9028a74dfe3d3b60edb44ba161fc104942292fa0cba297c497d92da9
+  data.tar.gz: cdc928eb2eed0c13333d0bd74ab80217b17676d279b676988bbb06f787d886c475fef68cb9ff505e08c21cccfa4e599bb03498170c4029a95b7e1b7c50494576

data/README.md

@@ -1,6 +1,6 @@
 # lita-salt [![Gem Version](https://badge.fury.io/rb/lita-salt.svg)](http://badge.fury.io/rb/lita-salt)
 
-**lita-salt** is an adapter for Lita that gives your bot the power to interact with your saltstack installation via salt-api.
+**lita-salt** is an adapter for [Lita](https://www.lita.io) that gives your bot the power to interact with your saltstack installation via salt-api.
 
 ## Installation
 
@@ -12,12 +12,16 @@ gem "lita-salt"
 
 ## Configuration
 
-### Required attributes
+### Required
 
 * `url` (String) – The location of the running salt-api service.
 * `username` (String) – The username used to authenticate with salt-api.
 * `password` (String) – The password used to authenticate with salt-api.
 
+### Optional
+
+* `returner` (String) – A [Saltstack returner](http://docs.saltstack.com/en/2014.7/ref/returners/all/) you'd like to use. (uses default if unset)
+
 ### Example
 
 ``` ruby

data/lib/lita/handlers/salt.rb

@@ -14,6 +14,7 @@ module Lita
       config :url, required: true
       config :username, required: true
       config :password, required: true
+      config :returner, required: false
 
 
 
@@ -100,7 +101,7 @@ module Lita
         if expired
           authenticate
         end
-        body = build_runner('manage.up')
+        body = build_runner('manage.up', returner)
         response = make_request('/', body)
         if response.status == 200
           msg.reply response.body
@@ -113,7 +114,7 @@ module Lita
         if expired
           authenticate
         end
-        body = build_runner('manage.down')
+        body = build_runner('manage.down', returner)
         response = make_request('/', body)
         if response.status == 200
           msg.reply response.body
@@ -132,7 +133,7 @@ module Lita
         if what.nil?
           msg.reply "Missing service name"
         else
-          body = build_local(where, "#{__callee__}.#{task}", what)
+          body = build_local(where, "#{__callee__}.#{task}", what, returner)
           response = make_request('/', body)
           msg.reply process_response(response)
         end
@@ -148,7 +149,7 @@ module Lita
         if what.nil?
           msg.reply "Missing job name"
         else
-          body = build_local(where, "#{__callee__}.#{task}", what)
+          body = build_local(where, "#{__callee__}.#{task}", what, returner)
           response = make_request('/', body)
           msg.reply process_response(response)
         end
@@ -164,7 +165,7 @@ module Lita
         if what.nil?
           msg.reply "Missing job name"
         else
-          body = build_local(where, "#{__callee__}.#{task}", what)
+          body = build_local(where, "#{__callee__}.#{task}", what, returner)
           response = make_request('/', body)
           msg.reply process_response(response)
         end
@@ -193,7 +194,7 @@ module Lita
         if what.nil?
           msg.reply "Missing job name"
         else
-          body = build_local(where, "#{__callee__}.#{task}", what)
+          body = build_local(where, "#{__callee__}.#{task}", what, returner)
           response = make_request('/', body)
           msg.reply_privately process_response(response)
         end
@@ -224,6 +225,10 @@ module Lita
         config.password
       end
 
+      def returner
+        config.returner
+      end
+
     end
 
     Lita.register_handler(Salt)

data/lib/lita/utils/payload.rb

@@ -3,19 +3,22 @@ require 'json'
 module Utils
   module Payload
 
-    def build_runner(function)
-      JSON.dump({
+    def build_runner(function, returner=nil)
+      s = {
         client: :runner,
         fun: function
-      })
+      }
+      s['ret'] = returner unless returner.nil?
+      JSON.dump(s)
     end
 
-    def build_local(target, function, arg=nil)
+    def build_local(target, function, arg=nil, returner=nil)
       s = {
         client: :local,
         tgt: target,
-        fun: function,
+        fun: function
       }
+      s['ret'] = returner unless returner.nil?
       s['arg'] = [arg] unless arg.nil?
       JSON.dump(s)
     end

data/lita-salt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-salt"
-  spec.version       = "0.2.1-beta"
+  spec.version       = "0.3.0"
   spec.authors       = ["Jurnell Cockhren"]
   spec.email         = ["jurnell@sophicware.com"]
   spec.description   = %q{Salt handler for lita 4+}
@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rspec", ">= 3.0.0"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "guard-rake"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "fakeredis"
 end

data/spec/spec_helper.rb

@@ -1,10 +1,9 @@
 require "simplecov"
-require "coveralls"
 require 'webmock/rspec'
+require 'fakeredis/rspec'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
 ]
 SimpleCov.start { add_filter "/spec/" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-salt
 version: !ruby/object:Gem::Version
-  version: 0.2.1.pre.beta
+  version: 0.3.0
 platform: ruby
 authors:
 - Jurnell Cockhren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: guard-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rake
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: fakeredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,9 +185,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5