Merge pull request #138 from youpong/introduce-options

Introduce Options

Author: TanmayPatil105

src/fetch.h

@@ -391,3 +391,42 @@ enum class Mode
     EXEC_TEST,
     SHOW_VERSION,
 };
+
+class Options
+{
+  public:
+    Mode mode = Mode::NORMAL;
+    string color_name = "def"s;
+    string distro_name = "def"s;
+    bool show_battery = false;
+
+    Options(){};
+    Options(int argc, char *argv[])
+    {
+        int opt;
+        while ((opt = getopt(argc, argv, "ta:d:vb")) != -1)
+        {
+
+            switch (opt)
+            {
+            case 't':
+                mode = Mode::EXEC_TEST;
+                break;
+            case 'a':
+                color_name = string(optarg);
+                break;
+            case 'd':
+                distro_name = string(optarg);
+                break;
+            case 'b':
+                show_battery = true;
+                break;
+            case 'v':
+                mode = Mode::SHOW_VERSION;
+                break;
+            default:
+                exit(1);
+            }
+        }
+    }
+};

src/main.cpp

@@ -12,44 +12,15 @@ void DisplayInfo(bool show_battery);
  */
 int main(int argc, char *argv[])
 {
-    Mode mode = Mode::NORMAL;
-    string color_name = "def"s;
-    string distro_name = "def"s;
-    bool show_battery = false;
-
-    int opt;
-    while ((opt = getopt(argc, argv, "ta:d:vb")) != -1)
-    {
-        switch (opt)
-        {
-        case 't':
-            mode = Mode::EXEC_TEST;
-            break;
-        case 'a':
-            color_name = string(optarg);
-            break;
-        case 'd':
-            distro_name = string(optarg);
-            break;
-        case 'b':
-            show_battery = true;
-            break;
-        case 'v':
-            mode = Mode::SHOW_VERSION;
-            break;
-        default:
-            return 1;
-        }
-    }
-
+    auto options = Options(argc, argv);
     if (optind != argc)
     {
         cout << "Error: "s << argv[0] << ": unknown argument: "s << argv[optind]
              << endl;
         return 1;
     }
 
-    switch (mode)
+    switch (options.mode)
     {
     case Mode::NORMAL:
         // no-op
@@ -67,8 +38,8 @@ int main(int argc, char *argv[])
     }
 
     // Mode::NORMAL
-    print(color_name, distro_name);
-    DisplayInfo(show_battery);
+    print(options.color_name, options.distro_name);
+    DisplayInfo(options.show_battery);
 
     return 0;
 }

src/util.cpp

@@ -102,6 +102,85 @@ static void test_Crayon()
     expect("\033[0;31mHIJIKI\033[0;m"s, style.text("HIJIKI"), ""s);
 }
 
+static void testhelper_Options(string msg, int argc, const char *argv[],
+                               Options expect, int expect_optind)
+{
+    optind = 1;
+    auto options = Options(argc, (char **)argv);
+
+    expect((int)expect.mode, (int)options.mode, msg + ": Options.mode"s);
+    expect(expect.color_name, options.color_name,
+           msg + ": Options.color_name"s);
+    expect(expect.distro_name, options.distro_name,
+           msg + ": Options.distro_name"s);
+    expect(expect.show_battery, options.show_battery,
+           msg + ": Options.show_battery"s);
+    expect(expect_optind, optind, msg + ": optind"s);
+}
+
+static void test_Options_default()
+{
+    int argc = 1;
+    const char *argv[] = {"procfetch", NULL};
+    Options expect;
+    expect.mode = Mode::NORMAL;
+    expect.color_name = "def"s;
+    expect.distro_name = "def"s;
+    expect.show_battery = false;
+
+    testhelper_Options("default", argc, argv, expect, 1);
+}
+
+static void test_Options_full()
+{
+    int argc = 6;
+    const char *argv[] = {"procfetch", "-a", "cyan", "-d",
+                          "Manjaro",   "-b", "arg",  NULL};
+    Options expect;
+    expect.mode = Mode::NORMAL;
+    expect.color_name = "cyan"s;
+    expect.distro_name = "Manjaro"s;
+    expect.show_battery = true;
+
+    testhelper_Options("full", argc, argv, expect, 6); // remains last "arg"
+}
+
+static void test_Options_test()
+{
+    int argc = 2;
+    const char *argv[] = {"procfetch", "-t", NULL};
+
+    Options expect;
+    expect.mode = Mode::EXEC_TEST;
+    expect.color_name = "def"s;
+    expect.distro_name = "def"s;
+    expect.show_battery = false;
+
+    testhelper_Options("test", argc, argv, expect, 2);
+}
+
+static void test_Options_version()
+{
+    int argc = 2;
+    const char *argv[] = {"procfetch", "-v", NULL};
+
+    Options expect;
+    expect.mode = Mode::SHOW_VERSION;
+    expect.color_name = "def"s;
+    expect.distro_name = "def"s;
+    expect.show_battery = false;
+
+    testhelper_Options("version", argc, argv, expect, 2);
+}
+
+static void test_Options()
+{
+    test_Options_default();
+    test_Options_full();
+    test_Options_test();
+    test_Options_version();
+}
+
 /**
  * Tests belows.
  * * class Path
@@ -115,4 +194,5 @@ void test_util()
     test_Command_async();
     test_Command_async_exception();
     test_Crayon();
+    test_Options();
 }