HipChat Support

Makefile

@@ -12,13 +12,14 @@ endif
 
 DOCKER_IMAGE      ?= operable/cog:0.5-dev
 
+ifeq ($(wildcard NO_CI),)
 ci: export DATABASE_URL = $(TEST_DATABASE_URL)
 ci: export MIX_ENV = test
 ci: ci-setup test-all ci-cleanup
 
 ci-reset:
 	@echo "Resetting build environment"
-	@rm -rf _build
+#	@rm -rf _build
 
 ci-setup: ci-reset
 # Nuke mnesia dirs so we don't get borked on emqttd upgrades
@@ -27,6 +28,11 @@ ci-setup: ci-reset
 
 ci-cleanup:
 	mix ecto.drop
+else
+ci:
+	@echo "NO_CI file found. CI build targets skipped."
+	@exit 0
+endif
 
 setup:
 	mix deps.get
@@ -51,8 +57,13 @@ test: reset-db
 	mix test $(TEST)
 
 test-all: export MIX_ENV = test
-test-all: reset-db
-	mix test
+test-all: unit-tests integration-tests
+
+unit-tests: reset-db
+	mix test --exclude=integration
+
+integration-tests: reset-db
+	mix test --only=integration
 
 test-watch: export MIX_ENV = test
 test-watch: reset-db
@@ -66,4 +77,4 @@ coverage:
 docker:
 	docker build --build-arg MIX_ENV=prod -t $(DOCKER_IMAGE) .
 
-.PHONY: ci ci-setup ci-cleanup test docker
+.PHONY: ci ci-setup ci-cleanup test docker unit-tests integration-tests

config/config.exs

@@ -22,13 +22,6 @@ config :cog, :embedded_bundle_version, "0.13.0"
 # Chat Adapters
 # ========================================================================
 
-config :cog, Cog.Chat.Adapter,
-  providers: [http: Cog.Chat.Http.Provider],
-  cache_ttl: {60, :sec}
-
-config :cog, Cog.Chat.Slack.Provider,
-  api_token: System.get_env("SLACK_API_TOKEN")
-
 config :cog, Cog.Chat.Http.Provider,
   foo: "blah"
 
@@ -193,4 +186,7 @@ config :cog, Cog.Mailer,
 config :cog, :email_from, System.get_env("COG_EMAIL_FROM")
 config :cog, :password_reset_base_url, System.get_env("COG_PASSWORD_RESET_BASE_URL")
 
+import_config "slack.exs"
+import_config "hipchat.exs"
+
 import_config "#{Mix.env}.exs"

config/dev.exs

@@ -9,11 +9,10 @@ config :lager, :handlers,
 
 config :cog, :enable_spoken_commands, ensure_boolean(System.get_env("ENABLE_SPOKEN_COMMANDS")) || false
 
-config :cog,
-  :template_cache_ttl, {1, :sec}
-
 config :cog, Cog.Chat.Adapter,
-  providers: [slack: Cog.Chat.Slack.Provider],
+  providers: [slack: Cog.Chat.Slack.Provider,
+              http: Cog.Chat.Http.Provider],
+  cache_ttl: {1, :sec},
   chat: :slack
 
 config :cog, Cog.Endpoint,

config/hipchat.exs

@@ -0,0 +1,10 @@
+use Mix.Config
+
+config :cog, Cog.Chat.HipChat.Provider,
+  api_root: System.get_env("HIPCHAT_API_ROOT") || "https://api.hipchat.com/v2",
+  chat_host: System.get_env("HIPCHAT_CHAT_HOST") || "chat.hipchat.com",
+  conf_host: System.get_env("HIPCHAT_CONF_HOST") || "conf.hipchat.com",
+  api_token: System.get_env("HIPCHAT_API_TOKEN"),
+  nickname: System.get_env("HIPCHAT_NICKNAME"),
+  jabber_id: System.get_env("HIPCHAT_JABBER_ID"),
+  jabber_password: System.get_env("HIPCHAT_JABBER_PASSWORD")

config/prod.exs

@@ -11,4 +11,5 @@ config :comeonin,
 
 config :cog, Cog.Chat.Adapter,
   providers: [slack: Cog.Chat.Slack.Provider],
-  chat: :slack
+  chat: :slack,
+  cache_ttl: {60, sec}

config/slack.exs

@@ -0,0 +1,4 @@
+use Mix.Config
+
+config :cog, Cog.Chat.Slack.Provider,
+  api_token: System.get_env("SLACK_API_TOKEN")

config/test.exs

@@ -7,7 +7,9 @@ config :lager, :handlers,
   [{LagerLogger, [level: :error]}]
 
 config :cog, Cog.Chat.Adapter,
-  providers: [test: Cog.Chat.Test.Provider],
+  providers: [test: Cog.Chat.Test.Provider,
+              http: Cog.Chat.Http.Provider],
+  cache_ttl: {1, :sec},
   chat: :test
 
 config :cog, Cog.Chat.Test.Provider,

lib/cog.ex

@@ -4,6 +4,14 @@ defmodule Cog do
 
   import Supervisor.Spec, warn: false
 
+  def restart() do
+    Logger.debug("Stopping Cog...")
+    :ok = Application.stop(:cog)
+    Logger.debug("Cog stopped. Restarting...")
+    {:ok, _}  =  Application.ensure_all_started(:cog)
+    Logger.debug("Cog restarted.")
+  end
+
   def start(_type, _args) do
     maybe_display_unenforcing_warning()
     children = [worker(Cog.BusDriver, [], shutdown: 1000),

lib/cog/chat/adapter.ex

@@ -246,8 +246,8 @@ defmodule Cog.Chat.Adapter do
                   false ->
                     state
                 end
-              _error ->
-                Logger.error("Ignoring invalid chat message: #{inspect message, pretty: true}")
+              error ->
+                Logger.error("Error decoding chat message: #{inspect error}   #{inspect message, pretty: true}")
                 state
             end
     {:noreply, state}
@@ -332,14 +332,14 @@ defmodule Cog.Chat.Adapter do
 
  defp parse_mention(_text, nil), do: nil
  defp parse_mention(text, bot_name) do
-   updated = Regex.replace(~r/^#{Regex.escape(bot_name)}/, text, "")
+   updated = Regex.replace(~r/^#{Regex.escape(bot_name)}/i, text, "")
    if updated != text do
       Regex.replace(~r/^:/, updated, "")
       |> String.trim
-    else
-      nil
-    end
-  end
+   else
+     nil
+   end
+ end
 
  defp prepare_target(target) do
    case Cog.Chat.Room.from_map(target) do