geoptima 0.0.2 → 0.0.4

data/bin/show_geoptima

@@ -7,6 +7,8 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
+Geoptima::assert_version("0.0.3")
+
 $debug=false
 
 $event_names=[]
@@ -17,7 +19,7 @@ def cw(val)
   val.nil? ? '' : "(#{val})"
 end
 
-while arg=ARGV.shift:
+while arg=ARGV.shift do
   if arg =~ /^\-(\w+)/
     $1.split(//).each do |aa|
       case aa
@@ -33,6 +35,10 @@ while arg=ARGV.shift:
         $export=true
       when 's'
         $seperate=true
+      when 'o'
+        $export_stats=true
+      when 'm'
+        $map_headers=true
       when 'E'
         $event_names += ARGV.shift.split(/[\,\;\:\.]+/)
       when 'T'
@@ -63,6 +69,8 @@ Usage: ./showGeoptimaEvents.rb <-dvxEh> <-L limit> <-E types> <-T min,max> file
   -p  print mode (print out final results to console) #{cw $print}
   -v  verbose mode (output extra information to console) #{cw $verbose}
   -x  export IMEI specific CSV files for further processing #{cw $export}
+  -o  export field statistis #{cw $export_stats}
+  -m  map headers to classic NetView compatible version #{cw $map_headers}
   -s  seperate the export files by event type #{cw $seperate}
   -h  show this help
   -L  limit verbose output to specific number of lines #{cw $print_limit}
@@ -76,8 +84,9 @@ $verbose = $verbose || $debug
 $datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range => $time_range)
 
 class Export
-  attr_reader :files, :names, :headers
+  attr_reader :files, :imei, :names, :headers
   def initialize(imei,names,dataset)
+    @imei = imei
     @names = names
     if $export
       if $seperate
@@ -91,12 +100,13 @@ class Export
     end
     @headers = names.inject({}) do |a,name|
       a[name] = dataset.header([name]).reject{|h| h === 'timeoffset'}
+      a[name] = a[name].map{|h| "#{name}.#{h}"} unless($separate)
       puts "Created header for name #{name}: #{a[name].join(',')}" if($debug)
       a
     end
     @headers[nil] = @headers.values.flatten
     files && files.each do |key,file|
-      file.puts "Time\tEvent\tLatitude\tLongitude\t#{header(key).join("\t")}\n"
+      file.puts map_headers(['Time','Event','Latitude','Longitude','IMSI','IMEI']+header(key)).join("\t")
     end
     if $debug || $verbose
       @headers.each do |name,head|
@@ -104,6 +114,38 @@ class Export
       end
     end
   end
+  def cap(array,sep="")
+    array.map do |v|
+      "#{v[0..0].upcase}#{v[1..-1]}"
+    end.join(sep)
+  end
+  def map_headers(hnames)
+    $map_headers && hnames.map do |h|
+        case h
+        when 'Time'
+          'time'
+        when /gps\./
+          cap(h.split(/[\._]/),'_').gsub(/gps/i,'GPS')
+        when /^(call|signal|data|sms|mms|browser|neighbor)/i
+          cap(h.split(/[\._]/),'_').gsub(/Neighbor/,'Neighbour').gsub(/mms/i,'MMS').gsub(/sms/,'SMS')
+        when /\./
+          cap(h.split(/[\._]/))
+        else
+          h
+        end
+    end || hnames
+  end
+  def export_stats(stats)
+    File.open("#{imei}_stats.csv",'w') do |out|
+      stats.keys.sort.each do |header|
+        out.puts header
+        values = stats[header].keys.sort
+        out.puts values.join("\t")
+        out.puts values.map{|v| stats[header][v]}.join("\t")
+        out.puts
+      end
+    end
+  end
   def header(name=nil)
     @headers[name]
   end
@@ -139,6 +181,7 @@ end
 puts "Found #{$datasets.length} IMEIs"
 $datasets.keys.sort.each do |imei|
   dataset = $datasets[imei]
+  imsi = dataset.imsi
   events = dataset.sorted
   puts if($print)
   puts "Found #{dataset}"
@@ -146,12 +189,13 @@ $datasets.keys.sort.each do |imei|
     names = $event_names
     names = dataset.events_names if(names.length<1)
     export = Export.new(imei,names,dataset)
+    export.export_stats(dataset.stats) if($export_stats)
     events.each do |event|
       names.each do |name|
         if event.name === name
           fields = export.header($seperate ? name : nil).map{|h| event[h]}
-          export.puts_to "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{fields.join("\t")}", name
-          if_le{puts "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{event.fields.inspect}"}
+          export.puts_to "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{imsi}\t#{imei}\t#{fields.join("\t")}", name
+          if_le{puts "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{imsi}\t#{imei}\t#{event.fields.inspect}"}
         end
       end
     end

data/examples/show_geoptima.rb

@@ -7,6 +7,8 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
+Geoptima::assert_version("0.0.4")
+
 $debug=false
 
 $event_names=[]
@@ -35,6 +37,8 @@ while arg=ARGV.shift do
         $seperate=true
       when 'o'
         $export_stats=true
+      when 'm'
+        $map_headers=true
       when 'E'
         $event_names += ARGV.shift.split(/[\,\;\:\.]+/)
       when 'T'
@@ -66,6 +70,7 @@ Usage: ./showGeoptimaEvents.rb <-dvxEh> <-L limit> <-E types> <-T min,max> file
   -v  verbose mode (output extra information to console) #{cw $verbose}
   -x  export IMEI specific CSV files for further processing #{cw $export}
   -o  export field statistis #{cw $export_stats}
+  -m  map headers to classic NetView compatible version #{cw $map_headers}
   -s  seperate the export files by event type #{cw $seperate}
   -h  show this help
   -L  limit verbose output to specific number of lines #{cw $print_limit}
@@ -101,7 +106,7 @@ class Export
     end
     @headers[nil] = @headers.values.flatten
     files && files.each do |key,file|
-      file.puts "Time\tEvent\tLatitude\tLongitude\t#{header(key).join("\t")}\n"
+      file.puts map_headers(['Time','Event','Latitude','Longitude','IMSI','IMEI']+header(key)).join("\t")
     end
     if $debug || $verbose
       @headers.each do |name,head|
@@ -109,6 +114,27 @@ class Export
       end
     end
   end
+  def cap(array,sep="")
+    array.map do |v|
+      "#{v[0..0].upcase}#{v[1..-1]}"
+    end.join(sep)
+  end
+  def map_headers(hnames)
+    $map_headers && hnames.map do |h|
+        case h
+        when 'Time'
+          'time'
+        when /gps\./
+          cap(h.split(/[\._]/),'_').gsub(/gps/i,'GPS')
+        when /^(call|signal|data|sms|mms|browser|neighbor)/i
+          cap(h.split(/[\._]/),'_').gsub(/Neighbor/,'Neighbour').gsub(/mms/i,'MMS').gsub(/sms/,'SMS')
+        when /\./
+          cap(h.split(/[\._]/))
+        else
+          h
+        end
+    end || hnames
+  end
   def export_stats(stats)
     File.open("#{imei}_stats.csv",'w') do |out|
       stats.keys.sort.each do |header|
@@ -155,6 +181,7 @@ end
 puts "Found #{$datasets.length} IMEIs"
 $datasets.keys.sort.each do |imei|
   dataset = $datasets[imei]
+  imsi = dataset.imsi
   events = dataset.sorted
   puts if($print)
   puts "Found #{dataset}"
@@ -167,8 +194,8 @@ $datasets.keys.sort.each do |imei|
       names.each do |name|
         if event.name === name
           fields = export.header($seperate ? name : nil).map{|h| event[h]}
-          export.puts_to "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{fields.join("\t")}", name
-          if_le{puts "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{event.fields.inspect}"}
+          export.puts_to "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{imsi}\t#{imei}\t#{fields.join("\t")}", name
+          if_le{puts "#{event.time_key}\t#{event.name}\t#{event.latitude}\t#{event.longitude}\t#{imsi}\t#{imei}\t#{event.fields.inspect}"}
         end
       end
     end

data/geoptima.gemspec

@@ -22,7 +22,9 @@ then rather consider the NetView and Customer IQ applications from AmanziTel at
 EOF
 
   s.require_path = 'lib'
-  s.files        = Dir.glob("{bin,lib,examples}/**/*").reject{|x| x=~/(tmp|target|test-data|kurt|357|012)/} + %w(README.rdoc CHANGELOG CONTRIBUTORS Gemfile geoptima.gemspec)
+  s.files        = Dir.glob("{bin,lib,rdoc}/**/*").reject{|x| x=~/(tmp|target|test-data)/ || x=~/~$/} +
+                   Dir.glob("examples/*rb") + Dir.glob("examples/sample*json") + 
+                   %w(README.rdoc CHANGELOG CONTRIBUTORS Gemfile geoptima.gemspec)
   s.executables  = ['show_geoptima']
   s.has_rdoc = true
   s.extra_rdoc_files = %w( README.rdoc )

data/lib/geoptima/data.rb

@@ -31,6 +31,21 @@ module Geoptima
 
   # The Geoptima::Event class represents and individual record or event
   class Event
+    KNOWN_HEADERS={
+      "gps" => ["timeoffset","latitude","longitude","altitude","accuracy","direction","speed"],
+      "service" => ["timeoffset","plmn","cell_id","lac","mnc","mcc"],
+      "call" => ["timeoffset","status","number"],
+      "runningApps" => ["timeoffset","appName","state"],
+      "batteryState" => ["timeoffset","state"],
+      "trafficSpeed" => ["timeoffset","interface","direction","delay","speed"],
+      "storageStatus" => ["timeoffset","path","totalSize","freeSize"],
+      "signal" => ["timeoffset","strength","rxqual","ecio"],
+      "roundtrip" => ["timeoffset","interface","address","type","roundtripTime"],
+      "httpRequest" => ["timeoffset","interface","address","delay","speed"],
+      "dnsLookup" => ["timeoffset","interface","address","lookupTime","ip"],
+      "ftpSpeed" => ["timeoffset","interface","direction","delay","peak","speed"],
+      "browserDedicatedTest" => ["timeoffset","url","pageRenders","pageRendered","pageSize","success"]
+    }
     attr_reader :header, :name, :data, :fields, :time, :latitude, :longitude
     def initialize(start,name,header,data)
       @name = name
@@ -152,6 +167,23 @@ module Geoptima
         events = data['values']
         event_type = data.keys.reject{|k| k=~/values/}[0]
         header = @events_metadata[event_type]
+        unless header
+          puts "No header found for '#{event_type}', trying known Geoptima headers"
+          header = Event::KNOWN_HEADERS[event_type]
+          if header
+            puts "Found known header '#{event_type}' => #{header.inspect}"
+            if data = events_data[event_type]
+              mismatch = data.length % header.length
+              if mismatch != 0
+                puts "Known header length #{header.length} incompatible with data length #{events_data[event_type].length}"
+                header = nil
+              end
+            else
+              puts "No data found for event type '#{event_type}'"
+              header = nil
+            end
+          end
+        end
         if header
           events_data[event_type] = (0...data[event_type].to_i).inject([]) do |a,block|
             index = header.length * block

data/lib/geoptima/version.rb

@@ -1,3 +1,29 @@
 module Geoptima
-  VERSION = "0.0.2"
+
+  VERSION = "0.0.4"
+
+  def self.version_as_int(ver)
+    base = 1
+    ver.split(/\./).reverse.inject(0) do |acc,v|
+      acc += base * v.to_i
+      base *= 100
+      acc
+    end
+  end
+
+  def self.compare_version(expected_ver)
+    version_as_int(expected_ver) - version_as_int(VERSION)
+  end
+
+  def self.assert_version(expected_ver)
+    if expected_ver.to_s != VERSION
+      diff = compare_version(expected_ver)
+      if(diff != 0)
+        msg = diff > 0 ? "against and older library" : "an older script"
+        puts "Geoptima library version mismatch. Expected #{expected_ver}, found #{VERSION}. Are you running #{msg}?"
+        exit -1
+      end
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geoptima
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Craig Taverner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-08 00:00:00 Z
+date: 2012-03-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json