remove version calls and tests

Author: phlptp

examples/simple.cpp

@@ -12,8 +12,7 @@ int main(int argc, char **argv) {
 
     CLI::App app("K3Pi goofit fitter");
     // add version output
-    app.version(std::string(CLI11_VERSION));
-
+    app.set_version_flag("--version",std::string(CLI11_VERSION));
     std::string file;
     CLI::Option *opt = app.add_option("-f,--file,file", file, "File name");
 

include/CLI/App.hpp

@@ -744,17 +744,6 @@ class App {
 
         return version_ptr_;
     }
-    /// Set the version as a string
-    App *version(const std::string &versionString) {
-        set_version_flag("--version", versionString);
-        return this;
-    }
-
-    /// Generate the version string through a callback function
-    App *version(std::function<std::string()> vfunc) {
-        set_version_flag("--version", vfunc);
-        return this;
-    }
 
   private:
     /// Internal function for adding a flag
@@ -1588,23 +1577,6 @@ class App {
         return formatter_->make_help(this, prev, mode);
     }
 
-    /// Displays a version string
-    std::string version() const {
-        std::string val;
-        if(version_ptr_ != nullptr) {
-            auto rv = version_ptr_->results();
-            version_ptr_->clear();
-            version_ptr_->add_result("true");
-            try {
-                version_ptr_->run_callback();
-            } catch(const CLI::CallForVersion &cfv) {
-                val = cfv.what();
-            }
-            version_ptr_->clear();
-            version_ptr_->add_result(rv);
-        }
-        return val;
-    }
     ///@}
     /// @name Getters
     ///@{

tests/HelpTest.cpp

@@ -1166,17 +1166,28 @@ TEST(THelp, FunctionDefaultString) {
     EXPECT_THAT(help, HasSubstr("INT=Powerful"));
 }
 
+static std::string getVersion(CLI::App& app, const std::string &args="--version")
+{
+    try {
+        app.parse(args);
+    }
+    catch (const CLI::CallForVersion& v)
+    {
+        return v.what();
+    }
+    return std::string{};
+}
 TEST(TVersion, simple_flag) {
 
     CLI::App app;
 
     app.set_version_flag("-v,--version", "VERSION " CLI11_VERSION);
 
-    auto vers = app.version();
+    auto vers = getVersion(app);
     EXPECT_THAT(vers, HasSubstr("VERSION"));
-
+    app.allow_extras();
     app.set_version_flag();
-    EXPECT_TRUE(app.version().empty());
+    EXPECT_TRUE(getVersion(app).empty());
 }
 
 TEST(TVersion, callback_flag) {
@@ -1185,39 +1196,19 @@ TEST(TVersion, callback_flag) {
 
     app.set_version_flag("-v,--version", []() { return std::string("VERSION " CLI11_VERSION); });
 
-    auto vers = app.version();
+    auto vers = getVersion(app);
     EXPECT_THAT(vers, HasSubstr("VERSION"));
 
     app.set_version_flag("-v", []() { return std::string("VERSION2 " CLI11_VERSION); });
-    vers = app.version();
-    EXPECT_THAT(vers, HasSubstr("VERSION"));
-}
-
-TEST(TVersion, simple_direct) {
-
-    CLI::App app;
-
-    app.version(std::string("VERSION " CLI11_VERSION));
-
-    auto vers = app.version();
-    EXPECT_THAT(vers, HasSubstr("VERSION"));
-}
-
-TEST(TVersion, callback_direct) {
-
-    CLI::App app;
-
-    app.version([]() { return std::string("VERSION " CLI11_VERSION); });
-
-    auto vers = app.version();
+    vers = getVersion(app,"-v");
     EXPECT_THAT(vers, HasSubstr("VERSION"));
 }
 
 TEST(TVersion, parse_throw) {
 
     CLI::App app;
 
-    app.version(CLI11_VERSION);
+    app.set_version_flag("--version", CLI11_VERSION);
 
     EXPECT_THROW(app.parse("--version"), CLI::CallForVersion);
     EXPECT_THROW(app.parse("--version --arg2 5"), CLI::CallForVersion);