cdo 1.0.7 → 1.0.8

data/gemspec

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

@@ -46,6 +46,8 @@ module Cdo
     tstepcount vardes vardup varmul varquot2test varrms vertwind write_e5ml
     writegrid writerandom yearcount]
 
+  @@outputOperatorsPattern = /(diff|info|output|griddes|zaxisdes|show)/
+
   private
   def Cdo.call(cmd)
     if (State[:debug])
@@ -93,10 +95,11 @@ module Cdo
     # 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)
+      opts = args.empty? ? '' : ',' + args.reject {|a| a.class == Hash}.join(',')
+      io   = args.find {|a| a.class == Hash}
+      args.delete_if   {|a| a.class == Hash}
+      if @@outputOperatorsPattern.match(sym)
+        run(" -#{sym.to_s}#{opts} #{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])
@@ -122,6 +125,9 @@ module Cdo
   def Cdo.debug
     State[:debug]
   end
+  def Cdo.version
+    "1.0.8"
+  end
   def Cdo.setReturnArray(value=true)
     if value
       Cdo.loadCdf
@@ -135,9 +141,16 @@ module Cdo
     State[:returnArray]
   end
 
+  def Cdo.hasCdo?(bin=@@CDO)
+    return true if File.exists?(@@CDO) and File.executable?(@@CDO)
+    ENV['PATH'].split(File::PATH_SEPARATOR).each {|path| 
+      return true if File.exists?([path,bin].join(File::SEPARATOR))
+    }
+  end
+
   # test if @@CDO can be used
   def Cdo.checkCdo
-    unless (File.exists?(@@CDO) and File.executable?(@@CDO))
+    unless hasCdo?(@@CDO)
       warn "Testing application #@@CDO is not available!"
       exit 1
     else

data/test/test_cdo.rb

@@ -5,31 +5,15 @@ require 'pp'
 
 class TestCdo < Test::Unit::TestCase
 
-  DEFAULT_CDO_PATH = '/usr/bin/cdo'
-  def setup
-    if ENV['CDO'].nil?
-      if File.exists?(DEFAULT_CDO_PATH)
-        Cdo.setCdo(DEFAULT_CDO_PATH)
-      else
-        stop(DEFAULT_CDO_PATH)
-      end
-    else
-      # Check user given path
-      unless File.exists?(ENV['CDO'])
-        stop(ENV['CDO'])
-      else
-        Cdo.setCdo(ENV['CDO'])
-      end
-    end
-  end
-  def stop(path)
-    warn "Could not find CDO binary (#{path})! Abort tests"
-    exit
-  end
+  DEFAULT_CDO_PATH = 'cdo'
 
   def test_cdo
     assert_equal(true,Cdo.checkCdo)
-    assert_equal('/usr/bin/cdo',Cdo.getCdo)
+    if ENV['CDO']
+      assert_equal(ENV['CDO'],Cdo.getCdo)
+    else
+      assert_equal(DEFAULT_CDO_PATH,Cdo.getCdo)
+    end
     newCDO="#{ENV['HOME']}/bin/cdo"
     if File.exist?(newCDO) then
       Cdo.setCdo(newCDO)
@@ -46,12 +30,19 @@ class TestCdo < Test::Unit::TestCase
       end
     }
   end
-  def test_info
+  def test_outputOperators
     levels = Cdo.showlevel(:in => "-stdatm,0")
     assert_equal([0,0].map(&:to_s),levels)
 
     info = Cdo.sinfo(:in => "-stdatm,0")
     assert_equal("File format: GRIB",info[0])
+
+    values = Cdo.outputkey("value",:in => "-stdatm,0")
+    assert_equal(["1013.25", "288"],values)
+    values = Cdo.outputkey("value",:in => "-stdatm,0,10000")
+    assert_equal(["1013.25", "271.913", "288", "240.591"],values)
+    values = Cdo.outputkey("level",:in => "-stdatm,0,10000")
+    assert_equal(["0", "10000","0", "10000"],values)
   end
   def test_args
     #Cdo.Debug = true

metadata

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