Fix dogma/credo

johnhamelink · Jan 5, 2017 · 700cfee · 700cfee
1 parent 2904543
commit 700cfee
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/lib/distillery.ex b/lib/distillery.ex
@@ -4,11 +4,12 @@ defmodule ExrmDeb.Distillery do
   [Distillery](https://github.com/bitwalker/distillery)'s plugin system.
   """
   use Mix.Releases.Plugin
+  alias ExrmDeb.Config
 
   def before_assembly(release, _options), do: release
   def after_assembly(release = %Release{}, _options) do
     info "Building Deb Package"
-    case ExrmDeb.Config.build_config(:distillery, release) do
+    case Config.build_config(:distillery, release) do
       {:ok, config} ->
         ExrmDeb.start_build(config)
         release

diff --git a/lib/exrm_deb/config.ex b/lib/exrm_deb/config.ex
@@ -6,12 +6,14 @@ defmodule ExrmDeb.Config do
   """
 
   defstruct name: nil, version: nil, licenses: nil, maintainers: nil,
-            external_dependencies: nil, maintainer_scripts: [], config_files: [],
-            homepage: nil, description: nil, vendor: nil,
-            arch: nil, owner: [user: "root", group: "root"]
+            external_dependencies: nil, maintainer_scripts: [],
+            config_files: [], homepage: nil, description: nil,
+            vendor: nil, arch: nil,
+            owner: [user: "root", group: "root"]
 
   use Vex.Struct
   alias ReleaseManager.Utils.Logger
+  alias ExrmDeb.Utils
   alias Mix.Project
   import Logger, only: [debug: 1, error: 1]
 
@@ -35,9 +37,9 @@ defmodule ExrmDeb.Config do
       [
         {:name, Atom.to_string(release.name)},
         {:version, release.version},
-        {:description, Mix.Project.config[:description]},
-        {:arch, ExrmDeb.Utils.Config.detect_arch}
-      ] ++ config_from_package(Mix.Project.config[:package])
+        {:description, Project.config[:description]},
+        {:arch, Utils.Config.detect_arch}
+      ] ++ config_from_package(Project.config[:package])
 
     base_config =
       base_config

diff --git a/lib/exrm_deb/control.ex b/lib/exrm_deb/control.ex
@@ -31,7 +31,8 @@ defmodule ExrmDeb.Control do
     debug "Marking config files"
     config_files = Map.get(config, :config_files, [])
     :ok =
-      Path.join([control_dir, "conffiles"])
+      [control_dir, "conffiles"]
+      |> Path.join()
       |> File.write(Enum.join(config_files, "\n"))
   end
 

diff --git a/lib/exrm_deb/data.ex b/lib/exrm_deb/data.ex
@@ -3,9 +3,10 @@ defmodule ExrmDeb.Data do
   This module houses the logic required to build the data payload portion of the
   debian package.
   """
-  alias  ReleaseManager.Utils.Logger
-  alias  ExrmDeb.Utils.Compression
+  alias ReleaseManager.Utils.Logger
+  alias ExrmDeb.Utils.Compression
   alias ExrmDeb.Generators.{Changelog, Upstart, Systemd}
+  alias Mix.Project
   import Logger, only: [debug: 1]
 
   def build(dir, config) do
@@ -53,7 +54,7 @@ defmodule ExrmDeb.Data do
 
   defp copy_release(data_dir, config) do
     dest = Path.join([data_dir, "opt", config.name])
-    src = Path.join([Mix.Project.build_path, "rel", config.name])
+    src = Path.join([Project.build_path, "rel", config.name])
 
     debug("Copying #{src} into #{dest} directory")
     {:ok, _} = File.cp_r(src, dest)

diff --git a/mix.lock b/mix.lock
@@ -3,8 +3,8 @@
   "certifi": {:hex, :certifi, "0.4.0", "a7966efb868b179023618d29a407548f70c52466bf1849b9e8ebd0e34b7ea11f", [:rebar3], []},
   "cf": {:hex, :cf, "0.2.1", "69d0b1349fd4d7d4dc55b7f407d29d7a840bf9a1ef5af529f1ebe0ce153fc2ab", [:rebar3], []},
   "combine": {:hex, :combine, "0.9.2", "cd3c8721f378ebe032487d8a4fa2ced3181a456a3c21b16464da8c46904bb552", [:mix], []},
-  "credo": {:hex, :credo, "0.4.12", "f5e1973405ea25c6e64959fb0b6bf92950147a0278cc2a002a491b45f78f7b87", [:mix], [{:bunt, "~> 0.1.6", [hex: :bunt, optional: false]}]},
   "distillery": {:hex, :distillery, "1.0.0", "a866a72bf2a3a5f078f5a249017ed951acda88a760d200512f91f585d74db1ec", [:mix], []},
+  "credo": {:hex, :credo, "0.5.3", "0c405b36e7651245a8ed63c09e2d52c2e2b89b6d02b1570c4d611e0fcbecf4a2", [:mix], [{:bunt, "~> 0.1.6", [hex: :bunt, optional: false]}]},
   "dogma": {:hex, :dogma, "0.1.8", "1ee856ed64f3ad635a4b2127beea427ea1b9bc271b8731679a97938e1827730f", [:mix], [{:poison, ">= 1.0.0", [hex: :poison, optional: false]}]},
   "earmark": {:hex, :earmark, "1.0.1", "2c2cd903bfdc3de3f189bd9a8d4569a075b88a8981ded9a0d95672f6e2b63141", [:mix], []},
   "erlware_commons": {:hex, :erlware_commons, "0.21.0", "a04433071ad7d112edefc75ac77719dd3e6753e697ac09428fc83d7564b80b15", [:rebar3], [{:cf, "0.2.1", [hex: :cf, optional: false]}]},