ruby-netcdf 0.7.1.1 → 0.7.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjU2MDE0Y2VjOTdiYmQ2MWIwMTVkMDg0ZTI0YzdlM2E0ZjhmMDJjMw==
-  data.tar.gz: !binary |-
-    MGIzOTc0YTQwNGZlM2U2YWFjYmM1MjM5NDJiNGMxMmMxMjgyNzg4ZQ==
+SHA1:
+  metadata.gz: 3d8e407e23373b1ac833f0924719f034ea283bdf
+  data.tar.gz: d3567461280f7b1ecc9716c05b40f2918b08a7f0
 SHA512:
-  metadata.gz: !binary |-
-    YzBlYjdjOTM4NTU5Mzk5NmRjMGZkZWVjYTZhYWVkN2ZmODgwNGEwZDE0MDcx
-    MDkzNzYzNzY5NWFkZWIzYTc2MTliMzIxYzk0MTlmYjNmZjA2NGNjNWNiMDFm
-    MDA1ODMxODBiMjgyNzUzOWFmY2VhNTQ1Nzk2YTVlNTUyN2Q2NmU=
-  data.tar.gz: !binary |-
-    NzRiOGU5YTI2MzMzZWVlMzE3Nzk0YmM4NGRlOTE0YTM2ZTk2YWM5YThlYmQz
-    NmNhYTMzYzMwMDE1MWJmNTZiNWQwMjc0ZTVmOWEzYzUwYzFjOGE2NzEyYjAz
-    YzJiMDA3NDQyODA1YTU1OWYzZGQwNzY4NTliMjhiNGZlODdkOTQ=
+  metadata.gz: 6c13aa6dd8cbcbc35d4fca8db098fb6c6f00c52815a090f0cce3d3e6a8e458e3977aceffe4a7fcd470c5dcef6a130bc4f8f0650634009e563a95d764b41ea07b
+  data.tar.gz: 0d3fda3f078eb56f0ea315fb3c1b1673a8a37a024c39dad5852bc9cc4dfcd7ed00f9b91d69c8e3346f2005673ada4c17e6db092284d46dd20688dec5dc98bda7

data/.gitignore

@@ -1,8 +1,7 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
+*.[oa]
+*~
+*.so
+Makefile
+ChangeLog
 /pkg/
-/spec/reports/
 /tmp/

data/Rakefile

@@ -1,2 +1,37 @@
-require "bundler/gem_tasks"
+# -* coding: utf-8 -*-
+require 'rake/testtask'
+require 'rake/extensiontask'
+require 'rake/packagetask'
+begin
+  require 'bundler/gem_helper'  # instead of 'bundler/gem_tasks' -> need manual
+                                # calls of install_tasks (see below)
+rescue LoadError
+  puts 'If you want to create gem, You must install Bundler'
+end
 
+# manual calls of install_tasks to support multiple gemspec files
+Bundler::GemHelper.install_tasks(name: "ruby-netcdf")
+#Bundler::GemHelper.install_tasks(name: "ruby-netcdf-bigmem")
+
+require './lib/numru/netcdf/version'
+def version
+  NumRu::NetCDF::VERSION
+end
+
+task :default => :test
+task :test => :compile
+Rake::TestTask.new do |t|
+  t.libs << 'lib' << 'test'
+  t.test_files = FileList['test/*.rb']
+end
+
+Rake::ExtensionTask.new do |ext|
+  ext.name = 'netcdfraw'
+  ext.ext_dir = 'ext/numru'
+  ext.lib_dir = 'lib/numru'
+end
+
+Rake::PackageTask.new('ruby-netcdf', "#{version}") do |t|
+  t.need_tar_gz = true
+  t.package_files.include `git ls-files`.split("\n")
+end

data/{extconf.rb → ext/numru/extconf.rb}

@@ -8,14 +8,14 @@ else
   ncversion = nil
 end
 
-if Gem.respond_to?(:find_files)
+if Gem.respond_to?(:find_files) and Gem.find_files("narray.h").length > 0
   require "rbconfig"
   so = RbConfig::CONFIG["DLEXT"]
   narray_include = File.expand_path(File.dirname(Gem.find_files("narray.h")[0]))
   narray_lib = File.expand_path(File.dirname(Gem.find_files("narray." + so)[0]))
 else
   gem_home=(`gem environment GEM_HOME`).chomp
-  narray_dir = Dir.glob("#{gem_home}/gems/narray-*").sort[-1]
+  narray_dir = Dir.glob("#{gem_home}/gems/narray-*/ext/narray").sort[-1]
   if narray_dir
     narray_include = narray_lib = narray_dir
   else

data/{netcdfraw.c → ext/numru/netcdfraw.c}

@@ -1153,6 +1153,30 @@ NetCDF_unlimited(VALUE file)
       return Qnil;
     }
 }
+
+#if NCVER >= 400
+
+VALUE 
+NetCDF_format(VALUE file)
+{
+  int ncid;
+  int formatp;
+  int status;
+  VALUE Integer;
+  struct Netcdf *ncfile;
+
+  Data_Get_Struct(file,struct Netcdf,ncfile);
+  ncid=ncfile->ncid;
+  status=nc_inq_format(ncid,&formatp);
+  if(status != NC_NOERR) NC_RAISE (status);
+  Integer = INT2NUM(formatp);
+  /* one of NC_FORMAT_CLASSIC (1), NC_FORMAT_64BIT (2), NC_FORMAT_NETCDF4 (3),
+     NC_FORMAT_NETCDF4_CLASSIC (4)
+   */
+  return Integer;
+}
+
+#endif
 			       
 VALUE
 NetCDF_sync(VALUE file)
@@ -4591,6 +4615,11 @@ Init_netcdfraw(void)
   rb_define_const(cNetCDF, "NC_ENDIAN_NATIVE", INT2FIX(NC_ENDIAN_NATIVE));
   rb_define_const(cNetCDF, "NC_ENDIAN_LITTLE", INT2FIX(NC_ENDIAN_LITTLE));
   rb_define_const(cNetCDF, "NC_ENDIAN_BIG", INT2FIX(NC_ENDIAN_BIG));
+
+  rb_define_const(cNetCDF, "NC_FORMAT_CLASSIC", INT2FIX(NC_FORMAT_CLASSIC));
+  rb_define_const(cNetCDF, "NC_FORMAT_64BIT", INT2FIX(NC_FORMAT_64BIT));
+  rb_define_const(cNetCDF, "NC_FORMAT_NETCDF4", INT2FIX(NC_FORMAT_NETCDF4));
+  rb_define_const(cNetCDF, "NC_FORMAT_NETCDF4_CLASSIC", INT2FIX(NC_FORMAT_NETCDF4_CLASSIC));
 #endif
  
 #ifdef NARRAY_BIGMEM
@@ -4617,6 +4646,9 @@ Init_netcdfraw(void)
   rb_define_method(cNetCDF,"ndims",NetCDF_ndims,0);
   rb_define_method(cNetCDF,"nvars",NetCDF_nvars,0);
   rb_define_method(cNetCDF,"natts",NetCDF_natts,0);
+#if NCVER >= 400
+  rb_define_method(cNetCDF,"format",NetCDF_format,0);
+#endif
   rb_define_method(cNetCDF,"sync",NetCDF_sync,0);
   rb_define_method(cNetCDF,"path",NetCDF_path,0);
   rb_define_method(cNetCDF,"dim",NetCDF_dim,1);

data/lib/{netcdf.rb → numru/netcdf.rb}

@@ -1,4 +1,5 @@
 require 'narray'
+require 'numru/netcdf/version'
 require 'numru/netcdfraw'
 
 if NArray.const_defined?(:SUPPORT_BIGMEM) && NArray::SUPPORT_BIGMEM
@@ -34,13 +35,14 @@ module NumRu
     def NetCDF.creation_format=(cmode)
       raise("This method is available only for NetCDF >= 4") unless @@nc4
       case cmode
-      when  0, nil, NC_CLASSIC_MODEL, /^CLASSIC$/i  # classic netcdf ver 3 fmt
+      when  0, nil, NC_CLASSIC_MODEL, /^CLASSIC$/i, NC_FORMAT_CLASSIC
+            # classic netcdf ver 3 fmt
         @@cr_format = 0
-      when NC_64BIT_OFFSET, /^64BIT_OFFSET$/i
+      when NC_64BIT_OFFSET, /^64BIT_OFFSET$/i, NC_FORMAT_64BIT
         @@cr_format = NC_64BIT_OFFSET
-      when NC_NETCDF4, /^NETCDF4$/i
+      when NC_NETCDF4, /^NETCDF4$/i, NC_FORMAT_NETCDF4
         @@cr_format = NC_NETCDF4
-      when ( NC_NETCDF4 | NC_CLASSIC_MODEL), /^NETCDF4_CLASSIC$/i
+      when ( NC_NETCDF4 | NC_CLASSIC_MODEL), /^NETCDF4_CLASSIC$/i, NC_FORMAT_NETCDF4_CLASSIC
         # NetCDF4 but disabling new data models
         @@cr_format = NC_NETCDF4 | NC_CLASSIC_MODEL
       else
@@ -57,7 +59,7 @@ module NumRu
         "64BIT_OFFSET"
       when NC_NETCDF4
         "NETCDF4"
-      when NC_NETCDF4 | NC_CLASSIC_MODEL
+      when (NC_NETCDF4 | NC_CLASSIC_MODEL)
         "NETCDF4_CLASSIC"
       end
     end

data/lib/numru/netcdf/version.rb

@@ -0,0 +1,7 @@
+module NumRu
+  class NetCDF
+
+    VERSION = "0.7.2"
+
+  end
+end

data/ruby-netcdf-bigmem.gemspec

@@ -0,0 +1,28 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'numru/netcdf/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "ruby-netcdf-bigmem"
+  spec.version       = NumRu::NetCDF::VERSION
+  spec.authors           = ["Takeshi Horinouchi", "Tsuyoshi Koshiro",\
+    "Shigenori Otsuka", "Seiya Nishizawa", "T Sakakima"]
+  spec.email            = ['eriko@gfd-dennou.org']
+
+  spec.summary          = %q{Ruby interface to NetCDF}
+  spec.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. This version works with Ruby2.0.}
+
+  spec.homepage         = 'http://www.gfd-dennou.org/arch/ruby/products/ruby-netcdf/'
+  spec.licenses         = ["BSD-2-Clause"]
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.test_files    = spec.files.grep(%r{^(test|demo)/})
+  spec.require_paths = ["ext","lib"]
+  spec.extensions << "ext/numru/extconf.rb"
+
+  spec.required_ruby_version = Gem::Requirement.new(">= 1.8")
+  spec.add_runtime_dependency(%q<narray-bigmem>, [">= 0"])
+  spec.add_runtime_dependency(%q<narray_miss-bigmem>, [">= 0"])
+
+end

data/ruby-netcdf.gemspec

@@ -1,34 +1,28 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'version'
+require 'numru/netcdf/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "ruby-netcdf"
-  spec.version       = Ruby::Netcdf::VERSION
+  spec.version       = NumRu::NetCDF::VERSION
   spec.authors           = ["Takeshi Horinouchi", "Tsuyoshi Koshiro",\
     "Shigenori Otsuka", "Seiya Nishizawa", "T Sakakima"]
   spec.email            = ['eriko@gfd-dennou.org']
 
-  #if spec.respond_to?(:metadata)
-  #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
-  #end
-
   spec.summary          = %q{Ruby interface to NetCDF}
   spec.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. This version works with Ruby2.0.}
 
   spec.homepage         = 'http://www.gfd-dennou.org/arch/ruby/products/ruby-netcdf/'
-  spec.licenses         = ["GFD Dennou Club"]
+  spec.licenses         = ["BSD-2-Clause"]
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^(test|demo)/})
-  #spec.bindir        = "exe"
-  #spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ["ext","lib"]
+  spec.extensions << "ext/numru/extconf.rb"
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 1.6")
+  spec.required_ruby_version = Gem::Requirement.new(">= 1.8")
   spec.add_runtime_dependency(%q<narray>, [">= 0"])
   spec.add_runtime_dependency(%q<narray_miss>, [">= 0"])
 
-  spec.extensions << "extconf.rb"
 end

data/test/test.rb

@@ -1,8 +1,8 @@
-##require 'numru/netcdf' 
+require 'numru/netcdf' 
 ## // to test before make install -->
-require 'narray'
-require '../netcdfraw'  
-require '../lib/netcdf'
+#require 'narray'
+#require '../netcdfraw'  
+#require '../lib/netcdf'
 ## <-- to test before make install //
 
 include NumRu

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-netcdf
 version: !ruby/object:Gem::Version
-  version: 0.7.1.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Takeshi Horinouchi
@@ -12,34 +12,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: narray_miss
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RubyNetCDF is the Ruby interface to the NetCDF library built on the NArray
@@ -49,20 +49,16 @@ email:
 - eriko@gfd-dennou.org
 executables: []
 extensions:
-- extconf.rb
+- ext/numru/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- ChangeLog
+- ".ChangeLog.until20150117"
+- ".gitignore"
 - Gemfile
 - INSTALL
 - LICENSE.txt
 - Rakefile
 - ToDo
-- bin/console
-- bin/setup
 - demo/README
 - demo/demo1-create-alt.rb
 - demo/demo1-create.rb
@@ -76,11 +72,12 @@ files:
 - doc/Ref_man_jp.html
 - doc/Ref_man_jp.rd
 - doc/to_html
-- extconf.rb
-- lib/netcdf.rb
-- lib/netcdf_miss.rb
-- lib/version.rb
-- netcdfraw.c
+- ext/numru/extconf.rb
+- ext/numru/netcdfraw.c
+- lib/numru/netcdf.rb
+- lib/numru/netcdf/version.rb
+- lib/numru/netcdf_miss.rb
+- ruby-netcdf-bigmem.gemspec
 - ruby-netcdf.gemspec
 - test/aref_aset.rb
 - test/char_var.rb
@@ -95,25 +92,26 @@ files:
 - test/type.rb
 homepage: http://www.gfd-dennou.org/arch/ruby/products/ruby-netcdf/
 licenses:
-- GFD Dennou Club
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
+- ext
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '1.6'
+      version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby interface to NetCDF

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "ruby/netcdf"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/lib/version.rb

@@ -1,5 +0,0 @@
-module Ruby
-  module Netcdf
-    VERSION = "0.7.1.1"
-  end
-end