cdo 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0405bd1a58c7c4342a4f921157849396a67d4c56
-  data.tar.gz: '09fe64c812dad7b1b63ff25abeee1d2a9de5a8cc'
+  metadata.gz: 839669f481246fb63e5ad6b7871127ef6b1c710d
+  data.tar.gz: fae0e2fa60efa590697c9cf73f0e1fc3db103cd8
 SHA512:
-  metadata.gz: 45d2c037d3956bb1da49ebbc53e9be594af2d206fa85a268e20e5a03d0df3aa0deb168af00f9776c96f815222f11f71320e84366e58cdb33e3c9542e7ef79a8c
-  data.tar.gz: 528faea8e6188b8908ae7d7b4327da8d1cd130f893cd86aa8c6e6b99afd1cbf55e72597d5d50b7d5cdc195e2daf8ebab04e924d7d049d3b708c678b5a0905196
+  metadata.gz: 12c44ad5bb29e96457a623d07060a87557f79b2ee9246faf1b0e477865ff5603219118260fa2db0623a149dda45f133db132980ddd18c41c44949dfb86c06fa0
+  data.tar.gz: '02851b39cb5c9fd19941e0e85c594d01fdcd51349bf0df6255477fb92ae1ede816a42d438fe19ba077ed7dc1958bcfc38d789031186faf09361b76c43c97ddd3'

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.3.3'
+  s.version           = '1.3.4'
   s.platform          = Gem::Platform::RUBY
   s.files             = ["lib/cdo.rb","lib/cdo_lib.rb"] + ["gemspec","LICENSE"]
   s.test_file         = "test/test_cdo.rb"

data/lib/cdo.rb

@@ -40,7 +40,7 @@ class Cdo
     @forceOutput            = forceOutput
     @env                    = env
     @debug                  = ENV.has_key?('DEBUG') ? true : debug
-    @noOutputOperators      = getNoOuputOperators(@cdo)
+    @noOutputOperators      = getNoOuputOperators(@cdo) # operators without output files (write to stdout)
     @returnNilOnError       = returnNilOnError
 
     @filetypes              = getFiletypes
@@ -87,7 +87,7 @@ class Cdo
   end
 
   def getNoOuputOperators(path2cdo)
-    if version > '1.8.0' then
+    if version > '1.8.0' and version < '1.9.0' then
       puts 'CMD:'+path2cdo+' --operators_no_output' if @debug
       IO.popen(path2cdo+' --operators_no_output').readlines.map{|line| line.split(' ')[0]}.flatten
     else
@@ -295,8 +295,13 @@ class Cdo
     return true
   end
 
-  def version
-    IO.popen("#{@cdo} -V 2>&1").readlines.first.split(/version/i).last.strip.split(' ').first
+  def version(verbose=false)
+    info = IO.popen("#{@cdo} -V 2>&1").readlines
+    if verbose then
+      return info.join
+    else
+      return info.first.split(/version/i).last.strip.split(' ').first
+    end
   end
 
   # return cdf handle to given file readonly

data/test/test_cdo.rb

@@ -38,6 +38,9 @@ class TestCdo < Minitest::Test
     pp @@maintainermode
     pp @@show
   end
+  def test_V
+    puts @cdo.version(verbose=true)
+  end
   def test_getOperators
     %w[for random stdatm info showlevel sinfo remap geopotheight mask topo thicknessOfLevels].each {|op|
       if ["thicknessOfLevels"].include?(op)
@@ -69,7 +72,8 @@ class TestCdo < Minitest::Test
   end
   def test_CDO_version
     assert("1.4.3.1" < @cdo.version,"Version too low: #{@cdo.version}")
-    assert("1.8.1" > @cdo.version,"Version too high: #{@cdo.version}")
+    assert("1.8.1" < @cdo.version,"Version too low: #{@cdo.version}")
+    assert("3.0" > @cdo.version,"Version too high: #{@cdo.version}")
   end
   def test_args
     ofile0 = @cdo.stdatm(0,20,40,80,200,230,400,600,1100)
@@ -259,12 +263,13 @@ class TestCdo < Minitest::Test
   end
 
   def test_noOutputOps
-    case
-    when "1.8.0" == @cdo.version then
-      assert_equal(Cdo::NoOutputOperators,@cdo.noOutputOps)
-    when "1.8.0" < @cdo.version
-      assert((Cdo::NoOutputOperators - @cdo.noOutputOps).empty?)
-    end
+    %w[griddes griddes2 gridverify info infoc infon infop infos infov map ncode
+       ncode ndate ngridpoints ngrids nlevel nmon npar ntime nvar nyear output
+       outputarr outputbounds outputboundscpt outputcenter outputcenter2
+       outputcentercpt outputext outputf outputfld outputint outputkey outputsrv
+       outputtab outputtri outputts outputvector outputvrml outputxyz pardes partab].each {|op|
+      assert(@cdo.noOutputOps.include?(op))
+    }
   end
 
   def test_output_set_to_nil
@@ -495,6 +500,12 @@ class TestCdo < Minitest::Test
     @cdo.sinfov(input: cmd)
     puts @cdo.showLog
   end
+  def test_noOutputOps
+    c = Cdo.new
+    opsCounf = c.noOutputOps.size
+    assert(opsCounf > 50)
+    assert(opsCounf < 200)
+  end
 end
 
 #  # Calling simple operators

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdo
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Ralf Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unifiedPlot
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Easy access to the Climate Data operators