cdo 1.3.1 → 1.3.2

checksums.yaml

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

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.1'
+  s.version           = '1.3.2'
   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

@@ -6,6 +6,18 @@ require 'stringio'
 class Cdo
   OutputOperatorsPattern = /(diff|info|output|griddes|zaxisdes|show|ncode|ndate|nlevel|nmon|nvar|nyear|ntime|npar|gradsdes|pardes)/
 
+  OutputOperators = %w[cdiread cmor codetab conv_cmor_table diff diffc diffn diffp
+  diffv dump_cmor_table dumpmap filedes ggstat ggstats gmtcells gmtxyz gradsdes
+  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
+  partab2 seinfo seinfoc seinfon seinfop showcode showdate showformat showlevel
+  showltype showmon showname showparam showstdname showtime showtimestamp
+  showunit showvar showyear sinfo sinfoc sinfon sinfop sinfov
+spartab specinfo tinfo vardes vct vct2 verifygrid vlist zaxisdes]
+
   attr_accessor :cdo, :returnCdf, :forceOutput, :env, :debug, :logging, :logFile
   attr_reader   :operators, :filetypes
 
@@ -83,23 +95,28 @@ class Cdo
 
   # Execute the given cdo call and return all outputs
   def _call(cmd,env={})
-    if (@debug)
-      puts '# DEBUG ====================================================================='
-      pp @env unless @env.empty?
-      pp  env unless  env.empty?
-      puts 'CMD: '
-      puts cmd
-      puts '# DEBUG ====================================================================='
-    end
-
     @logger.info(cmd+"\n") if @logging
 
     stdin, stdout, stderr, wait_thr = Open3.popen3(@env.merge(env),cmd)
-    {
+    status = {
       :stdout     => stdout.read,
       :stderr     => stderr.read,
       :returncode => wait_thr.value.exitstatus
     }
+
+    if (@debug)
+      puts '# DEBUG - start ============================================================='
+      pp @env unless @env.empty?
+      pp  env unless  env.empty?
+      puts 'CALL:' + cmd
+      puts 'STDOUT:'
+      puts status[:stdout] unless status[:stdout].strip.empty?
+      puts 'STDERR:'
+      puts status[:stderr] unless status[:stderr].strip.empty?
+      puts '# DEBUG - end ==============================================================='
+    end
+
+    status
   end
 
   # Error handling for the given command
@@ -183,7 +200,7 @@ class Cdo
 
     if @operators.include?(sym.to_s)
       io, opts = Cdo.parseArgs(args)
-      if OutputOperatorsPattern.match(sym.to_s)
+      if OutputOperators.include?(sym.to_s)
         _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],io[:env])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cdo
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Ralf Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unifiedPlot