Changed eliver.bump to work off of VERSION file instead of mix.exs, also fixed all syntax warnings

Author: pmarreck

lib/eliver/git.ex

@@ -27,7 +27,7 @@ defmodule Eliver.Git do
   end
 
   def on_master? do
-    current_branch == "master"
+    current_branch() == "master"
   end
 
   def fetch! do
@@ -42,7 +42,7 @@ defmodule Eliver.Git do
   end
 
   def push!(new_version) do
-    git "push", ["-q", "origin", current_branch, new_version]
+    git "push", ["-q", "origin", current_branch(), new_version]
   end
 
   defp git(command, args) when is_list(args) do

lib/eliver/mixfile.ex

@@ -1,22 +1,23 @@
 defmodule Eliver.MixFile do
-  def version_from_mixfile(filename \\ "mix.exs") do
+
+  @version_regex ~r/([0-9]+\.[0-9]+\.[0-9]+)/
+
+  def version(filename \\ "VERSION") do
     case File.read(filename) do
       {:ok, body} ->
-        (Regex.run(version_regex, body) || []) |> Enum.at(0)
+        (Regex.run(@version_regex, body) || []) |> Enum.at(0)
       {:error, _} -> nil
     end
   end
 
-  def bump(new_version, filename \\ "mix.exs") do
+  def bump(new_version, filename \\ "VERSION") do
     case File.read(filename) do
       {:ok, body} ->
-        new_contents  = Regex.replace(version_regex, body, new_version)
+        new_contents  = Regex.replace(@version_regex, body, new_version)
         File.write(filename, new_contents)
       {:error, _} -> nil
     end
   end
 
-  defp version_regex, do: ~r/(?<=version: ")(.*)(?=")/
-
 end
 

lib/mix/tasks/eliver.bump.ex

@@ -7,23 +7,23 @@ defmodule Mix.Tasks.Eliver.Bump do
   end
 
   defp bump(_) do
-    case check_for_git_problems do
+    case check_for_git_problems() do
       {:error, message} ->
         say message, :red
       {:ok} ->
-        {new_version, changelog_entries} = get_changes
+        {new_version, changelog_entries} = get_changes()
         if allow_changes?(new_version, changelog_entries) do
           make_changes(new_version, changelog_entries)
         end
     end
   end
 
   defp get_changes do
-    {get_new_version, get_changelog_entries}
+    {get_new_version(), get_changelog_entries()}
   end
 
   defp allow_changes?(new_version, changelog_entries) do
-    current_version = Eliver.MixFile.version_from_mixfile
+    current_version = Eliver.MixFile.version
     say "\n"
     say "Summary of changes:"
     say "Bumping version #{current_version} → #{new_version}", :green
@@ -48,7 +48,7 @@ defmodule Mix.Tasks.Eliver.Bump do
     cond do
       !Eliver.Git.is_tracking_branch? ->
         {:error, "This branch is not tracking a remote branch. Aborting..."}
-      !Eliver.Git.on_master? && !continue_on_branch? ->
+      !Eliver.Git.on_master? && !continue_on_branch?() ->
         {:error, "Aborting"}
       Eliver.Git.index_dirty? ->
         {:error, "Git index dirty. Commit changes before continuing"}
@@ -64,12 +64,12 @@ defmodule Mix.Tasks.Eliver.Bump do
     result = ask question, false
     case result do
       {:ok, value} -> value
-      {:error, _}  -> continue_on_branch?
+      {:error, _}  -> continue_on_branch?()
     end
   end
 
   defp get_new_version do
-    Eliver.MixFile.version_from_mixfile |> Eliver.next_version(get_bump_type)
+    Eliver.MixFile.version |> Eliver.next_version(get_bump_type())
   end
 
   defp get_changelog_entries do
@@ -86,7 +86,7 @@ defmodule Mix.Tasks.Eliver.Bump do
 
     case result do
       {:ok, value} -> value
-      {:error, _}  -> get_bump_type
+      {:error, _}  -> get_bump_type()
     end
   end
 

mix.lock

@@ -0,0 +1,3 @@
+%{"earmark": {:hex, :earmark, "1.2.3", "206eb2e2ac1a794aa5256f3982de7a76bf4579ff91cb28d0e17ea2c9491e46a4", [], [], "hexpm"},
+  "enquirer": {:hex, :enquirer, "0.1.0", "96ca1a330c919652db4baed6cf572d8c9957a8a305365c54490262c337996a18", [], [], "hexpm"},
+  "ex_doc": {:hex, :ex_doc, "0.16.4", "4bf6b82d4f0a643b500366ed7134896e8cccdbab4d1a7a35524951b25b1ec9f0", [], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"}}

test/change_log_file_test.exs

@@ -35,13 +35,13 @@ defmodule Eliver.ChangeLogFileTest do
     test "it updates the changelog" do
       Eliver.ChangeLogFile.bump("1.1.0", ["e1", "e2"], "test/support/CHANGELOG.md")
       {:ok, changelog_contents} = File.read("test/support/CHANGELOG.md")
-      assert changelog_contents == expected_existing_changelog_contents
+      assert changelog_contents == expected_existing_changelog_contents()
     end
 
     test "it is case insensitive and updates the changelog" do
       Eliver.ChangeLogFile.bump("1.1.0", ["e1", "e2"], "test/support/CHANGELOG2.md")
       {:ok, changelog_contents} = File.read("test/support/CHANGELOG2.md")
-      assert changelog_contents == expected_existing_changelog_contents
+      assert changelog_contents == expected_existing_changelog_contents()
     end
   end
 
@@ -58,7 +58,7 @@ defmodule Eliver.ChangeLogFileTest do
     test "it creates the changelog file if it doesn't exist" do
       Eliver.ChangeLogFile.bump("1.1.0", ["e1", "e2"], "test/support/test.md")
       {:ok, new_change_log_contents} = File.read("test/support/test.md")
-      assert new_change_log_contents == expected_new_changelog_contents
+      assert new_change_log_contents == expected_new_changelog_contents()
     end
   end
 

test/mixfile_test.exs

@@ -14,16 +14,16 @@ defmodule Eliver.MixFileTest do
   end
 
   describe "getting the current version number" do
-    test "it gets the version number when the mix file exixts" do
-      assert Eliver.MixFile.version_from_mixfile("test/support/test_with_version.exs") == "1.1.0"
+    test "it gets the version number when the mix file exists" do
+      assert Eliver.MixFile.version("test/support/test_with_version.exs") == "1.1.0"
     end
 
     test "it returns nil when the file does not exist" do
-      assert Eliver.MixFile.version_from_mixfile("foo.exs") == nil
+      assert Eliver.MixFile.version("foo.exs") == nil
     end
 
     test "it returns nil if the version is not specified in the mix file" do
-      assert Eliver.MixFile.version_from_mixfile("test/support/test_without_version.exs") == nil
+      assert Eliver.MixFile.version("test/support/test_without_version.exs") == nil
     end
   end
 
@@ -38,35 +38,13 @@ defmodule Eliver.MixFileTest do
 
     def expected_mixfile_contents do
       """
-      defmodule Eliver.Mixfile do
-        use Mix.Project
-
-        def project do
-          [app: :eliver_test,
-           version: "2.0.0",
-           elixir: "~> 1.3",
-           build_embedded: Mix.env == :prod,
-           start_permanent: Mix.env == :prod,
-           deps: deps()]
-        end
-
-        # Configuration for the OTP application
-        #
-        # Type "mix help compile.app" for more information
-        def application do
-          [applications: [:logger]]
-        end
-
-        defp deps do
-          []
-        end
-      end
+      2.0.0
       """
     end
 
     test "it updates the mixfile" do
       Eliver.MixFile.bump("2.0.0", "test/support/test_with_version.exs")
-      assert mixfile_contents == expected_mixfile_contents
+      assert mixfile_contents() == expected_mixfile_contents()
     end
 
   end

test/support/test_with_version_template.exs

@@ -1,23 +1 @@
-defmodule Eliver.Mixfile do
-  use Mix.Project
-
-  def project do
-    [app: :eliver_test,
-     version: "1.1.0",
-     elixir: "~> 1.3",
-     build_embedded: Mix.env == :prod,
-     start_permanent: Mix.env == :prod,
-     deps: deps()]
-  end
-
-  # Configuration for the OTP application
-  #
-  # Type "mix help compile.app" for more information
-  def application do
-    [applications: [:logger]]
-  end
-
-  defp deps do
-    []
-  end
-end
+1.1.0

test/support/test_without_version_template.exs

@@ -1,22 +0,0 @@
-defmodule Eliver.Mixfile do
-  use Mix.Project
-
-  def project do
-    [app: :eliver_test,
-     elixir: "~> 1.3",
-     build_embedded: Mix.env == :prod,
-     start_permanent: Mix.env == :prod,
-     deps: deps()]
-  end
-
-  # Configuration for the OTP application
-  #
-  # Type "mix help compile.app" for more information
-  def application do
-    [applications: [:logger]]
-  end
-
-  defp deps do
-    []
-  end
-end