argos-ruby 1.1.2 → 1.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjc1YTlhYTAwYTA4ZGE4MmYyZGFkYmUwNGNhNDE3MDNkYTA4MDdjNQ==
+    MmM0NDJiNWVjNDNjMWRhYTI4MmNjYWY2NTQ5ZTAwOWQwMjY5YTFjNA==
   data.tar.gz: !binary |-
-    YjQzNDA1MDlkZjkyMWZlYTAwZWQ3NTVjODNhNjk5ZDI3MDZhOThiOA==
+    MzBiY2Q2MzYyOGU2NmY3NTNjMjE3MDhlNzYzMjk4YTNjODc2MDU4Yg==
 SHA512:
   metadata.gz: !binary |-
-    ZTcxM2NmZTdmYmU4MGZiOTRiYmM2MjM3NmE5NmJjMmFlOGNlYzVlNTgwYmEy
-    NDQ3OTBkZTViZDk2MTJlMDc4NjA4NWE3OTMzYmIzN2ZhZDYwMjIyN2QyZWIy
-    MjE2NThhY2RlZTM3Njg1MjkyMThlNDliYmVkYzgzZmMzZjU0MTQ=
+    MmM4ZmI1N2EzMzAxODhhZWE4NTk1MmMyYTAyNGM4ZDNkZWZiOWI4YTRiNDg5
+    MTc3OTdlYTkyMmY2NGJhMTk1OWFlMDc4OTEyYjA4MTMzNzI3OWFlNTEyYWM0
+    MjcyMjNjNTAyNzQxMDAwOTZkNTVmMzJmZmZhMWM3ZWZjZGZhYzk=
   data.tar.gz: !binary |-
-    NmMyNzcwMDE0MjA3NTFhZjNkYzcyNjQyMDJhYjcxZmY4OTI3ZWQ3NGJmZWRj
-    MTczZDQwODE0Njg2OTE2ZjIxOTlkODFjMjdkZGIwM2VhYzRmNzg0MDIyODNk
-    YzE1NDkzZDUzMDc5N2EzOTUwYjQzNWZmMjY4M2VmNmZmODA4NzE=
+    MDcyMTZkMmYyNDVkOTdmZDY5YTBhZDk4MjkzZDc5NWRkNTY1ZTMwZWVlZTMz
+    OGQ2ZThiMDhiYWNmYjViNjhhZjk4YTA2YTkwYzc5OGVlYTczYmQ1YzdjZDQ4
+    OWYyM2E4M2IyMTNiNzI4ZDk2YWM1ODVlNTQ1MTAzYzBhZjU3NmE=

data/lib/argos/soap.rb

@@ -21,19 +21,19 @@ module Argos
     # A "simple" Soap client for Argos-system satellite tracking webservice
     # http://wanderingbarque.com/nonintersecting/2006/11/15/the-s-stands-for-simple/   
     
-    # client [Savon] 
+    # client [Savon] (version 3)
     # request [String] Soap:Envelope (XML request body)
     # response [Savon::Response]
     # operation [Savon::Operation]
+    # log [Logger]
     # xml [String] (Extracted, inner) XML
-    # filter FIXME
+    # filter 
     # platformId [String] Comma-separated list of platforms
     # programNumber [String] Comma-separated list of programs
     # nbDaysFromNow
     # period
-    attr_accessor :client, :request, :response, :operation, :xml, :filter,
+    attr_accessor :client, :request, :response, :operation, :log, :xml, :filter,
       :platformId, :programNumber, :nbDaysFromNow, :period
-    
     # username [String]
     # password [String]
     attr_writer :username, :password
@@ -78,7 +78,7 @@ module Argos
         end
       end
     end
-
+    
     # Build baseRequest Hash
     # The service requires programNumber or PlatformId, but if you do not provide any,
     # this method will call the service (@see #programs) and get the current user's programs
@@ -92,11 +92,11 @@ module Argos
       if @programNumber.nil? and @platformId.nil?
         # Fetch all programs if neither is provided
         baseRequest[:programNumber] = programs.map {|p|p.to_s}.join(",")
-      elsif @programNumber =~ /\d+/ and @platformId =~ /\d+/
-        raise "Cannot provide both programNumber and platformId"
-      elsif @programNumber =~ /\d+/ 
+      elsif @programNumber.to_s =~ /\d+/ and @platformId.to_s =~ /\d+/
+        baseRequest[:platformId] = @platformId # ignores programNumber
+      elsif @programNumber.to_s =~ /\d+/ 
         baseRequest[:programNumber] = @programNumber
-      elsif @platformId =~ /\d+/
+      elsif @platformId.to_s =~ /\d+/
         baseRequest[:platformId] = @platformId
       end
       
@@ -112,13 +112,14 @@ module Argos
         baseRequest[:period] = @period
       end
       
-      baseRequest = baseRequest.merge({ 
+      #baseRequest = baseRequest.merge({
+        # @todo 
         #<xs:element minOccurs="0" name="referenceDate" type="tns:referenceDateType"/>
         #<xs:element minOccurs="0" name="locClass" type="xs:string"/>
         #<xs:element minOccurs="0" name="geographicArea" type="xs:string"/>
         #<xs:element minOccurs="0" name="compression" type="xs:int"/>
         #<xs:element minOccurs="0" name="mostRecentPassages" type="xs:boolean"/>
-      })
+      #})
       baseRequest
       
     end
@@ -231,17 +232,19 @@ module Argos
     
     # Platforms: array of platformId integers
     # @return [Array] of [Integer]
-    def platforms(programNumber=nil)
+    def platforms
       platforms = []
 
       platformListPrograms = getPlatformList["data"]["program"]
 
-      if programNumber.to_s =~ /\d+/
-        platformListPrograms.select! {|p| p["programNumber"].to_i == programNumber.to_i }
+      if @programNumber.to_s =~ /\d+/
+        platformListPrograms.select! {|p| p["programNumber"].to_i == @programNumber.to_i }
       end
+      
       platformListPrograms.each do |program|
         platforms  += program["platform"].map {|p| p["platformId"].to_i}
       end
+      
       platforms
     end
     
@@ -268,7 +271,11 @@ module Argos
     
     # @return [String]
     def request
-      operation.build
+      if operation.nil?
+        nil
+      else
+        operation.build
+      end
     end
     
     # @return [Hash] {"DixService":{"ports":{"DixServicePort":{"type":"http://schemas.xmlsoap.org/wsdl/soap12/","location":"http://ws-argos.cls.fr/argosDws/services/DixService"}}}}
@@ -332,15 +339,15 @@ module Argos
       ng = Nokogiri.XML(xml)
       ng.xpath("/data/errors/error").each do | error |
         if error.key?("code")
-          case error["code"]
-          when "4"
+          case error["code"].to_i
+          when 4
             raise NodataException
           end
           #<error code="2">max response reached</error>
-          #<errors><error code="9">start date upper than end date</error></errors>
-
-      else
-          raise error
+          #<error code="3">authentification error</error>
+          #<error code="9">start date upper than end date</error>
+        else
+          raise Exception, error
         end
       end
       

data/lib/argos/soap_command.rb

@@ -1,21 +1,21 @@
-require "optparse"  
+require "optparse"    
 require "net/http"
 require "csv"
 
 module Argos
-  
   # argos-soap command
   #
   # On success, data is pumped to STDOUT, on faults/errors to STDERR
+  #
   # Examples:
   # $ argos-soap --operation getXml
-  # $ argos-soap -o getXml --startDate="2014-03-10T00:00:00Z" --endDate="2014-03-10T23:59:59.999Z" --log-level=1
-  # $ argos-soap -o getXml --startDate="`date --date=yesterday -I`T00:00:00Z" --endDate="`date --date=yesterday -I`T23:59:59.999Z" --username=**** --password=***** > /my/argos/xml/archive/`date -I --date=yesterday`.xml
+  # $ argos-soap -o getXml --startDate="2014-03-10T00:00:00Z" --endDate="2014-03-10T23:59:59.999Z" --log-level=0
+  # $ argos-soap -o getXml --date="`date --date=yesterday -I` --username=**** --password=***** > /my/argos/xml/archive/`date -I --date=yesterday`.xml
   class SoapCommand
      
     CMD = "argos-soap"
     
-    PARAM = { format: :json, wsdl: Argos::Soap::WSDL }
+    PARAM = { format: :json, wsdl: Argos::Soap::WSDL, level: 1 }
     
     def self.run(argv=ARGV)
       begin
@@ -40,11 +40,16 @@ module Argos
       
         opts.banner = "#{CMD} operation [options]\n"
 
-        opts.on("--debug", "Debug (alias for --log-level=0") do
+        opts.on("--debug", "Debug (alias for --log-level=0)") do
           @param[:level] = Logger::DEBUG
         end
         
-        # --date shorthand for 1 day startDate endDate
+        # --date shorthand for 1 day period
+        opts.on("--date=isodate", "Set period to one day") do |isodate|
+          startDate = Time.parse(isodate+"T00:00:00Z").iso8601
+          endDate = Time.parse(isodate+"T23:59:59.999Z").iso8601
+          @param[:period] = { startDate: startDate,  endDate: endDate }
+        end
 
         opts.on("--format=format", "-f=format", "{ json | xml | text | raw }") do |format|
           @param[:format] = format.to_sym
@@ -111,17 +116,28 @@ module Argos
             @param[:password] = password
           end
         end
+        
+        opts.on("--download=archive", "Download") do |archive|
+          @param[:archive] = archive
+        end
 
       end
       option_parser.parse!
       
+      @log = Logger.new(STDERR)
+      @log.level = param[:level].to_i
+      
+      if not @param[:archive].nil?
+        Argos::Download.download(param[:username], param[:password], param[:archive], log)
+        exit(true)
+      end
+    
       if operation.nil?
         STDOUT.write option_parser.help
         exit(false)
       end
       
-      @log = Logger.new(STDERR)
-      @log.level = param[:level].to_i
+
     end
     
     def debug?
@@ -154,7 +170,7 @@ module Argos
         when :operations
           @result = soap.operations
         when :platforms
-          @result = soap.platforms(param[:programNumber])
+          @result = soap.platforms
         when :programs
           @result = soap.programs
         when :services
@@ -162,12 +178,14 @@ module Argos
         else
           raise ArgumentError, "Unspported operation: #{param[:operation]}"  
         end
-        STDOUT.write output
+        puts output
         
       rescue NodataException
         log.debug output
+        exit(true)
       rescue => e
         STDERR.write output
+        exit(false)
       end
 
     end
@@ -178,7 +196,9 @@ module Argos
       
       if debug?
         log.debug "#{CMD} param: #{param.to_json}"
-        log.debug "$ curl -XPOST #{Argos::Soap::URI} -d'#{soap.request}' -H \"Content-Type: application/soap+xml\""
+        unless soap.request.nil?
+          log.debug "$ curl -XPOST #{Argos::Soap::URI} -d'#{soap.request}' -H \"Content-Type: application/soap+xml\""
+        end
       end
       
       if result.is_a? Savon::Response

data/lib/argos.rb

@@ -1,7 +1,7 @@
 require "bundler/setup"
 require "bigdecimal"
 require "date"
-require "time" # for iso8601
+require "time" # for #iso8601
 require "digest/sha1"
 require "json"
 require "logger"
@@ -12,9 +12,9 @@ require_relative "argos/ascii"
 require_relative "argos/ds"
 require_relative "argos/diag"
 require_relative "argos/soap"
-#require_relative "argos/download"
+require_relative "argos/download"
 
-# Argos library containg
+# [Argos](http://www.argos-system.org) satellite tracking data tools
 # * Parsers for Argos legacy ASCII files (DS/DAT and DIAG files)
 # * Soap web service client and Argos XML download tool
 #
@@ -25,7 +25,7 @@ require_relative "argos/soap"
 # 
 # For information about Argos, see: http://www.argos-system.org
 module Argos
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
   
   def self.library_version
     "argos-ruby-#{VERSION}" 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: argos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Espen Egeland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec