core(travis): upload automatically each new release into the public sonatype repository and update the changelog

Author: mcolmant

.gitignore

@@ -36,3 +36,4 @@ target/
 #bluecove
 *bluecove*
 
+secrets.tar

.travis.yml

@@ -10,6 +10,10 @@ env:
     - secure: "MLFJWju96LymkPNIsUeJelNN5J3BK55OV/RXVMONC5kDr4N7T4JyhT6KUa4k+FSJ0S1GTPQMWQQEkWDF1MlZXv5yGwW4h5rN3tt//vqyHk968SyqlhTdygqzx6tO6t3OsfQ2F1AqVWAWsHQckL+VmhEo53VqVXpsqLy9DyLYGjs=" # DOCKER_EMAIL
     - secure: "FbLHLKNAtpj7ZVgSobOPgAgdLK3/P4sR6RcaOmpVRsgaqodTPx7VkzGpkf4rOqPwxKU3+96vr0TlIdPRYWAE39Y3gMb1dyZ34+CxsrJ3avJYc2+9NT3kmAuU33Iy1DCo3IEnR7pWVVEyR80ob0c1ASfPAW1JN8DhBRRERpkMyn4=" # DOCKER_USER
     - secure: "VLK9NI4yE+hLV8rgjiB0hOfQn1uFO7cEHHL4sEDZKNu1TgvwfTrEWEzMMLvG8pwK/7eG78xfNB489m/Imj7Y52xK6sZuY7Y78Y06mkepZS8PisAJiW59kHWH1Ci84DYHZ0y07NAgvCOSLS9l0ncgLdlGvRboR9KBYDMEWycwEn8=" # DOCKER_PWD
+    - secure: "YdYgoOCsfP8etDVdbURY/HCqZhGUrWzOsgQcfBCnkbBueU0ugt48rX/BFTtrq/qIJp/N9YqDpw7Vz3X1mhfT3EMpNJRDkbHaMM1YxWX++PmGdVu71ZCiONd2/Q8h8uZP7MLgeD7nnMhls8LBgiCqqWUK0NXfMQwzALYechV42nw=" # SONATYPE_USER
+    - secure: "a5ZD5zp0Nu1GQUMJeTL9fCNxbtKfRzXOafWsrCipP/qg+uKrbNVS5sbhCBu7WB/Qf1x8cQapyXgRcFX/13bTkB+SWYEcUeRK5FH0hByaWLbjxuQNx5QjoRZEgi7lgvEbgyFPnsqAKLPoKmauRGGAlkhZOwnLRFpdha/+b2lKRs8=" # SONATYPE_PWD
+    - secure: "ixdgd8MbWHpLYPhmUF/+yAh6YGiK3C3xnhuYgam3wKkVhC5UcdW4SPGDuB2fNjgFCzMQ5uonBwYFINLDps3VWHtA0NTvImxOUuRFeo60NkAaygmx5hjEhw69Kgpo7h1MRe6Tkexq5+u+ImrAjoQFCwXZfRG8y7jhMvGUkicGPIg=" # PGP_PASSPHRASE
+    - secure: "A1o93OIGEa6GCRDAesU20gXUDZwWgJbz9hJJoBBVS49Zk4asB09uE5GVVPGKSs+4nDvI55os1lQZWYgvaF2Yy9kvaXcxgx1TeXNsCwlH2ZAd7yiaQJxDil2/wjle3KrT/Nqbb+VssHKHMjacQQHgwzUYCWjok7Q7D9EmFppXvR4=" # GITHUB_TOKEN
 
 cache:
   directories:
@@ -27,24 +31,26 @@ jdk:
 
 # workaround for openjdk buffer overflow
 addons:
-   hostname: localhost
+  hostname: localhost
 
 script:
-- sbt compile test:compile
-- sbt 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)' "project powerapi-core" coverage test
-- find $HOME/.sbt -name "*.lock" | xargs rm
+  - sbt compile test:compile
+  - sbt 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)' "project powerapi-core" coverage test
+  - find $HOME/.sbt -name "*.lock" | xargs rm
 
 before_install:
-- wget -O influxdb.deb https://s3.amazonaws.com/influxdb/influxdb_0.10.2-1_amd64.deb
-- sudo dpkg -i influxdb.deb
-- sudo service influxdb start
-- sleep 5; /usr/bin/influx --execute "CREATE USER powerapi WITH PASSWORD 'powerapi'
-  WITH ALL PRIVILEGES"
+  - openssl aes-256-cbc -K $encrypted_48ebb0d1c0b9_key -iv $encrypted_48ebb0d1c0b9_iv -in secrets.tar.enc -out secrets.tar -d
+  - tar xvf secrets.tar
+  - wget -O influxdb.deb https://s3.amazonaws.com/influxdb/influxdb_0.10.2-1_amd64.deb
+  - sudo dpkg -i influxdb.deb
+  - sudo service influxdb start
+  - sleep 5; /usr/bin/influx --execute "CREATE USER powerapi WITH PASSWORD 'powerapi' WITH ALL PRIVILEGES"
+  - sudo bash -c "source /usr/local/rvm/scripts/rvm; rvm use 2.2.3; gem install github_changelog_generator"
 
 after_success:
-- sbt "project powerapi-core" coverageReport
-- sbt "project powerapi-core" codacyCoverage
-- sbt "project powerapi-core" coveralls
+  - sbt "project powerapi-core" coverageReport
+  - sbt "project powerapi-core" codacyCoverage
+  - sbt "project powerapi-core" coveralls
 
 before_deploy:
   - sbt "project powerapi-sampling" universal:packageZipTarball
@@ -65,6 +71,12 @@ deploy:
     repo: Spirals-Team/powerapi
 
 after_deploy:
+  - sbt "project powerapi-core" publishSigned sonatypeRelease
+  - github_changelog_generator Spirals-Team/powerapi --token $GITHUB_TOKEN
+  - git config user.name "TRAVIS CI"
+  - git add CHANGELOG.md
+  - git commit -m "core(changelog): update the Changelog"
+  - git push --quiet "https://${GITHUB_TOKEN}@github.com/Spirals-Team/powerapi" master > /dev/null 2>&1
   - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PWD
   - docker build -f docker/sampling/Dockerfile-sampling -t spirals/powerapi-sampling:$TRAVIS_TAG .
   - docker build -f docker/Dockerfile-cli -t spirals/powerapi-cli:$TRAVIS_TAG .

powerapi-cli/src/main/scala/org/powerapi/app/PowerAPI.scala

@@ -65,7 +65,7 @@ object PowerAPI extends App {
     powerMeters = Seq()
   }
 
-  def validate(regex: Regex, str: String) = str match {
+  def validate(regex: Regex, str: String): Boolean = str match {
     case regex(_*) => true
     case _ => false
   }
@@ -125,7 +125,8 @@ object PowerAPI extends App {
       sys.exit(1)
   }
 
-  def cliMonitorsSubcommand(options: List[Map[Symbol, Any]], currentMonitor: Map[Symbol, Any], args: List[String]): (List[String], List[Map[Symbol, Any]]) = args match {
+  def cliMonitorsSubcommand(options: List[Map[Symbol, Any]], currentMonitor: Map[Symbol, Any],
+                            args: List[String]): (List[String], List[Map[Symbol, Any]]) = args match {
     case Nil =>
       (List(), options :+ currentMonitor)
     case "modules" :: value :: "--prefix" :: prefix :: "monitor" :: tail if validate(modulesR, value) =>
@@ -139,25 +140,45 @@ object PowerAPI extends App {
     case "--frequency" :: value :: tail if validate(durationR, value) =>
       cliMonitorsSubcommand(options, currentMonitor ++ Map('frequency -> value), tail)
     case "--self" :: tail =>
-      cliMonitorsSubcommand(options, currentMonitor + ('targets -> (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] + Process(ManagementFactory.getRuntimeMXBean.getName.split("@")(0).toInt))), tail)
+      cliMonitorsSubcommand(options,
+        currentMonitor + ('targets ->
+          (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] + Process(ManagementFactory.getRuntimeMXBean.getName.split("@")(0).toInt))
+      ), tail)
     case "--pids" :: value :: tail if validate(pidsR, value) =>
-      cliMonitorsSubcommand(options, currentMonitor + ('targets -> (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] ++ value.split(",").map(pid => Process(pid.toInt)))), tail)
+      cliMonitorsSubcommand(options,
+        currentMonitor + ('targets ->
+          (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] ++ value.split(",").map(pid => Process(pid.toInt)))
+      ), tail)
     case "--apps" :: value :: tail if validate(appsR, value) =>
-      cliMonitorsSubcommand(options, currentMonitor + ('targets -> (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] ++ value.split(",").map(app => Application(app)))), tail)
+      cliMonitorsSubcommand(options, currentMonitor + ('targets ->
+        (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] ++ value.split(",").map(app => Application(app)))
+      ), tail)
     case "--containers" :: value :: tail if validate(containersR, value) =>
-      cliMonitorsSubcommand(options, currentMonitor + ('targets -> (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] ++ value.split(",").map(container => Container(container)))), tail)
+      cliMonitorsSubcommand(options, currentMonitor + ('targets ->
+        (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] ++ value.split(",").map(container => Container(container)))
+      ), tail)
     case "--all" :: tail =>
-      cliMonitorsSubcommand(options, currentMonitor + ('targets -> (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] + All)), tail)
+      cliMonitorsSubcommand(options, currentMonitor + ('targets ->
+        (currentMonitor.getOrElse('targets, Set[Any]()).asInstanceOf[Set[Any]] + All)
+      ), tail)
     case "--agg" :: value :: tail if validate(aggR, value) =>
       cliMonitorsSubcommand(options, currentMonitor ++ Map('agg -> value), tail)
     case "--console" :: tail =>
-      cliMonitorsSubcommand(options, currentMonitor + ('displays -> (currentMonitor.getOrElse('displays, Set[Any]()).asInstanceOf[Set[Any]] + new ConsoleDisplay)), tail)
+      cliMonitorsSubcommand(options, currentMonitor + ('displays ->
+        (currentMonitor.getOrElse('displays, Set[Any]()).asInstanceOf[Set[Any]] + new ConsoleDisplay)
+      ), tail)
     case "--file" :: value :: tail =>
-      cliMonitorsSubcommand(options, currentMonitor + ('displays -> (currentMonitor.getOrElse('displays, Set[Any]()).asInstanceOf[Set[Any]] + new FileDisplay(value))), tail)
+      cliMonitorsSubcommand(options, currentMonitor + ('displays ->
+        (currentMonitor.getOrElse('displays, Set[Any]()).asInstanceOf[Set[Any]] + new FileDisplay(value))
+      ), tail)
     case "--chart" :: tail =>
-      cliMonitorsSubcommand(options, currentMonitor + ('displays -> (currentMonitor.getOrElse('displays, Set[Any]()).asInstanceOf[Set[Any]] + new JFreeChartDisplay)), tail)
+      cliMonitorsSubcommand(options, currentMonitor + ('displays ->
+        (currentMonitor.getOrElse('displays, Set[Any]()).asInstanceOf[Set[Any]] + new JFreeChartDisplay)
+      ), tail)
     case "--influx" :: host :: user :: pwd :: db :: measurement :: tail =>
-      cliMonitorsSubcommand(options, currentMonitor + ('displays -> (currentMonitor.getOrElse('displays, Set[Any]()).asInstanceOf[Set[Any]] + new InfluxDisplay(host, user, pwd, db, measurement))), tail)
+      cliMonitorsSubcommand(options, currentMonitor + ('displays ->
+        (currentMonitor.getOrElse('displays, Set[Any]()).asInstanceOf[Set[Any]] + new InfluxDisplay(host, user, pwd, db, measurement))
+      ), tail)
     case option :: tail =>
       println(s"unknown monitor option $option")
       sys.exit(1)
@@ -169,8 +190,9 @@ object PowerAPI extends App {
   }
 
   else {
-    if (System.getProperty("os.name").toLowerCase.indexOf("nix") >= 0 || System.getProperty("os.name").toLowerCase.indexOf("nux") >= 0) Seq("bash", "scripts/system.bash").!
-
+    if (System.getProperty("os.name").toLowerCase.indexOf("nix") >= 0 || System.getProperty("os.name").toLowerCase.indexOf("nux") >= 0) {
+      Seq("bash", "scripts/system.bash").!
+    }
     val (configuration, duration) = cli(List(), "3600", args.toList)
 
     var libpfmHelper: Option[LibpfmHelper] = None

powerapi-core/build.sbt

@@ -1,3 +1,6 @@
+import collection.JavaConversions._
+import com.typesafe.sbt.SbtPgp._
+
 name := "powerapi-core"
 
 organization := "org.powerapi"
@@ -71,3 +74,21 @@ publishTo := {
   else
     Some("releases" at nexus + "service/local/staging/deploy/maven2")
 }
+
+(System.getenv().getOrElse("SONATYPE_USERNAME", ""), System.getenv().getOrElse("SONATYPE_PASSWORD", "")) match {
+  case (username, password) if username != "" && password != "" =>
+    credentials += Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)
+  case _ =>
+    credentials ++= Seq()
+}
+
+System.getenv().getOrElse("PGP_PASSPHRASE", "") match {
+  case passphrase if passphrase != "" =>
+    pgpPassphrase := Some(passphrase.toCharArray)
+  case _ =>
+    pgpPassphrase := None
+}
+
+pgpSecretRing := file("local.secring.gpg")
+
+pgpPublicRing := file("local.pubring.gpg")

powerapi-core/src/main/scala/org/powerapi/PowerMeter.scala

@@ -152,7 +152,7 @@ class PowerMeter(factory: ActorRefFactory, modules: Seq[PowerModule]) extends Po
     * @return the instance of the underlying software power meter.
     */
   def waitFor(duration: FiniteDuration): this.type = {
-    Await.result(underlyingActor.ask(WaitForMessage(duration))(duration + 1l.seconds), duration + 1l.seconds)
+    Await.result(underlyingActor.ask(WaitForMessage(duration))(duration + 1L.seconds), duration + 1L.seconds)
     this
   }
 

powerapi-core/src/main/scala/org/powerapi/core/MonitorActors.scala

@@ -32,12 +32,14 @@ import akka.actor.{Actor, ActorRef, PoisonPill, Props}
 import akka.util.Timeout
 
 import org.powerapi.core.ClockChannel.{startClock, stopClock, subscribeClockTick, unsubscribeClockTick}
-import org.powerapi.core.MonitorChannel.{MonitorAggregator, MonitorFrequency, MonitorStart, MonitorStop, MonitorStopAll, formatMonitorChildName, publishMonitorTick, setAggregator, setFrequency, stopMonitor, subscribeMonitorsChannel}
+import org.powerapi.core.MonitorChannel.{MonitorAggregator, MonitorFrequency, MonitorStart, MonitorStop, MonitorStopAll}
+import org.powerapi.core.MonitorChannel.{formatMonitorChildName, publishMonitorTick, setAggregator, setFrequency, stopMonitor, subscribeMonitorsChannel}
 import org.powerapi.core.power._
 import org.powerapi.core.target.Target
 import org.powerapi.core.TickChannel.{subscribeTick, unsubscribeTick}
 import org.powerapi.module.FormulaChannel.stopFormula
-import org.powerapi.module.PowerChannel.{AggregatePowerReport, RawPowerReport, render, subscribeAggPowerReport, subscribeRawPowerReport, unsubscribeRawPowerReport, unsubscribeAggPowerReport}
+import org.powerapi.module.PowerChannel.{AggregatePowerReport, RawPowerReport}
+import org.powerapi.module.PowerChannel.{render, subscribeAggPowerReport, subscribeRawPowerReport, unsubscribeRawPowerReport, unsubscribeAggPowerReport}
 import org.powerapi.module.SensorChannel.stopSensor
 import org.powerapi.reporter.ReporterChannel.{startReporter, stopReporter}
 import org.powerapi.{PowerDisplay, PowerMonitoring}

powerapi-core/src/main/scala/org/powerapi/core/OSHelper.scala

@@ -108,7 +108,7 @@ trait OSHelper {
       case process: Process => getProcessCpuTime(process)
       case wrapper: Target if wrapper.isInstanceOf[Application] || wrapper.isInstanceOf[Container] =>
         getProcesses(wrapper).toSeq.map(process => getProcessCpuTime(process)).sum
-      case _ => 0l
+      case _ => 0L
     }
   }
 }
@@ -181,6 +181,9 @@ class LinuxHelper extends Configuration(None) with OSHelper {
   private val PSFormat = """^\s*(\d+)\s*""".r
   private val GlobalStatFormat = """cpu\s+([\d\s]+)""".r
   private val TimeInStateFormat = """(\d+)\s+(\d+)""".r
+  private val procUserTimeIndex = 13
+  private val procSysTimeIndex = 14
+  private val procGlobalIdleTime = 3
 
   def getCPUFrequencies: Set[Long] = {
     (for (index <- topology.values.flatten) yield {
@@ -230,13 +233,13 @@ class LinuxHelper extends Configuration(None) with OSHelper {
 
         val statLine = source.getLines.toIndexedSeq(0).split("\\s")
         // User time + System time
-        statLine(13).toLong + statLine(14).toLong
+        statLine(procUserTimeIndex).toLong + statLine(procSysTimeIndex).toLong
       })
     }
     catch {
       case ioe: IOException =>
         log.warn("i/o exception: {}", ioe.getMessage)
-        0l
+        0L
     }
   }
 
@@ -252,7 +255,7 @@ class LinuxHelper extends Configuration(None) with OSHelper {
             * @see http://lxr.free-electrons.com/source/kernel/sched/cputime.c#L165
             */
           case GlobalStatFormat(times) =>
-            val idleTime = times.split("\\s")(3).toLong
+            val idleTime = times.split("\\s")(procGlobalIdleTime).toLong
             val activeTime = times.split("\\s").slice(0, 8).map(_.toLong).sum - idleTime
 
             GlobalCpuTimes(idleTime, activeTime)
@@ -334,7 +337,7 @@ class SigarHelper(sigar: SigarProxy) extends OSHelper {
     catch {
       case se: SigarException =>
         log.warn("sigar exception: {}", se.getMessage)
-        0l
+        0L
     }
   }