argos-ruby 1.0.2 → 1.0.3

data/README.md

@@ -16,16 +16,46 @@ and onwards.
 $ gem install argos-ruby
 
 ## Command-line usage
+
 ```sh
 $  curl "https://raw.github.com/npolar/argos-ruby/master/spec/argos/_ds/990660_A.DAT" > /tmp/990660_A.DAT
-$  ./bin/argos-ruby /tmp/990660_A.DAT --filter "lambda {|a| a[:program] == 660 }"
+$  ./bin/argos-ruby /tmp/990660_A.DAT
 ```
-This will output (the lambda filter is of course optional):
+JSON output (shortened)
 
 ```json
-[{"program":660,"platform":14747,"lines":2,"sensors":32,"satellite":"K","lc":null,"positioned":null,"latitude":null,"longitude":null,"altitude":null,"headers":5,"measured":"1999-12-16T00:46:49Z","identical":1,"sensor_data":["92","128","130","132"],"technology":"argos","type":"ds","filename":"/tmp/990660_A.DAT","source":"3a39e0bd0b944dca4f4fbf17bc0680704cde2994","warn":["missing-position","sensors-count-mismatch"],"parser":"argos-ruby-1.0.0","id":"f2c82a5ca1330b312925949a15ac300d07452a12"}]
+[ { .. }, 
+  {
+    "program": 9660,
+    "platform": 2173,
+    "lines": 3,
+    "sensors": 3,
+    "satellite": "K",
+    "lc": "B",
+    "positioned": "1999-12-31T19:18:58Z",
+    "latitude": 77.562,
+    "longitude": 40.341,
+    "altitude": 0.0,
+    "headers": 12,
+    "measured": "1999-12-31T19:19:28Z",
+    "identical": 1,
+    "sensor_data": [
+      "18729",
+      "17",
+      "149"
+    ],
+    "technology": "argos",
+    "type": "ds",
+    "location": "file:///tmp/990660_A.DAT",
+    "source": "3a39e0bd0b944dca4f4fbf17bc0680704cde2994",
+    "parser": "argos-ruby-1.0.3",
+    "id": "5185906d06859457786753459894bd33fdd8cd0a"
+  }
+]
 
 ```
 Links
 * [http://api.npolar.no/tracking/?q=&filter-technology=argos](http://api.npolar.no/tracking/?q=&filter-technology=argos)
 * [Argos users manual v1.5](http://www.argos-system.org/files/pmedia/public/r363_9_argos_users_manual-v1.5.pdf) (PDF)
+* http://alaska.usgs.gov/science/biology/spatial/
+* http://gis-lab.info/programs/argos/argos-manual-eng.html

data/bin/argos-ruby

@@ -126,7 +126,7 @@ elsif "source" == param[:action]
     s
   }
   if argosfiles != result.size
-    log.fatal "Argos file count: #{argosfiles} differs from parsed files: #{result.size}"
+    log.warn "Argos file count: #{argosfiles} differs from parsed files: #{result.size}"
   end
   log.info "Documents (Σcount): #{sum_count}, sources: #{result.size} (ds: #{ds_count}, diag: #{diag_count}), bundle: #{bundle}, glob: #{glob}"
 end

data/lib/argos.rb

@@ -1,5 +1,6 @@
 require "bigdecimal"
 require "date"
+require "time" # for iso8601
 require "digest/sha1"
 require "json"
 require "logger"
@@ -16,7 +17,7 @@ require_relative "argos/diag"
 # 
 # For information about Argos, see: http://www.argos-system.org
 module Argos
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
   # Detect Argos type ("ds" or "diag" or nil)
   #
   # @param filename [String] Argos (DS or DIAG) file
@@ -87,7 +88,7 @@ module Argos
   # Source fingerprint of Argos file (sha1 hash, segment and document counts, etc.)
   #
   # @param  [Argos::Ds Argos::Diag] argos
-  # @return [Hash]
+  # @return [Hash] Source hash
   def self.source(argos)
 
     argos.parse(argos.filename)
@@ -100,7 +101,7 @@ module Argos
       longitude_mean = (argos.longitudes.inject{ |sum, longitude| sum + longitude } / argos.latitudes.size).round(3)
     end
     
-
+    
     source = {
       id: argos.source,
       technology: "argos",
@@ -118,7 +119,7 @@ module Argos
       longitude_mean: longitude_mean,
       location: "file://"+argos.filename,
       bytes: argos.filesize,
-      updated: argos.updated.xmlschema,
+      updated: argos.updated.utc.iso8601,
       messages: argos.messages.size,
       filter: argos.filtername.nil? ? argos.filter : argos.filtername,
       size: argos.size,

data/lib/argos/diag.rb

@@ -93,7 +93,7 @@ module Argos
       contact = []
       file = File.open(filename)
       @filesize = file.size
-      @updated = file.mtime
+      @updated = file.mtime.utc
 
       log.debug "Parsing Argos DIAG file #{filename} sha1:#{sha1} (#{filesize} bytes)"
       if filter?

data/lib/argos/ds.rb

@@ -79,7 +79,7 @@ module Argos
       contact = []
       file = File.open(filename)
       @filesize = file.size
-      @updated = file.mtime
+      @updated = file.mtime.utc
       
       log.debug "Parsing ARGOS DS file #{filename} source:#{sha1} (#{filesize} bytes)"
       if filter?

data/spec/argos_spec.rb

@@ -28,7 +28,7 @@ module Argos
 :messages=>449,
 :filter=>nil,
 :size=>843,
-:updated => "2013-10-21T19:02:32+02:00",
+:updated =>  "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-21T20:31:55+02:00",
+:updated=>"2013-10-21T18:31:55Z",
 :messages=>448,
 :filter=>nil,
 :size=>448,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: argos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec