cdo 1.2.1 → 1.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 06d6492570a2bb4f02b81788514e61dc4fca1abc
+  data.tar.gz: 210c76b7cb096c5eb4d8e65672aa491b77152cc9
+SHA512:
+  metadata.gz: 9beb317468976260445422c30644062908c763b530ac883e038003af764a1cd1873460680f436263c4d47ffb48296c58c1ce6e1b2f4d57ca158069ded712337d
+  data.tar.gz: 883ae4494bb3304c829c3ca082b04179ea6dc9d15702eabaeb5bf0c0045b81b256f914a81ec91f4c3c9749d321e63d91e38b3a538deeae0b0ff1f22a58bfb6b1

data/gemspec

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
 spec = Gem::Specification.new do |s|
   s.name              = "cdo"
-  s.version           = '1.2.1'
+  s.version           = '1.2.2'
   s.platform          = Gem::Platform::RUBY
   s.files             = ["lib/cdo.rb"] + ["gemspec","COPYING","README.rdoc","ChangeLog"]
   s.test_file         = "test/test_cdo.rb"

data/lib/cdo.rb

@@ -17,11 +17,11 @@ require 'open3'
 # CDO calling mechnism
 module Cdo
 
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 
   State = {
     :debug       => false,
-    :returnCdf => false,
+    :returnCdf   => false,
     :operators   => [],
     :forceOutput => true
   }
@@ -103,6 +103,7 @@ module Cdo
       :returncode => wait_thr.value.exitstatus
     }
   end
+
   def Cdo.run(cmd,ofile='',options='',returnCdf=false,force=nil,returnArray=nil,returnMaArray=nil)
     cmd = "#{@@CDO} -O #{options} #{cmd} "
     case ofile
@@ -136,6 +137,7 @@ module Cdo
       return ofile
     end
   end
+
   def Cdo.parseArgs(args)
     # splitinto hash-like args and the rest
     operatorArgs = args.reject {|a| a.class == Hash}
@@ -143,8 +145,11 @@ module Cdo
     io   = args.find {|a| a.class == Hash}
     io   = {} if io.nil?
     args.delete_if   {|a| a.class == Hash}
+    # join input streams together if possible
+    io[:input] = io[:input].join(' ') if io[:input].respond_to?(:join)
     return [io,opts]
   end
+
   def Cdo.method_missing(sym, *args, &block)
     ## args is expected to look like [opt1,...,optN,:input => iStream,:output => oStream] where
     # iStream could be another CDO call (timmax(selname(Temp,U,V,ifile.nc))
@@ -160,6 +165,7 @@ module Cdo
       raise ArgumentError,"Operator #{sym.to_s} not found"
     end
   end
+
   def Cdo.loadCdf
     begin
       require "numru/netcdf_miss"
@@ -170,19 +176,38 @@ module Cdo
     end
   end
 
+  def Cdo.getSupportedLibs(force=false)
+    return unless (State[:libs].nil? or force)
+    _, _, stderr, _ = Open3.popen3(@@CDO + " -V")
+    supported       = stderr.readlines.map(&:chomp)
+    with            = supported.grep(/with/)[0].split(':')[1].split.map(&:downcase)
+    libs            = supported.grep(/library version/).map {|l| 
+      l.strip.split(':').map {|l| 
+        l.split.first.downcase
+      }[0,2]
+    }
+    State[:libs] = {}
+    with.flatten.each {|k| State[:libs][k]=true}
+    libs.each {|lib,version| State[:libs][lib] = version}
+  end
+
   public
   def Cdo.debug=(value)
     State[:debug] = value
   end
+
   def Cdo.debug
     State[:debug]
   end
+
   def Cdo.forceOutput=(value)
     State[:forceOutput] = value
   end
+
   def Cdo.forceOutput
     State[:forceOutput]
   end
+
   def Cdo.version
     cmd     = @@CDO + ' 2>&1'
     help    = IO.popen(cmd).readlines.map {|l| l.chomp.lstrip}
@@ -190,15 +215,18 @@ module Cdo
     line    = help.find {|v| v =~ regexp}
     version = regexp.match(line)[1]
   end
+
   def Cdo.setReturnCdf(value=true)
     if value
       Cdo.loadCdf
     end
     State[:returnCdf] = value
   end
+
   def Cdo.unsetReturnCdf
     setReturnCdf(false)
   end
+
   def Cdo.returnCdf
     State[:returnCdf]
   end
@@ -221,19 +249,45 @@ module Cdo
     end
     return true
   end
+
   def Cdo.setCdo(cdo)
     puts "Will use #{cdo} instead of #@@CDO" if Cdo.debug
     @@CDO = cdo
     Cdo.getOperators(true)
   end
+
   def Cdo.getCdo
     @@CDO
   end
+
   def Cdo.operators
     Cdo.getOperators if State[:operators].empty?
     State[:operators]
   end
 
+  def Cdo.libs
+    getSupportedLibs
+    State[:libs]
+  end
+
+  def Cdo.hasLib?(lib)
+    return Cdo.libs.has_key?(lib)
+    return false
+  end
+
+  def Cdo.libsVersion(lib)
+    unless Cdo.hasLib?(lib)
+      raise ArgumentError, "Cdo does NOT have support for '#{lib}'"
+    else
+      if State[:libs][lib].kind_of? String
+        return State[:libs][lib]
+      else
+        warn "No version information available about '#{lib}'"
+        return false
+      end
+    end
+  end
+
   #==================================================================
   # Addional operotors:
   #------------------------------------------------------------------
@@ -281,6 +335,7 @@ module Cdo
       raise ArgumentError,"Cannot find variable '#{varname}'"
     end
   end
+
   def Cdo.help(operator=nil)
     if operator.nil?
       puts Cdo.call([@@CDO,'-h'].join(' '))[:stderr]
@@ -301,9 +356,11 @@ module MyTempfile
   @@_tempfiles           = []
   @@persistent_tempfiles = false
   @@N                    = 10000000
+
   def MyTempfile.setPersist(value)
     @@persistent_tempfiles = value
   end
+
   def MyTempfile.path
     unless @@persistent_tempfiles
       t = Tempfile.new(self.class.to_s)
@@ -316,6 +373,7 @@ module MyTempfile
       t
     end
   end
+
   def MyTempfile.showFiles
     @@_tempfiles.each {|f| print(f+" ") if f.kind_of? String}
   end

data/test/test_cdo.rb

@@ -76,8 +76,10 @@ class TestCdo < Test::Unit::TestCase
     names = Cdo.showname(:input => "-stdatm,0",:options => "-f nc")
     assert_equal(["P T"],names)
 
-    ofile = Cdo.topo(:output => ofile,:options => "-z szip")
-    assert_equal(["GRIB SZIP"],Cdo.showformat(:input => ofile))
+    if Cdo.hasLib?("sz")
+      ofile = Cdo.topo(:output => ofile,:options => "-z szip")
+      assert_equal(["GRIB SZIP"],Cdo.showformat(:input => ofile))
+    end
   end
   def test_chain
     Cdo.debug = true
@@ -282,6 +284,38 @@ class TestCdo < Test::Unit::TestCase
     end
   end
 
+  def test_inputArray
+    # check for file input
+    fileA = Cdo.stdatm(0)
+    fileB = Cdo.stdatm(0)
+    files = [fileA,fileB]
+    assert_equal(Cdo.diffv(:input => files.join(' ')),
+                 Cdo.diffv(:input => files))
+    assert_equal("0 of 2 records differ",Cdo.diffv(:input => files).last)
+    # check for operator input
+    assert_equal("0 of 2 records differ",Cdo.diffv(:input => ["-stdatm,0","-stdatm,0"]).last)
+    # check for operator input and files
+    assert_equal("0 of 2 records differ",Cdo.diffv(:input => ["-stdatm,0",fileB]).last)
+  end
+
+  def test_libs
+    assert(Cdo.hasLib?("cdi"),"CDI support missing")
+    assert(Cdo.hasLib?("nc4"),"netcdf4 support missing")
+    assert(Cdo.hasLib?("netcdf"),"netcdf support missing")
+    assert_equal(false,Cdo.hasLib?("boost"))
+    if 'thingol' == `hostname`.chomp
+      assert_equal('1.10.0',Cdo.libsVersion("grib_api")) if Cdo.hasLib?("grib_api") 
+    end
+    assert_raise ArgumentError do
+      Cdo.libsVersion("foo")
+    end
+  end
+
+  def test_output_set_to_nil
+    assert_equal(String,Cdo.topo(:output => nil).class)
+    assert_equal("File format: GRIB",Cdo.sinfov(:input => "-topo", :output => nil)[0])
+  end
+
   if 'thingol' == `hostname`.chomp  then
     def test_readCdf
       input = "-settunits,days  -setyear,2000 -for,1,4"

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdo
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.2.2
 platform: ruby
 authors:
 - Ralf Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies: []
 description: Easy access to the Climate Data operators
 email: stark.dreamdetective@gmail.com
@@ -28,27 +27,27 @@ files:
 homepage: https://code.zmaw.de/projects/cdo/wiki/Cdo%7Brbpy%7D
 licenses:
 - GPLv2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easy access to the Climate Data operators
 test_files:
 - test/test_cdo.rb
+has_rdoc: