Mostly type specs, some whitespace

lib/fleet_manager.ex

@@ -10,7 +10,7 @@ defmodule OpenAperture.FleetManager do
 
   Returns `:ok` or `{:error, explanation}` otherwise.
   """
-  @spec start(:atom, [any]) :: :ok | {:error, String.t}
+  @spec start(atom, [any]) :: :ok | {:error, String.t}
   def start(_type, _args) do
     Logger.info("Starting FleetManager...")
     OpenAperture.FleetManager.Supervisor.start_link

lib/fleet_manager/actions/fleet_response.ex

@@ -18,18 +18,17 @@ defmodule OpenAperture.FleetManager.FleetAction.FleetResponse do
 	@spec parse(term) :: {:ok, term} | {:error, String.t}
 	def parse(response) do
 	  case response do
-	    {:ok, values} -> {:ok, parse_value(values)}
+	    {:ok, values}    -> {:ok, parse_value(values)}
 	    {:error, reason} -> {:error, reason}
 	  end
 	end
 
-	@spec parse_value(List) :: List
+	@spec parse_value(list) :: list
 	defp parse_value(raw_items) when is_list(raw_items) do
     Enum.reduce raw_items, [], fn(raw_item, items) ->
-      if raw_item == nil do
-        items
-      else
-        items ++ [parse_value(raw_item)]
+      case raw_item do
+        nil -> items
+        _   -> items ++ [parse_value(raw_item)]
       end
     end
 	end
@@ -38,4 +37,4 @@ defmodule OpenAperture.FleetManager.FleetAction.FleetResponse do
 	defp parse_value(raw_item) do
 	  Map.from_struct(raw_item)
 	end
-end
+end

lib/fleet_manager/actions/list_machines.ex

@@ -17,13 +17,13 @@ defmodule OpenAperture.FleetManager.FleetAction.ListMachines do
 
   ## Return Value
 
-  {:ok, List} | {:error, reason}
+  {:ok, list} | {:error, reason}
   """
-	@spec execute(FleetRequest.t) :: {:ok, List} | {:error, String.t}
+	@spec execute(FleetRequest.t) :: {:ok, list} | {:error, String.t}
 	def execute(fleet_request) do
     case FleetApi.start_link(fleet_request.etcd_token) do
-    	{:ok, api_pid} -> FleetResponse.parse(FleetApi.list_machines(api_pid))
-    	{:error, reason} -> {:error, reason}
+      {:ok, api_pid}   -> FleetResponse.parse(FleetApi.list_machines(api_pid))
+      {:error, reason} -> {:error, reason}
     end
-	end
-end
+  end
+end

lib/fleet_manager/actions/node_info.ex

@@ -17,9 +17,9 @@ defmodule OpenAperture.FleetManager.FleetAction.NodeInfo do
 
   ## Return Value
 
-  {:ok, Map} | {:error, reason}
+  {:ok, map} | {:error, reason}
   """
-  @spec execute(FleetRequest.t) :: {:ok, Map} | {:error, String.t}
+  @spec execute(FleetRequest.t) :: {:ok, map} | {:error, String.t}
   def execute(fleet_request) do
     if fleet_request.action_parameters[:nodes] == nil || length(fleet_request.action_parameters[:nodes]) == 0 do
       {:error, "An invalid 'nodes' parameter was provided!"}      
@@ -78,9 +78,9 @@ defmodule OpenAperture.FleetManager.FleetAction.NodeInfo do
 
   ## Return Value
 
-  Map
+  map
   """
-  @spec parse_script_output(String.t) :: Map
+  @spec parse_script_output(String.t) :: map
   def parse_script_output(output) do
     lines = String.split(output, "\n")
     {node_info, _type} = Enum.reduce lines, {%{}, nil}, fn(line, {node_info, next_line_type}) ->
@@ -110,4 +110,4 @@ defmodule OpenAperture.FleetManager.FleetAction.NodeInfo do
     end
     node_info
   end
-end
+end

lib/fleet_manager/actions/restart_unit.ex

@@ -19,9 +19,9 @@ defmodule OpenAperture.FleetManager.FleetAction.RestartUnit do
 
   ## Return Value
 
-  {:ok, Map} | {:error, reason}
+  {:ok, map} | {:error, reason}
   """
-  @spec execute(FleetRequest.t) :: {:ok, Map} | {:error, String.t}
+  @spec execute(FleetRequest.t) :: {:ok, map} | {:error, String.t}
   def execute(fleet_request) do
     cond do
       fleet_request.action_parameters[:unit_name] == nil -> {:error, "An invalid 'unit_name' parameter was provided!"}
@@ -85,4 +85,4 @@ defmodule OpenAperture.FleetManager.FleetAction.RestartUnit do
       File.rm_rf(script_file)
     end
   end
-end
+end

lib/fleet_manager/dispatcher.ex

@@ -110,7 +110,7 @@ defmodule OpenAperture.FleetManager.Dispatcher do
   The `payload` defines the Messaging payload
 
   """
-  @spec process_request(String.t, Map) :: term
+  @spec process_request(String.t, map) :: term
   def process_request(delivery_tag, payload) do
     request = RpcRequest.from_payload(payload)
 
@@ -147,24 +147,20 @@ defmodule OpenAperture.FleetManager.Dispatcher do
       request = case FleetActions.execute(fleet_request) do
         {:ok, response} ->
           Logger.debug("[Dispatcher][Request][#{delivery_tag}] Completed successfully")
-          %{request |
-            status: :completed,
-            response_body: response,
-          }
+          %{request | status:        :completed,
+                      response_body: response}
         {:error, reason} ->
           Logger.debug("[Dispatcher][Request][#{delivery_tag}] Failed:  #{inspect reason}")
-          %{request |
-            status: :error,
-            response_body: %{errors: ["#{inspect reason}"]},
-          }
+          %{request | status:        :error,
+                      response_body: %{errors: ["#{inspect reason}"]}}
       end
       Logger.debug("[Dispatcher][Request][#{delivery_tag}] Attempting to acknowledge...")
       acknowledge(delivery_tag, request)
       Logger.debug("[Dispatcher][Request][#{delivery_tag}] Completed processing")
     catch
-      :exit, code -> process_request_failure("Exited with code #{inspect code}", delivery_tag, request)
+      :exit,  code  -> process_request_failure("Exited with code #{inspect code}", delivery_tag, request)
       :throw, value -> process_request_failure("Throw called with #{inspect value}", delivery_tag, request)
-      what, value -> process_request_failure("Caught #{inspect what} with #{inspect value}", delivery_tag, request)
+      what,   value -> process_request_failure("Caught #{inspect what} with #{inspect value}", delivery_tag, request)
     end
   end
 

lib/fleet_manager/message_manager.ex

@@ -34,7 +34,7 @@ defmodule OpenAperture.FleetManager.MessageManager do
     * :subscription_handler
     * :delivery_tag
   """
-  @spec track(Map) :: term
+  @spec track(map) :: term
   def track(%{subscription_handler: subscription_handler, delivery_tag: delivery_tag} = _async_info) do
     Logger.debug("#{@logprefix} Tracking message #{delivery_tag}...")
     new_message = %{
@@ -60,7 +60,7 @@ defmodule OpenAperture.FleetManager.MessageManager do
 
   Map containing the subscription_handler and delivery_tag
   """
-  @spec remove(String.t) :: Map
+  @spec remove(String.t) :: map
   def remove(delivery_tag) do
     Logger.debug("#{@logprefix} Finished tracking message #{delivery_tag}...")