lita-puppet 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc01d182f59a053388f0ebbab4e0dc6212b7ef18
-  data.tar.gz: 96d3ec8b6c30c7d32eec8511a4a08dc1afdb739a
+  metadata.gz: 3c1150a88c8b08a9520d3a28a724d5a12c58ee9f
+  data.tar.gz: 5c25d159b9492928484993df6a3736a79cbfb344
 SHA512:
-  metadata.gz: 779595d2a15c640e635bb7598023e4a66d98d3b285e20a347e5622fc4b3f8288c7c5dc889a3d5e02654c19e8a6db0b8786233d16bb8bd8103197da6100c3ce25
-  data.tar.gz: 826ed7a4fddfdb30dca4e0021fda54305d6f101a0929451c1107320bd9a48b4df5d3ffbefb30e1f4e420edc4cf8113b8c545d125b0d445b96e361c4c2e27bf40
+  metadata.gz: 19e33adbed14606f8a02f54cb69f21c5c15dfde377145e1779c1b5c8099f327d2b3ecb3d5f278407c9bcb0b69fe1ec3f36eec6eceadada268e5fc9178cd91777
+  data.tar.gz: 362c3195f6d0ae7fb4441eb0d4edf9dff91ad17a04496b85131bd2a3fd7569014e923227474e7f209bf1fae1fd5ca4fff0ee226965c9557f065d79133f9a7c96

data/README.md

@@ -1,6 +1,6 @@
 # lita-puppet
 
-TODO: Add a description of the plugin.
+A [Lita](https://www.lita.io/) handler plugin for some basic [Puppet](https://puppet.com/) operations.
 
 ## Installation
 
@@ -26,3 +26,25 @@ This is also available as:
     puppet deploy [environment]
     pp deploy [environment]
     pp r10k [environment]
+
+#### Trigger a manual run of the Puppet agent on a host
+    puppet agent run on <host>
+
+This is also available as:
+
+    puppet run on <host>
+    puppet run <host>
+    pp agent run on <host>
+    pp run on <host>
+    pp on <host>
+
+Though we don't recomend that last one...
+
+#### Remove an SSL cert from the Puppet Master
+    puppet cert clean <host>
+
+This is also available as:
+
+    pp cert clean <host>
+
+**Note** though that this doesn't do anything on the client side. If you want puppet to work on the `<host>` machine you'll need to generate a new cert. Usually you run this if you're planning to do that anyway though.

data/lib/lita/handlers/puppet.rb

@@ -7,67 +7,61 @@ module Lita
       config :control_repo_path, required: false, type: String
 
       route(
-        /(puppet|pp)\s+(r10k|deploy)(\s(\S+))?/i,
-        :r10k_deploy,
+        /(puppet|pp)(\s+agent)?\s+(run)(\s+on)?\s+(\S+)/i,
+        :puppet_agent_run,
         command: true,
         help: {
-          "puppet r10k [env]" => "Deploy the latest puppet code on the puppet master via r10k, optionally specifying an environment."
+          "puppet agent run on <host>" => "Run the puppet agent on <host>."
         }
       )
 
       route(
-        /(puppet|pp)(\s+agent)?\s+(run)(\s+on)?\s(\S+)/i,
-        :puppet_agent_run,
+        /(puppet|pp)\s+(cert)\s+(clean)\s+(\S+)/i,
+        :cert_clean,
         command: true,
         help: {
-          "puppet agent run on <host>" => "Run the puppet agent on <host>."
+          "puppet cert clean <host>" => "Remove all traces of the SSL cert for <host> on the Puppet Master."
+        }
+      )
+
+      route(
+        /(puppet|pp)\s+(r10k|deploy)(\s+(\S+))?/i,
+        :r10k_deploy,
+        command: true,
+        help: {
+          "puppet r10k [env]" => "Deploy the latest puppet code on the puppet master via r10k, optionally specifying an environment."
         }
       )
 
       include ::Utils::SSH
       include ::Utils::Text
 
-      def r10k_deploy(response)
-        environment = response.matches[0][3]
-        control_repo = config.control_repo_path || '/opt/puppet/control'
+      def cert_clean(response)
+        cert = response.matches[0][3]
         user = config.ssh_user || 'lita'
         username = friendly_name(response.user.name)
 
-        response.reply("#{username}, I'll get right on that. Give me a moment and I'll let you know how it went.")
-
-        result1 = over_ssh(host: config.master_hostname, user: user, timeout: 120) do |server|
-          # Need to use sudo
-          server.enable_sudo
-          server[control_repo].git :pull
-        end
-
-        if result1[:exception]
-          response.reply "#{username}, your r10k run didn't seem to work. Looks like there was a problem with Git:"
-          response.reply "/code " + result1[:exception].message
-          raise result1[:exception]
-        end
+        response.reply("#{username}, working on that `puppet cert clean`. I'll get right back to you.")
 
-        result2 = over_ssh(host: config.master_hostname, user: user) do |server|
+        result = over_ssh(host: config.master_hostname, user: user, timeout: 120) do |server|
+          server.cd '/tmp'
           # Need to use sudo
           server.enable_sudo
           # scary...
           server.disable_safe_mode
 
-          command = "r10k deploy environment"
-          command << " #{environment}" if environment
-          command << ' -pv'
-          server.execute command
+          server.execute "puppet cert clean #{cert}"
         end
 
-        if result2[:exception]
-          response.reply "#{username}, your r10k run didn't seem to work... Maybe it timed out?"
-          response.reply "/code " + result2[:exception].message
-          raise result2[:exception]
+        if result[:exception]
+          response.reply "#{username}, your `puppet cert clean` didn't seem to work... ;-("
+          response.reply "/code " + result[:exception].message
+          raise result[:exception]
         end
 
         # build a reply
-        response.reply("#{username}, your r10k deployment is done!")
-        reply_content = [result1[:stdout].join("\n"), result2[:stderr].join("\n")].join("\n")
+        response.reply("#{username}, your `puppet cert clean` is all done!")
+        reply_content = [result[:stdout].join("\n"), result[:stderr].join("\n")].join("\n")
         response.reply "/code " + sanitze_for_chat(reply_content)
       end
 
@@ -107,6 +101,50 @@ module Lita
         end
       end
 
+      def r10k_deploy(response)
+        environment = response.matches[0][3]
+        control_repo = config.control_repo_path || '/opt/puppet/control'
+        user = config.ssh_user || 'lita'
+        username = friendly_name(response.user.name)
+
+        response.reply("#{username}, I'll get right on that. Give me a moment and I'll let you know how it went.")
+
+        result1 = over_ssh(host: config.master_hostname, user: user, timeout: 120) do |server|
+          # Need to use sudo
+          server.enable_sudo
+          server[control_repo].git :pull
+        end
+
+        if result1[:exception]
+          response.reply "#{username}, your r10k run didn't seem to work. Looks like there was a problem with Git:"
+          response.reply "/code " + result1[:exception].message
+          raise result1[:exception]
+        end
+
+        result2 = over_ssh(host: config.master_hostname, user: user) do |server|
+          # Need to use sudo
+          server.enable_sudo
+          # scary...
+          server.disable_safe_mode
+
+          command = "r10k deploy environment"
+          command << " #{environment}" if environment
+          command << ' -pv'
+          server.execute command
+        end
+
+        if result2[:exception]
+          response.reply "#{username}, your r10k run didn't seem to work... Maybe it timed out?"
+          response.reply "/code " + result2[:exception].message
+          raise result2[:exception]
+        end
+
+        # build a reply
+        response.reply("#{username}, your r10k deployment is done!")
+        reply_content = [result1[:stdout].join("\n"), result2[:stderr].join("\n")].join("\n")
+        response.reply "/code " + sanitze_for_chat(reply_content)
+      end
+
       Lita.register_handler(self)
     end
   end

data/lita-puppet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-puppet"
-  spec.version       = "0.3.1"
+  spec.version       = "0.4.0"
   spec.authors       = ["Jonathan Gnagy"]
   spec.email         = ["jgnagy@knuedge.com"]
   spec.description   = "Some basic Puppet interactions for Lita"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-puppet
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita