puppet_webhook 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1766c8c40fdad1e020f0f749e7cad83fc4dcd60cd1c20fd20fad1d14cde5b350
-  data.tar.gz: 57dc8f86203799218849a0baaddc6006535959345ccbad10d8863a4a08d1d476
+  metadata.gz: 7285f0d9e15b365e5b9e4b715a419182fc78e266f104762da4be350f45c05ffc
+  data.tar.gz: 619d6b615710aeb263f36f0d79162dd7036d18739ca5d5aa2dbe150f195f06a3
 SHA512:
-  metadata.gz: 9ac05a999b6233e9fc4ab464e3d3f25b582f119efae8ff60bd069ca3582e4c17dd0f7e773088cafcac5fc61fc84113fdf6a28345d6ed1b8654e686368790d638
-  data.tar.gz: 8a19dfe7d9b3264b7432bf208c4da1c0c5745c39a540744177336ca2317c0c44a31da85df35b70823a24fc28677339d06458cda64fcb4663008950e0d988e9d6
+  metadata.gz: 761de6f49d6d89c87a8c90fd790e2886b6d0fd316d996749cf2cc13ae8605deddd3e360ffa00f27a7449171856ffccc1b03854a590572031c1974a63e615b01a
+  data.tar.gz: a4f40e21093d3eebe62a95fc167297d84dc9b027f442d1be2efbd80a0394f65cb22ba66bc67fdba44118315d8588b399e76de49cf0108c79995bf36fb4675963

data/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
+## [v1.3.0](https://github.com/voxpupuli/puppet_webhook/tree/v1.3.0) (2018-04-24)
+[Full Changelog](https://github.com/voxpupuli/puppet_webhook/compare/v1.2.0...v1.3.0)
+
+**Implemented enhancements:**
+
+- Add additional Slack options. [\#50](https://github.com/voxpupuli/puppet_webhook/pull/50) ([dhollinger](https://github.com/dhollinger))
+- Async routes [\#49](https://github.com/voxpupuli/puppet_webhook/pull/49) ([dhollinger](https://github.com/dhollinger))
+
 ## [v1.2.0](https://github.com/voxpupuli/puppet_webhook/tree/v1.2.0) (2018-04-06)
 [Full Changelog](https://github.com/voxpupuli/puppet_webhook/compare/v1.1.0...v1.2.0)
 

data/README.md

@@ -192,10 +192,25 @@ MCollective Ruby discovery timeout. REQUIRES `use_mco_ruby` TO BE `true`.
 
 ##### slack_webhook
 
-Whether or not to use Slack Notifications.
-* Valid options: [ `true`, `false` ]
+URL of your Slack Webhook receiver, if you wish not to use a Slack Webhook, then simply leave the option on `false`, otherwise use the full Wwebhook URL for your community as per https://api.slack.com/incoming-webhooks.
+* Valid options: [ `https://hooks.slack.com/services/<generated_hash>`, `false` ]
 * Default: `false`
 
+##### slack_channel
+
+Name of the Slack channel to post to. Ignored if `slack_webhook` is disabled.
+Default: `#general`
+
+##### slack_user
+
+Name of the Slack user to post as. Ignored if `slack_webhook` is disabled.
+Default: `puppet_webhook`
+
+##### slack_emoji
+
+Icon emoji for the Webhook to use when posting. Ignored if `slack_webhook` is disabled.
+Default: `:ocean:`
+
 ##### slack_proxy_url
 
 The proxy URL for Slack if used.

data/lib/helpers/tasks.rb

@@ -47,15 +47,8 @@ module Tasks # rubocop:disable Style/Documentation
   end
 
   def run_command(command)
-    if Open3.respond_to?('capture3')
-      stdout, stderr, exit_status = Open3.capture3(command)
-      message = "triggered: #{command}\n#{stdout}\n#{stderr}"
-    else
-      message = "forked: #{command}"
-      Process.detach(fork { exec "#{command} &" })
-      exit_status = 0
-    end
-    raise "#{stdout}\n#{stderr}" if exit_status != 0
+    message = "forked: #{command}"
+    exec "#{command} &"
     message
   end
 
@@ -87,9 +80,9 @@ module Tasks # rubocop:disable Style/Documentation
     end
 
     notifier = Slack::Notifier.new settings.slack_webhook do
-      defaults channel: '#general',
-               username: 'puppet_webhook',
-               icon_emoji: ':ocean:',
+      defaults channel: settings.slack_channel,
+               username: settings.slack_user,
+               icon_emoji: settings.slack_emoji,
                http_options: http_options
     end
 

data/lib/puppet_webhook.rb

@@ -38,6 +38,9 @@ class PuppetWebhook < Sinatra::Base # rubocop:disable Style/Documentation
   set :use_mcollective, false unless settings.respond_to? :use_mcollective=
   set :discovery_timeout, false unless settings.respond_to? :discovery_timeout=
   set :slack_webhook, false unless settings.respond_to? :slack_webhook=
+  set :slack_channel, '#general' unless settings.respond_to? :slack_channel=
+  set :slack_user, 'puppet_webhook' unless settings.respond_to? :slack_user=
+  set :slack_emoji, ':ocean:' unless settings.respond_to? :slack_emoji=
   set :slack_proxy_url, nil unless settings.respond_to? :slack_proxy_url=
   set :default_branch, 'production' unless settings.respond_to? :default_branch=
   set :ignore_environments, [] unless settings.respond_to? :ignore_environments=

data/lib/routes/module.rb

@@ -20,7 +20,7 @@ module Sinatra
 
           module_name = sanitize_input(module_name)
           LOGGER.info("Deploying module #{module_name}")
-          deploy_module(module_name)
+          Process.detach(fork { deploy_module(module_name) })
         end
       end
     end

data/lib/routes/payload.rb

@@ -61,7 +61,7 @@ module Sinatra
             return 200
           else
             LOGGER.info("Deploying environment #{env}")
-            deploy(env, deleted)
+            Process.detach(fork { deploy(env, deleted) })
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_webhook
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json