Changeset 226 for trunk/bin

Timestamp:

Mar 11, 2007, 8:32:41 PM (17 years ago)

Author:

Peter Johansson

Message:

added reading of config file in Parameter closes ##106 and #98. Move function check_target from svndigest.cc to utility.cc and changed name to node_exist. added support for aliases in Copyright update refs #36

Location:

trunk/bin

Files:

• Parameter.cc (modified) (7 diffs)
• Parameter.h (modified) (1 diff)
• svndigest.cc (modified) (3 diffs)

trunk/bin/Parameter.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2006 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2007 Peter Johansson
 
   This file is part of svndigest, http://lev.thep.lu.se/trac/svndigest
@@ -26 +27 @@
 #include <config.h> // this header file is created by configure
 
+#include <fstream>
 #include <iostream>
+#include <sstream>
 #include <stdexcept>
 #include <string>
@@ -40 +43 @@
       bool ok=false;
       std::string myargv(argv[i]);
-      if (myargv=="-f" || myargv=="--force"){
+      if (myargv=="-c" || myargv=="--config"){
+        if (++i<argc){
+          config_path_= std::string(argv[i]);
+          ok=true;
+        }
+      }
+      else if (myargv=="--copyright"){
+          copyright_=true;
+          ok=true;
+      }
+      else if (myargv=="-f" || myargv=="--force"){
           force_=true;
-          ok=true;
-      }
-      if (myargv=="--copyright"){
-          copyright_=true;
           ok=true;
       }
@@ -86 +95 @@
                                  "\nType 'svndigest --help' for usage.");
     }
+
+    std::string home_path = getenv("HOME") + "/.svndigest";
+    if (!node_exist(home_path))
+      mkdir(home_path);
+    if (!node_exist(home_path+"/config"))
+      print_config(home_path+"/config");
+    read_config(config_path_);
 
     analyse();
@@ -126 +142 @@
   void Parameter::defaults(void)
   {
+    config_path_ = getenv("HOME")+"/.svndigest/config";
     copyright_=false;
     force_=false;
@@ -149 +166 @@
               << "\n"
               << "Valid options:\n"
+              << "  -c [--config] arg : path to config file ["
+              << config_path_ << "]\n"
               << "  -f [--force]   : remove target directory/file if it exists\n"
               << "                   [no force]. NOTE recursive delete.\n"
@@ -165 +184 @@
 
 
+  void Parameter::print_config(std::string path) const
+  {
+    std::ofstream os(path.c_str());
+    if (!os.good()){
+      os.close();
+      throw std::runtime_error("svndigest: error: cannot create file '" + 
+                               path + "': permission denied");
+    }
+    os << "### This file configures various behaviors for svndigest\n"
+       << "### The commented-out below are intended to demonstrate how to use\n" 
+       << "### this file.\n"
+       << "\n"
+       << "### Section for setting aliases used in copyright update\n"
+       << "#[copyright-alias]\n"
+       << "# jdoe = John Doe\n"
+       << std::endl;
+    os.close();
+  }
+
+
+  void Parameter::read_config(std::string path)
+  {
+    if (!node_exist(path))
+      throw std::runtime_error("svndigest: error: configuration file '" + 
+                               path + "' not found");
+    std::ifstream is(path.c_str());
+    if (!is.good()){
+      is.close();
+      throw std::runtime_error("svndigest: error: cannot open file '" + path +
+                               "' for reading");
+    }
+    std::string line;
+    std::string section;
+    std::string tmp;
+    while (getline(is, line)) {
+      line = ltrim(line);
+      if (line.empty() || line[0]=='#')
+        continue;
+      std::stringstream ss(line);
+      if (line[0] == '[') {
+        getline(ss, tmp, '[');
+        getline(ss, section, ']');
+      }
+      else if (section == "copyright-alias"){
+        getline(ss, tmp, '=');
+        std::string key = trim(tmp);
+        getline(ss, tmp);
+        std::string name = trim(tmp);
+        copyright_alias_[key] = name;
+      }
+    }
+    is.close();
+  }
+
+
   void Parameter::version(void) const
   {
     using namespace std;
     cout << PACKAGE_STRING
-         << "\nCopyright (C) 2006 Jari Häkkinen and Peter Johansson.\n\n"
+         << "\nCopyright (C) 2006-2007 Jari Häkkinen and Peter Johansson.\n\n"
          << "This is free software; see the source for copying conditions.\n"
          << "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR\n"

trunk/bin/Parameter.h

@@ -52 +52 @@
     void defaults(void);
     void help(void);
+    void print_config(std::string) const;
+    void read_config(std::string);
     void version(void) const;
 
+    std::string config_path_;
     bool copyright_;
     std::map<std::string, std::string> copyright_alias_;

trunk/bin/svndigest.cc

@@ -40 +40 @@
 #include <unistd.h>
 
-///
-/// @brief Check whether \a path already exists or not.
-///
-/// @return True if \a path exists, false otherwise.
-///
-bool check_target(const std::string& path)
-{
-  struct stat buf;
-  return !stat(path.c_str(),&buf);
-}
-
-
 int main(const int argc,const char* argv[])
 {
@@ -83 +71 @@
     std::cout << "Checking target directory" << std::endl;
   std::string target_path=option->targetdir() + '/' + file_name(option->root());
-  bool need_to_erase_target = check_target(target_path);
+  bool need_to_erase_target = node_exist(target_path);
   if (need_to_erase_target && !option->force())
     throw std::runtime_error(std::string("svndigest: directory (") +
@@ -162 +150 @@
   if (option->copyright()){
     try {
-      tree.print_copyright(commit_dates, authors);
+      tree.print_copyright(commit_dates, authors, option->copyright_alias());
     }
     catch (const std::runtime_error& x) {