fix(cli): Add a missing module

The RAPL module reference was missing.

chore(build): update the version

The version was not correct, the 3.1 is already published.

Author: mcolmant

build.sbt

@@ -1,6 +1,6 @@
 name := "powerapi"
 
-version in ThisBuild := "3.0"
+version in ThisBuild := "3.1"
 
 scalaVersion in ThisBuild := "2.11.4"
 

…scala/org/powerapi/app/Application.scala …in/scala/org/powerapi/app/PowerAPI.scalapowerapi-cli/src/main/scala/org/powerapi/app/Application.scala renamed to powerapi-cli/src/main/scala/org/powerapi/app/PowerAPI.scala powerapi-cli/src/main/scala/org/powerapi/app/Application.scala renamed to powerapi-cli/src/main/scala/org/powerapi/app/PowerAPI.scala

@@ -25,6 +25,7 @@ package org.powerapi.app
 import java.lang.management.ManagementFactory
 
 import org.powerapi.core.target.{Application, All, Process, Target}
+import org.powerapi.module.rapl.RAPLModule
 import org.powerapi.reporter.{FileDisplay, JFreeChartDisplay, ConsoleDisplay}
 import org.powerapi.{PowerMonitoring, PowerMeter, PowerModule}
 import org.powerapi.core.power._
@@ -43,7 +44,7 @@ import scala.sys.process.stringSeqToProcess
  * @author <a href="mailto:l.huertas.pro@gmail.com">Loïc Huertas</a>
  */
 object PowerAPI extends App {
-  val modulesR = """(cpu-simple|cpu-dvfs|libpfm-core|libpfm-core-process|powerspy)(,(cpu-simple|cpu-dvfs|libpfm-core|libpfm-core-process|powerspy))*""".r
+  val modulesR = """(cpu-simple|cpu-dvfs|libpfm-core|libpfm-core-process|powerspy|rapl)(,(cpu-simple|cpu-dvfs|libpfm-core|libpfm-core-process|powerspy|rapl))*""".r
   val aggR = """max|min|geomean|logsum|mean|median|stdev|sum|variance""".r
   val durationR = """\d+""".r
   val pidR = """(\d+)""".r
@@ -72,6 +73,7 @@ object PowerAPI extends App {
         case "libpfm-core" => LibpfmCoreModule()
         case "libpfm-core-process" => LibpfmCoreProcessModule()
         case "powerspy" => PowerSpyModule()
+        case "rapl" => RAPLModule()
       }
     }).toSeq
   }
@@ -123,7 +125,7 @@ object PowerAPI extends App {
         |
         |Build a software-defined power meter. Do not forget to configure correctly the modules (see the documentation).
         |
-        |usage: ./powerapi modules [cpu-simple|cpu-dvfs|libpfm-core|libpfm-core-proces|powerspy, ...] \
+        |usage: ./powerapi modules [cpu-simple|cpu-dvfs|libpfm-core|libpfm-core-proces|powerspy|rapl,...] \
         |                          monitor --frequency [ms] --targets [pid, ..., app, ...)|all] --agg [max|min|geomean|logsum|mean|median|stdev|sum|variance] --[console,file [filepath],chart] \
         |                  duration [s]
         |
@@ -172,7 +174,7 @@ object PowerAPI extends App {
       val modules = powerMeterConf('modules).toString
       if(modules.contains("libpfm-core") || modules.contains("libpfm-core-process")) LibpfmHelper.init()
 
-      val powerMeter = PowerMeter.loadModule(powerMeterConf('modules).toString: _*)
+      val powerMeter = PowerMeter.loadModule(modules: _*)
       powerMeters :+= powerMeter
 
       for(monitorConf <- powerMeterConf('monitors).asInstanceOf[List[Map[Symbol, Any]]]) {