geoptima 0.0.5 → 0.0.6

data/bin/show_geoptima

@@ -7,7 +7,7 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
-Geoptima::assert_version("0.0.5")
+Geoptima::assert_version("0.0.6")
 
 $debug=false
 
@@ -39,8 +39,12 @@ while arg=ARGV.shift do
         $export_stats=true
       when 'm'
         $map_headers=true
+      when 'a'
+        $combine_all=true
       when 'l'
         $more_headers=true
+      when 'C'
+        $chart_spec = ARGV.shift
       when 'E'
         $event_names += ARGV.shift.split(/[\,\;\:\.]+/)
       when 'T'
@@ -75,16 +79,18 @@ Usage: ./showGeoptimaEvents.rb <-dvxEh> <-L limit> <-E types> <-T min,max> file
   -m  map headers to classic NetView compatible version #{cw $map_headers}
   -l  longer header list (phone and operator fields) #{cw $more_headers}
   -s  seperate the export files by event type #{cw $seperate}
+  -a  combine all IMEI's into a single dataset #{cw $combine_all}
   -h  show this help
-  -L  limit verbose output to specific number of lines #{cw $print_limit}
+  -C  use specified chart specification file for stats and charts: #{$chart_spec}
   -E  comma-seperated list of event types to show and export (default: all; current: #{$event_names.join(',')})
   -T  time range to limit results to (default: all; current: #{$time_range})
+  -L  limit verbose output to specific number of lines #{cw $print_limit}
 EOHELP
   exit 0
 end
 
 $verbose = $verbose || $debug
-$datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range => $time_range)
+$datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range => $time_range, :combine_all => $combine_all)
 
 class Export
   attr_reader :files, :imei, :names, :headers
@@ -108,7 +114,7 @@ class Export
       puts "Created header for name #{name}: #{a[name].join(',')}" if($debug)
       a
     end
-    @headers[nil] = @headers.values.flatten
+    @headers[nil] = @headers.values.flatten.sort
     files && files.each do |key,file|
       file.puts map_headers(base_headers+more_headers+header(key)).join("\t")
     end
@@ -118,14 +124,21 @@ class Export
       end
     end
   end
+  def export_imei
+    ($combine_all || $more_headers)
+  end
   def base_headers
-    ['Time','Event','Latitude','Longitude']
+    ['Time','Event','Latitude','Longitude'] + 
+    (export_imei ? ['IMEI'] : [])
   end
   def more_headers
-    $more_headers ? ['IMSI','IMEI','MSISDN','MCC','MNC','LAC','CI','RSSI','Platform','Model','OS','Operator'] : []
+    $more_headers ?
+    ['IMSI','MSISDN','MCC','MNC','LAC','CI','LAC-CI','RSSI','Platform','Model','OS','Operator'] :
+    []
   end
   def base_fields(event)
-    [event.time_key,event.name,event.latitude,event.longitude]
+    [event.time_key,event.name,event.latitude,event.longitude] +
+    (export_imei ? [event.file.imei] : [])
   end
   def more_fields(event,dataset)
     more_headers.map do |h|
@@ -136,6 +149,8 @@ class Export
         dataset.recent(event,'service.lac')
       when 'CI'
         dataset.recent(event,'service.cell_id')
+      when 'LAC-CI'
+        "#{dataset.recent(event,'service.lac')}-#{dataset.recent(event,'service.cell_id')}"
       when 'MCC'
         dataset[h] || dataset.recent(event,'service.mcc')
       when 'MNC'
@@ -144,8 +159,6 @@ class Export
         dataset['carrierName']
       when 'IMSI'
         dataset.imsi
-      when 'IMEI'
-        dataset.imei
       else
         dataset[h]
       end

data/examples/show_geoptima.rb

@@ -7,7 +7,7 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
-Geoptima::assert_version("0.0.5")
+Geoptima::assert_version("0.0.6")
 
 $debug=false
 
@@ -39,8 +39,12 @@ while arg=ARGV.shift do
         $export_stats=true
       when 'm'
         $map_headers=true
+      when 'a'
+        $combine_all=true
       when 'l'
         $more_headers=true
+      when 'C'
+        $chart_spec = ARGV.shift
       when 'E'
         $event_names += ARGV.shift.split(/[\,\;\:\.]+/)
       when 'T'
@@ -75,16 +79,18 @@ Usage: ./showGeoptimaEvents.rb <-dvxEh> <-L limit> <-E types> <-T min,max> file
   -m  map headers to classic NetView compatible version #{cw $map_headers}
   -l  longer header list (phone and operator fields) #{cw $more_headers}
   -s  seperate the export files by event type #{cw $seperate}
+  -a  combine all IMEI's into a single dataset #{cw $combine_all}
   -h  show this help
-  -L  limit verbose output to specific number of lines #{cw $print_limit}
+  -C  use specified chart specification file for stats and charts: #{$chart_spec}
   -E  comma-seperated list of event types to show and export (default: all; current: #{$event_names.join(',')})
   -T  time range to limit results to (default: all; current: #{$time_range})
+  -L  limit verbose output to specific number of lines #{cw $print_limit}
 EOHELP
   exit 0
 end
 
 $verbose = $verbose || $debug
-$datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range => $time_range)
+$datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range => $time_range, :combine_all => $combine_all)
 
 class Export
   attr_reader :files, :imei, :names, :headers
@@ -108,7 +114,7 @@ class Export
       puts "Created header for name #{name}: #{a[name].join(',')}" if($debug)
       a
     end
-    @headers[nil] = @headers.values.flatten
+    @headers[nil] = @headers.values.flatten.sort
     files && files.each do |key,file|
       file.puts map_headers(base_headers+more_headers+header(key)).join("\t")
     end
@@ -118,14 +124,21 @@ class Export
       end
     end
   end
+  def export_imei
+    ($combine_all || $more_headers)
+  end
   def base_headers
-    ['Time','Event','Latitude','Longitude']
+    ['Time','Event','Latitude','Longitude'] + 
+    (export_imei ? ['IMEI'] : [])
   end
   def more_headers
-    $more_headers ? ['IMSI','IMEI','MSISDN','MCC','MNC','LAC','CI','RSSI','Platform','Model','OS','Operator'] : []
+    $more_headers ?
+    ['IMSI','MSISDN','MCC','MNC','LAC','CI','LAC-CI','RSSI','Platform','Model','OS','Operator'] :
+    []
   end
   def base_fields(event)
-    [event.time_key,event.name,event.latitude,event.longitude]
+    [event.time_key,event.name,event.latitude,event.longitude] +
+    (export_imei ? [event.file.imei] : [])
   end
   def more_fields(event,dataset)
     more_headers.map do |h|
@@ -136,6 +149,8 @@ class Export
         dataset.recent(event,'service.lac')
       when 'CI'
         dataset.recent(event,'service.cell_id')
+      when 'LAC-CI'
+        "#{dataset.recent(event,'service.lac')}-#{dataset.recent(event,'service.cell_id')}"
       when 'MCC'
         dataset[h] || dataset.recent(event,'service.mcc')
       when 'MNC'
@@ -144,8 +159,6 @@ class Export
         dataset['carrierName']
       when 'IMSI'
         dataset.imsi
-      when 'IMEI'
-        dataset.imei
       else
         dataset[h]
       end

data/geoptima.gemspec

@@ -30,6 +30,7 @@ EOF
   s.extra_rdoc_files = %w( README.rdoc )
   s.rdoc_options = ["--quiet", "--title", "Geoptima.rb", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
 
-  s.add_dependency('json',">= 1.6.5")
+  s.add_dependency('multi_json',">= 1.1.0")
+  s.add_dependency('json_pure',">= 1.6.5")
   s.required_ruby_version = ">= 1.8.6"
 end

data/lib/geoptima/data.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'json'
+require 'multi_json'
 require 'date'
 
 #
@@ -46,8 +46,9 @@ module Geoptima
       "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)
+    attr_reader :file, :header, :name, :data, :fields, :time, :latitude, :longitude
+    def initialize(file,start,name,header,data)
+      @file = file
       @name = name
       @header = header
       @data = data
@@ -97,7 +98,8 @@ module Geoptima
     attr_reader :path, :json, :count
     def initialize(path)
       @path = path
-      @json = JSON.parse(File.read(path))
+#      @json = JSON.parse(File.read(path))
+      @json = MultiJson.decode(File.read(path))
       @fields = {}
       if $debug
         puts "Read Geoptima: #{geoptima.to_json}"
@@ -118,6 +120,9 @@ module Geoptima
     def subscriber
       @subscriber ||= geoptima['subscriber']
     end
+    def imei
+      @imei ||= self['imei']
+    end
     def [](key)
       @fields[key] ||= subscriber[key] || subscriber[key.downcase]
     end
@@ -182,7 +187,7 @@ module Geoptima
             data = events[index...(index+header.length)]
             if data && data.length == header.length
               @count += 1
-              a << Event.new(start,event_type,header,data)
+              a << Event.new(self,start,event_type,header,data)
             else
               puts "Invalid '#{event_type}' data block #{block}: #{data.inspect}"
               break a
@@ -381,8 +386,9 @@ module Geoptima
         unless geoptima.valid?
           puts "INVALID: #{geoptima.start}\t#{file}\n\n"
         else
-          datasets[geoptima['imei']] ||= Geoptima::Dataset.new(geoptima['imei'], options)
-          datasets[geoptima['imei']] << geoptima
+          key = options[:combine_all] ? 'all' : geoptima['imei']
+          datasets[key] ||= Geoptima::Dataset.new(key, options)
+          datasets[key] << geoptima
         end
       end
       datasets

data/lib/geoptima/version.rb

@@ -1,6 +1,6 @@
 module Geoptima
 
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 
   def self.version_as_int(ver)
     base = 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geoptima
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Craig Taverner
@@ -15,12 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-09 00:00:00 Z
+date: 2012-03-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: multi_json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,7 +48,7 @@ dependencies:
         - 5
         version: 1.6.5
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 description: |
   Geoptima is a suite of applications for measuring and locating mobile/cellular subscriber experience on GPS enabled smartphones.
   It is produced by AmanziTel AB in Helsingborg, Sweden, and supports many phone manufacturers, with free downloads from the