cdo 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d6492570a2bb4f02b81788514e61dc4fca1abc
-  data.tar.gz: 210c76b7cb096c5eb4d8e65672aa491b77152cc9
+  metadata.gz: eef819d14c01a9fa0dfdfef9a6753c74fd1b8759
+  data.tar.gz: 41b9ed1d2a5441fa063aaa7f3c341e825662b2d5
 SHA512:
-  metadata.gz: 9beb317468976260445422c30644062908c763b530ac883e038003af764a1cd1873460680f436263c4d47ffb48296c58c1ce6e1b2f4d57ca158069ded712337d
-  data.tar.gz: 883ae4494bb3304c829c3ca082b04179ea6dc9d15702eabaeb5bf0c0045b81b256f914a81ec91f4c3c9749d321e63d91e38b3a538deeae0b0ff1f22a58bfb6b1
+  metadata.gz: add6ac2a46680acb6e77c5c0b644d8949007693f537039a908ac4d879ae0e7de3cd3df5778a4bbb3576a26242b31b1e8adba4141aa3f658c3ddcf702681e1c36
+  data.tar.gz: e929e98ff52046e8b2dab8592e504c512b8ff6eacd96a153711890b4c6e7c527a4e57a19e289ff58f81fa1abffd388e4b0bdbcd847cf33276ed307bebaafd503

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.2'
+  s.version           = '1.2.3'
   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,7 +17,7 @@ require 'open3'
 # CDO calling mechnism
 module Cdo
 
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 
   State = {
     :debug       => false,
@@ -180,7 +180,7 @@ module Cdo
     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)
+    with            = supported.grep(/(with|Features)/)[0].split(':')[1].split.map(&:downcase)
     libs            = supported.grep(/library version/).map {|l| 
       l.strip.split(':').map {|l| 
         l.split.first.downcase
@@ -254,6 +254,7 @@ module Cdo
     puts "Will use #{cdo} instead of #@@CDO" if Cdo.debug
     @@CDO = cdo
     Cdo.getOperators(true)
+    Cdo.getSupportedLibs(true)
   end
 
   def Cdo.getCdo

data/test/test_cdo.rb

@@ -67,10 +67,10 @@ class TestCdo < Test::Unit::TestCase
     (1...info.size).each {|i| assert_equal(0.0,info[i].split[-1].to_f)}
   end
   def test_operator_options
+    Cdo.debug=true
     targetLevels = [0,10,50,100,200,400,1000]
-    ofile = Cdo.stdatm(targetLevels)
-    levels = Cdo.showlevel(:input => ofile)
-    [0,1].each {|i| assert_equal(targetLevels.map(&:to_s),levels[i].split)}
+    levels = Cdo.showlevel(:input => " -stdatm,#{targetLevels.join(',')}")
+    [0,1].each {|i| assert_equal(targetLevels.join(' '),levels[i])}
   end
   def test_CDO_options
     names = Cdo.showname(:input => "-stdatm,0",:options => "-f nc")
@@ -305,6 +305,10 @@ class TestCdo < Test::Unit::TestCase
     assert_equal(false,Cdo.hasLib?("boost"))
     if 'thingol' == `hostname`.chomp
       assert_equal('1.10.0',Cdo.libsVersion("grib_api")) if Cdo.hasLib?("grib_api") 
+      Cdo.debug  = true
+      assert(! Cdo.libs.has_key?('magics'),"Magics support shoud not be build in the system wide installation")
+      Cdo.setCdo('../../src/cdo')
+      assert(Cdo.libs.has_key?('magics'),"Magics support is expected in the local development binary")
     end
     assert_raise ArgumentError do
       Cdo.libsVersion("foo")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdo
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Ralf Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies: []
 description: Easy access to the Climate Data operators
 email: stark.dreamdetective@gmail.com