lita-puppet 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9097b96f123e1d9952226626448af5b9162f131d
-  data.tar.gz: 2f729905e6c7ba910923eeaf048fa4483161812f
+  metadata.gz: 57bbb8a20245057c75fdbc4b930e35f0402bc53d
+  data.tar.gz: 246146da0825efad3b35fc05838a7a5ab1186bd0
 SHA512:
-  metadata.gz: 9ab0ca71632fe5e9ea5e7f617f83b3dbf2d6d9f6d359b41eec56159529a6acab40e9aef93e824f4bc1e9ac89bd3017c897061c0a7745ef44fdd279618865585d
-  data.tar.gz: b09ed799fc39ed282e2b2b88421a2c7a6b1a73b50414aa2f653bc3ff44e547ac5792083041f3819bfb391f8daee484e348c3cf8c478cfccf883fa41c19669acf
+  metadata.gz: 41b578974acfb904c33f5042936e7b2812e6f1de86d2462355fcfb4cbefa003878e817eff8ad65da6b7f7abb633ebd5e252b743fd353f1cddfbf1c33e2dd195d
+  data.tar.gz: d63d1ccce2367c89758658154daba0993be51e0cf6095fdd0181b92db6b12374f415409d9e08545a74a0e7a41b864b9ae56d84a7ffafac4b843c3a75daefb342

data/lib/lita/handlers/puppet.rb

@@ -24,106 +24,86 @@ module Lita
         }
       )
 
+      include ::Utils::SSH
+      include ::Utils::Text
+
       def r10k_deploy(response)
         environment = response.matches[0][3]
         control_repo = config.control_repo_path || '/opt/puppet/control'
         user = config.ssh_user || 'lita'
-        username = response.user.name
+        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.")
 
-        ret = nil
-
-        # TODO: better error handling
-        puppet_master = Rye::Box.new(
-          config.master_hostname,
-          user: user,
-          auth_methods: ['publickey'],
-          password_prompt: false
-        )
-
-        begin
-          Timeout::timeout(600) do
-            puppet_master.cd control_repo
-
-            # Need to use sudo from here on
-            puppet_master.enable_sudo
-
-            puppet_master.git :pull
-
-            # scary...
-            puppet_master.disable_safe_mode
-            command = "r10k deploy environment"
-            command << " #{environment}" if environment
-            command << ' -pv'
-            ret = puppet_master.execute command
-          end
-        rescue Exception => e
-          exception = e
-        ensure
-          puppet_master.disconnect
+        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
 
-        # build a reply
-        if ret
-          response.reply("#{username}, your r10k deployment is done!")
-          response.reply "/code " + ret.stderr.join("\n")
-        else
-          response.reply "#{username}, your r10k run didn't seem to work... I think it may have timed out."
-          response.reply "/code " + exception.message
+        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
 
       def puppet_agent_run(response)
         host = response.matches[0][4]
         user = config.ssh_user || 'lita'
-        username = response.user.name
+        username = friendly_name(response.user.name)
 
         response.reply("#{username}, I'll run puppet right away. Give me a sec and I'll let you know how it goes.")
 
-        ret = nil
-        exception = nil
-
-        # TODO: better error handling
-        remote = Rye::Box.new(
-          host,
-          user: user,
-          auth_methods: ['publickey'],
-          password_prompt: false
-        )
-
-        begin
-          Timeout::timeout(300) do
-            remote.cd '/tmp'
-
-            # Need to use sudo from here on
-            remote.enable_sudo
-
-            # scary...
-            remote.disable_safe_mode
-
-            # build up the command
-            command = 'puppet agent'
-            command << ' --verbose --no-daemonize'
-            command << ' --no-usecacheonfailure'
-            command << ' --no-splay --show_diff'
-
-            ret = remote.execute command
-          end
-        rescue Exception => e
-          exception = e
-        ensure
-          remote.disconnect
+        result = over_ssh(host: host, user: user) do |server|
+          server.cd '/tmp'
+
+          # Need to use sudo from here on
+          server.enable_sudo
+
+          # scary...
+          server.disable_safe_mode
+
+          # build up the command
+          command = 'puppet agent'
+          command << ' --verbose --no-daemonize'
+          command << ' --no-usecacheonfailure'
+          command << ' --no-splay --show_diff'
+
+          server.execute command
         end
 
         # build a reply
-        if ret
-          response.reply "#{username}, that puppet run is complete! It exited with status #{ret.exit_status}."
+        if !result[:exception]
+          response.reply "#{username}, that puppet run is complete! It exited with status #{result[:exit_status]}."
           # Send the standard out, but strip off the bash color code stuff...
-          response.reply "/code " + ret.stdout.join("\n").gsub(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]/, '')
+          response.reply "/code " + sanitze_for_chat(result[:stdout].join("\n"))
         else
           response.reply "#{username}, your puppet run is done, but didn't seem to work... I think it may have timed out."
-          response.reply "/code " + exception.message
+          response.reply "/code " + result[:exception].message
         end
       end
 

data/lib/lita-puppet.rb

@@ -6,6 +6,8 @@ Lita.load_locales Dir[File.expand_path(
   File.join("..", "..", "locales", "*.yml"), __FILE__
 )]
 
+require 'utils/ssh'
+require 'utils/text'
 require "lita/handlers/puppet"
 
 Lita::Handlers::Puppet.template_root File.expand_path(

data/lib/utils/ssh.rb

@@ -0,0 +1,37 @@
+module Utils
+  # Utility methods for doing things over SSH
+  module SSH
+    # Intelligently do some things over SSH
+    def over_ssh(opts = {})
+      result = {}
+      fail "MissingSSHHost" unless opts[:host]
+      fail "MissingSSHUser" unless opts[:user]
+      opts[:timeout] ||= 300 # default to a 5 minute timeout
+
+      remote = Rye::Box.new(
+        opts[:host],
+        user: opts[:user],
+        auth_methods: ['publickey'],
+        password_prompt: false
+      )
+
+      exception = nil
+
+      output = begin
+        Timeout::timeout(opts[:timeout]) do
+          yield remote # pass our host back to the user to work with
+        end
+      rescue Exception => e
+        exception = e
+      ensure
+        remote.disconnect
+      end
+
+      result[:exception] = exception
+      result[:exit_status] = output.exit_status
+      result[:stdout] = output.stdout
+      result[:stderr] = output.stderr
+      return result
+    end
+  end
+end

data/lib/utils/text.rb

@@ -0,0 +1,15 @@
+module Utils
+  # Utility methods for manipulating text
+  module Text
+    # Try to make names more friendly
+    def friendly_name(long_name)
+      long_name.split(/\s/).first
+    end
+
+    # Strip off bad characters 
+    def sanitze_for_chat(text)
+      # Remove bash colorings
+      text.gsub(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]/, '')
+    end
+  end
+end

data/lita-puppet.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-puppet
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Jonathan Gnagy
@@ -123,6 +123,8 @@ files:
 - Rakefile
 - lib/lita-puppet.rb
 - lib/lita/handlers/puppet.rb
+- lib/utils/ssh.rb
+- lib/utils/text.rb
 - lita-puppet.gemspec
 - locales/en.yml
 - spec/lita/handlers/puppet_spec.rb