From d542d5919b4c3db9df93bf5015b1be5cf4f86cd1 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Fri, 2 Feb 2024 14:20:31 +0100 Subject: [PATCH 1/5] Rename the `pop-count` exercise to `eliuds-eggs`. --- config.json | 2 +- .../practice/{pop-count => eliuds-eggs}/.docs/instructions.md | 0 .../practice/{pop-count => eliuds-eggs}/.docs/introduction.md | 0 exercises/practice/{pop-count => eliuds-eggs}/.formatter.exs | 0 exercises/practice/{pop-count => eliuds-eggs}/.gitignore | 0 exercises/practice/{pop-count => eliuds-eggs}/.meta/config.json | 0 exercises/practice/{pop-count => eliuds-eggs}/.meta/example.ex | 0 exercises/practice/{pop-count => eliuds-eggs}/.meta/tests.toml | 0 exercises/practice/{pop-count => eliuds-eggs}/lib/pop_count.ex | 0 exercises/practice/{pop-count => eliuds-eggs}/mix.exs | 0 .../practice/{pop-count => eliuds-eggs}/test/pop_count_test.exs | 0 .../practice/{pop-count => eliuds-eggs}/test/test_helper.exs | 0 12 files changed, 1 insertion(+), 1 deletion(-) rename exercises/practice/{pop-count => eliuds-eggs}/.docs/instructions.md (100%) rename exercises/practice/{pop-count => eliuds-eggs}/.docs/introduction.md (100%) rename exercises/practice/{pop-count => eliuds-eggs}/.formatter.exs (100%) rename exercises/practice/{pop-count => eliuds-eggs}/.gitignore (100%) rename exercises/practice/{pop-count => eliuds-eggs}/.meta/config.json (100%) rename exercises/practice/{pop-count => eliuds-eggs}/.meta/example.ex (100%) rename exercises/practice/{pop-count => eliuds-eggs}/.meta/tests.toml (100%) rename exercises/practice/{pop-count => eliuds-eggs}/lib/pop_count.ex (100%) rename exercises/practice/{pop-count => eliuds-eggs}/mix.exs (100%) rename exercises/practice/{pop-count => eliuds-eggs}/test/pop_count_test.exs (100%) rename exercises/practice/{pop-count => eliuds-eggs}/test/test_helper.exs (100%) diff --git a/config.json b/config.json index f31f771f6a..fdf16e852e 100644 --- a/config.json +++ b/config.json @@ -1583,7 +1583,7 @@ "difficulty": 3 }, { - "slug": "pop-count", + "slug": "eliuds-eggs", "name": "Eliud's Eggs", "uuid": "8a9d6e1e-9188-44c9-8681-ade84d340dd0", "practices": [ diff --git a/exercises/practice/pop-count/.docs/instructions.md b/exercises/practice/eliuds-eggs/.docs/instructions.md similarity index 100% rename from exercises/practice/pop-count/.docs/instructions.md rename to exercises/practice/eliuds-eggs/.docs/instructions.md diff --git a/exercises/practice/pop-count/.docs/introduction.md b/exercises/practice/eliuds-eggs/.docs/introduction.md similarity index 100% rename from exercises/practice/pop-count/.docs/introduction.md rename to exercises/practice/eliuds-eggs/.docs/introduction.md diff --git a/exercises/practice/pop-count/.formatter.exs b/exercises/practice/eliuds-eggs/.formatter.exs similarity index 100% rename from exercises/practice/pop-count/.formatter.exs rename to exercises/practice/eliuds-eggs/.formatter.exs diff --git a/exercises/practice/pop-count/.gitignore b/exercises/practice/eliuds-eggs/.gitignore similarity index 100% rename from exercises/practice/pop-count/.gitignore rename to exercises/practice/eliuds-eggs/.gitignore diff --git a/exercises/practice/pop-count/.meta/config.json b/exercises/practice/eliuds-eggs/.meta/config.json similarity index 100% rename from exercises/practice/pop-count/.meta/config.json rename to exercises/practice/eliuds-eggs/.meta/config.json diff --git a/exercises/practice/pop-count/.meta/example.ex b/exercises/practice/eliuds-eggs/.meta/example.ex similarity index 100% rename from exercises/practice/pop-count/.meta/example.ex rename to exercises/practice/eliuds-eggs/.meta/example.ex diff --git a/exercises/practice/pop-count/.meta/tests.toml b/exercises/practice/eliuds-eggs/.meta/tests.toml similarity index 100% rename from exercises/practice/pop-count/.meta/tests.toml rename to exercises/practice/eliuds-eggs/.meta/tests.toml diff --git a/exercises/practice/pop-count/lib/pop_count.ex b/exercises/practice/eliuds-eggs/lib/pop_count.ex similarity index 100% rename from exercises/practice/pop-count/lib/pop_count.ex rename to exercises/practice/eliuds-eggs/lib/pop_count.ex diff --git a/exercises/practice/pop-count/mix.exs b/exercises/practice/eliuds-eggs/mix.exs similarity index 100% rename from exercises/practice/pop-count/mix.exs rename to exercises/practice/eliuds-eggs/mix.exs diff --git a/exercises/practice/pop-count/test/pop_count_test.exs b/exercises/practice/eliuds-eggs/test/pop_count_test.exs similarity index 100% rename from exercises/practice/pop-count/test/pop_count_test.exs rename to exercises/practice/eliuds-eggs/test/pop_count_test.exs diff --git a/exercises/practice/pop-count/test/test_helper.exs b/exercises/practice/eliuds-eggs/test/test_helper.exs similarity index 100% rename from exercises/practice/pop-count/test/test_helper.exs rename to exercises/practice/eliuds-eggs/test/test_helper.exs From 357912167b60e92eaed2956218c3493019c0676f Mon Sep 17 00:00:00 2001 From: Jeremie Gillet Date: Sat, 3 Feb 2024 11:42:13 +0900 Subject: [PATCH 2/5] reorder exercise --- config.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/config.json b/config.json index fdf16e852e..63cf969590 100644 --- a/config.json +++ b/config.json @@ -1341,6 +1341,21 @@ ], "difficulty": 3 }, + { + "slug": "eliuds-eggs", + "name": "Eliud's Eggs", + "uuid": "8a9d6e1e-9188-44c9-8681-ade84d340dd0", + "practices": [ + "bit-manipulation" + ], + "prerequisites": [ + "bit-manipulation", + "multiple-clause-functions", + "pattern-matching", + "recursion" + ], + "difficulty": 3 + }, { "slug": "flatten-array", "name": "Flatten Array", @@ -1582,21 +1597,6 @@ ], "difficulty": 3 }, - { - "slug": "eliuds-eggs", - "name": "Eliud's Eggs", - "uuid": "8a9d6e1e-9188-44c9-8681-ade84d340dd0", - "practices": [ - "bit-manipulation" - ], - "prerequisites": [ - "bit-manipulation", - "multiple-clause-functions", - "pattern-matching", - "recursion" - ], - "difficulty": 3 - }, { "slug": "prime-factors", "name": "Prime Factors", From 9c4cf320df170bea350c04dc1d231fd4da79b7ed Mon Sep 17 00:00:00 2001 From: Jeremie Gillet Date: Sat, 3 Feb 2024 12:01:12 +0900 Subject: [PATCH 3/5] Rename module and files --- .../practice/eliuds-eggs/.meta/config.json | 4 +-- .../practice/eliuds-eggs/.meta/example.ex | 2 +- .../lib/{pop_count.ex => eliuds_eggs.ex} | 2 +- exercises/practice/eliuds-eggs/mix.exs | 4 +-- .../eliuds-eggs/test/eliuds_eggs_test.exs | 29 +++++++++++++++++++ .../eliuds-eggs/test/pop_count_test.exs | 29 ------------------- 6 files changed, 35 insertions(+), 35 deletions(-) rename exercises/practice/eliuds-eggs/lib/{pop_count.ex => eliuds_eggs.ex} (86%) create mode 100644 exercises/practice/eliuds-eggs/test/eliuds_eggs_test.exs delete mode 100644 exercises/practice/eliuds-eggs/test/pop_count_test.exs diff --git a/exercises/practice/eliuds-eggs/.meta/config.json b/exercises/practice/eliuds-eggs/.meta/config.json index 7ad7ca7fdd..5cecbce243 100644 --- a/exercises/practice/eliuds-eggs/.meta/config.json +++ b/exercises/practice/eliuds-eggs/.meta/config.json @@ -4,10 +4,10 @@ ], "files": { "solution": [ - "lib/pop_count.ex" + "lib/eliuds_eggs.ex" ], "test": [ - "test/pop_count_test.exs" + "test/.meta/eliuds_eggs_test.exs" ], "example": [ ".meta/example.ex" diff --git a/exercises/practice/eliuds-eggs/.meta/example.ex b/exercises/practice/eliuds-eggs/.meta/example.ex index 5c42817c9b..0a12eaa392 100644 --- a/exercises/practice/eliuds-eggs/.meta/example.ex +++ b/exercises/practice/eliuds-eggs/.meta/example.ex @@ -1,6 +1,6 @@ import Bitwise -defmodule PopCount do +defmodule EliudsEggs do @doc """ Given the number, count the number of eggs. """ diff --git a/exercises/practice/eliuds-eggs/lib/pop_count.ex b/exercises/practice/eliuds-eggs/lib/eliuds_eggs.ex similarity index 86% rename from exercises/practice/eliuds-eggs/lib/pop_count.ex rename to exercises/practice/eliuds-eggs/lib/eliuds_eggs.ex index 317bb05b8a..d43064f522 100644 --- a/exercises/practice/eliuds-eggs/lib/pop_count.ex +++ b/exercises/practice/eliuds-eggs/lib/eliuds_eggs.ex @@ -1,4 +1,4 @@ -defmodule PopCount do +defmodule EliudsEggs do @doc """ Given the number, count the number of eggs. """ diff --git a/exercises/practice/eliuds-eggs/mix.exs b/exercises/practice/eliuds-eggs/mix.exs index 3f65937ce2..7273346ba2 100644 --- a/exercises/practice/eliuds-eggs/mix.exs +++ b/exercises/practice/eliuds-eggs/mix.exs @@ -1,9 +1,9 @@ -defmodule PopCount.MixProject do +defmodule EliudsEggs.MixProject do use Mix.Project def project do [ - app: :pop_count, + app: :eliuds_eggs, version: "0.1.0", # elixir: "~> 1.8", start_permanent: Mix.env() == :prod, diff --git a/exercises/practice/eliuds-eggs/test/eliuds_eggs_test.exs b/exercises/practice/eliuds-eggs/test/eliuds_eggs_test.exs new file mode 100644 index 0000000000..4dd82c4167 --- /dev/null +++ b/exercises/practice/eliuds-eggs/test/eliuds_eggs_test.exs @@ -0,0 +1,29 @@ +defmodule EliudsEggsTest do + use ExUnit.Case + + describe "egg count" do + test "0 eggs" do + assert EliudsEggs.egg_count(0) == 0 + end + + @tag :pending + test "1 egg" do + assert EliudsEggs.egg_count(16) == 1 + end + + @tag :pending + test "4 eggs" do + assert EliudsEggs.egg_count(89) == 4 + end + + @tag :pending + test "13 eggs" do + assert EliudsEggs.egg_count(2_000_000_000) == 13 + end + + @tag :pending + test "100 eggs" do + assert EliudsEggs.egg_count(1_267_650_600_228_229_401_496_703_205_375) == 100 + end + end +end diff --git a/exercises/practice/eliuds-eggs/test/pop_count_test.exs b/exercises/practice/eliuds-eggs/test/pop_count_test.exs deleted file mode 100644 index 9b26aa513c..0000000000 --- a/exercises/practice/eliuds-eggs/test/pop_count_test.exs +++ /dev/null @@ -1,29 +0,0 @@ -defmodule PopCountTest do - use ExUnit.Case - - describe "egg count" do - test "0 eggs" do - assert PopCount.egg_count(0) == 0 - end - - @tag :pending - test "1 egg" do - assert PopCount.egg_count(16) == 1 - end - - @tag :pending - test "4 eggs" do - assert PopCount.egg_count(89) == 4 - end - - @tag :pending - test "13 eggs" do - assert PopCount.egg_count(2_000_000_000) == 13 - end - - @tag :pending - test "100 eggs" do - assert PopCount.egg_count(1_267_650_600_228_229_401_496_703_205_375) == 100 - end - end -end From a07b6715b295b85a92eba7b90a72f65683457050 Mon Sep 17 00:00:00 2001 From: Jeremie Gillet Date: Sat, 3 Feb 2024 12:05:15 +0900 Subject: [PATCH 4/5] fix typo --- .tool-versions | 2 ++ exercises/practice/eliuds-eggs/.meta/config.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000000..000a611a06 --- /dev/null +++ b/.tool-versions @@ -0,0 +1,2 @@ +elixir 1.16.0-otp-26 +erlang 26.2.1 diff --git a/exercises/practice/eliuds-eggs/.meta/config.json b/exercises/practice/eliuds-eggs/.meta/config.json index 5cecbce243..446bfeed3c 100644 --- a/exercises/practice/eliuds-eggs/.meta/config.json +++ b/exercises/practice/eliuds-eggs/.meta/config.json @@ -7,7 +7,7 @@ "lib/eliuds_eggs.ex" ], "test": [ - "test/.meta/eliuds_eggs_test.exs" + "test/eliuds_eggs_test.exs" ], "example": [ ".meta/example.ex" From 991c2b5934f5d68d1843d230bffe88b329454811 Mon Sep 17 00:00:00 2001 From: Jeremie Gillet Date: Sat, 3 Feb 2024 12:08:34 +0900 Subject: [PATCH 5/5] remove stray file --- .tool-versions | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index 000a611a06..0000000000 --- a/.tool-versions +++ /dev/null @@ -1,2 +0,0 @@ -elixir 1.16.0-otp-26 -erlang 26.2.1