add no_enabled and not_in_bundle errors to the command resolver

Author: Matthew Peck

lib/cog/command/command_resolver.ex

@@ -23,9 +23,13 @@ defmodule Cog.Command.CommandResolver do
         %SiteCommandAlias{pipeline: pipeline} ->
           {:pipeline, pipeline}
         :not_found ->
-          :not_found
+          {:error, :not_found}
+        {:not_enabled, bundle_name} ->
+          {:error, {:not_enabled, bundle_name}}
+        {:not_in_bundle, bundle_name} ->
+          {:error, {:not_in_bundle, bundle_name}}
         {:ambiguous, names} ->
-          {:ambiguous, names}
+          {:error, {:ambiguous, names}}
       end
     end
   end
@@ -51,13 +55,13 @@ defmodule Cog.Command.CommandResolver do
     case Map.get(enabled_bundles, bundle_name) do
       nil ->
         # No enabled version of the requested bundle was found
-        :not_found
+        {:not_enabled, bundle_name}
       version ->
         case Bundles.command_for_bundle_version(command_name, bundle_name, version) do
           nil ->
             # The enabled bundle version does not contain the
             # requested command
-            :not_found
+            {:not_in_bundle, bundle_name}
           result ->
             {:ok, rules} = Rules.rules_for_command(result.command)
             Cog.Command.Pipeline.ParserMeta.new(result.command.bundle.name,

mix.exs

@@ -66,6 +66,8 @@ defmodule Cog.Mixfile do
       {:greenbar, github: "operable/greenbar"},
       {:probe, github: "operable/probe"},
       {:spanner, github: "operable/spanner"},
+      # This is just here until I get piper updated everywhere
+      {:piper, github: "operable/piper", branch: "peck/error-messages", override: true},
 
       # MQTT-related
       ########################################################################

mix.lock

@@ -54,7 +54,7 @@
   "phoenix_html": {:hex, :phoenix_html, "2.7.0", "19e12e2044340c2e43df206a06d059677c59ea1868bd1c35165438d592cd420b", [:mix], [{:plug, "~> 1.0", [hex: :plug, optional: false]}]},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.0.5", "829218c4152ba1e9848e2bf8e161fcde6b4ec679a516259442561d21fde68d0b", [:mix], [{:fs, "~> 0.9.1", [hex: :fs, optional: false]}, {:phoenix, "~> 1.0 or ~> 1.2-rc", [hex: :phoenix, optional: false]}]},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.0.1", "c10ddf6237007c804bf2b8f3c4d5b99009b42eca3a0dfac04ea2d8001186056a", [:mix], []},
-  "piper": {:git, "https://github.com/operable/piper.git", "0afedeb326e5ce686daf83a4ed203890e1ad7fe8", []},
+  "piper": {:git, "https://github.com/operable/piper.git", "decef8846fba349058f3123fc8e5567e0a15cab5", [branch: "peck/error-messages"]},
   "plug": {:hex, :plug, "1.2.2", "cfbda521b54c92ab8ddffb173fbaabed8d8fc94bec07cd9bb58a84c1c501b0bd", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, optional: true]}, {:mime, "~> 1.0", [hex: :mime, optional: false]}]},
   "poison": {:hex, :poison, "2.2.0", "4763b69a8a77bd77d26f477d196428b741261a761257ff1cf92753a0d4d24a63", [:mix], []},
   "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], []},