g5k-graph 0.1.0 → 0.2.0

data/bin/g5k-graph

@@ -9,7 +9,8 @@ require 'optparse'
   :resolution => 15,
   :metrics => ['mem_free', 'cpu_idle', 'bytes_in', 'bytes_out'],
   :to => (Time.now.to_i/15*15),
-  :output => File.expand_path("./data")
+  :output => File.expand_path("./data"),
+  :empty => false
 }
 
 option_parser = OptionParser.new do |opts|
@@ -36,6 +37,9 @@ BANNER
   opts.on("-o=", "--output=", "Where to write the timeseries data and graphs [default=#{@options[:output]}]") do |v|
     @options[:output] = File.expand_path(v)
   end
+  opts.on("--empty", "Empty the output directory before writing into it [default=#{@options[:empty].inspect}]") do |v|
+    @options[:empty] = true
+  end
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit

data/lib/grid5000/graph.rb

@@ -1,6 +1,8 @@
+require 'fileutils'
+
 module Grid5000
   class Graph
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
     
     class Error < StandardError; end
     
@@ -26,6 +28,8 @@ module Grid5000
       raise(Error, "No nodes given") if nodes.empty?
 
       if nodes.all?{|n| n =~ /\.\w+\.grid5000\.fr$/}
+        FileUtils.rm_rf options[:output] if options[:empty]
+        FileUtils.mkdir_p options[:output]
         fetch_timeseries
         graph_timeseries
       else
@@ -54,7 +58,7 @@ module Grid5000
     def graph_timeseries
       Dir.chdir(options[:output]) do |dir|
         Dir["*.zip"].each do |zip|
-         system "unzip #{zip}"
+         system "unzip -o #{zip}"
         end
         commands = {}
         Dir["*.grid5000.fr/*.xml"].each do |xml|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: g5k-graph
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Cyril Rohr