cdo 1.0.9 → 1.0.10

data/gemspec

@@ -1,10 +1,9 @@
 require 'rubygems'
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
-require 'cdo'
 
 spec = Gem::Specification.new do |s|
   s.name              = "cdo"
-  s.version           = '1.0.9'
+  s.version           = '1.0.10'
   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

@@ -15,11 +15,16 @@ require 'pp'
 # ==============================================================================
 # CDO calling mechnism
 module Cdo
+
+  VERSION = "1.0.10"
+
   State = {
     :debug       => false,
     :returnArray => false,
     :operators   => []
   }
+  State[:debug] = true unless ENV['DEBUG'].nil?
+
   @@CDO = ENV['CDO'].nil? ? 'cdo' : ENV['CDO']
 
   # Since cdo-1.5.4 undocumented operators are given with the -h option. For
@@ -31,7 +36,7 @@ module Cdo
     ensrkhistspace ensrkhisttime eof3d eof3dspatial eof3dtime export_e5ml
     export_e5res fc2gp fc2sp fillmiss fisher fldcovar fldrms fourier fpressure
     gather gengrid geopotheight ggstat ggstats globavg gp2fc gradsdes
-    gridverify harmonic hourcount hpressure ifs2icon import_e5ml import_e5res
+    gridverify harmonic hourcount hpressure import_e5ml import_e5res
     import_obs imtocomplex infos infov interpolate intgrid intgridbil
     intgridtraj intpoint isosurface lmavg lmean lmmean lmstd log lsmean
     meandiff2test mergegrid mod moncount monlogs mrotuv mrotuvb mulcoslat ncode
@@ -49,6 +54,26 @@ module Cdo
   @@outputOperatorsPattern = /(diff|info|output|griddes|zaxisdes|show)/
 
   private
+  def Cdo.getOperators(force=false)
+    # Do NOT compute anything, if it is not required
+    return State[:operators] unless (State[:operators].empty? or force)
+    cmd       = @@CDO + ' 2>&1'
+    help      = IO.popen(cmd).readlines.map {|l| l.chomp.lstrip}
+    if 5 >= help.size
+      warn "Operators could not get listed by running the CDO binary (#{@@CDO})"
+      pp help if Cdo.debug
+      exit
+    end
+    # in version 1.5.6 the output of '-h' has changed
+    State[:operators] = case 
+                        when Cdo.version < "1.5.6"
+                          (help[help.index("Operators:")+1].split + @@undocumentedOperators).uniq
+                        else
+                          help[(help.index("Operators:")+1)..help.index(help.find {|v| v =~ /CDO version/}) - 2].join(' ').split
+                        end
+
+    
+  end
   def Cdo.call(cmd)
     if (State[:debug])
       puts '# DEBUG ====================================================================='
@@ -59,14 +84,14 @@ module Cdo
       system(cmd + ' 1>/dev/null 2>&1 ')
     end
   end
-  def Cdo.run(cmd,ofile=nil,options='',returnArray=false)
+  def Cdo.run(cmd,ofile='',options='',returnArray=false)
     cmd = "#{@@CDO} -O #{options} #{cmd} "
     case ofile
     when $stdout
       cmd << " 2>/dev/null"
       return IO.popen(cmd).readlines.map {|l| l.chomp.strip}
     when nil
-      ofile = Tempfile.new("Cdo.rb").path
+      ofile = MyTempfile.path
     end
     cmd << "#{ofile}"
     call(cmd)
@@ -76,26 +101,15 @@ module Cdo
       return ofile
     end
   end
-  def Cdo.getOperators(force=false)
-    # Do NOT compute anything, if it is not required
-    return State[:operators] unless (State[:operators].empty? or force)
-
-    cmd       = @@CDO + ' 2>&1'
-    help      = IO.popen(cmd).readlines.map {|l| l.chomp.lstrip}
-    if 5 >= help.size
-      warn "Operators could not get listed by running the CDO binary (#{@@CDO})"
-      pp help if Cdo.debug
-      exit
-    end
-    State[:operators] = (help[help.index("Operators:")+1].split + @@undocumentedOperators).uniq
-  end
   def Cdo.method_missing(sym, *args, &block)
     # args is expected to look like [opt1,...,optN,:in => iStream,:out => oStream] where
     # iStream could be another CDO call (timmax(selname(Temp,U,V,ifile.nc))
     puts "Operator #{sym.to_s} is called" if State[:debug]
     if getOperators.include?(sym.to_s)
-      opts = args.empty? ? '' : ',' + args.reject {|a| a.class == Hash}.join(',')
+      operatorArgs = args.reject {|a| a.class == Hash}
+      opts = operatorArgs.empty? ? '' : ',' + operatorArgs.join(',')
       io   = args.find {|a| a.class == Hash}
+      io   = {} if io.nil?
       args.delete_if   {|a| a.class == Hash}
       if @@outputOperatorsPattern.match(sym)
         run(" -#{sym.to_s}#{opts} #{io[:in]} ",$stdout)
@@ -125,7 +139,11 @@ module Cdo
     State[:debug]
   end
   def Cdo.version
-    "1.0.9"
+    cmd     = @@CDO + ' 2>&1'
+    help    = IO.popen(cmd).readlines.map {|l| l.chomp.lstrip}
+    regexp  = %r{CDO version (\d.*), Copyright}
+    line    = help.find {|v| v =~ regexp}
+    version = regexp.match(line)[1]
   end
   def Cdo.setReturnArray(value=true)
     if value
@@ -167,6 +185,7 @@ module Cdo
     @@CDO
   end
   def Cdo.operators
+    Cdo.getOperators if State[:operators].empty?
     State[:operators]
   end
 

data/test/test_cdo.rb

@@ -26,10 +26,14 @@ class TestCdo < Test::Unit::TestCase
       if ["thicknessOfLevels"].include?(op)
         assert(Cdo.respond_to?(op),"Operator '#{op}' not found")
       else
-        assert(Cdo.getOperators.include?(op))
+        assert(Cdo.getOperators.include?(op),"Operator '#{op}' not found")
       end
     }
   end
+  def test_listAllOperators
+    print Cdo.operators.join("\n")
+  end
+
   def test_outputOperators
     levels = Cdo.showlevel(:in => "-stdatm,0")
     assert_equal([0,0].map(&:to_s),levels)
@@ -44,6 +48,9 @@ class TestCdo < Test::Unit::TestCase
     values = Cdo.outputkey("level",:in => "-stdatm,0,10000")
     assert_equal(["0", "10000","0", "10000"],values)
   end
+  def test_CDO_version
+    assert("1.4.3.1" < Cdo.version,"Version to low: #{Cdo.version}")
+  end
   def test_args
     #Cdo.Debug = true
     #MyTempfile.setPersist(true)
@@ -88,6 +95,11 @@ class TestCdo < Test::Unit::TestCase
     assert_equal(diff[1].split(' ')[-1],"0.53060")
   end
 
+  def test_operators
+    assert_includes(Cdo.operators,"infov")
+    assert_includes(Cdo.operators,"showlevel")
+  end
+
   def test_bndLevels
     ofile = MyTempfile.path
     Cdo.stdatm(25,100,250,500,875,1400,2100,3000,4000,5000,:out => ofile,:options => "-f nc")
@@ -112,6 +124,11 @@ class TestCdo < Test::Unit::TestCase
   def test_tempfile
     ofile0, ofile1 = MyTempfile.path, MyTempfile.path
     assert_not_equal(ofile0,ofile1)
+    # Tempfile should not disappeare even if the GC was started
+    puts ofile0
+    assert(File.exist?(ofile0))
+    GC.start
+    assert(File.exist?(ofile0))
   end
 
   def test_returnArray
@@ -143,17 +160,19 @@ class TestCdo < Test::Unit::TestCase
     assert_equal(targetThicknesses, Cdo.thicknessOfLevels(:in => "-selname,T -stdatm,#{levels.join(',')}"))
   end
 
+  def test_showlevels
+    sourceLevels = %W{25 100 250 500 875 1400 2100 3000 4000 5000}
+    assert_equal(sourceLevels,
+                 Cdo.showlevel(:in => "-selname,T #{Cdo.stdatm(*sourceLevels,:options => '-f nc')}")[0].split)
+  end
+
+  def test_verticalLevels
+    targetThicknesses = [50.0,  100.0,  200.0,  300.0,  450.0,  600.0,  800.0, 1000.0, 1000.0, 1000.0]
+    sourceLevels = %W{25 100 250 500 875 1400 2100 3000 4000 5000}
+    thicknesses = Cdo.thicknessOfLevels(:in => "-selname,T #{Cdo.stdatm(*sourceLevels,:options => '-f nc')}")
+    assert_equal(targetThicknesses,thicknesses)
+  end
   if 'thingol' == `hostname`.chomp  then
-    def test_verticalLevels
-      iconpath = "/home/ram/src/git/icon/grids"
-      # check, if a given input files has vertival layers of a given thickness array
-      targetThicknesses = [50.0,  100.0,  200.0,  300.0,  450.0,  600.0,  800.0, 1000.0, 1000.0, 1000.0]
-      ifile = [iconpath,"ts_phc_annual-iconR2B04-L10_50-1000m.nc"].join('/')
-      assert_equal(["25 100 250 500 875 1400 2100 3000 4000 5000",
-                   "25 100 250 500 875 1400 2100 3000 4000 5000"],Cdo.showlevel(:in => ifile))
-      thicknesses = Cdo.thicknessOfLevels(:in => ifile)
-      assert_equal(targetThicknesses,thicknesses)
-    end
     def test_readCdf
       input = "-settunits,days  -setyear,2000 -for,1,4"
       cdfFile = Cdo.copy(:options =>"-f nc",:in=>input)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdo
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies: []
 description: Easy access to the Climate Data operators
 email: stark.dreamdetective@gmail.com