perfmonger 0.10.2 → 0.11.0

data/lib/perfmonger/command/fingerprint.rb

@@ -57,6 +57,10 @@ EOS
         save_proc_info()
       end
 
+      do_with_message("Saving numactl info") do
+        save_numactl_info()
+      end
+
       do_with_message("Saving IRQ info") do
         save_irq_info()
       end
@@ -109,9 +113,14 @@ EOS
         save_nvme_info()
       end
 
-
       ## Collect vendor specific info
 
+      # https://aws.amazon.com/jp/code/ec2-instance-metadata-query-tool/
+      if find_executable("ec2-metadata")
+        do_with_message("Saving EC2 metadata info") do
+          save_ec2metadata_info()
+        end
+      end
 
       # LSI MegaRAID
       megacli_bin = "/opt/MegaRAID/MegaCli/MegaCli64"
@@ -241,6 +250,22 @@ EOS
     end
   end
 
+  def save_numactl_info()
+    numactl_bin = find_executable("numactl")
+
+    File.open("#{@output_dir}/numactl.log", "w") do |f|
+      f.puts(`#{numactl_bin} --hardware`)
+    end
+  end
+
+  def save_ec2metadata_info()
+    ec2metadata_bin = find_executable("ec2-metadata")
+
+    File.open("#{@output_dir}/ec2-metadata.log", "w") do |f|
+      f.puts(`#{ec2metadata_bin} --all`)
+    end
+  end
+
   def save_lsblk_info()
     lsblk_bin = find_executable("lsblk")
 

data/lib/perfmonger/command/live.rb

@@ -7,10 +7,29 @@ module PerfMonger
 module Command
 
 class LiveOption < RecordOption
+  def initialize
+    super
+
+    @color = false
+    @parser.on("-c", "--color", "Use colored JSON output") do
+      @color = true
+    end
+
+    @pretty
+    @parser.on("--pretty",  "Use human readable JSON output") do
+      @pretty = true
+    end
+
+  end
+
   def make_command
     cmd = super()
     @player_bin = ::PerfMonger::Command::CoreFinder.player()
     cmd += ["-player-bin", @player_bin]
+    cmd << "-color" if @color
+    cmd << "-pretty" if @pretty
+
+    cmd
   end
 end
 

data/lib/perfmonger/command/play.rb

@@ -16,6 +16,16 @@ Usage: perfmonger play [options] LOG_FILE
 Options:
 EOS
 
+    @color = false
+    @parser.on("-c", "--color", "Use colored JSON ouptut") do
+      @color = true
+    end
+
+    @pretty = false
+    @parser.on("-p", "--pretty", "Use human readable JSON ouptut") do
+      @pretty = true
+    end
+
   end
 
   def parse_args(argv)
@@ -46,6 +56,12 @@ EOS
     end
 
     cmd = [@player_bin]
+    if @color
+      cmd << "-color"
+    end
+    if @pretty
+      cmd << "-pretty"
+    end
     cmd << @logfile
 
     Process.exec(*cmd)

data/lib/perfmonger/command/plot.rb

@@ -24,6 +24,7 @@ EOS
     @output_type = 'pdf'
     @output_prefix = ''
     @save_gpfiles = false
+    @disk_only = nil
     @disk_only_regex = nil
     @disk_plot_read = true
     @disk_plot_write = true
@@ -78,6 +79,7 @@ EOS
     end
 
     @parser.on('--disk-only REGEX', "Select disk devices that matches REGEX") do |regex|
+      @disk_only = regex
       @disk_only_regex = Regexp.compile(regex)
     end
 
@@ -139,7 +141,13 @@ EOS
     @cpu_dat = File.expand_path("cpu.dat", @tmpdir)
 
     meta_json = nil
-    IO.popen([formatter_bin, "-perfmonger", @data_file, "-cpufile", @cpu_dat, "-diskfile", @disk_dat], "r") do |io|
+    cmd = [formatter_bin, "-perfmonger", @data_file, "-cpufile", @cpu_dat,
+      "-diskfile", @disk_dat]
+    if @disk_only_regex
+      cmd << "-disk-only"
+      cmd << @disk_only
+    end
+    IO.popen(cmd, "r") do |io|
       meta_json = io.read
     end
     if $?.exitstatus != 0
@@ -151,8 +159,6 @@ EOS
     plot_disk(meta)
     plot_cpu(meta)
 
-    FileUtils.rm_rf(@tmpdir)
-
     true
   end
 
@@ -391,10 +397,10 @@ EOS
       nr_cols = nr_cpu_factors.select do |x|
         x <= Math.sqrt(nr_cpu)
       end.max
-      nr_cols ||= Math.sqrt(nr_cpu).ceil
+      nr_cols = 1
       nr_rows = nr_cpu / nr_cols
 
-      plot_height = 8
+      plot_height = ([nr_cpu, 8].min) + ([nr_cpu - 8, 0].max) * 0.5
 
       if nr_rows == 1
         plot_height /= 2.0
@@ -424,14 +430,14 @@ EOS
         end
 
         all_gpfile.puts <<EOS
-set title 'cpu #{cpu_idx}' offset 0.0,-0.7 font 'Arial,16'
+set title 'cpu #{cpu_idx}' offset -61,-3 font 'Arial,16'
 unset key
 set origin #{xpos}, #{ypos}
 set size #{1.0/nr_cols}, #{(1.0 - legend_height)/nr_rows}
-set rmargin 0.5
-set lmargin 3.5
-set tmargin 1.3
-set bmargin 1.3
+set rmargin 2
+set lmargin 12
+set tmargin 0.5
+set bmargin 0.5
 set xtics offset 0.0,0.5
 set ytics offset 0.5,0
 set style fill noborder

data/lib/perfmonger/command/server.rb

@@ -114,7 +114,7 @@ EOS
     _, record_option = PerfMonger::Command::RecordOption.parse(@record_cmd_args)
 
     # find perfmonger command
-    perfmonger_bin = File.expand_path('bin/perfmonger', PerfMonger::ROOTDIR)
+    perfmonger_bin = File.expand_path('exe/perfmonger', PerfMonger::ROOTDIR)
     if ! File.executable?(perfmonger_bin)
       puts("ERROR: perfmonger not found!")
       exit(false)

data/lib/perfmonger/version.rb

@@ -1,3 +1,3 @@
 module PerfMonger
-  VERSION = "0.10.2"
+  VERSION = "0.11.0"
 end

data/misc/werker-box/Dockerfile

@@ -0,0 +1,35 @@
+FROM golang:1.8
+
+WORKDIR /app
+
+## install packages
+RUN apt-get update
+RUN apt-get install -y build-essential libncurses-dev libreadline-dev libssl-dev gnuplot git
+
+## get source code
+RUN git clone https://github.com/hayamiz/perfmonger .
+
+## install RVM
+RUN curl -sSL https://get.rvm.io | bash -s stable
+RUN ln -sf /bin/bash /bin/sh
+
+## install ruby
+RUN bash -l -c "rvm install 1.9.3"
+RUN bash -l -c "rvm use 1.9.3 && gem install bundler && bundle"
+
+RUN bash -l -c "rvm install 2.0.0"
+RUN bash -l -c "rvm use 2.0.0 && gem install bundler && bundle"
+
+RUN bash -l -c "rvm install 2.1.10"
+RUN bash -l -c "rvm use 2.1.10 && gem install bundler && bundle"
+
+RUN bash -l -c "rvm install 2.2.5"
+RUN bash -l -c "rvm use 2.2.5 && gem install bundler && bundle"
+
+RUN bash -l -c "rvm install 2.3.1"
+RUN bash -l -c "rvm use 2.3.1 && gem install bundler && bundle"
+
+RUN bash -l -c "rvm install 2.4.0"
+RUN bash -l -c "rvm use 2.4.0 && gem install bundler && bundle"
+
+CMD true

data/misc/werker-box/build-push.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+docker build -t go-rvm .
+docker tag go-rvm hayamiz/go-rvm:wercker-env
+docker push hayamiz/go-rvm:wercker-env

data/perfmonger.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |s|
   end
   s.files      += Dir.glob("lib/exec/*")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
+  s.bindir      = "exe"
+  s.executables = `git ls-files -- exe/*`.split("\n").map{|f| File.basename(f)}
 
   s.post_install_message = <<EOS
 

data/spec/data/busy100.pgr.played

@@ -1,3 +1,3 @@
-{"time":1425358686.123,"cpu":{"num_core":2,"all":{"usr":100.00,"nice":0.00,"sys":0.67,"idle":99.33,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},"cores":[{"usr":0.33,"nice":0.00,"sys":0.33,"idle":99.33,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},{"usr":99.67,"nice":0.00,"sys":0.33,"idle":0.00,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00}]},"disk":{"devices":["sda","sda1","sda2"],"sda":{"riops":0.00,"wiops":1.67,"rkbyteps":0.00,"wkbyteps":26.66,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00},"sda1":{"riops":0.00,"wiops":1.67,"rkbyteps":0.00,"wkbyteps":26.66,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00},"sda2":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"total":{"riops":0.00,"wiops":3.33,"rkbyteps":0.00,"wkbyteps":53.31,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00}},"net":{"devices":["eth0","lo"],"eth0":{"rxkbyteps":0.04,"rxpktps":0.67,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.24,"txpktps":0.67,"txerrps":0.00,"txdropps":0.00},"lo":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"total":{"rxkbyteps":0.04,"rxpktps":0.67,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.24,"txpktps":0.67,"txerrps":0.00,"txdropps":0.00}}}
-{"time":1425358689.123,"cpu":{"num_core":2,"all":{"usr":100.50,"nice":0.00,"sys":0.33,"idle":99.17,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},"cores":[{"usr":0.33,"nice":0.00,"sys":0.33,"idle":99.33,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},{"usr":100.00,"nice":0.00,"sys":0.00,"idle":0.00,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00}]},"disk":{"devices":["sda","sda1","sda2"],"sda":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda1":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda2":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"total":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00}},"net":{"devices":["eth0","lo"],"eth0":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"lo":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"total":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00}}}
-{"time":1425358690.645,"cpu":{"num_core":2,"all":{"usr":100.65,"nice":0.00,"sys":0.00,"idle":99.35,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},"cores":[{"usr":0.65,"nice":0.00,"sys":0.65,"idle":98.70,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},{"usr":100.00,"nice":0.00,"sys":0.00,"idle":0.00,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00}]},"disk":{"devices":["sda","sda1","sda2"],"sda":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda1":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda2":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"total":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00}},"net":{"devices":["eth0","lo"],"eth0":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"lo":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"total":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00}}}
+{"time":1425358686.123,"elapsed_time":3.001,"cpu":{"num_core":2,"all":{"usr":100.00,"nice":0.00,"sys":0.67,"idle":99.33,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},"cores":[{"usr":0.33,"nice":0.00,"sys":0.33,"idle":99.33,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},{"usr":99.67,"nice":0.00,"sys":0.33,"idle":0.00,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00}]},"disk":{"devices":["sda","sda1","sda2"],"sda":{"riops":0.00,"wiops":1.67,"rkbyteps":0.00,"wkbyteps":26.66,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00},"sda1":{"riops":0.00,"wiops":1.67,"rkbyteps":0.00,"wkbyteps":26.66,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00},"sda2":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"total":{"riops":0.00,"wiops":3.33,"rkbyteps":0.00,"wkbyteps":53.31,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":32.00,"qlen":0.00}},"net":{"devices":["eth0","lo"],"eth0":{"rxkbyteps":0.04,"rxpktps":0.67,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.24,"txpktps":0.67,"txerrps":0.00,"txdropps":0.00},"lo":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"total":{"rxkbyteps":0.04,"rxpktps":0.67,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.24,"txpktps":0.67,"txerrps":0.00,"txdropps":0.00}}}
+{"time":1425358689.123,"elapsed_time":6.001,"cpu":{"num_core":2,"all":{"usr":100.50,"nice":0.00,"sys":0.33,"idle":99.17,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},"cores":[{"usr":0.33,"nice":0.00,"sys":0.33,"idle":99.33,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},{"usr":100.00,"nice":0.00,"sys":0.00,"idle":0.00,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00}]},"disk":{"devices":["sda","sda1","sda2"],"sda":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda1":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda2":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"total":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00}},"net":{"devices":["eth0","lo"],"eth0":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"lo":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"total":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00}}}
+{"time":1425358690.645,"elapsed_time":7.524,"cpu":{"num_core":2,"all":{"usr":100.65,"nice":0.00,"sys":0.00,"idle":99.35,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},"cores":[{"usr":0.65,"nice":0.00,"sys":0.65,"idle":98.70,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00},{"usr":100.00,"nice":0.00,"sys":0.00,"idle":0.00,"iowait":0.00,"hardirq":0.00,"softirq":0.00,"steal":0.00,"guest":0.00,"guestnice":0.00}]},"disk":{"devices":["sda","sda1","sda2"],"sda":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda1":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"sda2":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00},"total":{"riops":0.00,"wiops":0.00,"rkbyteps":0.00,"wkbyteps":0.00,"rlatency":0.000,"wlatency":0.000,"rsize":0.00,"wsize":0.00,"qlen":0.00}},"net":{"devices":["eth0","lo"],"eth0":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"lo":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00},"total":{"rxkbyteps":0.00,"rxpktps":0.00,"rxerrps":0.00,"rxdropps":0.00,"txkbyteps":0.00,"txpktps":0.00,"txerrps":0.00,"txdropps":0.00}}}

data/spec/fingerprint_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'tmpdir'
 
-describe '[fingerprint] subcommand' do
+RSpec.describe '[fingerprint] subcommand' do
   before(:each) do
     @old_pwd = Dir.pwd
     @tmpdir = Dir.mktmpdir

data/spec/live_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe '[live] subcommand' do
+RSpec.describe '[live] subcommand' do
   before(:each) do
     skip_if_proc_is_not_available
   end
@@ -9,7 +9,6 @@ describe '[live] subcommand' do
     cmd = "#{perfmonger_bin} live --timeout 3"
     run(cmd, 5)
     expect(last_command_started).to be_successfully_executed
-    expect(last_command_started.stdout.lines.to_a.size).to eq 3
 
     run(cmd)
     last_command_started.stdout.each_line do |line|
@@ -21,6 +20,6 @@ describe '[live] subcommand' do
       expect(json.keys.sort).to eq %w{time cpu disk net}.sort
     end
 
-    expect("perfmonger.pgr").to be_an_existing_file
+    expect("perfmonger.pgr.gz").to be_an_existing_file
   end
 end

data/spec/perfmonger_spec.rb

@@ -1,7 +1,7 @@
 
 require 'spec_helper'
 
-describe "perfmonger command" do
+RSpec.describe "perfmonger command" do
   it "should be an executable" do
     expect(File.executable?(perfmonger_bin)).to be true
   end

data/spec/play_spec.rb

@@ -1,7 +1,7 @@
 
 require 'spec_helper'
 
-describe '[play] subcommand' do
+RSpec.describe '[play] subcommand' do
   it 'should print 3 JSON records for busy100.pgr' do
     busy100 = data_file "busy100.pgr"
     cmd = "#{perfmonger_bin} play #{busy100}"

data/spec/plot_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 # TODO: examples for options
 
-describe '[plot] subcommand' do
+RSpec.describe '[plot] subcommand' do
   let(:busy100_disk_dat) {
     File.read(data_file "busy100.pgr.plot-formatted.disk.dat")
   }
@@ -74,4 +74,19 @@ describe '[plot] subcommand' do
     expect("disk.dat").to have_file_content busy100_disk_dat
     expect("cpu.dat").to have_file_content busy100_cpu_dat
   end
+
+  it "should work with --disk-only option" do
+    busy100 = data_file "busy100.pgr.gz"
+
+    cmd = "#{perfmonger_bin} plot --save #{busy100} --disk-only sda1"
+
+    run(cmd, 30)
+
+    expect(last_command_started).to be_successfully_executed
+
+    disk_dat = File.expand_path("disk.dat", last_command_started.working_directory)
+    total_write_iops = `cat #{disk_dat}|grep total -A 2|tail -n1|awk '{print $3}'`.to_f
+
+    expect(total_write_iops).to be_within(1.67).of(0.01)
+  end
 end

data/spec/record_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe '[record] subcommand' do
+RSpec.describe '[record] subcommand' do
   before(:each) do
     skip_if_proc_is_not_available
   end
@@ -9,7 +9,16 @@ describe '[record] subcommand' do
     cmd = "#{perfmonger_bin} record --timeout 1"
     run(cmd)
     expect(last_command_started).to be_successfully_executed
+    expect("perfmonger.pgr.gz").to be_an_existing_file # default file name
+    expect(last_command_started.stdout).to be_empty
+  end
+
+  it 'should create a non-gzipped logfile' do
+    cmd = "#{perfmonger_bin} record --timeout 1 --no-gzip"
+    run(cmd)
+    expect(last_command_started).to be_successfully_executed
     expect("perfmonger.pgr").to be_an_existing_file # default file name
     expect(last_command_started.stdout).to be_empty
   end
+
 end

data/spec/spec_helper.rb

@@ -19,15 +19,40 @@ def data_file(rel_path)
 end
 
 def perfmonger_bin
-  File.expand_path('../../bin/perfmonger', __FILE__)
+  File.expand_path('../../exe/perfmonger', __FILE__)
 end
 
 RSpec.configure do |config|
-  # RSpec config here
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  config.filter_run_when_matching :focus
+
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  config.disable_monkey_patching!
+
+  config.warnings = true
+
+  if config.files_to_run.one?
+    config.default_formatter = "doc"
+  end
+
+  config.profile_examples = 10
+
+  config.order = :random
+  # Kernel.srand config.seed
 end
 
 def skip_if_proc_is_not_available
-  if ! File.exists?("/proc/diskstats")
+  if ! File.exist?("/proc/diskstats")
     skip "/proc/diskstats is not available."
   end
 end

data/spec/stat_spec.rb

@@ -1,7 +1,7 @@
 
 require 'spec_helper'
 
-describe '[stat] subcommand' do
+RSpec.describe '[stat] subcommand' do
   before(:each) do
     skip_if_proc_is_not_available
   end
@@ -10,6 +10,6 @@ describe '[stat] subcommand' do
     cmd = "#{perfmonger_bin} stat -- sleep 1"
     run(cmd)
     expect(last_command_started).to be_successfully_executed
-    expect("perfmonger.pgr").to be_an_existing_file
+    expect("perfmonger.pgr.gz").to be_an_existing_file
   end
 end

data/spec/summary_spec.rb

@@ -1,7 +1,7 @@
 
 require 'spec_helper'
 
-describe '[summary] subcommand' do
+RSpec.describe '[summary] subcommand' do
   let(:busy100_summary) do
     content = File.read(data_file "busy100.pgr.summary")