protocol_for_deps: support git:// alongside https://

inaka · Nov 11, 2024 · cdd09a4 · cdd09a4
1 parent 4b411cd
commit cdd09a4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/doc_rules/elvis_project/protocol_for_deps.md b/doc_rules/elvis_project/protocol_for_deps.md
@@ -8,7 +8,7 @@ This rule was called `protocol_for_deps_rebar` before
 ## Options
 
 - `regex :: string()`.
-  - default: `(https://.*|[0-9]+([.][0-9]+)*)`.
+  - default: `^(https://|git://|\\d+(\\.\\d+)*)`.
 
 ## Example
 
@@ -21,5 +21,5 @@ This rule was called `protocol_for_deps_rebar` before
 - since [2.0.0](https://github.com/inaka/elvis_core/releases/tag/2.0.0)
 
 ```erlang
-{elvis_project, protocol_for_deps, #{ regex => "(https://.*|[0-9]+([.][0-9]+)*)" }}
+{elvis_project, protocol_for_deps, #{ regex => "^(https://|git://|\\d+(\\.\\d+)*)" }}
 ```
diff --git a/src/elvis_project.erl b/src/elvis_project.erl
@@ -30,7 +30,7 @@
 default(no_branch_deps) ->
     #{ignore => []};
 default(protocol_for_deps) ->
-    #{ignore => [], regex => "(https://.*|[0-9]+([.][0-9]+)*)"};
+    #{ignore => [], regex => "^(https://|git://|\\d+(\\.\\d+)*)"};
 default(old_configuration_format) ->
     #{}.
 

diff --git a/test/examples/rebar.config.fail b/test/examples/rebar.config.fail
@@ -21,7 +21,7 @@
 {deps_dir, "deps"}.
 {deps,
  [
-  {lager, "2.*", {git, "git://github.com/basho/lager.git", "2.0.0"}},
+  {lager, "2.*", {git, "git2://github.com/basho/lager.git", "2.0.0"}},
   {getopt, "0.*", {git, "[email protected]:jcomellas/getopt.git", {branch, "main"}}},
   {meck, "0.*", {git, "https://github.com/eproxus/meck.git", "0.8.2"}},
   {jiffy, "0.*", {git, "https://github.com/davisp/jiffy.git", "0.11.3"}},
@@ -30,7 +30,7 @@
   {aleppo, "0.*", {git, "https://github.com/inaka/aleppo.git", "main"}},
   {jsx, {raw, {git, "[email protected]:talentdeficit.git", {branch, "develop"}}}},
 
-  {lager, {git, "git://github.com/basho/lager.git", "2.0.0"}},
+  {lager, {git, "git2://github.com/basho/lager.git", "2.0.0"}},
   {getopt, {git, "[email protected]:jcomellas/getopt.git", {branch, "main"}}},
   {meck, {git, "https://github.com/eproxus/meck.git", "0.8.2"}},
   {jiffy, {git, "https://github.com/davisp/jiffy.git", "0.11.3"}},

diff --git a/test/examples/rebar3_2.config.success b/test/examples/rebar3_2.config.success
@@ -4,12 +4,12 @@
     {rebar, "1.0.0"},
     {rebar, {pkg, rebar_fork}},
     {rebar, "1.0.0", {pkg, rebar_fork}},
-    {rebar, {git, "https://github.com/rebar/rebar.git", {branch, "main"}}},
+    {rebar, {git, "git://github.com/rebar/rebar.git", {branch, "main"}}},
     {rebar, {git, "https://github.com/rebar/rebar.git", {tag, "1.0.0"}}},
     {rebar, {git, "https://github.com/rebar/rebar.git", {ref, "7f73b8d6"}}},
     {rebar, {hg, "https://github.com/rebar/rebar.git", {tag, "1.0.0"}}},
     {rebar, {git_subdir, "https://github.com/rebar/rebar.git", {branch, "main"}, "subdir"}},
-    {rebar, {git_subdir, "https://github.com/rebar/rebar.git", {tag, "1.0.0"}, "sub/dir"}},
+    {rebar, {git_subdir, "git://github.com/rebar/rebar.git", {tag, "1.0.0"}, "sub/dir"}},
     {rebar, {git_subdir, "https://github.com/rebar/rebar.git", {ref, "7f73b8d6"}, "dir"}},
     %% Alternative formats, backwards compatible declarations
     {rebar, {git, "https://github.com/rebar/rebar.git"}},