Merge pull request #246 from getsentry/1.6.0

use Elixir 1.6.0 and formatter [WIP]

Author: mitchellhenke

.formatter.exs

@@ -0,0 +1,8 @@
+[
+  inputs: [
+    "lib/**/*.ex",
+    "config/*.exs",
+    "test/**/*.exs",
+    "mix.exs"
+  ]
+]

.travis.yml

@@ -3,20 +3,32 @@ elixir:
   - 1.3.4
   - 1.4
   - 1.5
-  - 1.6.0-rc.0
+  - 1.6.0
 otp_release:
   - 18.3
   - 19.3
   - 20.0
-
+env:
+  - MIX_FORMAT=true
+  - MIX_FORMAT=false
 matrix:
-  allow_failures:
+  exclude:
+    - elixir: 1.6.0
+      env: MIX_FORMAT=false
     - elixir: 1.3.4
-    - elixir: 1.6.0-rc.0
-
+      env: MIX_FORMAT=true
+    - elixir: 1.4
+      env: MIX_FORMAT=true
+    - elixir: 1.5
+      env: MIX_FORMAT=true
+    - elixir: 1.6.0
+      otp_release: 18.3
+    - elixir: 1.3.4
+      otp_release: 20.0
 notifications:
   email:
     - [email protected]
 script:
   - mix test
   - mix credo
+  - if [ "$MIX_FORMAT" = "true" ]; then mix format --dry-run --check-formatted; fi

config/config.exs

@@ -7,4 +7,4 @@ config :sentry,
   enable_source_code_context: true,
   root_source_code_path: File.cwd!()
 
-import_config "#{Mix.env}.exs"
+import_config "#{Mix.env()}.exs"

config/dev.exs

@@ -1,4 +1,3 @@
 use Mix.Config
 
-config :sentry,
-  environment_name: :dev
+config :sentry, environment_name: :dev

config/prod.exs

@@ -1,4 +1,3 @@
 use Mix.Config
 
-config :sentry,
-  environment_name: :prod
+config :sentry, environment_name: :prod

lib/mix/tasks/sentry.send_test_event.ex

@@ -14,28 +14,31 @@ defmodule Mix.Tasks.Sentry.SendTestEvent do
 
     Application.ensure_all_started(:sentry)
 
-    Sentry.Client.get_dsn!
+    Sentry.Client.get_dsn!()
     |> print_environment_info()
 
-
     maybe_send_event()
   end
 
   defp print_environment_info({endpoint, public_key, secret_key}) do
-    Mix.shell.info "Client configuration:"
-    Mix.shell.info "server: #{endpoint}"
-    Mix.shell.info "public_key: #{public_key}"
-    Mix.shell.info "secret_key: #{secret_key}"
-    Mix.shell.info "included_environments: #{inspect included_environments()}"
-    Mix.shell.info "current environment_name: #{inspect Config.environment_name()}"
-    Mix.shell.info "hackney_opts: #{inspect Config.hackney_opts()}\n"
+    Mix.shell().info("Client configuration:")
+    Mix.shell().info("server: #{endpoint}")
+    Mix.shell().info("public_key: #{public_key}")
+    Mix.shell().info("secret_key: #{secret_key}")
+    Mix.shell().info("included_environments: #{inspect(included_environments())}")
+    Mix.shell().info("current environment_name: #{inspect(Config.environment_name())}")
+    Mix.shell().info("hackney_opts: #{inspect(Config.hackney_opts())}\n")
   end
 
   defp included_environments do
     case Application.fetch_env(:sentry, :included_environments) do
-      {:ok, envs} when is_list(envs) -> envs
+      {:ok, envs} when is_list(envs) ->
+        envs
+
       _ ->
-        Mix.raise "Sentry included_environments is not configured in :sentry, :included_environments"
+        Mix.raise(
+          "Sentry included_environments is not configured in :sentry, :included_environments"
+        )
     end
   end
 
@@ -44,23 +47,27 @@ defmodule Mix.Tasks.Sentry.SendTestEvent do
     included_envs = included_environments()
 
     if env_name in included_envs do
-      Mix.shell.info "Sending test event..."
+      Mix.shell().info("Sending test event...")
 
-      result = "Testing sending Sentry event"
-                    |> RuntimeError.exception
-                    |> Sentry.capture_exception(result: :sync)
+      result =
+        "Testing sending Sentry event"
+        |> RuntimeError.exception()
+        |> Sentry.capture_exception(result: :sync)
 
       case result do
         {:ok, id} ->
-          Mix.shell.info "Test event sent!  Event ID: #{id}"
+          Mix.shell().info("Test event sent!  Event ID: #{id}")
+
         :error ->
-          Mix.shell.info "Error sending event!"
+          Mix.shell().info("Error sending event!")
+
         :excluded ->
-          Mix.shell.info "No test event was sent because the event was excluded by a filter"
+          Mix.shell().info("No test event was sent because the event was excluded by a filter")
       end
-
     else
-      Mix.shell.info "#{inspect env_name} is not in #{inspect included_envs} so no test event will be sent"
+      Mix.shell().info(
+        "#{inspect(env_name)} is not in #{inspect(included_envs)} so no test event will be sent"
+      )
     end
   end
 end

lib/sentry.ex

@@ -91,13 +91,18 @@ defmodule Sentry do
   See `Sentry.Logger`
   """
 
-  @type task :: {:ok, Task.t} | :error | :excluded | :ignored
+  @type task :: {:ok, Task.t()} | :error | :excluded | :ignored
 
   def start(_type, _opts) do
     children = [
       supervisor(Task.Supervisor, [[name: Sentry.TaskSupervisor]]),
-      :hackney_pool.child_spec(Sentry.Client.hackney_pool_name(),  [timeout: Config.hackney_timeout(), max_connections: Config.max_hackney_connections()])
+      :hackney_pool.child_spec(
+        Sentry.Client.hackney_pool_name(),
+        timeout: Config.hackney_timeout(),
+        max_connections: Config.max_hackney_connections()
+      )
     ]
+
     opts = [strategy: :one_for_one, name: Sentry.Supervisor]
 
     Supervisor.start_link(children, opts)
@@ -107,7 +112,7 @@ defmodule Sentry do
   Parses and submits an exception to Sentry if current environment is in included_environments.
   `opts` argument is passed as the second argument to `Sentry.send_event/2`.
   """
-  @spec capture_exception(Exception.t, Keyword.t) :: task
+  @spec capture_exception(Exception.t(), Keyword.t()) :: task
   def capture_exception(exception, opts \\ []) do
     filter_module = Config.filter()
     {source, opts} = Keyword.pop(opts, :event_source)
@@ -126,7 +131,7 @@ defmodule Sentry do
 
   `opts` argument is passed as the second argument to `Sentry.send_event/2`.
   """
-  @spec capture_message(String.t, Keyword.t) :: task
+  @spec capture_message(String.t(), Keyword.t()) :: task
   def capture_message(message, opts \\ []) do
     opts
     |> Keyword.put(:message, message)
@@ -139,13 +144,15 @@ defmodule Sentry do
 
   `opts` argument is passed as the second argument to `send_event/2` of the configured `Sentry.HTTPClient`.  See `Sentry.Client.send_event/2` for more information.
   """
-  @spec send_event(Event.t, Keyword.t) :: task
+  @spec send_event(Event.t(), Keyword.t()) :: task
   def send_event(event, opts \\ [])
+
   def send_event(%Event{message: nil, exception: nil}, _opts) do
     Logger.warn("Sentry: unable to parse exception")
 
     :ignored
   end
+
   def send_event(%Event{} = event, opts) do
     included_environments = Config.included_environments()
     environment_name = Config.environment_name()