ruby-netcdf 0.6.5 → 0.6.6

data/ChangeLog

@@ -1,3 +1,10 @@
+Sun Feb 19  2011  T Horinouchi
+	* ruby-netcdf-0.6.6 released (relase tag: ruby-netcdf-0_6_6)
+	* lib/netcdf.rb: method pack: debug of enbug made 
+	  when 1.1 -> 1.2 (cvs tag) commited in Jan 2010.
+	* netcdfraw.c: Added macro NC_RAISE2. Enhanced error 
+	  messaging in NetCDF_open and NetCDF_create to show file name.
+
 Thu Feb 17  2011  T Horinouchi
 	* ruby-netcdf-0.6.5 released (relase tag: ruby-netcdf-0_6_5)
 Thu Feb 17  2011  T Horinouchi

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 
 NAME = 'ruby-netcdf'
-VER = '0.6.5'
+VER = '0.6.6'
 
 PKG_FILES = FileList[
   '**',
@@ -14,14 +14,15 @@ PKG_FILES = FileList[
 spec = Gem::Specification.new do |s|
   s.name             = NAME
   s.version          = VER
-  s.authors           = ['T. Horinouchi','T. Sakakima',\
-                'GFD Dennou Club' ]
-  s.email            = 'eriko@gfd-dennou.org'
+  s.authors           = ["Takeshi Horinouchi", "Tsuyoshi Koshiro",\
+    "Shigenori Otsuka", "Seiya Nishizawa", "T Sakakima"]
+  s.email            = ['eriko@gfd-dennou.org']
   s.homepage         = 'http://www.gfd-dennou.org/arch/ruby/products/ruby-netcdf/'
   s.licenses         = ["GFD Dennou Club"]
   s.platform         = Gem::Platform::RUBY
-  s.summary          = 'Ruby interface to NetCDF'
-  s.description      = 'RubyNetCDF is the Ruby interface to the NetCDF library built on the NArray library, which is an efficient multi-dimensional numeric array class for Ruby.'
+  s.summary          = %q{Ruby interface to NetCDF}
+  s.description      = %q{RubyNetCDF is the Ruby interface to the NetCDF library built on the NArray library, which is an efficient multi-dimensional numeric array class for Ruby.}
+
   s.files            = PKG_FILES.to_a
   s.require_paths    = ['lib']
   s.test_files = Dir.glob("test/*")

data/extconf.rb

@@ -39,7 +39,7 @@ if File.directory?("/usr/include/netcdf")  #-- for Vine linux
   $CFLAGS += ' ' + cflags
   $LOCAL_LIBS += ' ' + libs
 end
-
+ 
 if (enable_config('opendap',true) && ( xsystem("opendap-config --libs") ||
                                        xsystem("ncdap-config --libs") ) )
 

data/lib/netcdf.rb

@@ -318,6 +318,7 @@ module NumRu
        if self.typecode <= NArray::LINT
          packed = packed.round
        end
+       packed
      end
    end
    

data/netcdfraw.c

@@ -203,6 +203,7 @@
 }
 
 #define NC_RAISE(status) rb_raise(err_status2class(status),(nc_strerror(status)))
+#define NC_RAISE2(status, str) rb_raise(err_status2class(status),"%s (%s)",nc_strerror(status),(str) )
 
 static VALUE mNumRu = 0;
 static VALUE cNetCDF;
@@ -1033,7 +1034,7 @@ NetCDF_open(VALUE mod,VALUE filename,VALUE omode)
   c_omode=NUM2INT(omode);
   
   status = nc_open(c_filename,c_omode,&ncid);
-  if(status !=NC_NOERR){NC_RAISE(status);}
+  if(status !=NC_NOERR){NC_RAISE2(status,c_filename);}
 
   ncfile = NetCDF_init(ncid,c_filename);
   retval = Data_Wrap_Struct(cNetCDF,0,NetCDF_free,ncfile);
@@ -1056,7 +1057,7 @@ NetCDF_create(VALUE mod,VALUE filename,VALUE cmode)
   c_cmode=NUM2INT(cmode);
   
   status = nc_create(c_filename,c_cmode,&ncid);
-  if(status != NC_NOERR) NC_RAISE(status);
+  if(status != NC_NOERR) NC_RAISE2(status, c_filename);
 
   ncfile = NetCDF_init(ncid,c_filename);
   return( Data_Wrap_Struct(cNetCDF,0,NetCDF_free,ncfile) );

metadata

@@ -1,23 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-netcdf
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
+  hash: 11
+  prerelease: false
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
-- T. Horinouchi
-- T. Sakakima
-- GFD Dennou Club
+- Takeshi Horinouchi
+- Tsuyoshi Koshiro
+- Shigenori Otsuka
+- Seiya Nishizawa
+- T Sakakima
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +09:00
+date: 2012-02-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,7 +51,8 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 description: RubyNetCDF is the Ruby interface to the NetCDF library built on the NArray library, which is an efficient multi-dimensional numeric array class for Ruby.
-email: eriko@gfd-dennou.org
+email: 
+- eriko@gfd-dennou.org
 executables: []
 
 extensions: 
@@ -57,40 +60,38 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- INSTALL
-- LICENSE.txt
-- ChangeLog
 - netcdfraw.c
 - Rakefile
-- extconf.rb.rej
-- extconf.rb.orig
+- LICENSE.txt
+- ChangeLog
 - extconf.rb
 - ToDo
-- lib/netcdf.rb
+- INSTALL
 - lib/netcdf_miss.rb
-- demo/demo2-graphic.rb
-- demo/demo4-copy.rb
-- demo/demo1-create-alt.rb
+- lib/netcdf.rb
+- demo/demo3-ncepclim.rb
 - demo/README
 - demo/demo1-create.rb
-- demo/demo3-ncepclim.rb
+- demo/demo4-copy.rb
+- demo/demo2-graphic.rb
+- demo/demo1-create-alt.rb
+- doc/Ref_man_jp.rd
+- doc/Ref_man.rd
 - doc/Ref_man_jp.html
 - doc/to_html
-- doc/Ref_man.html
-- doc/Ref_man.rd
-- doc/Ref_man_jp.rd
 - doc/README_JP.txt
-- test/def_var_with_dim.rb
+- doc/Ref_man.html
+- test/create_tmp.rb
 - test/putatt.rb
-- test/type.rb
-- test/test.cdl
 - test/char_var.rb
-- test/test.rb
-- test/putatt.cdl
-- test/aref_aset.rb
 - test/clone.rb
+- test/def_var_with_dim.rb
+- test/aref_aset.rb
+- test/type.rb
+- test/test.rb
 - test/factor_offset.rb
-- test/create_tmp.rb
+- test/test.cdl
+- test/putatt.cdl
 has_rdoc: true
 homepage: http://www.gfd-dennou.org/arch/ruby/products/ruby-netcdf/
 licenses: 
@@ -122,19 +123,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby interface to NetCDF
 test_files: 
-- test/def_var_with_dim.rb
+- test/create_tmp.rb
 - test/putatt.rb
-- test/type.rb
-- test/test.cdl
 - test/char_var.rb
-- test/test.rb
-- test/putatt.cdl
-- test/aref_aset.rb
 - test/clone.rb
+- test/def_var_with_dim.rb
+- test/aref_aset.rb
+- test/type.rb
+- test/test.rb
 - test/factor_offset.rb
-- test/create_tmp.rb
+- test/test.cdl
+- test/putatt.cdl

data/extconf.rb.orig

@@ -1,124 +0,0 @@
-require "mkmf"
-
-dir_config('narray',$sitearchdir,$sitearchdir)
-dir_config('netcdf','/usr/local')
-
-if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
-print <<EOS
-** configure error **  
-   Header narray.h or narray_config.h is not found. If you have these files in 
-   /narraydir/include, try the following:
-
-   % ruby extconf.rb --with-narray-include=/narraydir/include
-
-EOS
-   exit(-1)
-end
-
-if xsystem("ncdap-config --libs")
-  libncdods = "nc-dap"
-  cflags = `ncdap-config --cflags`.gsub(/\n/, " ")
-  libs = `ncdap-config --libs`.gsub(/\n/, " ")
-  prefix_dods = `ncdap-config --prefix`.gsub(/\n/, "")
-elsif xsystem("opendap-config --libs")
-  libncdods = "nc-dods"
-  cflags = `opendap-config --cflags`.gsub(/\n/, " ")
-  libs = `opendap-config --libs-nc`.gsub(/\n/, " ")
-  prefix_dods = `opendap-config --prefix`.gsub(/\n/, "")
-end
-
-if (enable_config('opendap',true) && ( xsystem("opendap-config --libs") ||
-                                       xsystem("ncdap-config --libs") ) )
-
-  dir_config(libncdods,prefix_dods)
-
-  if (!have_library(libncdods))
-    print <<-EOS
-    ** ERROR ** Library not found: nc-dods (OPeNDAP/DODS-enabled NetCDF lib)
-    Install it, or run extconf.rb with option --disable-opendap.
-                                              ^^^^^^^^^^^^^^^^^
-    EOS
-    exit(-1)
-  else
-    print <<-EOS
-    ** Message **  Compiling with OPeNDAP/DODS-enabled NetCDF library.
- 
-    This is because the command opendap-config is found in your system.
-    If you want to use the ordinary (non-DODS) version of NetCDF,
-    run extconf.rb with option --disable-opendap.
-                               ^^^^^^^^^^^^^^^^^
-    EOS
-  end
-
-  $CFLAGS += ' '+cflags
-  $LOCAL_LIBS += ' ' + libs
-
-  # non portable treatments: should be improved (by Horinouchi)
-  CONFIG['LDSHARED'].sub!(/gcc/,'g++')
-  $LIBS.sub!(/-lc\s/,'') ; $LIBS.sub!(/-lc$/,'')
-  print <<-EOS
-    ** Warning **  non-portable treatments are made, 
-    which was sucessfull redhat linux 9:
-     * gcc was replaced with g++ in CONFIG['LDSHARED']
-     * -lc library was removed if in $LIBS 
-
-  EOS
-  #  p '@@@'
-  #  ary = []
-  #  CONFIG.each{|k,v| ary.push([k,v])}
-  #  ary.sort.each{|x| p x}
-else
-  if xsystem("nc-config --libs") # for NetCDF 4
-    cflags = `nc-config --cflags`.gsub(/\n/, " ")
-    libs = `nc-config --libs`.gsub(/\n/, " ")
-    prefix_nc = `nc-config --prefix`.gsub(/\n/, "")
-
-    dir_config("netcdf",prefix_nc)
-    $CFLAGS += ' ' + cflags
-    $LOCAL_LIBS += ' ' + libs
-  end
-  if ( ! ( have_header("netcdf.h") && have_library("netcdf") ) )then
-    print <<-EOS
-    ** configure error **  
-       Header netcdf.h or the compiled netcdf library is not found. 
-       If you have the library installed under /netcdfdir (that is, netcdf.h is
-       in /netcdfdir/include and the library in /netcdfdir/lib/),
-       try the following:
-
-       % ruby extconf.rb --with-netcdf-dir=/netcdfdir
-
-       Alternatively, you can specify the two directory separately
-       with --with-netcdf-include and --with-netcdf-lib.
-    EOS
-    exit(-1)
-  end
-end
-
-if /cygwin|mingw/ =~ RUBY_PLATFORM
-   have_library("narray") || raise("ERROR: narray library is not found")
-end
-
-create_makefile "numru/netcdfraw"
-
-######  Modify Makefile: #######
-File.rename("Makefile","Makefile.orig")
-oldmkfl = File.open("Makefile.orig")
-newmkfl = File.open("Makefile","w")
-oldmkfl.each_line{ |line|
-   case(line)
-   when /^distclean:/
-      newmkfl.puts(line)
-      newmkfl.puts("\t\t@$(RM) *.nc demo/*.nc demo/*~ lib/*~ doc/*~ test/*.nc test/*~ Makefile.orig")
-   when /^all:/
-      newmkfl.puts(line)
-      newmkfl.puts("")         
-      newmkfl.puts("test: all")            # insert the "test" target
-      newmkfl.puts("\t\t@cd test && ruby test.rb && echo 'test did not fail :-p (please ignore the warnings)' && cd ..") 
-   when /lib\/netcdf/
-      line = line.chomp! + "/"
-      newmkfl.puts(line)
-   else
-      newmkfl.puts(line)
-   end
-}
-newmkfl.close

data/extconf.rb.rej

@@ -1,16 +0,0 @@
---- extconf.rb	2011-02-04 13:30:55.000000000 +0900
-+++ extconf.rb	2011-02-14 15:57:48.000000000 +0900
-@@ -33,6 +39,13 @@
-   prefix_dods = `opendap-config --prefix`.gsub(/\n/, "")
- end
- 
-+if File.directory?("/usr/include/netcdf")  #-- for Vine linux
-+  cflags = "-I/usr/include/netcdf"
-+  libs = "-L/usr/lib"
-+  $CFLAGS += ' ' + cflags
-+  $LOCAL_LIBS += ' ' + libs
-+end
-+
- if (enable_config('opendap',true) && ( xsystem("opendap-config --libs")) ||
-                                        xsystem("ncdap-config --libs") )
-