argos-ruby 1.0.4 → 1.0.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDNkNTlmYzhjMjk2YzhlNGMzNjVjNDY3NDM5MjZjNzE4YzYwMzMxZA==
+  data.tar.gz: !binary |-
+    MzVlNThiZTM1NzUxMTQ1ODQwMDZiNjU2NGFjYzIwMDY4MDRjZTIyMA==
+SHA512:
+  metadata.gz: !binary |-
+    Zjc1OWM3ZjE1MmI3ZDZiMzIyYThkMzYwODZhZTMxNjM3MWRiMTQ0MTY4YTFh
+    YzU1YTY0NzZjNmE1YmQxYTgwOGZlMWM5YTgwNTczZjJmNGIzODkxOGI0NmNl
+    ODk3ZTAwY2FhNGZkMTA1YjFkMDdlMGM4ZmY5MjY5ZjYyMmJlZjI=
+  data.tar.gz: !binary |-
+    NmY0NDdmM2NmYzc2ODdjNjQwZmQ1NzQ4N2M3YzBhYTg2YTMwZWVmMzg3MDNm
+    ODNlNDJlNTRiNTY3YzM2ZmI0YmM5NTFkODEzODJjMjk1MjRmN2ZhYWRlMDg3
+    OGE5M2M3MGE1MDFiYjY0MDM5NjYyYjg0ZTcxNTNiM2E2Zjk5NDE=

data/bin/argos-ruby

@@ -5,6 +5,7 @@
 require_relative "../lib/argos"
 require "optparse"
 require "yaml"
+require "fileutils"
 
 param = { format: "json",
   action: "parse",
@@ -93,8 +94,9 @@ Dir[glob].reject {|f| File.directory? f}.select {|f|
   argos.log = log
 
   case param[:action]
-    when "source"
+    when "source","metadata"
       result << Argos.source(argos).merge(glob: glob, bundle: bundle)
+      
     when "parse"
       
       arr = argos.parse(filename)
@@ -119,13 +121,21 @@ if ["parse", "messages"].include? param[:action]
   log.info "Documents: #{result.size}, ds: #{ds_count}, diag: #{diag_count}, bundle: #{bundle}, glob: #{glob}"
   
   
-elsif "source" == param[:action]
+elsif /source|metadata/ =~ param[:action]
+  # Count the total number of files in the bundle
   result = result.select {|s| s[:size] > 0 }
   sum_count = result.map {|s| s[:size]}.inject { |sum, c| sum + c }
   result = result.map {|s|
     s[:total] = sum_count
     s
   }
+  unless param[:dest].nil?
+    jsonfile = "#{param[:dest].gsub(/\$/, "")}/bundle-#{bundle}-metadata.json"
+    FileUtils.mkpath(File.dirname(jsonfile))
+    log.debug "Argos bundle metadata: #{jsonfile}"
+    File.open(jsonfile, "w") { |file| file.write(result.to_json) }
+    
+  end
   if argosfiles != result.size
     log.warn "Argos file count: #{argosfiles} differs from parsed files: #{result.size}"
   end

data/lib/argos/command.rb

@@ -16,49 +16,7 @@ module Argos
       @param = PARAM_DEFAULT
     end
 
-    def param(argv=ARGV)
-      optparser = OptionParser.new(ARGV) do |opts|
     
-        opts.banner = "argos-ruby [OPTIONS] {filename|glob}
-        For more information and source: https://github.com/npolar/argos-ruby
-
-Options:\n
-        "
-    
-        opts.on_tail("--version", "-v", "Library version") do
-          puts Argos.library_version
-          exit
-        end
-      
-        opts.on("--action=ACTION", "-a", "Action") do |action|
-          param[:action] = action
-        end
-      
-        opts.on("--filter=FILTER", "-f", "Filter") do |filter|
-          param[:filter] = filter
-        end
-      
-        opts.on("--level=LEVEL", "-l=LEVEL", "Log level") do |level|
-      
-          param[:level] = case level
-            when /debug|0/i
-              Logger::DEBUG
-            when /info|1/i
-              Logger::INFO
-            when /warn|2/i
-              Logger::WARN
-            when /error|3/i
-              Logger::ERROR
-            when /fatal|4/i
-              Logger::FATAL
-            else
-              param[:level]
-          end
-        end
-      
-      end
-      optparser.parse!
-    end
 
   end
 end

data/lib/argos/diag.rb

@@ -21,7 +21,7 @@ module Argos
 
     attr_reader :bundle, :filename, :filter, :filtername, :sha1, :valid, :filesize, :updated, :multiplicates, :errors
   
-    START_REGEX = /^\s*\d{5,6}\s+Date : \d{2}.\d{2}.\d{2} \d{2}:\d{2}:\d{2}/
+    START_REGEX = /^(\s*Prog\s\d{4,}|\s*\d{5,6}\s+Date : \d{2}.\d{2}.\d{2} \d{2}:\d{2}:\d{2})/
     $start_diag ='^\s*\d{5,6}\s+Date : \d{2}.\d{2}.\d{2} \d{2}:\d{2}:\d{2}'
   
     # Diag format 1
@@ -54,7 +54,8 @@ module Argos
   
   
     def initialize
-      @errors = []  
+      @errors = []
+      @programs = []
     end
 
     def filter?
@@ -80,7 +81,7 @@ module Argos
       @total = linecount = 0
       @valid = false
 
-      #filename = File.realpath(filename)
+      filename = File.realpath(filename)
       @filename = filename
       if filename.nil? or not File.exists? filename
         raise ArgumentError, "Missing ARGOS DS file: \"#{filename}\""
@@ -109,7 +110,14 @@ module Argos
       File.open(filename, :encoding => "iso-8859-1").each do |line|
         line = line.to_s.strip
         linecount+=1
-        if line =~ /#{$start_diag}/
+        
+        if line =~ /Prog\s(\d{4,})$/
+          @program = line.split(" ").last
+          log.info "Program: #{@program}"
+          @programs << @program
+        end
+        
+        if line =~ START_REGEX
           match+=1
           if contact !=""
             check_format(contact.strip, startline)
@@ -120,14 +128,16 @@ module Argos
           contact = contact + " " +line
         end
       end
+      
       check_format(contact.strip, startline)
-
+      
+      @programs = @programs.uniq
       if filter?
         total = self.size
         filtered = self.select{|diag| filter.call(diag)}    
         log.info "Selected #{filtered.size}/#{total} Argos DIAG segments sha1:#{sha1} #{filename}"
         self.clear
-        
+        # programs may be wrong now!
         filtered.each do |filtered|
           self << filtered
         end
@@ -152,6 +162,8 @@ module Argos
     if contact =~ /#{$FORMAT_1}/ or contact =~ /#{$FORMAT_2}/ or contact =~ /#{$FORMAT_2}/
       self << create_diag_hash(contact)
       true
+    elsif contact =~ /Prog\s\d{5,}$/
+      true
     else
       error = "#{filename}:#{line_num} sha1:#{@sha1} Invalid format:\n"  + contact
       @errors << error
@@ -228,12 +240,17 @@ module Argos
       }
 
       idbase = diag.clone
-      idbase.delete :filename
+      idbase.delete :location
       id = Digest::SHA1.hexdigest(idbase.to_json)
 
       diag[:parser] = Argos.library_version
       diag[:id] = id
       diag[:bundle] = bundle
+      if @program
+        diag[:program] = @program
+      end
+      
+      
       diag
     end
   

data/lib/argos/ds.rb

@@ -354,7 +354,7 @@ module Argos
 
       idbase = m.clone
       idbase.delete :errors
-      idbase.delete :filename
+      idbase.delete :location
       idbase.delete :warn
       
       id = Digest::SHA1.hexdigest(idbase.to_json)

data/lib/argos.rb

@@ -17,7 +17,7 @@ require_relative "argos/diag"
 # 
 # For information about Argos, see: http://www.argos-system.org
 module Argos
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
   # Detect Argos type ("ds" or "diag" or nil)
   #
   # @param filename [String] Argos (DS or DIAG) file
@@ -119,7 +119,7 @@ module Argos
       longitude_mean: longitude_mean,
       location: "file://"+argos.filename,
       bytes: argos.filesize,
-      updated: argos.updated.utc.iso8601,
+      modified: argos.updated.utc.iso8601,
       messages: argos.messages.size,
       filter: argos.filtername.nil? ? argos.filter : argos.filtername,
       size: argos.size,

data/spec/argos/_diag/Prog_header.ds

@@ -0,0 +1,52 @@
+ Prog 14660
+
+ 080683 Date : 03.05.08 10:50:50  LC : 1  IQ : 50
+      Lat1 : 78.246N  Lon1 :  15.533E  Lat2 : 74.710N  Lon2 :  33.046E
+      Nb mes : 008  Nb mes>-120dB : 000  Best level : -124 dB
+      Pass duration : 420s   NOPC : 1
+      Calcul freq : 401 651795.4 Hz   Altitude :    0 m
+              03           01          146          144
+
+ 080683 Date : 03.05.08 10:57:20  LC : 1  IQ : 56
+      Lat1 : 78.207N  Lon1 :  15.519E  Lat2 : 81.674N  Lon2 :  23.273E
+      Nb mes : 007  Nb mes>-120dB : 000  Best level : -122 dB
+      Pass duration : 601s   NOPC : 3
+      Calcul freq : 401 651801.5 Hz   Altitude :  500 m
+              03           01          146          144
+
+ Prog 9999
+
+02170  Date : 03.02.09 17:47:56  LC : 3  IQ : 66
+      Lat1 : 33.385N  Lon1 : 111.811W  Lat2 : 35.397N  Lon2 : 121.727W
+      Nb mes : 009  Nb mes>-120dB : 000  Best level : -126 dB
+      Pass duration : 811s  NOPC :  3
+      Calcul freq : 401 637664.9 Hz   Altitude :  352 m
+              00           7B           5D           E0
+              C2           51           81           51
+              14           6A           30           00
+              3F           FC           03           00
+              03           FF           C0           30
+              00           3F           FC           0C
+              3F           FF           FF           C0
+02170  Date : 03.02.09 18:04:26  LC : 3  IQ : 66
+      Lat1 : 33.385N  Lon1 : 111.810W  Lat2 : 37.544N  Lon2 : 131.878W
+      Nb mes : 007  Nb mes>-120dB : 000  Best level : -123 dB
+      Pass duration : 630s  NOPC :  3
+      Calcul freq : 401 637664.6 Hz   Altitude :  352 m
+              00           0D           DD           E0
+              C2           51           81           51
+              14           86           AC           01
+              FF           00           00           00
+              00           0E           7F           E0
+              00           2B           00           7F
+              C0           00           00           00
+              03           80           E9           7F
+ 
+ Prog 14660
+
+ 080683 Date : 03.05.08 10:59:59  LC : 1  IQ : 50
+      Lat1 : 78.246N  Lon1 :  15.533E  Lat2 : 74.710N  Lon2 :  33.046E
+      Nb mes : 008  Nb mes>-120dB : 000  Best level : -124 dB
+      Pass duration : 420s   NOPC : 1
+      Calcul freq : 401 651795.4 Hz   Altitude :    0 m
+              03           01          146          144

data/spec/argos/diag_spec.rb

@@ -60,13 +60,22 @@ module Argos
         :technology=>"argos",
         :type=>"diag",
         :location=>"file://"+VALID_DIAG,
-        :id => "ea2243d95df7d70a02a4fb66bc8876f10fdabf12",
+        :id => "a4e59580432b7b621f66c0cdc3087127554acd1d",
         :parser => "argos-ruby-#{Argos::VERSION}",
         :bundle => nil,
         :source =>"f53ae3ab454f3e210347439aa440c084f775f9a4"}
         end
       end
+      
+      it "should parse program from Prog header if present" do
+        @diag.parse(diagfile("Prog_header.ds")).map {|diag|
+          diag[:program]||nil }. should == ["14660", "9999", "14660", "9999", "14660"]
+      end
+      
+      
     end
+    
+
     #describe '#check_format' do
     #  it 'should return true if this is a recognized Diag format' do
     #    str ="02170  Date : 03.02.09 17:47:56  LC : 3  IQ : 66 Lat1 : 33.385N  Lon1 : 111.811W  Lat2 : 35.397N  Lon2 : 121.727W Nb mes : 009  Nb mes>-120dB : 000  Best level : -126 dB Pass duration : 811s  NOPC :  3 Calcul freq : 401 637664.9 Hz   Altitude :  352 m 00           7B           5D           E0 C2           51           81           51 14           6A           30           00 3F           FC           03           00 03           FF           C0           30 00           3F           FC           0C 3F           FF           FF           C0"

data/spec/argos/ds_spec.rb

@@ -92,7 +92,7 @@ module Argos
 :longitude=>22.319, :altitude=>0.0, :headers=>12,
 :measured=>"1999-12-30T18:43:52Z", :identical=>3, :sensor_data=>["78", "00", "00"],
 :technology=>"argos", :type=>"ds", :location=>"file://"+VALID_DS, :parser => "argos-ruby-#{Argos::VERSION}",
-:source=>"3a39e0bd0b944dca4f4fbf17bc0680704cde2994", :id=>"c78642c2bbfd4188df8940cd966b40cef33f2881",
+:source=>"3a39e0bd0b944dca4f4fbf17bc0680704cde2994", :id=>"4369c31c191bd55a998e6293ff4639da3984a95d",
 :bundle=>nil}]
           end
         end
@@ -117,7 +117,7 @@ module Argos
 :warn=>["missing-position", "sensors-count-mismatch"],
 :parser=>"argos-ruby-#{Argos::VERSION}",
 :bundle=>nil,
-:id=>"e81e2f255b62fa88e20351de8d5b2de9bf6b3028"}]
+:id=>"f2c82a5ca1330b312925949a15ac300d07452a12"}]
       end
 
     end

data/spec/argos_spec.rb

@@ -28,7 +28,7 @@ module Argos
 :messages=>449,
 :filter=>nil,
 :size=>843,
-:updated =>  "2013-10-21T17:02:32Z",
+:modified =>  "2013-10-21T17:02:32Z",
 :parser=>Argos.library_version }
         end
       end
@@ -53,7 +53,7 @@ module Argos
 :longitude_mean=>30.752,
 :location=>"file://#{diagfile("990660_A.DIA")}",
 :bytes=>222056,
-:updated=>"2013-10-21T18:31:55Z",
+:modified=>"2013-10-21T18:31:55Z",
 :messages=>448,
 :filter=>nil,
 :size=>448,

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: argos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.0.5
 platform: ruby
 authors:
 - Espen Egeland
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +45,7 @@ files:
 - lib/argos/ds.rb
 - lib/argos/exception.rb
 - spec/argos/_diag/990660_A.DIA
+- spec/argos/_diag/Prog_header.ds
 - spec/argos/_diag/dup.diag
 - spec/argos/_diag/error.diag
 - spec/argos/_diag/valid_2009-03-02_DB_DIAG.txt
@@ -62,26 +60,25 @@ files:
 homepage: http://github.com/npolar/argos-ruby
 licenses:
 - GPL-3.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Argos satellite tracking data parsers
 test_files: []