lita 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e05fe1e0cb321abc7f328ade3580833013f91650
-  data.tar.gz: 150331c84e76818a44f66f2759a965aed8d8fa75
+  metadata.gz: bee2a741d49b87172b517ce6f499112eff3ee14d
+  data.tar.gz: ae078494be2d7787bc92851abecc9b9aa1c96881
 SHA512:
-  metadata.gz: af679c53aaa2fd86fedfa2c69b984d0961f9d7af73cf371a7c3a8148101dbae94396d078331b19fd2dcddaf1bd12b2bcf8e73dbed00bfbdda0134b3475ce8a2a
-  data.tar.gz: f61fd270bd693b01bc78ccd5e07062bf4838ca5265c25fa08394cf6b63f25a93fb48e655377b83b1f93a3550a86bd5ded52401d82a269b3d3d28a53261955df0
+  metadata.gz: 9a0c5e3efa4af7a3e38f8edf9a10b8c48ceaebdf9cc9227953bb833652abe3c2347375472e5d19e32ff8779c793d4279a887a7d3190c15892b644fbffbea5e8e
+  data.tar.gz: 5f517756b1ffc8ae36e6435db1a1b10a8c8ce2336ec06b2c38f88ca1a10b81dd6363668657b390d45659165ba69314839ec2b30acab1b8d1c71740ea515d5483

data/.travis.yml

@@ -4,6 +4,8 @@ rvm:
 script: bundle exec rake
 before_install:
   - gem update --system
+services:
+  - redis-server
 notifications:
   webhooks:
     urls:

data/README.md

@@ -82,6 +82,7 @@ To configure Lita, edit the file `lita_config.rb` generated by the `lita new` co
 Lita.configure do |config|
   config.robot.name = "Sir Bottington"
   config.robot.mention_name = "bottington"
+  config.robot.alias = "/"
   config.robot.adapter = :example_chat_service
   config.adapter.username = "bottington"
   config.adapter.password = "secret"
@@ -96,6 +97,7 @@ The main config objects are:
 * `robot` - General settings for Lita.
   * `name` (String) - The display name the bot will use on the chat service. Default: `"Lita"`.
   * `mention_name` (String) - The name the bot will look for in messages to determine if the message is being addressed to it. Usually this is the same as the display name, but in some cases it may not be. For example, in HipChat, display names are required to be a first and last name, such as "Lita Bot", whereas the mention system would use a name like "LitaBot". Default: `Lita.config.robot.name`.
+  * `alias` (String) - The alias the bot will look for in messages to determine if the message is being addressed to it. Useful if you want to use something shorter than the robot's name or mention name, such as a slash, to send it a command. No default.
   * `adapter` (Symbol, String) - The adapter to load. Default: `:shell`.
   * `log_level` (Symbol, String) - The severity level of log messages to output. Valid options are, in order of severity: `:debug`, `:info`, `:warn`, `:error`, and `:fatal`. For whichever level you choose, log messages of that severity and greater will be output. Default: `:info`.
   * `admins` (Array<String>) - An array of string user IDs which tell Lita which users are considered administrators. Only these users will have access to Lita's `auth` command. Default: `nil`.
@@ -145,7 +147,7 @@ To generate a starting template for a new adapter gem, run `lita adapter NAME`,
 
 ### Example
 
-Here is a bare bones example of an adapter for the fictious chat service, FancyChat.
+Here is a bare bones example of an adapter for the fictitious chat service, FancyChat.
 
 ``` ruby
 module Lita
@@ -205,7 +207,7 @@ route /^echo\s+(.+)/, :echo
 Here is an example of a route declaration with all the options:
 
 ``` ruby
-route /^echo\s+(.+)/, to: :echo, command: true, restrict_to: [:testers, :committers], help => {
+route /^echo\s+(.+)/, :echo, command: true, restrict_to: [:testers, :committers], help => {
   "echo FOO" => "Replies back with FOO."
 }
 ```

data/lib/lita/daemon.rb

@@ -36,7 +36,7 @@ FATAL
 
     # Call the appropriate method depending on kill mode.
     def handle_existing_process
-      if @kill_existing
+      if @kill_existing && File.exists?(@pid_path)
         kill_existing_process
       else
         ensure_not_running

data/lib/lita/message.rb

@@ -25,7 +25,13 @@ module Lita
       @body = body
       @source = source
 
-      @command = !!@body.sub!(/^\s*@?#{@robot.mention_name}[:,]?\s*/i, "")
+      name_pattern = Regexp.escape(@robot.mention_name)
+
+      if @robot.alias
+        name_pattern = "#{name_pattern}|#{Regexp.escape(@robot.alias)}"
+      end
+
+      @command = !!@body.sub!(/^\s*@?(?:#{name_pattern})[:,]?\s*/i, "")
     end
 
     # An array of arguments created by shellsplitting the message body, as if

data/lib/lita/robot.rb

@@ -13,6 +13,11 @@ module Lita
     # @return [String] The mention name.
     attr_accessor :mention_name
 
+    # An alias the robot will look for in incoming messages to determine if it's
+    # being addressed.
+    # @return [String, Nil] The alias, if one was set.
+    attr_accessor :alias
+
     # The name of the robot as it will appear in the chat.
     # @return [String] The robot's name.
     attr_reader :name
@@ -20,6 +25,7 @@ module Lita
     def initialize
       @name = Lita.config.robot.name
       @mention_name = Lita.config.robot.mention_name || @name
+      @alias = Lita.config.robot.alias
       @app = RackApp.new(self).to_app
       load_adapter
       trigger(:loaded)

data/lib/lita/version.rb

@@ -1,4 +1,4 @@
 module Lita
   # The current version of Lita.
-  VERSION = "2.6.0"
+  VERSION = "2.7.0"
 end

data/spec/lita/adapters/shell_spec.rb

@@ -1,5 +1,7 @@
 describe Lita::Adapters::Shell do
-  let(:robot) { double("Lita::Robot", name: "Lita", mention_name: "LitaBot") }
+  let(:robot) do
+    double("Lita::Robot", name: "Lita", mention_name: "LitaBot", alias: "/")
+  end
 
   subject { described_class.new(robot) }
 

data/spec/lita/message_spec.rb

@@ -1,7 +1,9 @@
 require "spec_helper"
 
 describe Lita::Message do
-  let(:robot) { double("Lita::Robot", name: "Lita", mention_name: "LitaBot") }
+  let(:robot) do
+    double("Lita::Robot", name: "Lita", mention_name: "LitaBot", alias: ".")
+  end
 
   subject do
     described_class.new(robot, "Hello", "Carl")
@@ -53,6 +55,15 @@ describe Lita::Message do
       expect(subject).to be_a_command
     end
 
+    it "is true when the Robot's alias is used" do
+      subject = described_class.new(
+        robot,
+        "#{robot.alias}hello",
+        "Carl"
+      )
+      expect(subject).to be_a_command
+    end
+
     it "is false when the message is not addressed to the Robot" do
       expect(subject).not_to be_a_command
     end

data/templates/plugin/travis.yml

@@ -4,3 +4,5 @@ rvm:
 script: bundle exec rake
 before_install:
   - gem update --system
+services:
+  - redis-server

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A multi-service chat bot with extendable behavior.
@@ -306,4 +306,3 @@ test_files:
 - spec/lita/util_spec.rb
 - spec/lita_spec.rb
 - spec/spec_helper.rb
-has_rdoc: