fixing namespaces

COMPAT

@@ -1 +0,0 @@
-0

coveralls.json

@@ -2,14 +2,7 @@
  "custom_stop_words": [],
  "skip_files": [
   "lib/mix",
-  "lib/system/targets",
-  "lib/system/farmbot_system_updates.ex",
-  "lib/system/farmbot_system_network.ex",
-  "lib/farmbot_system.ex",
-
-  "lib/update_handler.ex",
-  "lib/easter_eggs.ex",
-
-  "lib/system/cmd_wrappers"
+  "lib/farmbot/system/",
+  "lib/farmbot/easter_eggs.ex"
  ]
 }

lib/farmbot.ex

@@ -7,57 +7,44 @@ defmodule Farmbot do
   alias Farmbot.Sync.Database
   alias Farmbot.System.Supervisor, as: FBSYS
 
-  @spec init(map) :: [{:ok, pid}]
-  def init(%{target: target,
-             compat_version: compat_version,
-             version: version,
-             commit: commit})
-  do
+  @doc """
+    Entry Point to Farmbot
+  """
+  def start(type, args)
+  def start(_, _args) do
+    Logger.info ">> init!"
+    Amnesia.start
+    Database.create! Keyword.put([], :memory, [node()])
+    Database.wait(15_000)
+    Supervisor.start_link(__MODULE__, [], name: Farmbot.Supervisor)
+  end
+
+  def init(_args) do
     children = [
-      # system specifics
-      supervisor(FBSYS, [target: target], restart: :permanent),
-      # auth services
-      worker(Farmbot.Auth, [], restart: :permanent),
-      # web app
-      supervisor(Farmbot.Configurator, [], restart: :permanent),
       # Generic counter.
       worker(Counter, [], restart: :permanent),
+      # System specifics.
+      supervisor(FBSYS, [], restart: :permanent),
+      # Auth services.
+      worker(Farmbot.Auth, [], restart: :permanent),
+      # Web app.
+      supervisor(Farmbot.Configurator, [], restart: :permanent),
       # The worker for diffing db entries.
       worker(Farmbot.Sync.Supervisor, [], restart: :permanent),
       # Handles tracking of various parts of the bots state.
-      supervisor(Farmbot.BotState.Supervisor,
-        [%{target: target,
-           compat_version: compat_version,
-           version: version,
-           commit: commit}], restart: :permanent),
-
-      # Handles FarmEvents
-      supervisor(FarmEvent.Supervisor, [], restart: :permanent),
-
+      supervisor(Farmbot.BotState.Supervisor, [], restart: :permanent),
+      # Handles FarmEvents.
+      supervisor(Farmbot.FarmEvent.Supervisor, [], restart: :permanent),
       # Handles the passing of messages from one part of the system to another.
       supervisor(Farmbot.Transport.Supervisor, [], restart: :permanent),
-
-      # Handles external scripts and what not
+      # Handles external scripts and what not.
       supervisor(Farmware.Supervisor, [], restart: :permanent),
-
-      # handles communications between bot and arduino
+      # handles communications between bot and arduino.
       supervisor(Farmbot.Serial.Supervisor, [], restart: :permanent),
+      # Watches the images directory and uploads them.
       worker(Farmbot.ImageWatcher, [], restart: :permanent)
     ]
     opts = [strategy: :one_for_one]
     supervise(children, opts)
   end
-
-  @doc """
-    Entry Point to Farmbot
-  """
-  @spec start(atom, [any]) :: {:ok, pid}
-  def start(type, args)
-  def start(_, [args]) do
-    Logger.info ">> init!"
-    Amnesia.start
-    Database.create! Keyword.put([], :memory, [node()])
-    Database.wait(15_000)
-    Supervisor.start_link(__MODULE__, args, name: Farmbot.Supervisor)
-  end
 end

lib/farmbot/bot_state/process_manager/process_tracker.ex

@@ -10,6 +10,7 @@ defmodule Farmbot.BotState.ProcessTracker do
   use GenServer
   require Logger
   alias Nerves.Lib.UUID
+  alias Farmbot.RegimenRunner
 
   defmodule Info do
     @moduledoc false

lib/farmbot/bot_state/supervisor.ex

@@ -9,22 +9,10 @@ defmodule Farmbot.BotState.Supervisor do
   use Supervisor
   require Logger
   alias Farmbot.EasterEggs
-  def init(
-    %{target: target,
-      compat_version: compat_version,
-      version: version,
-      commit: commit})
-  do
+  def init([]) do
     children = [
       worker(Farmbot.BotState.Monitor, [], [restart: :permanent]),
-
-      worker(Farmbot.BotState.Configuration, [
-        %{compat_version: compat_version,
-          target: target,
-          version: version,
-          commit: commit}
-        ], [restart: :permanent]),
-
+      worker(Farmbot.BotState.Configuration, [], [restart: :permanent]),
       worker(Farmbot.BotState.Hardware,  [], [restart: :permanent]),
       worker(Farmbot.BotState.ProcessSupervisor, [], [restart: :permanent]),
       worker(EasterEggs, [name: EasterEggs], [restart: :permanent])
@@ -33,11 +21,11 @@ defmodule Farmbot.BotState.Supervisor do
     supervise(children, opts)
   end
 
-  def start_link(args) do
+  def start_link do
     # We have to start all the monitors and what not
     # and then add the logger backent because the logger backend asks for stuff
     # like position and some configuraion.
-    sup = Supervisor.start_link(__MODULE__, args, name: __MODULE__)
+    sup = Supervisor.start_link(__MODULE__, [], name: __MODULE__)
     EasterEggs.start_cron_job
     if @use_logger, do: Logger.add_backend(Farmbot.Logger)
     sup

lib/farmbot/bot_state/trackers/configuration_tracker.ex

@@ -7,6 +7,7 @@ defmodule Farmbot.BotState.Configuration do
   require Logger
   alias Farmbot.StateTracker
   @behaviour StateTracker
+
   use StateTracker,
     name: __MODULE__,
     model:
@@ -24,7 +25,6 @@ defmodule Farmbot.BotState.Configuration do
       informational_settings: %{
         locked: false,
         controller_version: "loading...",
-        compat_version: -1,
         target: "loading...",
         commit: "loading...",
         sync_status: :sync_now,
@@ -35,11 +35,6 @@ defmodule Farmbot.BotState.Configuration do
     The message for the sync button to display
   """
   @type sync_msg :: :sync_now | :syncing | :sync_error | :unknown
-  @type args
-    :: %{compat_version: integer,
-         target: String.t,
-         version: String.t,
-         commit: String.t}
   @type state ::
     %State{
       configuration: %{
@@ -56,15 +51,18 @@ defmodule Farmbot.BotState.Configuration do
       informational_settings: map # TODO type this
     }
 
-  @spec load(args) :: {:ok, state} | no_return
-  def load(args) do
+  @version Mix.Project.config()[:version]
+  @target  Mix.Project.config()[:target]
+  @commit  Mix.Project.config()[:commit]
+
+  @spec load([]) :: {:ok, state} | no_return
+  def load([]) do
     initial = %State{
       informational_settings: %{
-        controller_version: args.version,
-        compat_version: args.compat_version,
+        controller_version: @version,
+        target: @target,
+        commit: @commit,
         locked: false,
-        target: args.target,
-        commit: args.commit,
         sync_status: :sync_now,
         firmware_version: "Arduino Disconnected!"
       }

lib/farmbot/celery_script/command.ex

@@ -16,7 +16,7 @@ defmodule Farmbot.CeleryScript.Command do
   @max_count 1_000
 
   celery =
-    "lib/celery_script/commands/"
+    "lib/farmbot/celery_script/commands/"
     |> File.ls!
     |> Enum.reduce([], fn(file_name, acc) ->
       case String.split(file_name, ".ex") do

lib/farmbot/celery_script/commands/sequence.ex

@@ -17,7 +17,7 @@ defmodule Farmbot.CeleryScript.Command.Sequence do
   def run(args, body) do
     # rebuild the ast node
     ast = %Ast{kind: "sequence", args: args, body: body}
-    {:ok, _pid} = SequenceRunner.start_link(ast)
+    {:ok, _pid} = Farmbot.SequenceRunner.start_link(ast)
     # Elixir.Sequence.Supervisor.add_child(ast, Timex.now())
   end
 end

lib/farmbot/farm_event/supervisor.ex

@@ -1,4 +1,4 @@
-defmodule FarmEvent.Supervisor do
+defmodule Farmbot.FarmEvent.Supervisor do
   @moduledoc """
     Supervisor for FarmEvents
   """

lib/farmbot/regimen/supervisor.ex

@@ -17,7 +17,7 @@ defmodule Regimen.Supervisor do
   """
   def add_child(regimen, time) do
     Supervisor.start_child(__MODULE__,
-      worker(RegimenRunner, [regimen, time],
+      worker(Farmbot.RegimenRunner, [regimen, time],
         [restart: :permanent, id: regimen.id]))
   end
 

lib/farmbot/regimen_runner.ex

@@ -1,4 +1,4 @@
-defmodule RegimenRunner do
+defmodule Farmbot.RegimenRunner do
   @moduledoc """
     Runs a regimen
   """

lib/farmbot/sequence/supervisor.ex

@@ -5,6 +5,7 @@ defmodule Sequence.Supervisor do
   @behaviour Farmbot.EventSupervisor
   use GenServer
   use Farmbot.Sync.Database
+  alias Farmbot.SequenceRunner
   require Logger
 
   @type state :: %{

lib/farmbot/sequence_runner.ex

@@ -1,4 +1,4 @@
-defmodule SequenceRunner do
+defmodule Farmbot.SequenceRunner do
   @moduledoc """
     Runs a sequence
   """
@@ -7,7 +7,7 @@ defmodule SequenceRunner do
   require Logger
   use GenServer
   alias Farmbot.CeleryScript.Ast
-  alias SequenceRunner.Binding
+  alias Farmbot.SequenceRunner.Binding
   use Counter, __MODULE__
 
   defmodule State do

lib/farmbot/sequence_runner/binding.ex

@@ -1,4 +1,4 @@
-defmodule SequenceRunner.Binding do
+defmodule Farmbot.SequenceRunner.Binding do
   use GenServer
 
   def start_link(opts \\ []), do: GenServer.start_link(__MODULE__, [], opts)

lib/farmbot/sync/database.ex

@@ -10,9 +10,7 @@ defmodule Farmbot.Sync do
   import Syncable
   alias Farmbot.Sync.Helpers
   alias Farmbot.ImageWatcher
-  # alias Farmbot.Sync.Database.Diff
   require Logger
-  # alias Farmbot.BotState.ProcessTracker, as: PT
 
   defdatabase Database do
     use Amnesia

lib/farmbot/system/supervisor.ex

@@ -4,17 +4,18 @@ defmodule Farmbot.System.Supervisor do
   """
   use Supervisor
   @redis_config Application.get_all_env(:farmbot)[:redis]
+  @target Mix.Project.config()[:target]
 
-  def start_link(args) do
-    Supervisor.start_link(__MODULE__, [args], name: __MODULE__)
+  def start_link do
+    Supervisor.start_link(__MODULE__, [], name: __MODULE__)
   end
 
-  def init(target: target) do
+  def init([]) do
     children = [
-      worker(Farmbot.System.FS, [target], restart: :permanent),
-      worker(Farmbot.System.FS.Worker, [target], restart: :permanent),
+      worker(Farmbot.System.FS, [@target], restart: :permanent),
+      worker(Farmbot.System.FS.Worker, [@target], restart: :permanent),
       worker(Farmbot.System.FS.ConfigStorage, [], restart: :permanent),
-      worker(Farmbot.System.Network, [target], restart: :permanent)
+      worker(Farmbot.System.Network, [@target], restart: :permanent)
     ] ++ maybe_redis()
     opts = [strategy: :one_for_one]
     supervise(children, opts)