geoptima 0.1.4 → 0.1.6

data/bin/csv_chart

@@ -10,7 +10,7 @@ require 'geoptima/options'
 require 'fileutils'
 require 'geoptima/daterange'
 
-Geoptima::assert_version("0.1.4")
+Geoptima::assert_version("0.1.6")
 Geoptima::Chart.available? || puts("No charting libraries available") || exit(-1)
 
 $export_dir = '.'
@@ -37,18 +37,19 @@ $merge_all = true if($time_split)
 $help = true unless($files.length>0)
 if $help
   puts <<EOHELP
-Usage: csv_chart <-dhamt> <-S specfile> <-N name> <-D dir> <-T range> <-P diversity> files...
- -d  debug mode #{cw $debug}
- -h  print this help #{cw $help}
- -a  automatically create charts for all properties #{cw $create_all}
- -m  merge all files into single stats #{cw $merge_all}
- -t  merge and split by time (days) #{cw $time_split}
- -N  use specified name for merged dataset: #{$merged_name}
- -D  export charts to specified directory: #{$export_dir}
- -S  use chart specification in specified file: #{$specfile}
- -P  diversity threshold in percentage for automatic reports: #{$diversity}
- -T  set time-range filter: #{$time_range}
- -W  set default chart-width: #{$chart_width}
+Usage: csv_chart <-dhamtf> <-S specfile> <-N name> <-D dir> <-T range> <-P diversity> files...
+  -d  debug mode #{cw $debug}
+  -h  print this help #{cw $help}
+  -a  automatically create charts for all properties #{cw $create_all}
+  -m  merge all files into single stats #{cw $merge_all}
+  -t  merge and split by time (days) #{cw $time_split}
+  -f  flush stdout #{cw $flush_stdout}
+  -N  use specified name for merged dataset: #{$merged_name}
+  -D  export charts to specified directory: #{$export_dir}
+  -S  use chart specification in specified file: #{$specfile}
+  -P  diversity threshold in percentage for automatic reports: #{$diversity}
+  -T  set time-range filter: #{$time_range}
+  -W  set default chart-width: #{$chart_width}
 Files to import: #{$files.join(', ')}
 EOHELP
   exit
@@ -224,18 +225,18 @@ module Geoptima
         val
       end
     end
-    def prepare_values(values)
+    def prepare_values(all_values)
       @values = []
       if @indices
         puts "StatSpec[#{self}]: #{options.inspect}" if($debug)
-        @values = @indices.map{|i| values[i]}
+        @values = @indices.map{|i| all_values[i]}
         puts "\tVALUES:      #{values.inspect}" if($debug)
       end
       @values
     end
-    def vals_for(values,filter={})
+    def vals_for(all_values,filter={})
       if @indices
-        prepare_values(values)
+        prepare_values(all_values)
         (options[:filter] || filter).each do |field,expected|
           puts "\t\tChecking if field #{field} is #{expected}" if($debug)
           puts "\t\tLooking for #{field} or #{event}.#{field} in #{@fields.inspect}" if($debug)
@@ -246,8 +247,8 @@ module Geoptima
         values
       end
     end
-    def map_fields(values,filter={})
-      if vals = vals_for(values,filter)
+    def map_fields(all_values,filter={})
+      if vals = vals_for(all_values,filter)
         val = proc.nil? ? vals[0] : proc.call(*vals)
         puts "\tBLOCK MAP:   #{vals.inspect} --> #{val.inspect}" if($debug)
         if options[:div]

data/bin/csv_merge

@@ -9,7 +9,7 @@ require 'geoptima/options'
 require 'fileutils'
 require 'geoptima/daterange'
 
-Geoptima::assert_version("0.1.4")
+Geoptima::assert_version("0.1.6")
 
 $export_dir = '.'
 $export_name = 'merged.csv'

data/bin/show_geoptima

@@ -8,7 +8,7 @@ require 'date'
 require 'geoptima'
 require 'geoptima/options'
 
-Geoptima::assert_version("0.1.4")
+Geoptima::assert_version("0.1.6")
 
 $debug=false
 
@@ -117,6 +117,7 @@ Usage: show_geoptima <-dpvxomlsah> <-L limit> <-E types> <-T min,max> <-M mapfil
   -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}
+  -f  flush stdout #{cw $flush_stdout}
   -h  show this help
   -P  prefix for exported files (default: ''; current: #{$export_prefix})
   -E  comma-seperated list of event types to show and export (default: all; current: #{$event_names.join(',')})
@@ -202,15 +203,15 @@ class Export
       when 'LAC-CI'
         "#{dataset.recent(event,'service.lac')}-#{dataset.recent(event,'service.cell_id')}"
       when 'MCC'
-        event.file[h] || dataset.recent(event,'service.mcc')
+        event.file[h] || dataset.recent(event,'service.mcc',3600)
       when 'MNC'
-        event.file[h] || dataset.recent(event,'service.mnc')
+        event.file[h] || dataset.recent(event,'service.mnc',3600)
       when 'Battery'
         dataset.recent(event,'batteryState.state',600)
       when 'Operator'
-        event.file['carrierName']
-      when 'IMSI'
-        event.file['imsi']
+        event.file['carrierName'] || dataset.recent(event,'carrierName',3600)
+      when 'IMSI', 'OS', 'Platform', 'IMSI', 'MSISDN', 'Model'
+        event.file[h] || dataset.recent(event,h,3600)
       else
         event.file[h]
       end
@@ -283,13 +284,14 @@ def if_le
   $count += 1
 end
 
-puts "Found #{$datasets.length} IMEIs"
+puts "Found #{$datasets.length} datasets: #{$datasets.values.join('; ')}"
+
 $datasets.keys.sort.each do |imei|
   dataset = $datasets[imei]
   imsi = dataset.imsi
   events = dataset.sorted
   puts if($print)
-  puts "Found #{dataset}"
+  puts "Found #{dataset.description}"
   if $verbose
     puts "\tFirst Event: #{dataset.first}"
     puts "\tLast Event:  #{dataset.last}"

data/examples/csv_chart.rb

@@ -10,7 +10,7 @@ require 'geoptima/options'
 require 'fileutils'
 require 'geoptima/daterange'
 
-Geoptima::assert_version("0.1.4")
+Geoptima::assert_version("0.1.6")
 Geoptima::Chart.available? || puts("No charting libraries available") || exit(-1)
 
 $export_dir = '.'
@@ -37,18 +37,19 @@ $merge_all = true if($time_split)
 $help = true unless($files.length>0)
 if $help
   puts <<EOHELP
-Usage: csv_chart <-dhamt> <-S specfile> <-N name> <-D dir> <-T range> <-P diversity> files...
- -d  debug mode #{cw $debug}
- -h  print this help #{cw $help}
- -a  automatically create charts for all properties #{cw $create_all}
- -m  merge all files into single stats #{cw $merge_all}
- -t  merge and split by time (days) #{cw $time_split}
- -N  use specified name for merged dataset: #{$merged_name}
- -D  export charts to specified directory: #{$export_dir}
- -S  use chart specification in specified file: #{$specfile}
- -P  diversity threshold in percentage for automatic reports: #{$diversity}
- -T  set time-range filter: #{$time_range}
- -W  set default chart-width: #{$chart_width}
+Usage: csv_chart <-dhamtf> <-S specfile> <-N name> <-D dir> <-T range> <-P diversity> files...
+  -d  debug mode #{cw $debug}
+  -h  print this help #{cw $help}
+  -a  automatically create charts for all properties #{cw $create_all}
+  -m  merge all files into single stats #{cw $merge_all}
+  -t  merge and split by time (days) #{cw $time_split}
+  -f  flush stdout #{cw $flush_stdout}
+  -N  use specified name for merged dataset: #{$merged_name}
+  -D  export charts to specified directory: #{$export_dir}
+  -S  use chart specification in specified file: #{$specfile}
+  -P  diversity threshold in percentage for automatic reports: #{$diversity}
+  -T  set time-range filter: #{$time_range}
+  -W  set default chart-width: #{$chart_width}
 Files to import: #{$files.join(', ')}
 EOHELP
   exit
@@ -224,18 +225,18 @@ module Geoptima
         val
       end
     end
-    def prepare_values(values)
+    def prepare_values(all_values)
       @values = []
       if @indices
         puts "StatSpec[#{self}]: #{options.inspect}" if($debug)
-        @values = @indices.map{|i| values[i]}
+        @values = @indices.map{|i| all_values[i]}
         puts "\tVALUES:      #{values.inspect}" if($debug)
       end
       @values
     end
-    def vals_for(values,filter={})
+    def vals_for(all_values,filter={})
       if @indices
-        prepare_values(values)
+        prepare_values(all_values)
         (options[:filter] || filter).each do |field,expected|
           puts "\t\tChecking if field #{field} is #{expected}" if($debug)
           puts "\t\tLooking for #{field} or #{event}.#{field} in #{@fields.inspect}" if($debug)
@@ -246,8 +247,8 @@ module Geoptima
         values
       end
     end
-    def map_fields(values,filter={})
-      if vals = vals_for(values,filter)
+    def map_fields(all_values,filter={})
+      if vals = vals_for(all_values,filter)
         val = proc.nil? ? vals[0] : proc.call(*vals)
         puts "\tBLOCK MAP:   #{vals.inspect} --> #{val.inspect}" if($debug)
         if options[:div]

data/examples/csv_merge.rb

@@ -9,7 +9,7 @@ require 'geoptima/options'
 require 'fileutils'
 require 'geoptima/daterange'
 
-Geoptima::assert_version("0.1.4")
+Geoptima::assert_version("0.1.6")
 
 $export_dir = '.'
 $export_name = 'merged.csv'

data/examples/show_geoptima.rb

@@ -8,7 +8,7 @@ require 'date'
 require 'geoptima'
 require 'geoptima/options'
 
-Geoptima::assert_version("0.1.4")
+Geoptima::assert_version("0.1.6")
 
 $debug=false
 
@@ -117,6 +117,7 @@ Usage: show_geoptima <-dpvxomlsah> <-L limit> <-E types> <-T min,max> <-M mapfil
   -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}
+  -f  flush stdout #{cw $flush_stdout}
   -h  show this help
   -P  prefix for exported files (default: ''; current: #{$export_prefix})
   -E  comma-seperated list of event types to show and export (default: all; current: #{$event_names.join(',')})
@@ -202,15 +203,15 @@ class Export
       when 'LAC-CI'
         "#{dataset.recent(event,'service.lac')}-#{dataset.recent(event,'service.cell_id')}"
       when 'MCC'
-        event.file[h] || dataset.recent(event,'service.mcc')
+        event.file[h] || dataset.recent(event,'service.mcc',3600)
       when 'MNC'
-        event.file[h] || dataset.recent(event,'service.mnc')
+        event.file[h] || dataset.recent(event,'service.mnc',3600)
       when 'Battery'
         dataset.recent(event,'batteryState.state',600)
       when 'Operator'
-        event.file['carrierName']
-      when 'IMSI'
-        event.file['imsi']
+        event.file['carrierName'] || dataset.recent(event,'carrierName',3600)
+      when 'IMSI', 'OS', 'Platform', 'IMSI', 'MSISDN', 'Model'
+        event.file[h] || dataset.recent(event,h,3600)
       else
         event.file[h]
       end
@@ -283,13 +284,14 @@ def if_le
   $count += 1
 end
 
-puts "Found #{$datasets.length} IMEIs"
+puts "Found #{$datasets.length} datasets: #{$datasets.values.join('; ')}"
+
 $datasets.keys.sort.each do |imei|
   dataset = $datasets[imei]
   imsi = dataset.imsi
   events = dataset.sorted
   puts if($print)
-  puts "Found #{dataset}"
+  puts "Found #{dataset.description}"
   if $verbose
     puts "\tFirst Event: #{dataset.first}"
     puts "\tLast Event:  #{dataset.last}"

data/lib/geoptima/data.rb

@@ -239,10 +239,10 @@ module Geoptima
 
   class Dataset
 
-    attr_reader :imei, :options
+    attr_reader :name, :options
 
-    def initialize(imei,options={})
-      @imei = imei
+    def initialize(name,options={})
+      @name = name
       @data = []
       @options = options
       @time_range = options[:time_range] || DateRange.new(Config[:min_datetime],Config[:max_datetime])
@@ -263,14 +263,26 @@ module Geoptima
     end
 
     def imsis
-      @imsis ||= @data.inject({}) do |a,d|
-        a[d['imsi']] ||= 0
-        a[d['imsi']] += d.count.to_i
+      @imsis ||= make_all_from_metadata('imsi')
+    end
+
+    def imei
+      imeis[0]
+    end
+
+    def imeis
+      @imeis ||= make_all_from_metadata('imei')
+    end
+
+    def make_all_from_metadata(field_name)
+      @data.inject({}) do |a,d|
+        a[d[field_name]] ||= 0
+        a[d[field_name]] += d.count.to_i
         a
       end.to_a.sort do |a,b|
         b[1]<=>a[1]
       end.map do |x|
-        #puts "Have IMSI: #{x.join('=')}"
+        #puts "Have #{field_name}: #{x.join('=')}"
         x[0]
       end.compact.uniq
     end
@@ -304,18 +316,18 @@ module Geoptima
     end
 
     def [](key)
-      @fields[key.downcase] ||= @data.map{|d| d[key]}.compact.uniq[0]
+      @fields[key.downcase] ||= @data.map{|d| d[key]}.compact.uniq
     end
 
-    def platform
+    def platforms
       self['Platform']
     end
 
-    def model
+    def models
       self['Model']
     end
 
-    def os
+    def oses
       self['OS']
     end
 
@@ -345,8 +357,8 @@ module Geoptima
 
     def header(names=nil)
       merge_events unless @sorted
-      (names || events_names).map do |name|
-        [(s=sorted(name)[0]) && s.header]
+      (names || events_names).map do |event_type|
+        [(s=sorted(event_type)[0]) && s.header]
       end.flatten
     end
 
@@ -420,7 +432,11 @@ module Geoptima
     end
 
     def to_s
-      "IMEI:#{imei}, IMSI:#{imsis.join(',')}, Platform:#{platform}, Model:#{model}, OS:#{os}, Files:#{file_count}, Events:#{sorted && sorted.length}"
+      (imei.to_s.length < 1 || name == imei) ? name : imeis.join(',')
+    end
+
+    def description
+      "Dataset:#{name}, IMEI:#{imeis.join(',')}, IMSI:#{imsis.join(',')}, Platform:#{platforms.join(',')}, Model:#{models.join(',')}, OS:#{oses.join(',')}, Files:#{file_count}, Events:#{sorted && sorted.length}"
     end
 
     def self.make_datasets(files, options={})

data/lib/geoptima/options.rb

@@ -45,6 +45,7 @@ module Geoptima
 
     def self.process_args(debug=nil)
       options = Options.new(debug)
+      options.add('f') {$flush_stdout = true}
       options.add('v') {$print_version = true}
       options.add('d') {$debug = true}
       options.add('h') {$help = true}
@@ -60,6 +61,7 @@ module Geoptima
         end
       end
       puts "Geoptima Gem Version: #{Geoptima::VERSION}" if($print_version)
+      STDOUT.sync if($flush_stdout)
       options.args
     end
 

data/lib/geoptima/version.rb

@@ -1,6 +1,6 @@
 module Geoptima
 
-  VERSION = "0.1.4"
+  VERSION = "0.1.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: 19
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Craig Taverner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-17 00:00:00 +02:00
+date: 2012-04-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency