lita-enhance 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bab760c36e5ebb11ec2c0773f6de3c1096fc1582
-  data.tar.gz: 4139bbccc64e710503d0aec21d2b8b13ba0f87bb
+  metadata.gz: 856a763659c54a676c1516beac9bd6e3f6bfcc9b
+  data.tar.gz: 6254798d459f7209b75c0513cff2f3eb29d30a3f
 SHA512:
-  metadata.gz: 5cdec5118bd90e90fa50427da94bd33e243bd76db7cbb067ec755928b094cce0bc5fa745129b2b92139d356935e6336c4fde8644f0971205d2397d3afb727b67
-  data.tar.gz: ae27a421db43c6cd1134297942257e154670c508ce79a477ba23b305d366e80c6102b652ec3a794ad0e25bbba16a620d206fdf042315112a4e36691e0d802f25
+  metadata.gz: da9f0f937afced190dbba4e7625215646bb1f87a75a1778fb6459fe8acb10cfa909b94dc44da0823a20ec4ba1e5cb51c6cd4f6677acd616bd9fdabf02261552f
+  data.tar.gz: a51619607f7538fcb21f08f54b40f61b28f7caabef17feb5f1431c321cdcd4eee011e03b5d6717608cd3eec91b2bf2be73f4f404462aa26c27f8f3e3ebcdc4ea

data/README.md

@@ -31,7 +31,7 @@ Machine details are obtained by indexing database of machine assets. Right now o
 
 ```
 you> enhance lvl:2 old-box01
-lita> ¿old-box01 (us-east-1)?
+lita> ?old-box01 (us-east-1)?
 ```
 
 [And for fun](https://www.youtube.com/watch?v=Vxq9yj2pVWk), you can implicitly enhance previously enhanced text by just sending ```enhance```. The string to enhance is retained separately in each room that the enhance string was sent.

data/lib/lita/handlers/enhance.rb

@@ -70,9 +70,9 @@ module Lita
         after(0) do
           begin
             lock_and_refresh_index
-            response.reply(success(t 'refresh.success'))
+            response.reply(render_template('success', message: (t 'refresh.success')))
           rescue => e
-            response.reply(failed(t 'refresh.failed'))
+            response.reply(render_template('failed', message: (t 'refresh.failed')))
             log.info { "#{e.message}\n#{e.backtrace.join("\n")}" }
           end
         end
@@ -97,26 +97,26 @@ module Lita
         end
 
         unless blurry_string
-          response.reply(failed(t 'enhance.message_required'))
+          response.reply(render_template('failed', message: (t 'enhance.message_required')))
           return
         end
 
         level = session.last_level + 1 unless level
 
         if level > max_level
-          response.reply(failed(t 'enhance.level_too_high', max_level: max_level))
+          response.reply(render_template('failed', message: (t 'enhance.level_too_high', max_level: max_level)))
           return
         elsif level < 1
-          response.reply(failed(t 'enhance.level_too_low', max_level: max_level))
+          response.reply(render_template('failed', message: (t 'enhance.level_too_low', max_level: max_level)))
           return
         end
 
         enhanced_message = session.enhance!(blurry_string, level)
 
         if enhanced_message != blurry_string
-          response.reply(render_template('enhance', message: enhanced_message))
+          response.reply(render_template('mono', message: enhanced_message))
         else
-          response.reply(no_change(t 'enhance.nothing_to_enhance'))
+          response.reply(render_template('no_change', message: (t 'enhance.nothing_to_enhance')))
         end
       end
 
@@ -132,68 +132,28 @@ module Lita
       end
 
       private
-        # This mutex must be obtained to refresh the index
-        REFRESH_MUTEX = Mutex.new unless defined?(REFRESH_MUTEX)
 
-        # This mutex must be obtains to update the index with new data, or to use the index to enhance some text
-        INDEX_MUTEX   = Mutex.new unless defined?(INDEX_MUTEX)
+      # This mutex must be obtained to refresh the index
+      REFRESH_MUTEX ||= Mutex.new
 
-        def lock_and_refresh_index
-          REFRESH_MUTEX.synchronize do
-            @@chef_indexer.refresh
-          end
-        end
-
-        def last_message_key(response)
-          response.message.source.room || response.message.source.user.id
-        end
-
-        def max_level
-          @@enhancers.map {|x| x.max_level }.max
-        end
-
-        def adapter
-          if Lita.respond_to?(:config)
-            Lita.config.robot.adapter
-          elsif robot.respond_to?(:config)
-            robot.config.robot.adapter
-          else
-            :unknown
-          end
-        end
+      # This mutex must be obtains to update the index with new data, or to use the index to enhance some text
+      INDEX_MUTEX ||= Mutex.new
 
-        # Calls out that this message was successful via adapter specific messaging
-        def success(message)
-          case adapter
-          when :hipchat
-            "(successful) #{message}"
-          else
-            message
-          end
+      def lock_and_refresh_index
+        REFRESH_MUTEX.synchronize do
+          @@chef_indexer.refresh
         end
+      end
 
-        # Calls out that the action failed via adapter specific messaging
-        def failed(message)
-          case adapter
-          when :hipchat
-            "(failed) #{message}"
-          else
-            message
-          end
-        end
+      def last_message_key(response)
+        response.message.source.room || response.message.source.user.id
+      end
 
-        # Calls out that action resulted in no change via adapter specific messaging
-        def no_change(message)
-          case adapter
-          when :hipchat
-            "(nothingtodohere) #{message}"
-          else
-            message
-          end
-        end
+      def max_level
+        @@enhancers.map {|x| x.max_level }.max
+      end
     end
 
-
     Lita.register_handler(Enhance)
   end
 end

data/lib/lita/handlers/enhance/enhancer.rb

@@ -7,7 +7,7 @@ module Lita
         @@subclasses = []
 
         @@current = %w(* *)
-        @@old = %w(¿ ?)
+        @@old = %w(? ?)
 
         def self.all
           @@subclasses.select! {|x| x.weakref_alive? }

data/lita-enhance.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-enhance"
-  spec.version       = "0.9.2"
+  spec.version       = "0.9.3"
   spec.authors       = ["Doug Barth"]
   spec.email         = ["doug@pagerduty.com"]
   spec.description   = %q{A Lita handler that enhances text by replacing opaque machine identifiers with that machine's hostname}

data/spec/lita/handlers/enhance/enhancer_example.rb

@@ -10,7 +10,7 @@ RSpec.shared_examples 'an enhancer' do
     node = nodes.first
     node.last_seen_at = Time.now - 24 * 60 * 60
 
-    expect(enhancer.render(node, 1)).to eq('¿box01?')
-    expect(enhancer.render(node, 2)).to eq('¿box01 (us-west-2b)?')
+    expect(enhancer.render(node, 1)).to eq('?box01?')
+    expect(enhancer.render(node, 2)).to eq('?box01 (us-west-2b)?')
   end
 end

data/spec/lita/handlers/enhance_spec.rb

@@ -3,18 +3,20 @@ require "spec_helper"
 describe Lita::Handlers::Enhance, lita_handler: true do
   include_context 'indexed'
 
+  before { allow(described_class).to receive(:new).and_return(subject) }
+
   # Make sure that we are indexing into the same Redis namespace that the handler uses.
   let(:redis) { subject.redis }
 
-  let(:alice) { Lita::User.create("2", name: "Alice") }
+  let(:alice) { Lita::User.create('2', name: 'Alice') }
 
-  it { routes_command('refresh enhance').to(:refresh) }
-  it { routes_command('enhance stats').to(:stats) }
+  it { is_expected.to route_command('refresh enhance').to(:refresh) }
+  it { is_expected.to route_command('enhance stats').to(:stats) }
 
-  it { routes_command('enhance 127.0.0.1').to(:enhance) }
-  it { routes_command("enhance lvl:1 blah\nblah").to(:enhance) }
-  it { routes_command("enhance").to(:enhance) }
-  it { routes_command("enhance lvl:2").to(:enhance) }
+  it { is_expected.to route_command('enhance 127.0.0.1').to(:enhance) }
+  it { is_expected.to route_command("enhance lvl:1 blah\nblah").to(:enhance) }
+  it { is_expected.to route_command('enhance').to(:enhance) }
+  it { is_expected.to route_command('enhance lvl:2').to(:enhance) }
 
   it 'should show stats about itself' do
     send_command('enhance stats')
@@ -103,18 +105,40 @@ describe Lita::Handlers::Enhance, lita_handler: true do
 
   describe 'under Slack' do
     before do
-      robot.config.robot.adapter = :slack
+      allow_any_instance_of(Lita::TemplateResolver).to receive(:adapter_name).and_return(:slack)
+    end
+
+    it 'should mark success using an emoji' do
+      expect(subject).to receive(:lock_and_refresh_index)
+
+      send_command('refresh enhance')
+
+      # Give the timer a chance to run
+      sleep(0.5)
+
+      expect(replies).to include('Will refresh enhance index...')
+      expect(replies).to include(':heavy_check_mark: Refreshed enhance index')
+    end
+
+    it 'mark failure using an emoji' do
+      send_command('enhance')
+      expect(replies).to include(':heavy_multiplication_x: I need a string to enhance')
     end
 
-    it 'should format the response with a code block' do
+    it 'should use backticks to render mono text' do
       send_command('enhance 54.214.188.37')
       expect(replies).to include('```*box01*```')
     end
+
+    it 'should use emoji to call out when nothing was found to enhance' do
+      send_command('enhance bubbles')
+      expect(replies).to include(':heavy_minus_sign: I could not find anything to enhance')
+    end
   end
 
   describe 'under HipChat' do
     before do
-      robot.config.robot.adapter = :hipchat
+      allow_any_instance_of(Lita::TemplateResolver).to receive(:adapter_name).and_return(:hipchat)
     end
 
     it 'should mark success using an emoji' do

data/spec/spec_helper.rb

@@ -62,3 +62,5 @@ RSpec.shared_context 'indexed' do
     end
   end
 end
+
+Lita.version_3_compatibility_mode = false

data/templates/failed.hipchat.erb

@@ -0,0 +1 @@
+(failed) <%= @message %>

data/templates/failed.slack.erb

@@ -0,0 +1 @@
+:heavy_multiplication_x: <%= @message %>

data/templates/mono.erb

@@ -0,0 +1 @@
+<%= @message %>

data/templates/no_change.erb

@@ -0,0 +1 @@
+<%= @message %>

data/templates/no_change.hipchat.erb

@@ -0,0 +1 @@
+(nothingtodohere) <%= @message %>

data/templates/no_change.slack.erb

@@ -0,0 +1 @@
+:heavy_minus_sign: <%= @message %>

data/templates/success.erb

@@ -0,0 +1 @@
+<%= @message %>

data/templates/success.hipchat.erb

@@ -0,0 +1 @@
+(successful) <%= @message %>

data/templates/success.slack.erb

@@ -0,0 +1 @@
+:heavy_check_mark: <%= @message %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-enhance
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Doug Barth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -123,9 +123,18 @@ files:
 - spec/lita/handlers/enhance/session_spec.rb
 - spec/lita/handlers/enhance_spec.rb
 - spec/spec_helper.rb
-- templates/enhance.erb
-- templates/enhance.hipchat.erb
-- templates/enhance.slack.erb
+- templates/failed.erb
+- templates/failed.hipchat.erb
+- templates/failed.slack.erb
+- templates/mono.erb
+- templates/mono.hipchat.erb
+- templates/mono.slack.erb
+- templates/no_change.erb
+- templates/no_change.hipchat.erb
+- templates/no_change.slack.erb
+- templates/success.erb
+- templates/success.hipchat.erb
+- templates/success.slack.erb
 homepage: https://github.com/PagerDuty/lita-enhance
 licenses:
 - MIT