lita-puppet 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24922d792c78cac0dbc47d19319680e6d4aa8e65
-  data.tar.gz: af23e3bb3dce2e5a053356a8ae03128b5d18b426
+  metadata.gz: 9d628affc13749d488e0425795d1c186529d6aa1
+  data.tar.gz: 9d6b10693e3ecccab9e6250b5a6dda87fc7abc25
 SHA512:
-  metadata.gz: 3fa73002df79c370f7d4717d99a5b8784ab3a1fd4435e7ebf7e9d36f91e52aea1d2220dd50869ca3ad6d3d2089256f96b0525a2f3560f5a63dce0d0d398e3bee
-  data.tar.gz: 969b0634bc6f682a5118b16a7c08c904deff71f2d640632964ae079c2ca61fccb5c2335baf599942a885a8d1c1df37276d6cc0dd22db83b38afb04e46b7bc7a7
+  metadata.gz: 33df42ee1cb7799138a0b829423cbe5d6316da8eff92f0c856695bf5143e8f4214f5ebab06291d9297e2524628ef6a09ae021a77fece2cd25b3696cbe29b2709
+  data.tar.gz: a7e34d69a70957729c495f40bef7d835d140a99a722bbdf57e16d192758f741d9a49a0a887b7727e458a4352b65f5e577f41a8860fe3195f3564dbf7a2b9b026

data/.rubocop.yml

@@ -0,0 +1,19 @@
+Documentation:
+  Exclude:
+    - lib/lita/handlers/puppet.rb
+
+FileName:
+  Exclude:
+    - lib/lita-puppet.rb
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/AbcSize:
+  Max: 22
+
+Metrics/MethodLength:
+  Max: 20
+
+Metrics/ClassLength:
+  Max: 150

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 2.2.5
+  - 2.3.1
+services:
+  - redis-server
+cache: bundler

data/Gemfile

@@ -1,3 +1,3 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -1,5 +1,10 @@
 # lita-puppet
 
+[![Build Status](https://img.shields.io/travis/knuedge/lita-puppet/master.svg)](https://travis-ci.org/knuedge/lita-puppet)
+[![MIT License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://tldrlegal.com/license/mit-license)
+[![RubyGems :: RMuh Gem Version](http://img.shields.io/gem/v/lita-puppet.svg)](https://rubygems.org/gems/lita-puppet)
+[![Code Climate](https://img.shields.io/codeclimate/github/knuedge/lita-puppet.svg)](https://codeclimate.com/github/knuedge/lita-puppet)
+
 A [Lita](https://www.lita.io/) handler plugin for some basic [Puppet](https://puppet.com/) operations.
 
 ## Installation

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:rubocop)
 
-task default: :spec
+task default: [:spec, :rubocop]

data/lib/lita-puppet.rb

@@ -1,18 +1,18 @@
-require "lita"
+require 'lita'
 require 'rye'
 require 'timeout'
 require 'puppetdb'
 
 Lita.load_locales Dir[File.expand_path(
-  File.join("..", "..", "locales", "*.yml"), __FILE__
+  File.join('..', '..', 'locales', '*.yml'), __FILE__
 )]
 
-require 'utils/puppetdb'
-require 'utils/ssh'
-require 'utils/text'
-require "lita/handlers/puppet"
+require 'utils/lita_puppet/puppetdb'
+require 'utils/lita_puppet/ssh'
+require 'utils/lita_puppet/text'
+require 'lita/handlers/puppet'
 
 Lita::Handlers::Puppet.template_root File.expand_path(
-  File.join("..", "..", "templates"),
- __FILE__
+  File.join('..', '..', 'templates'),
+  __FILE__
 )

data/lib/lita/handlers/puppet.rb

@@ -3,225 +3,185 @@ module Lita
     class Puppet < Handler
       namespace 'Puppet'
       config :master_hostname, required: true, type: String
-      config :ssh_user, required: false, type: String
-      config :control_repo_path, required: false, type: String
+      config :ssh_user, required: false, type: String, default: 'lita'
+      config :control_repo_path, required: false, type: String, default: '/opt/puppet/control'
       config :puppetdb_url, required: false, type: String
 
       route(
         /(puppet|pp)(\s+agent)?\s+(run)(\s+on)?\s+(\S+)/i,
         :puppet_agent_run,
         command: true,
-        help: {
-          "puppet agent run on <host>" => "Run the puppet agent on <host>."
-        }
+        help: { t('help.puppet_agent_run.syntax') => t('help.puppet_agent_run.desc') }
       )
 
       route(
         /(puppet|pp)\s+(cert)\s+(clean)\s+(\S+)/i,
         :cert_clean,
         command: true,
-        help: {
-          "puppet cert clean <host>" => "Remove all traces of the SSL cert for <host> on the Puppet Master."
-        }
+        help: { t('help.cert_clean.syntax') => t('help.cert_clean.desc') }
       )
 
       route(
         /(puppet|pp)\s+(catalog|node)\s+(\S+)\s+(profiles)/i,
         :node_profiles,
         command: true,
-        help: {
-          "puppet catalog <host> profiles" => "Query PuppetDB to get a list of all roles and profiles applied to <host>."
-        }
+        help: { t('help.node_profiles.syntax') => t('help.node_profiles.desc') }
       )
 
       route(
         /(puppet|pp)\s+(class)\s+(nodes)\s+(\S+)/i,
         :nodes_with_class,
         command: true,
-        help: {
-          "puppet class nodes <class>" => "Query PuppetDB to get a list of all nodes containing a class."
-        }
+        help: { t('help.nodes_with_class.syntax') => t('help.nodes_with_class.desc') }
       )
 
       route(
         /(puppet|pp)\s+(r10k|deploy)(\s+(\S+)(\s+(\S+))?)?/i,
         :r10k_deploy,
         command: true,
-        help: {
-          "puppet r10k [env [module]]" => "Deploy the latest puppet code on the puppet master via r10k, optionally specifying an environment, and possibly a module."
-        }
+        help: { t('help.r10k_deploy.syntax') => t('help.r10k_deploy.desc') }
       )
 
-      include ::Utils::PuppetDB
-      include ::Utils::SSH
-      include ::Utils::Text
+      include ::Utils::LitaPuppet::PuppetDB
+      include ::Utils::LitaPuppet::SSH
+      include ::Utils::LitaPuppet::Text
 
       def cert_clean(response)
         cert = response.matches[0][3]
-        user = config.ssh_user || 'lita'
-        username = friendly_name(response.user.name)
 
-        response.reply("#{username}, working on that `puppet cert clean`. I'll get right back to you.")
+        response.reply_with_mention(t('replies.cert_clean.working'))
 
-        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
-
-          server.execute "puppet cert clean #{cert} 2>&1"
-        end
+        result = cert_clean_result(config.master_hostname, config.ssh_user, cert)
 
         if result[:exception]
-          response.reply "#{username}, your `puppet cert clean` didn't seem to work... ;-("
-          response.reply as_code(result[:exception].message)
-          return false
+          fail_message t('replies.cert_clean.failure'), result[:exception].message
+        else
+          success_message(
+            t('replies.cert_clean.success'),
+            (result[:stdout] + result[:stderr]).join("\n")
+          )
         end
-
-        # build a reply
-        response.reply("#{username}, your `puppet cert clean` is all done!")
-        reply_content = [result[:stdout].join("\n"), result[:stderr].join("\n")].join("\n")
-        response.reply as_code(reply_content)
       end
 
       def puppet_agent_run(response)
         host = response.matches[0][4]
-        user = config.ssh_user || 'lita'
-        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.")
+        response.reply_with_mention(t('replies.puppet_agent_run.working'))
 
-        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 << ' --onetime --verbose --no-daemonize'
-          command << ' --no-usecacheonfailure'
-          command << ' --no-splay --show_diff 2>&1'
-
-          server.execute command
-        end
+        result = simple_ssh_command(host, config.ssh_user, agent_command)
 
         # build a reply
-        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 as_code(result[:stdout].join("\n"))
+        if result[:exception]
+          fail_message t('replies.puppet_agent_run.failure'), result[:exception].message
         else
-          response.reply "#{username}, your puppet run is done, but didn't seem to work... I think it may have timed out."
-          response.reply as_code(result[:exception].message)
+          success_message(
+            t('replies.puppet_agent_run.success', status: result[:exit_status]),
+            result[:stdout].join("\n")
+          )
         end
       end
 
       def node_profiles(response)
         host = response.matches[0][2]
         url  = config.puppetdb_url
-        username = friendly_name(response.user.name)
 
         unless url
-          cant_reply = "#{username}, I would do that, but I don't know how to connect to PuppetDB."
-          cant_reply << "Edit my config and add `config.handlers.puppet.puppetdb_url`."
-          response.reply(cant_reply)
+          response.reply(t('replies.node_profiles.notconf'))
           return false
         end
 
-        response.reply("#{username}, let me see what I can find in PuppetDB for you.")
+        response.reply_with_mention(t('replies.node_profiles.working'))
 
         profiles = node_roles_and_profiles(url, host)
+
         if profiles.is_a? String
-          response.reply("Hmmm, that didn't work. Here's what PuppetDB responded with: '#{profiles}'")
-          return false
+          fail_message t('replies.node_profiles.failure', error: profiles)
         else
-          response.reply("Here are the profiles and roles for #{host}:")
-          response.reply as_code(profiles.join("\n"))
+          success_message t('replies.node_profiles.success', host: host), profiles.join("\n")
         end
       end
 
       def nodes_with_class(response)
         puppet_class = response.matches[0][3]
         url = config.puppetdb_url
-        username = friendly_name(response.user.name)
 
         unless url
-          cant_reply = "#{username}, I would do that, but I don't know how to connect to PuppetDB."
-          cant_reply << "Edit my config and add `config.handlers.puppet.puppetdb_url`."
-          response.reply(cant_reply)
+          response.reply(t('replies.nodes_with_class.notconf'))
           return false
         end
 
-        response.reply("#{username}, let me see what I can find in PuppetDB for you.")
-        
-        search = class_camel(puppet_class)
-        puppet_classes = class_nodes(url, search)
+        response.reply_with_mention(t('replies.nodes_with_class.working'))
+
+        puppet_classes = class_nodes(url, class_camel(puppet_class))
         if puppet_classes.empty?
-          response.reply("There are no nodes with #{puppet_class} class, are you sure its a valid class?")
-          return false
+          fail_message t('replies.nodes_with_class.failure', pclass: puppet_class)
         else
-          response.reply("Here are all the nodes with class #{puppet_class}:")
-          response.reply as_code(puppet_classes.join("\n"))
+          success_message(
+            t('replies.nodes_with_class.success', pclass: puppet_class),
+            puppet_classes.join("\n")
+          )
         end
       end
 
-
+      # rubocop:disable Metrics/AbcSize
       def r10k_deploy(response)
         environment = response.matches[0][3]
         mod = response.matches[0][5]
-        control_repo = config.control_repo_path || '/opt/puppet/control'
-        user = config.ssh_user || 'lita'
-        username = friendly_name(response.user.name)
+        user = config.ssh_user
 
-        response.reply("#{username}, I'll get right on that. Give me a moment and I'll let you know how it went.")
+        response.reply_with_mention(t('replies.r10k_deploy.working'))
 
-        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
+        result1 = r10k_git_result(config.master_hostname, user, config.control_repo_path)
 
         if result1[:exception]
-          response.reply "#{username}, your r10k run didn't seem to work. Looks like there was a problem with Git:"
-          response.reply as_code(result1[:exception].message)
+          fail_message t('replies.r10k_deploy.gitfail'), result1[:exception].message
           return false
         end
 
-        result2 = over_ssh(host: config.master_hostname, user: user) do |server|
+        result2 = simple_ssh_command(config.master_hostname, user, r10k_command(environment, mod))
+
+        if result2[:exception]
+          fail_message t('replies.r10k_deploy.pupfail'), result2[:exception].message
+        else
+          success_message(
+            t('replies.r10k_deploy.success'),
+            [result1[:stdout].join("\n"), result2[:stderr].join("\n")].join("\n")
+          )
+        end
+      end
+
+      private
+
+      def fail_message(message, data = nil)
+        response.reply_with_mention(message)
+        response.reply(as_code(data)) if data
+      end
+
+      alias success_message fail_message
+
+      def simple_ssh_command(host, user, command, timeout = 300)
+        over_ssh(host: host, user: user, timeout: timeout) do |server|
+          server.cd '/tmp'
           # Need to use sudo
           server.enable_sudo
           # scary...
           server.disable_safe_mode
 
-          command = "r10k deploy"
-          if environment && mod
-            command << ' module'
-            command << " -e #{environment}"
-            command << " #{mod}"
-            command << " -v"
-          else
-            command << " environment"
-            command << " #{environment}" if environment
-            command << ' -pv'
-          end
           server.execute command
         end
+      end
 
-        if result2[:exception]
-          response.reply "#{username}, your r10k run didn't seem to work... Maybe it timed out?"
-          response.reply as_code(result2[:exception].message)
-          return false
-        end
+      def cert_clean_result(host, user, cert)
+        cmd = "puppet cert clean #{cert} 2>&1"
+        simple_ssh_command(host, user, cmd, 120)
+      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 as_code(reply_content)
+      def r10k_git_result(host, user, repo_location)
+        over_ssh(host: host, user: user, timeout: 120) do |server|
+          # Need to use sudo
+          server.enable_sudo
+          server[repo_location].git :pull
+        end
       end
 
       Lita.register_handler(self)

data/lib/utils/lita_puppet/puppetdb.rb

@@ -0,0 +1,39 @@
+module Utils
+  module LitaPuppet
+    # Utility methods for working with PuppetDB
+    module PuppetDB
+      def dbquery(url, q)
+        # TODO: validate incoming query structure
+        client = ::PuppetDB::Client.new(server: url)
+        client.request(*q)
+      end
+
+      def node_roles_and_profiles(url, nodename)
+        # TODO: validate url and nodename
+        ::PuppetDB::Client.new(server: url) # this is weird but required
+        d = ::PuppetDB::Client.get("/catalogs/#{nodename}")
+        return d['error'] if d['error']
+
+        tags = []
+        d['data']['resources'].each { |r| tags.concat(r['tags']) }
+
+        # return all the tags related to profile:: or role::
+        tags.sort.uniq.select { |t| t.match(/^(profile|role)::/) }
+      end
+
+      def class_nodes(url, classname)
+        client = ::PuppetDB::Client.new(server: url)
+        q = client.request(
+          'resources',
+          [
+            :and,
+            [:'=', 'type', 'Class'],
+            [:'=', 'title', classname.to_s]
+          ]
+        )
+
+        q.data.map { |node| node['certname'] }
+      end
+    end
+  end
+end

data/lib/utils/lita_puppet/ssh.rb

@@ -0,0 +1,47 @@
+module Utils
+  module LitaPuppet
+    # Utility methods for doing things over SSH
+    module SSH
+      # Intelligently do some things over SSH
+      def over_ssh(opts = {})
+        raise 'MissingSSHHost' unless opts[:host]
+        raise '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,
+          error: STDOUT # send STDERR to STDOUT for things that actually print
+        )
+
+        exception = nil
+
+        # Getting serious about not crashing Lita...
+        output = begin
+          # pass our host back to the user to work with
+          Timeout.timeout(opts[:timeout]) { yield remote }
+        rescue Rye::Err, StandardError => e
+          exception = e
+        ensure
+          remote.disconnect
+        end
+
+        calculate_result(output, exception)
+      end
+
+      def calculate_result(output, exception)
+        result = {}
+        if exception
+          result[:exception] = exception
+        else
+          result[:exit_status] = output.exit_status
+          result[:stdout] = output.stdout
+          result[:stderr] = output.stderr
+        end
+        result
+      end
+    end
+  end
+end

data/lib/utils/lita_puppet/text.rb

@@ -0,0 +1,42 @@
+module Utils
+  module LitaPuppet
+    # Utility methods for manipulating text
+    module Text
+      # 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
+
+      # camel case puppet classes
+      def class_camel(text)
+        text.split('::').map(&:capitalize).join('::')
+      end
+
+      # Format some text as code
+      #  Note that this is HipChat specific for the moment
+      # TODO: Make this *not* HipChat specific
+      def as_code(text)
+        '/code ' + sanitze_for_chat(text)
+      end
+
+      def r10k_command(environment, mod)
+        command = 'r10k deploy'
+        if environment && mod
+          command << " module -e #{environment} #{mod} -v"
+        else
+          command << ' environment'
+          command << " #{environment}" if environment
+          command << ' -pv'
+        end
+      end
+
+      def agent_command
+        command = 'puppet agent'
+        command << ' --onetime --verbose --no-daemonize'
+        command << ' --no-usecacheonfailure'
+        command << ' --no-splay --show_diff 2>&1'
+      end
+    end
+  end
+end

data/lita-puppet.gemspec

@@ -1,26 +1,29 @@
 Gem::Specification.new do |spec|
-  spec.name          = "lita-puppet"
-  spec.version       = "0.6.1"
-  spec.authors       = ["Daniel Schaaff", "Jonathan Gnagy"].sort
-  spec.email         = ["jgnagy@knuedge.com"]
-  spec.description   = "Some basic Puppet interactions for Lita"
-  spec.summary       = "Allow the Lita bot to handle requests for puppet tasks"
-  spec.homepage      = "https://github.com/knuedge/lita-puppet"
+  spec.name          = 'lita-puppet'
+  spec.version       = '0.6.2'
+  spec.authors       = ['Daniel Schaaff', 'Jonathan Gnagy'].sort
+  spec.email         = ['jgnagy@knuedge.com']
+  spec.description   = 'Some basic Puppet interactions for Lita'
+  spec.summary       = 'Allow the Lita bot to handle requests for puppet tasks'
+  spec.homepage      = 'https://github.com/knuedge/lita-puppet'
   spec.license       = 'MIT'
-  spec.metadata      = { "lita_plugin_type" => "handler" }
+  spec.metadata      = { 'lita_plugin_type' => 'handler' }
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "lita", "~> 4.7"
-  spec.add_runtime_dependency "rye"
-  spec.add_runtime_dependency "puppetdb-ruby"
+  spec.add_runtime_dependency 'lita', '~> 4.7'
+  spec.add_runtime_dependency 'rye'
+  spec.add_runtime_dependency 'puppetdb-ruby'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rubocop'
 end

data/locales/en.yml

@@ -2,3 +2,43 @@ en:
   lita:
     handlers:
       puppet:
+        help:
+          puppet_agent_run:
+            syntax: puppet agent run on <host>
+            desc: Run the puppet agent on <host>.
+          cert_clean:
+            syntax: puppet cert clean <host>
+            desc: Remove all traces of the SSL cert for <host> on the Puppet Master.
+          node_profiles:
+            syntax: puppet catalog <host> profiles
+            desc: Query PuppetDB to get a list of all roles and profiles applied to <host>.
+          nodes_with_class:
+            syntax: puppet class nodes <class>
+            desc: Query PuppetDB to get a list of all nodes containing a class.
+          r10k_deploy:
+            syntax: puppet r10k [env [module]]
+            desc: Deploy the latest puppet code on the puppet master via r10k, optionally specifying an environment, and possibly a module.
+        replies:
+          cert_clean:
+            working: "working on that `puppet cert clean`. I'll get right back to you."
+            failure: "your `puppet cert clean` didn't seem to work... ;-("
+            success: "your `puppet cert clean` is all done!"
+          puppet_agent_run:
+            working: "I'll run puppet right away. Give me a sec and I'll let you know how it goes."
+            failure: "your puppet run is done, but didn't seem to work... I think it may have timed out."
+            success: "that puppet run is complete! It exited with status %{status}."
+          node_profiles:
+            notconf: "I would do that, but I don't know how to connect to PuppetDB. Edit my config and add `config.handlers.puppet.puppetdb_url`."
+            working: "let me see what I can find in PuppetDB for you."
+            failure: "Hmmm, that didn't work. Here's what PuppetDB responded with: '%{error}'"
+            success: "Here are the profiles and roles for %{host}:"
+          nodes_with_class:
+            notconf: "I would do that, but I don't know how to connect to PuppetDB. Edit my config and add `config.handlers.puppet.puppetdb_url`."
+            working: "let me see what I can find in PuppetDB for you."
+            failure: "There are no nodes with %{pclass} class, are you sure it's a valid class?"
+            success: "Here are all the nodes with class %{pclass}:"
+          r10k_deploy:
+            working: "I'll get right on that. Give me a moment and I'll let you know how it went."
+            gitfail: "your r10k run didn't seem to work. Looks like there was a problem with Git:"
+            pupfail: "your r10k run didn't seem to work. Here's what went wrong:"
+            success: "your r10k deployment is done!"

data/spec/lita/handlers/puppet_spec.rb

@@ -1,4 +1,23 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Lita::Handlers::Puppet, lita_handler: true do
+  it 'routes agent run commands properly' do
+    is_expected.to route_command('puppet agent run on foo').to(:puppet_agent_run)
+  end
+
+  it 'routes cert clean commands properly' do
+    is_expected.to route_command('puppet cert clean foo').to(:cert_clean)
+  end
+
+  it 'routes catalog profiles commands properly' do
+    is_expected.to route_command('puppet catalog foo profiles').to(:node_profiles)
+  end
+
+  it 'routes class nodes commands properly' do
+    is_expected.to route_command('puppet class nodes foo').to(:nodes_with_class)
+  end
+
+  it 'routes r10k commands properly' do
+    is_expected.to route_command('puppet r10k').to(:r10k_deploy)
+  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,12 @@
-require "lita-puppet"
-require "lita/rspec"
+require 'simplecov'
+# require 'coveralls'
+SimpleCov.formatters = [
+  SimpleCov::Formatter::HTMLFormatter
+]
+SimpleCov.start { add_filter '/spec/' }
+
+require 'lita-puppet'
+require 'lita/rspec'
 
 # A compatibility mode is provided for older plugins upgrading from Lita 3. Since this plugin
 # was generated with Lita 4, the compatibility mode should be left disabled.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-puppet
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Daniel Schaaff
@@ -123,6 +123,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Some basic Puppet interactions for Lita
 email:
 - jgnagy@knuedge.com
@@ -131,6 +173,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -138,9 +182,9 @@ files:
 - Rakefile
 - lib/lita-puppet.rb
 - lib/lita/handlers/puppet.rb
-- lib/utils/puppetdb.rb
-- lib/utils/ssh.rb
-- lib/utils/text.rb
+- lib/utils/lita_puppet/puppetdb.rb
+- lib/utils/lita_puppet/ssh.rb
+- lib/utils/lita_puppet/text.rb
 - lita-puppet.gemspec
 - locales/en.yml
 - spec/lita/handlers/puppet_spec.rb

data/lib/utils/puppetdb.rb

@@ -1,31 +0,0 @@
-module Utils
-  # Utility methods for working with PuppetDB
-  module PuppetDB
-    def dbquery(url, q)
-      # TODO: validate incoming query structure
-      client = ::PuppetDB::Client.new(server: url)
-      client.request *q
-    end
-
-    def node_roles_and_profiles(url, nodename)
-      # TODO: validate url and nodename
-      ::PuppetDB::Client.new(server: url) # this is weird but required
-      d = ::PuppetDB::Client.get("/catalogs/#{nodename}")
-      return d["error"] if d['error']
-
-      tags = []
-      d["data"]["resources"].each {|r| tags.concat(r['tags'])}
-
-      # return all the tags related to profile:: or role::
-      tags.sort.uniq.select {|t| t.match /^(profile|role)::/ }
-    end
-
-    def class_nodes(url, classname)
-      client = ::PuppetDB::Client.new(server: url)
-      q = client.request('resources',[:and,[:'=','type', 'Class'],[:'=','title',"#{classname}"]])
-
-      q.data.map { |node| node['certname'] }
-    end
-
-  end
-end

data/lib/utils/ssh.rb

@@ -1,46 +0,0 @@
-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,
-        error: STDOUT # send STDERR to STDOUT for things that actually print
-      )
-
-      exception = nil
-
-      # Getting serious about not crashing Lita...
-      output = begin
-        Timeout::timeout(opts[:timeout]) do
-          yield remote # pass our host back to the user to work with
-        end
-      rescue Rye::Err => e
-        exception = e
-      rescue StandardError => e
-        exception = e
-      rescue Exception => e
-        exception = e
-      ensure
-        remote.disconnect
-      end
-
-      if exception
-        result[:exception] = exception
-      else
-        result[:exit_status] = output.exit_status
-        result[:stdout] = output.stdout
-        result[:stderr] = output.stderr
-      end
-      return result
-    end
-  end
-end

data/lib/utils/text.rb

@@ -1,28 +0,0 @@
-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
-
-    # camel case puppet classes
-    def class_camel(text)
-      text.split('::').map(&:capitalize).join('::')
-    end
-
-    # Format some text as code
-    #  Note that this is HipChat specific for the moment
-    # TODO: Make this *not* HipChat specific
-    def as_code(text)
-      "/code " + sanitze_for_chat(text)
-    end
-  end
-
-end