cdo 1.0.6 → 1.0.7

data/gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name              = "cdo"
-  s.version           = '1.0.6'
+  s.version           = '1.0.7'
   s.platform          = Gem::Platform::RUBY
   s.files             = ["lib/cdo.rb"] + ["gemspec","COPYING","README.rdoc","ChangeLog"]
   s.test_file         = "test/test_cdo.rb"
@@ -10,7 +10,7 @@ spec = Gem::Specification.new do |s|
   s.summary           = "Easy access to the Climate Data operators"
   s.author            = "Ralf Mueller"
   s.email             = "stark.dreamdetective@gmail.com"
-  s.homepage          = "http://code.zmaw.de/projects/cdo"
+  s.homepage          = "https://code.zmaw.de/projects/cdo/wiki/Cdo%7Brbpy%7D"
   s.extra_rdoc_files  = ["README.rdoc","COPYING"]
   s.license           = "GPLv2"
   s.required_ruby_version = ">= 1.9"

data/lib/cdo.rb

@@ -20,7 +20,7 @@ module Cdo
     :returnArray => false,
     :operators   => []
   }
-  @@CDO = ENV['CDO'].nil? ? '/usr/bin/cdo' : ENV['CDO']
+  @@CDO = ENV['CDO'].nil? ? 'cdo' : ENV['CDO']
 
   # Since cdo-1.5.4 undocumented operators are given with the -h option. For
   # earlier version, they have to be provided manually
@@ -75,6 +75,36 @@ 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)
+      io = args.find {|a| a.class == Hash}
+      args.delete_if {|a| a.class == Hash}
+      if /(diff|info|show|griddes)/.match(sym)
+        run(" -#{sym.to_s} #{io[:in]} ",$stdout)
+      else
+        opts = args.empty? ? '' : ',' + args.reject {|a| a.class == Hash}.join(',')
+        run(" -#{sym.to_s}#{opts} #{io[:in]} ",io[:out],io[:options],io[:returnArray])
+      end
+    else
+      warn "Operator #{sym.to_s} not found"
+    end
+  end
   def Cdo.loadCdf
     begin
       require "numru/netcdf"
@@ -114,43 +144,18 @@ module Cdo
       puts "Using CDO: #@@CDO"
       puts IO.popen(@@CDO + " -V").readlines
     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.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
+  def Cdo.getCdo
+    @@CDO
   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)
-      io = args.find {|a| a.class == Hash}
-      args.delete_if {|a| a.class == Hash}
-      if /(diff|info|show|griddes)/.match(sym)
-        run(" -#{sym.to_s} #{io[:in]} ",$stdout)
-      else
-        opts = args.empty? ? '' : ',' + args.reject {|a| a.class == Hash}.join(',')
-        run(" -#{sym.to_s}#{opts} #{io[:in]} ",io[:out],io[:options],io[:returnArray])
-      end
-    else
-      warn "Operator #{sym.to_s} not found"
-    end
+  def Cdo.operators
+    State[:operators]
   end
 
   #==================================================================
@@ -195,6 +200,7 @@ module MyTempfile
     unless @@persistent_tempfiles
       t = Tempfile.new(self.class.to_s)
       @@_tempfiles << t
+      @@_tempfiles << t.path
       t.path
     else
       t = "_"+rand(@@N).to_s
@@ -202,4 +208,7 @@ module MyTempfile
       t
     end
   end
+  def MyTempfile.showFiles
+    @@_tempfiles.each {|f| print(f+" ") if f.kind_of? String}
+  end
 end

data/test/test_cdo.rb

@@ -27,6 +27,16 @@ class TestCdo < Test::Unit::TestCase
     exit
   end
 
+  def test_cdo
+    assert_equal(true,Cdo.checkCdo)
+    assert_equal('/usr/bin/cdo',Cdo.getCdo)
+    newCDO="#{ENV['HOME']}/bin/cdo"
+    if File.exist?(newCDO) then
+      Cdo.setCdo(newCDO)
+      assert_equal(true,Cdo.checkCdo)
+      assert_equal(newCDO,Cdo.getCdo)
+    end
+  end
   def test_getOperators
     %w[for random stdatm info showlevel sinfo remap geopotheight mask topo thicknessOfLevels].each {|op|
       if ["thicknessOfLevels"].include?(op)
@@ -99,14 +109,20 @@ class TestCdo < Test::Unit::TestCase
   def test_combine
     ofile0, ofile1 = MyTempfile.path, MyTempfile.path
     Cdo.fldsum(:in => Cdo.stdatm(25,100,250,500,875,1400,2100,3000,4000,5000,:options => "-f nc"),:out => ofile0)
-    ofile1 = Cdo.fldsum(:in => "-stdatm,25,100,250,500,875,1400,2100,3000,4000,5000",:options => "-f nc")
-    Cdo.setReturnArray(true)
-    diff = Cdo.sub(:in => [ofile0,ofile1].join(' '),:out => MyTempfile.path).var('T').get
+    Cdo.fldsum(:in => "-stdatm,25,100,250,500,875,1400,2100,3000,4000,5000",:options => "-f nc",:out => ofile1)
+    Cdo.setReturnArray
+    MyTempfile.showFiles
+    diff = Cdo.sub(:in => [ofile0,ofile1].join(' ')).var('T').get
     assert_equal(0.0,diff.min)
     assert_equal(0.0,diff.max)
     Cdo.setReturnArray(false)
   end
 
+  def test_tempfile
+    ofile0, ofile1 = MyTempfile.path, MyTempfile.path
+    assert_not_equal(ofile0,ofile1)
+  end
+
   def test_returnArray
     ofile = MyTempfile.path
     vals = Cdo.stdatm(25,100,250,500,875,1400,2100,3000,4000,5000,:out => ofile,:options => "-f nc")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdo
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies: []
 description: Easy access to the Climate Data operators
 email: stark.dreamdetective@gmail.com
@@ -25,7 +25,7 @@ files:
 - README.rdoc
 - ChangeLog
 - test/test_cdo.rb
-homepage: http://code.zmaw.de/projects/cdo
+homepage: https://code.zmaw.de/projects/cdo/wiki/Cdo%7Brbpy%7D
 licenses:
 - GPLv2
 post_install_message: 
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Easy access to the Climate Data operators