argos-ruby 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6d81b4bb58e504df7d458fe87544910e327dfd1
-  data.tar.gz: e87b06d9f868a023c48d23c1d48b62ffc364872e
+  metadata.gz: 8017d65ed93ced9c7870caa378cf60f3d9c6cec5
+  data.tar.gz: 1367b8b06d4fa33ada9826f5876d1badf18554bb
 SHA512:
-  metadata.gz: 8172746732affef98be2a58174e30989c7743732ab3f57bbe1df2289a66d281d40e500489619b09658ece4d75d7d518328b5a97f50b61dd58b5d2f0ad415465a
-  data.tar.gz: 7b41c164def0bd79e06dbfddf6312fb423044656e92e571b05a333716e50aac24876f00ed4163c28d718792d7ab40a283d1a5a63fa8938562a032ccdef2be606
+  metadata.gz: ed466838fd2a430ed490a08261cbc91078b3892f78ffd4e88cb95acf1a22294291b30b93fe898d508fa96eaf27758df7f702492742f90d1989c258c35b64fa43
+  data.tar.gz: 45427c315a422bb09c418a0e500642dd1e9bbf97161a03e3069f8cc46bd61b76d64722376b4f68c5b998f14c16791d0c8c3b1e6cdf89dee1f14a4d1b5792d3a9

data/Gemfile

@@ -1,11 +1,8 @@
+# http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
 source "https://rubygems.org"
-gem "yajl-ruby", require: "yajl" # 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"
+gem "codeclimate-test-reporter", group: :test, require: nil
+
 gem "savon", github: "savonrb/savon", branch: "version3"
 
-group :development, :test do
-  gem "rspec"
-  gem "simplecov"
-end
+gemspec
+

data/README.md

@@ -16,7 +16,9 @@ Developed by staff at the [Norwegian Polar Data Centre](http://data.npolar.no),
 $ argos-soap -o getXsd # does not require authentication
 $ argos-soap --download archive/tracking/CLS  --username=USERNAME --password=PASSWORD --debug
 $ argos-soap -o getXml --username=USERNAME --password=PASSWORD
+
 ```
+
 See [argos-soap](https://github.com/npolar/argos-ruby/wiki/argos-soap) for more usage examples.
 
 ### Legacy file parsing
@@ -36,7 +38,10 @@ $ xsltproc lib/argos/_xslt/argos-json.xslt spec/argos/_soap/getXml.xml
 ## Install
 ```sh
 $ gem install argos-ruby
+$ cd `gem environment gemdir`/gems/argos-ruby-1.2.4
+$ bundle install
 ```
+Note: The extra step is a [bug](https://github.com/npolar/argos-ruby/issues/1)
 
 ## Links
 * https://github.com/npolar/api.npolar.no/wiki/Tracking-API-JSON

data/argos-ruby.gemspec

@@ -1,6 +1,10 @@
 # encoding: utf-8
 # https://github.com/radar/guides/blob/master/gem-development.md
-require File.expand_path(File.dirname(__FILE__)+"/lib/argos")
+
+lib = File.expand_path("#{__dir__}/lib")
+
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "argos/version"
 
 Gem::Specification.new do |s|
   s.name        = "argos-ruby"
@@ -9,12 +13,20 @@ Gem::Specification.new do |s|
   s.authors     = ["Espen Egeland", "Conrad Helgeland"]
   s.email       = ["data*npolar.no"]
   s.homepage    = "http://github.com/npolar/argos-ruby"
-  s.summary     = %q{Argos satellite tracking library and command-line tools}
+  s.summary     = %q{Argos CLS satellite tracking library and command-line tools}
   s.description = %q{Argos (http://www.argos-system.org/) webservice client and Argos legacy file (DS/DAT and DIAG/DIA) parser.}
   s.license = "GPL-3.0"
+
   s.add_development_dependency 'rspec', '~> 3'
+  s.add_development_dependency 'simplecov'
+
+  s.add_dependency 'yajl-ruby'
+  s.add_dependency 'uuidtools'
+  s.add_dependency 'hashie'
+  s.add_dependency 'json-schema'
+
   s.files         = `git ls-files`.split("\n")
-  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

data/lib/argos/download.rb

@@ -37,7 +37,11 @@ module Argos
       
         platforms = soap.platforms
         
+        # inactive (no last collect)
+        inactive = program["platform"]
+        
         active = program["platform"].select {|platform|
+          platform.key? "lastCollectDate" and platform.key? "lastLocationDate"}.select {|platform|
           
           lastCollectDate = DateTime.parse(platform["lastCollectDate"])
           lastLocationDate = DateTime.parse(platform["lastLocationDate"])
@@ -47,10 +51,9 @@ module Argos
           (lastCollectDate > twentydays or lastLocationDate > twentydays)
           
         }
-        
-        
+        # inactive = platforms where last collect date is missing or > 20 days
         inactive = program["platform"] - active
-        
+
         active.each_with_index do |a,m|
           log.debug "Active [#{m+1}/#{active.size}]: #{a.reject{|k,v| k =~ /location/i }.to_json}"
         end

data/lib/argos/version.rb

@@ -0,0 +1,3 @@
+module Argos
+  VERSION = "1.2.4"
+end

data/lib/argos.rb

@@ -26,8 +26,6 @@ require_relative "argos/download"
 # 
 # For information about Argos, see: http://www.argos-system.org
 module Argos
-  VERSION = "1.2.3"
-  
   def self.library_version
     "argos-ruby-#{VERSION}" 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: argos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Espen Egeland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -25,6 +25,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Argos (http://www.argos-system.org/) webservice client and Argos legacy
   file (DS/DAT and DIAG/DIA) parser.
 email:
@@ -37,7 +107,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - argos-ruby.gemspec
@@ -54,6 +123,7 @@ files:
 - lib/argos/exception.rb
 - lib/argos/soap.rb
 - lib/argos/soap_command.rb
+- lib/argos/version.rb
 - spec/argos/_diag/990660_A.DIA
 - spec/argos/_diag/Prog_header.ds
 - spec/argos/_diag/dup.diag
@@ -106,6 +176,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Argos satellite tracking library and command-line tools
+summary: Argos CLS satellite tracking library and command-line tools
 test_files: []
 has_rdoc: 

data/Gemfile.lock

@@ -1,59 +0,0 @@
-GIT
-  remote: git://github.com/savonrb/savon.git
-  revision: 61e13c61b68e5d3fa80826c31d54d696ab77290d
-  branch: version3
-  specs:
-    savon (3.0.0)
-      builder (>= 3.0.0)
-      httpclient (~> 2.3)
-      logging (~> 1.8)
-      nokogiri (>= 1.4.0)
-      nori (~> 2.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    hashie (3.3.1)
-    httpclient (2.4.0)
-    little-plugger (1.1.3)
-    logging (1.8.2)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.8.4)
-    mini_portile (0.6.0)
-    multi_json (1.10.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    nori (2.2.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    uuidtools (2.1.5)
-    yajl-ruby (1.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  hashie
-  rspec
-  savon!
-  simplecov
-  uuidtools
-  yajl-ruby