argos-ruby 1.0.3 → 1.0.4

data/.gitignore

@@ -11,7 +11,9 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-
+Gemfile.lock
+buffer.txt
+todo.txt
 # YARD artifacts
 .yardoc
 _yardoc

data/Gemfile

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+gem "yajl-ruby", git: "git://github.com/brianmario/yajl-ruby.git"
+gem "uuidtools"
+gem "hashie", git:  "git://github.com/intridea/hashie.git"
+#gem "json-schema", git:  "git://github.com/hoxworth/json-schema.git"
+
+
+group :development, :test do
+  gem "thin"
+  gem "shotgun"
+  gem "rspec"
+  gem "simplecov"
+  gem "ruby-prof"
+end

data/README.md

@@ -1,60 +1,91 @@
 # argos-ruby
 
-A Ruby library for parsing Argos tracking data
+A Ruby library and command-line tool for parsing Argos tracking data files.
 
-[argos-ruby](https://github.com/npolar/argos-ruby) is used to parse [Argos](http://www.argos-system.org)
-satellite tracking data files collected at the [Norwegian Polar Institute]
-(http://npolar.no/en) since 1989.
-
-Be warned, the Argos file formats have changed over time. No promises are
-made that the library will work outside of Norway :).
-
-Currently, the library parses Argos DS/DIAG files dating from August 1990
-and onwards.
-
-## Install
-$ gem install argos-ruby
-
-## Command-line usage
+## Usage
+### DS/DIAG to JSON
 
+```argos-ruby``` converts Argos files to JSON. DS header data is repeated in each message
 ```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
+curl "https://raw.github.com/npolar/argos-ruby/master/spec/argos/_ds/fragment.ds" > /tmp/fragment.ds
+argos-ruby /tmp/fragment.ds 
 ```
-JSON output (shortened)
-
 ```json
-[ { .. }, 
+[
+  {
+    "program": 9660,
+    "platform": 10783,
+    "lines": 3,
+    "sensors": 3,
+    "satellite": "K",
+    "lc": "3",
+    "positioned": "1999-12-30T17:58:26Z",
+    "latitude": 79.824,
+    "longitude": 22.363,
+    "altitude": 0.0,
+    "headers": 12,
+    "measured": "1999-12-30T17:56:30Z",
+    "identical": 2,
+    "sensor_data": [
+      "78",
+      "00",
+      "00"
+    ],
+    "technology": "argos",
+    "type": "ds",
+    "location": "file:///tmp/fragment.ds",
+    "source": "a9c02cf81978a9fafecac582309c7c8161e5a76c",
+    "parser": "argos-ruby-1.0.4",
+    "id": "2d833010d13714dfb771f73470417405b887e8f4",
+    "bundle": "bc30f5e5733087f730202bea53fa730092a192e3"
+  },
   {
     "program": 9660,
-    "platform": 2173,
+    "platform": 10783,
     "lines": 3,
     "sensors": 3,
     "satellite": "K",
-    "lc": "B",
-    "positioned": "1999-12-31T19:18:58Z",
-    "latitude": 77.562,
-    "longitude": 40.341,
+    "lc": "3",
+    "positioned": "1999-12-30T17:58:26Z",
+    "latitude": 79.824,
+    "longitude": 22.363,
     "altitude": 0.0,
     "headers": 12,
-    "measured": "1999-12-31T19:19:28Z",
-    "identical": 1,
+    "measured": "1999-12-30T18:01:20Z",
+    "identical": 5,
     "sensor_data": [
-      "18729",
-      "17",
-      "149"
+      "78",
+      "00",
+      "00"
     ],
     "technology": "argos",
     "type": "ds",
-    "location": "file:///tmp/990660_A.DAT",
-    "source": "3a39e0bd0b944dca4f4fbf17bc0680704cde2994",
-    "parser": "argos-ruby-1.0.3",
-    "id": "5185906d06859457786753459894bd33fdd8cd0a"
+    "location": "file:///tmp/fragment.ds",
+    "source": "a9c02cf81978a9fafecac582309c7c8161e5a76c",
+    "parser": "argos-ruby-1.0.4",
+    "id": "26af9092d01fbd49ff8cb9041e63df352886dba6",
+    "bundle": "bc30f5e5733087f730202bea53fa730092a192e3"
   }
 ]
 
 ```
-Links
+
+## About
+
+[argos-ruby](https://github.com/npolar/argos-ruby) has been developed to parse [Argos](http://www.argos-system.org)
+satellite tracking data files collected by the [Norwegian Polar Institute]
+(http://npolar.no/en) since 1989.
+
+Be warned, the Argos file formats have changed over time. No promises are
+made that the library will work outside of Norway :).
+
+Currently, the library parses Argos DS/DIAG files dating from August 1990
+and onwards.
+
+## Install
+$ gem install argos-ruby
+
+## 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/

data/bin/argos-ruby

@@ -89,6 +89,7 @@ Dir[glob].reject {|f| File.directory? f}.select {|f|
   argos = Argos.factory(Argos.type(filename))
   argos.filename = filename
   argos.filter = param[:filter]
+  argos.bundle = bundle
   argos.log = log
 
   case param[:action]

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.3"
+  VERSION = "1.0.4"
   # Detect Argos type ("ds" or "diag" or nil)
   #
   # @param filename [String] Argos (DS or DIAG) file

data/lib/argos/command.rb

@@ -19,6 +19,12 @@ module Argos
     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

data/lib/argos/diag.rb

@@ -17,9 +17,9 @@ module Argos
   
     LOCATION_CLASS = ["3", "2", "1", "0", "A", "B", "Z"]
 
-    attr_accessor :log, :filename, :programs
+    attr_accessor :log, :filename, :programs, :bundle
 
-    attr_reader :filename, :filter, :filtername, :sha1, :valid, :filesize, :updated, :multiplicates, :errors
+    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_diag ='^\s*\d{5,6}\s+Date : \d{2}.\d{2}.\d{2} \d{2}:\d{2}:\d{2}'
@@ -224,7 +224,7 @@ module Argos
         technology: "argos",
         type: type,
         location: "file://"+filename,
-        source: "#{sha1}"
+        source: "#{sha1}",
       }
 
       idbase = diag.clone
@@ -233,6 +233,7 @@ module Argos
 
       diag[:parser] = Argos.library_version
       diag[:id] = id
+      diag[:bundle] = bundle
       diag
     end
   

data/lib/argos/ds.rb

@@ -17,9 +17,9 @@ module Argos
   class Ds < Array
     include Argos  
 
-    attr_writer :log, :filename
+    attr_writer :log, :filename, :bundle
 
-    attr_reader :filename, :filter, :filtername, :valid, :filesize, :updated, :sha1, :messages, :multiplicates, :errors
+    attr_reader :bundle, :filename, :filter, :filtername, :valid, :filesize, :updated, :sha1, :messages, :multiplicates, :errors
 
     START_REGEX = /^\d{5} \d{5,6} +\d+ +\d+/
 
@@ -361,6 +361,7 @@ module Argos
 
       m[:parser] = Argos.library_version
       m[:id] = id
+      m[:bundle] = bundle
       m
     end
 

data/spec/argos/_ds/fragment.ds

@@ -0,0 +1,3 @@
+09660 10783   3  3 K 3 1999-12-30 17:58:26  79.824   22.363  0.000 401649712    
+      1999-12-30 17:56:30  2         78           00           00               
+      1999-12-30 18:01:20  5         78           00           00               

data/spec/argos/diag_spec.rb

@@ -62,6 +62,7 @@ module Argos
         :location=>"file://"+VALID_DIAG,
         :id => "ea2243d95df7d70a02a4fb66bc8876f10fdabf12",
         :parser => "argos-ruby-#{Argos::VERSION}",
+        :bundle => nil,
         :source =>"f53ae3ab454f3e210347439aa440c084f775f9a4"}
         end
       end

data/spec/argos/ds_spec.rb

@@ -64,7 +64,8 @@ module Argos
          :location,
          :source,
          :parser,
-         :id]}
+         :id,
+         :bundle]}
       end
 
       it "should sort ascending on positioned, measured" do
@@ -91,7 +92,8 @@ 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=>"c78642c2bbfd4188df8940cd966b40cef33f2881",
+:bundle=>nil}]
           end
         end
       end
@@ -114,6 +116,7 @@ module Argos
 :source=>"3a39e0bd0b944dca4f4fbf17bc0680704cde2994",
 :warn=>["missing-position", "sensors-count-mismatch"],
 :parser=>"argos-ruby-#{Argos::VERSION}",
+:bundle=>nil,
 :id=>"e81e2f255b62fa88e20351de8d5b2de9bf6b3028"}]
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: argos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -37,6 +37,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
 - LICENSE
 - README.md
 - argos-ruby.gemspec
@@ -52,6 +53,7 @@ files:
 - spec/argos/_diag/valid_2009-03-02_DB_DIAG.txt
 - spec/argos/_ds/990660_A.DAT
 - spec/argos/_ds/dup.ds
+- spec/argos/_ds/fragment.ds
 - spec/argos/_ds/sensor_mismatch_ds.txt
 - spec/argos/diag_spec.rb
 - spec/argos/ds_spec.rb
@@ -83,4 +85,3 @@ signing_key:
 specification_version: 3
 summary: Argos satellite tracking data parsers
 test_files: []
-has_rdoc: