cdo 1.3.0 → 1.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 287002a4182d792a1e88e67a710bc62b8a4a02d2
+  data.tar.gz: 86b007202f2872033207d264f3332880ff162199
+SHA512:
+  metadata.gz: 0f921f437cbfa4a7c33b6424fe04623a873979aadb1dc33075a733c38b5856250b8ca612f847402b81945c0d6a7b016617850703145d264fb044aba4f1bbd322
+  data.tar.gz: 10e9c2af264a497d737923ee6fe75ebf1633fe9d04a9c43fe1aece6a2c7b14b10068eac4f15ed6fead7d9b265e449edb5c2d5746c18d5adfa0742afad9f10871

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.0'
+  s.version           = '1.3.1'
   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

@@ -43,14 +43,14 @@ class Cdo
   # split arguments into hash-like args and the rest
   def Cdo.parseArgs(args)
     operatorArgs = args.reject {|a| a.class == Hash}
-    opts = operatorArgs.empty? ? '' : ',' + operatorArgs.join(',')
+    opArguments = operatorArgs.empty? ? '' : ',' + operatorArgs.join(',')
     io   = args.find {|a| a.class == Hash}
     io   = {} if io.nil?
-    args.delete_if   {|a| a.class == Hash}
+    #args.delete_if   {|a| a.class == Hash}
     # join input streams together if possible
     io[:input] = io[:input].join(' ') if io[:input].respond_to?(:join)
 
-    return [io,opts]
+    return [io,opArguments]
   end
 
   # collect the complete list of possible operators
@@ -82,10 +82,11 @@ class Cdo
 
 
   # Execute the given cdo call and return all outputs
-  def _call(cmd)
+  def _call(cmd,env={})
     if (@debug)
       puts '# DEBUG ====================================================================='
       pp @env unless @env.empty?
+      pp  env unless  env.empty?
       puts 'CMD: '
       puts cmd
       puts '# DEBUG ====================================================================='
@@ -93,7 +94,7 @@ class Cdo
 
     @logger.info(cmd+"\n") if @logging
 
-    stdin, stdout, stderr, wait_thr = Open3.popen3(@env,cmd)
+    stdin, stdout, stderr, wait_thr = Open3.popen3(@env.merge(env),cmd)
     {
       :stdout     => stdout.read,
       :stderr     => stderr.read,
@@ -118,7 +119,7 @@ class Cdo
   end
 
   # command execution wrapper, which handles the possible return types
-  def _run(cmd,ofile='',options=nil,returnCdf=false,force=nil,returnArray=nil,returnMaArray=nil)
+  def _run(cmd,ofile='',options=nil,returnCdf=false,force=nil,returnArray=nil,returnMaArray=nil,env=nil)
     options = options.to_s
 
     options << '-f nc' if options.empty? and ( \
@@ -128,9 +129,12 @@ class Cdo
                                              )
     cmd = "#{@cdo} -O #{options} #{cmd} "
 
+    # use an empty hash for non-given environment
+    env = {} if env.nil?
+
     case ofile
     when $stdout
-      retvals = _call(cmd)
+      retvals = _call(cmd,env)
       unless _hasError(cmd,retvals)
         return retvals[:stdout].split($/).map {|l| l.chomp.strip}
       else
@@ -145,7 +149,7 @@ class Cdo
       if force or not File.exists?(ofile.to_s)
         ofile = MyTempfile.path if ofile.nil?
         cmd << "#{ofile}"
-        retvals = _call(cmd)
+        retvals = _call(cmd,env)
         if _hasError(cmd,retvals)
           if @returnNilOnError then
             return nil
@@ -180,9 +184,9 @@ class Cdo
     if @operators.include?(sym.to_s)
       io, opts = Cdo.parseArgs(args)
       if OutputOperatorsPattern.match(sym.to_s)
-        _run(" -#{sym.to_s}#{opts} #{io[:input]} ",$stdout)
+        _run(" -#{sym.to_s}#{opts} #{io[:input]} ",$stdout,nil,nil,nil,nil,nil,env)
       else
-        _run(" -#{sym.to_s}#{opts} #{io[:input]} ",io[:output],io[:options],io[:returnCdf],io[:force],io[:returnArray],io[:returnMaArray])
+        _run(" -#{sym.to_s}#{opts} #{io[:input]} ",io[:output],io[:options],io[:returnCdf],io[:force],io[:returnArray],io[:returnMaArray],io[:env])
       end
     else
       return false if @returnFalseOnError

data/test/test_cdo.rb

@@ -9,12 +9,14 @@ require 'pp'
 #===============================================================================
 def rm(files); files.each {|f| FileUtils.rm(f) if File.exists?(f)};end
 
-@show = ENV.has_key?('SHOW')
 
 class TestCdo < Minitest::Test
 
   DEFAULT_CDO_PATH = 'cdo'
 
+  @@show           = ENV.has_key?('SHOW')
+  @@maintainermode = ENV.has_key?('MAINTAINERMODE')
+
   def setup
     @cdo = Cdo.new
   end
@@ -32,6 +34,9 @@ class TestCdo < Minitest::Test
       assert_equal(true,cdo.check)
       assert_equal(newCDO,cdo.cdo)
     end
+    pp 'MAINTAINERMODE: '
+    pp @@maintainermode
+    pp @@show
   end
   def test_getOperators
     %w[for random stdatm info showlevel sinfo remap geopotheight mask topo thicknessOfLevels].each {|op|
@@ -310,7 +315,7 @@ class TestCdo < Minitest::Test
     assert_equal("File format: GRIB".tr(' ',''),@cdo.sinfov(:input => "-topo", :output => nil)[0].tr(' ',''))
   end
 
-  if 'luthien' == `hostname`.chomp  then
+  if @@maintainermode  then
     def test_readCdf
       input = "-settunits,days  -setyear,2000 -for,1,4"
       cdfFile = @cdo.copy(:options =>"-f nc",:input=>input)
@@ -352,7 +357,7 @@ class TestCdo < Minitest::Test
       UnifiedPlot.linePlot([{:y => vOrg, :style => 'line',:title => 'org'},
                             {:y => vFm,  :style => 'points',:title => 'fillmiss'},
                             {:y => vFm1s,:style => 'points',:title => 'fillmiss2'}],
-                            plotConf: {:yrange => '[0:1]'},title: 'r1x10') if @show
+                            plotConf: {:yrange => '[0:1]'},title: 'r1x10') if @@show
       # check left-right replacement
       rand = @cdo.setname('v',:input => '-random,r10x1 ', :options => ' -f nc',:output => '/tmp/rand.nc')
       cdf  = @cdo.openCdf(rand)
@@ -371,7 +376,7 @@ class TestCdo < Minitest::Test
       UnifiedPlot.linePlot([{:y => vOrg, :style => 'line',:title => 'org'},
                             {:y => vFm,  :style => 'points',:title => 'fillmiss'},
                             {:y => vFm1s,:style => 'points',:title => 'fillmiss2'}],
-                            plotConf: {:yrange => '[0:1]'},title: 'r10x1') if @show
+                            plotConf: {:yrange => '[0:1]'},title: 'r10x1') if @@show
     end
   end
 
@@ -408,8 +413,8 @@ class TestCdo < Minitest::Test
     rm(ofiles)
 
     # oType = nc, from input ENV setting for each call
-    ofiles = expected.map {|f| f += '.nc2'}
-    @cdo.splitlevel(input: @cdo.stdatm(0,10,100,options: '-f nc'),output: oTag,env: {'CDO_FILE_SUFFIX' => '.nc2'})
+    ofiles = expected.map {|f| f += '.nc4'}
+    @cdo.splitlevel(input: @cdo.stdatm(0,10,100,options: '-f nc'),output: oTag,env: {'CDO_FILE_SUFFIX' => '.nc4'})
     assert_equal(ofiles,Dir.glob(oTag+'*').sort)
     rm(ofiles)
   end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: cdo
 version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+  version: 1.3.1
 platform: ruby
 authors:
 - Ralf Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unifiedPlot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Easy access to the Climate Data operators
@@ -33,35 +30,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- gemspec
 - lib/cdo.rb
 - lib/cdo_lib.rb
-- gemspec
-- LICENSE
 - test/test_cdo.rb
 homepage: https://code.zmaw.de/projects/cdo/wiki/Cdo%7Brbpy%7D
 licenses:
 - GPLv2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easy access to the Climate Data operators
 test_files:
 - test/test_cdo.rb