lita-puppet 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6784e1f9c91bdbab4691357ae148e2fd90310001
-  data.tar.gz: d879f631327cdee20d76c005fdea4c993261c3a5
+  metadata.gz: d80423ebb3746f0fda22ff43b2f93086bbc295ca
+  data.tar.gz: c8f55e2beeffe1cfe1e29d99d6c31d006894fa49
 SHA512:
-  metadata.gz: 5cd85ed54bd6eebba840a5bc1baf530ef0ed12e73f21c065b34a01b111cef0e1e0346988f723b326e243f731309bc2e3f080c8eec63c6e11a3451ff27a4bd356
-  data.tar.gz: c19266fc0db852119049a9287fd6a26337f110aaf99de06c3de910b715b0ac0d2703d2a2291f69bd68017cae93825ff4036eda1eaf2add7e001cc05c3e3ed31d
+  metadata.gz: 15fce99d528e4dfc3665481ddf0786debc70c52421a0b24bb00562bc58f446d32b12afb980543ca5277ee4df22c71770dd98700409db839ab696edb86f0cc42b
+  data.tar.gz: da28f2632ec6ebb15f61d8dba2981068193c24a67d707507e6aa6dba9a4226b0a9fa957ab5afe8ece0c2d638fb9cfbca07e0979bec95b7c6ac9a52df5ee82a85

data/lib/utils/lita_puppet/ssh.rb

@@ -35,13 +35,12 @@ module Utils
         output = begin
           # pass our host back to the user to work with
           Timeout.timeout(opts[:timeout]) { yield remote }
-        rescue Rye::Err, StandardError => e
+        rescue Rye::Err, Timeout::Error => e
           exception = e
         ensure
           remote.disconnect
         end
 
-        remote = nil # Try to force the destruction of the Rye box
         calculate_result(output, exception)
       end
 

data/lib/utils/lita_puppet/text.rb

@@ -35,7 +35,11 @@ module Utils
       # Strip off bad characters
       def sanitze_for_chat(text)
         # Remove bash colorings
-        text.gsub(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]/, '')
+        o = text.gsub(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]/, '')
+        # Limit text to 50 lines
+        o = (o.lines.to_a[0...49] << "\n... truncated to 50 lines").join if o.lines.size > 50
+        # return the output
+        o
       end
     end
   end

data/lita-puppet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-puppet'
-  spec.version       = '2.1.3'
+  spec.version       = '2.1.4'
   spec.authors       = ['Daniel Schaaff', 'Jonathan Gnagy'].sort
   spec.email         = ['jgnagy@knuedge.com']
   spec.description   = 'Some basic Puppet interactions for Lita'

data/spec/lita/handlers/puppet_spec.rb

@@ -105,6 +105,10 @@ describe Lita::Handlers::Puppet, lita_handler: true do
   end
 
   describe('#puppet_agent_run') do
+    let(:rye_output_base) do
+      double(exit_status: 0, stdout: (0..99).to_a, stderr: ['bar'])
+    end
+
     before do
       robot.auth.add_user_to_group!(lita_user, :puppet_admins)
     end
@@ -113,6 +117,13 @@ describe Lita::Handlers::Puppet, lita_handler: true do
       send_command('puppet agent run on server.name', as: lita_user)
       expect(replies[-2]).to eq('that puppet run is complete! It exited with status 0.')
     end
+
+    it 'should truncate long results' do
+      allow(Rye::Box).to receive(:new).and_return(rye_box)
+      send_command('puppet agent run on server.name', as: lita_user)
+      expect(replies[-1].lines.last).to eq('... truncated to 50 lines')
+      expect(replies[-1].lines.size).to eq(51)
+    end
   end
 
   describe('#node_profiles') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-puppet
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Daniel Schaaff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Allow the Lita bot to handle requests for puppet tasks