rb-grib 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f8f3d0dfbd8bcdf02783485139224e0e0c151071
+  data.tar.gz: 6fc49fc43aa1af1fd981803253b40281d2850350
+SHA512:
+  metadata.gz: 5c1a614dd1264329f35793a828cb074d7f5e4603ee21ee22ef5014a73a695b14871e4e3fb750693a5014820b380a31dd4603316fdebcd0d46c350bddd1773092
+  data.tar.gz: c1d07b21d120b59563f2bce553676a8448d4179de0b90f7c8a5cdf3db59f9efd7613140978ccd64d062469a969f04b31fa4d1c707f4237b2cc92df85c7e8e111

data/BSDL

@@ -1,4 +1,4 @@
-Copyright (C) 2011 Seiya Nishizawa and GFD Dennou Club. All rights reserved.
+Copyright (C) 2011-2016 Seiya Nishizawa and GFD Dennou Club. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

data/README.rdoc

@@ -12,7 +12,7 @@ The URL of the rb-GRIB home-page is:
 = Requires
 
 * Ruby (http://www.ruby-lang.org/)
-* NArray (http://narray.rubyforge.org/index.html.en)
+* NumRu-NArray (https://github.com/seiya/numru-narray) or NArray (https://masa16.github.io/narray/index.html)
 * NArrayMiss (http://ruby.gfd-dennou.org/products/narray_miss/)
 * GRIB API (http://www.ecmwf.int/products/data/software/grib_api.html)
 

data/ext/extconf.rb

@@ -2,13 +2,23 @@ require "mkmf"
 
 begin
   require "rubygems"
-  paths = Gem.find_files("narray.h").map{|d| File.dirname(d)}
+  if Gem::Specification.respond_to?(:find_by_name)
+    if spec = ( Gem::Specification.find_by_name("numru-narray") || Gem::Specification.find_by_name("narray") )
+      gem_path = spec.full_gem_path
+    end
+  else
+    if (spec = (Gem.source_index.find_name("numru-narray") || Gem.source_index.find_name("narray")) ).any?
+      gem_path = spec.full_gem_path
+    end
+  end
+  gem_path = File.join(gem_path, "ext", "numru", "narray")
 rescue LoadError
-  paths = []
+  dir_config("narray", RbConfig::CONFIG["sitearchdir"])
+end
+
+unless find_header("narray.h", gem_path)
+  find_header("narray.h", File.join(gem_path,"src"))
 end
-paths += [$archdir, $sitearchdir, $vendorarchdir]
-dir_config("narray")
-find_header("narray.h", *paths)
 
 dir_config("grib_api")
 if have_header("grib_api.h") && have_library("grib_api")

data/ext/grib.c

@@ -4,6 +4,9 @@
 #include "grib_api.h"
 #include "narray.h"
 
+#ifndef NARRAY_BIGMEM
+typedef int na_shape_t;
+#endif
 
 #define MAX_VALUE_LENGTH 1024
 
@@ -11,7 +14,7 @@
 static void
 check_error(int code)
 {
-  if (code) rb_raise(rb_eRuntimeError, grib_get_error_message(code));
+  if (code) rb_raise(rb_eRuntimeError, "%s", grib_get_error_message(code));
 };
 
 
@@ -681,7 +684,7 @@ rg_message_get_value(int argc, VALUE *argv, VALUE self)
 	  ret = LONG2NUM(l);
 	}	  
       } else {
-	int shape[1];
+	na_shape_t shape[1];
 	struct NARRAY *nary;
 	shape[0] = len;
 	VALUE rnary = na_make_object(NA_LINT, 1, shape, cNArray);
@@ -698,7 +701,7 @@ rg_message_get_value(int argc, VALUE *argv, VALUE self)
 	if (grib_get_double(message->handle, name, &value) == GRIB_SUCCESS)
 	  ret = rb_float_new(value);
       } else {
-	int shape[1];
+	na_shape_t shape[1];
 	struct NARRAY *nary;
 	shape[0] = len;
 	VALUE rnary = na_make_object(NA_DFLOAT, 1, shape, cNArray);
@@ -730,7 +733,7 @@ rg_message_get_data(VALUE self)
   double *lon, *lat, *value;
   VALUE na_lon, na_lat, na_value;
   struct NARRAY *nary;
-  int shape[1];
+  na_shape_t shape[1];
   shape[0] = np;
   na_lon = na_make_object(NA_DFLOAT, 1, shape, cNArray);
   GetNArray(na_lon, nary);
@@ -757,7 +760,7 @@ rg_message_get_data(VALUE self)
 
 void Init_grib()
 {
-  rb_require("narray");
+  //  rb_require("narray");
 
   id_init = rb_intern("init");
 

data/lib/numru/grib/setenv.rb

@@ -4,7 +4,15 @@ if File.exist?(def_path)
   if gdp = ENV[env_name]
     ENV[env_name] = "#{gdp}:#{def_path}"
   else
-    path = `grib_info -d`.strip
+    begin
+      path = `grib_info -d`.strip
+    rescue
+      $stderr.print <<-EOM
+The 'grib_info' command cannot be found.
+If you have the command, please set the PATH environment variable.
+      EOM
+      exit(-1)
+    end
     if File.exist?(path)
       ENV[env_name] = "#{path}:#{def_path}"
     end

data/lib/numru/grib/version.rb

@@ -1,5 +1,5 @@
 module NumRu
   class Grib
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/rb-grib.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
-  s.add_runtime_dependency "narray"
+  s.add_runtime_dependency "numru-narray"
   s.add_runtime_dependency "narray_miss"
 end

data/spec/grib_read_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.join('.','spec_helper'), File.dirname(__FILE__))
+include NumRu
 
 dir = File.expand_path(File.join('..','data'), File.dirname(__FILE__))
 GribData = {
@@ -48,7 +49,7 @@ describe NumRu::Grib do
   describe 'Grib.is_a_Grib?' do
     it 'returns whether the specific file is a GRIB1/2 file' do
       GribData.each do |fname, hash|
-        NumRu::Grib.is_a_Grib?(fname).should be_true
+        expect(NumRu::Grib.is_a_Grib?(fname)).to eq true
       end
     end
   end
@@ -59,12 +60,12 @@ describe NumRu::Grib do
     it 'returns Grib object' do
       GribData.each do |fname, hash|
         file = NumRu::Grib.open(fname)
-        file.should be_a_kind_of(NumRu::Grib)
+        expect(file).to be_instance_of(NumRu::Grib)
         @files.push file
       end
     end
     it 'raise exception when file name which does not exist is given' do
-      proc { NumRu::Grib.open(fname_not_exist)}.should raise_error
+      expect { NumRu::Grib.open(fname_not_exist) }.to raise_error(RuntimeError)
     end
   end
 
@@ -75,7 +76,7 @@ describe NumRu::Grib do
     end
     it do
       @files.each do |file|
-        proc {file.close}.should_not raise_error
+        expect {file.close}.not_to raise_error
       end
     end
   end
@@ -89,15 +90,19 @@ describe NumRu::Grib do
       @files.each{|fname,file| file.close}
     end
     it '#path returns path' do
-      @files.each {|fname,file| file.path.should == fname}
+      @files.each do |fname,file|
+        expect( file.path ).to eq fname
+      end
     end
     it '#var_names returns Array of variable names' do
-      @files.each {|fname, file| file.var_names.should == GribData[fname].keys}
+      @files.each do |fname, file|
+        expect( file.var_names ).to eq GribData[fname].keys
+      end
     end
     it '#var returns GribVar object' do
       @files.each do |fname, file|
         GribData[fname].each do |vname, hash|
-          file.var(vname).should be_a_kind_of NumRu::GribVar
+          expect( file.var(vname) ).to be_instance_of NumRu::GribVar
         end
       end
     end
@@ -116,41 +121,41 @@ describe NumRu::GribVar do
   end
   after { @files.each{|file| file.close}}
   it '#rank returns rank' do
-    @vars.each{|var,hash| var.rank.should == hash[:shape].length}
+    @vars.each{|var,hash| expect(var.rank).to eq hash[:shape].length}
   end
   it '#total returns total length' do
-    @vars.each{|var,hash| var.total.should == hash[:shape].inject(1,:*)}
+    @vars.each{|var,hash| expect(var.total).to eq hash[:shape].inject(1,:*)}
   end
   it '#dim_names returns Array of dimension names' do
-    @vars.each{|var,hash| var.dim_names.should == hash[:dims]}
+    @vars.each{|var,hash| expect(var.dim_names).to eq hash[:dims]}
   end
   it '#shape returns Array of shape' do
-    @vars.each{|var,hash| var.shape.should == hash[:shape]}
+    @vars.each{|var,hash| expect(var.shape).to eq hash[:shape]}
   end
   it '#dim returns GribDim' do
     @vars.each do |var,hash|
-      hash[:dims].each{|dname| var.dim(dname).should be_a_kind_of NumRu::GribDim}
+      hash[:dims].each{|dname| expect(var.dim(dname)).to be_instance_of NumRu::GribDim}
     end
   end
   it '#att_names returns Array of attribute names' do
-    @vars.each{|var,hash| var.att_names.should be_a_kind_of Array}
+    @vars.each{|var,hash| expect(var.att_names).to be_instance_of Array}
   end
   it '#att returns attribute value' do
     @vars.each do |var,hash|
-      var.att_names.each{|aname| var.att(aname).should_not == nil }
+      var.att_names.each{|aname| expect(var.att(aname)).to_not eq nil }
     end
   end
   it '#typecode returns type code' do
-    @vars.each{|var,hash| var.typecode.should be_a_kind_of Fixnum}
+    @vars.each{|var,hash| expect(var.typecode).to be_instance_of Fixnum}
   end
   it '#missing_value returns missing value' do
-    @vars.each{|var,hash| var.missing_value.should be_a_kind_of Numeric}
+    @vars.each{|var,hash| expect(var.missing_value).to be_kind_of Numeric}
   end
   it '#get returns value' do
     @vars.each do |var,hash|
       hash[:val].each do |idx,val|
         v = var.get[*idx]
-        ((v-val).abs/((v+val)/2)).should < 1e-10
+        expect((v-val).abs/((v+val)/2)).to be < 1e-10
       end
     end
   end
@@ -175,23 +180,23 @@ describe NumRu::GribDim do
     @files.each{|file| file.close}
   end
   it '#length returns length' do
-    @dims.each{|dim,len| dim.length.should == len}
+    @dims.each{|dim,len| expect(dim.length).to eq len}
   end
   it '#val returns value' do
     @dims.each do |dim,len|
-      dim.val.should be_a_kind_of NArray
-      dim.val.length.should == len
+      expect(dim.val).to be_instance_of NArray
+      expect(dim.val.length).to eq len
     end
   end
   it '#typecode returns typecode' do
-    @dims.each{|dim,len| dim.typecode.should be_a_kind_of Fixnum}
+    @dims.each{|dim,len| expect(dim.typecode).to be_instance_of Fixnum}
   end
   it '#att_names returns Array of attribute names' do
-    @dims.each{|dim,len| dim.att_names.should be_a_kind_of Array}
+    @dims.each{|dim,len| expect(dim.att_names).to be_instance_of Array}
   end
   it '#att returns attributes value' do
     @dims.each do |dim,len|
-      dim.att_names.each{|aname| dim.att(aname).should_not == nil }
+      dim.att_names.each{|aname| expect(dim.att(aname)).to_not eq nil }
     end
   end
 

metadata

@@ -1,75 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rb-grib
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Seiya Nishizawa
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-02-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: narray
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: numru-narray
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: narray_miss
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !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
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This class library enable you to handle GRIB file.
-email: 
+email:
 - seiya@gfd-dennou.org
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - BSDL
 - Gemfile
 - LICENSE.txt
@@ -108,37 +99,27 @@ files:
 - spec/spec_helper.rb
 homepage: http://ruby.gfd-dennou.org/products/rb-grib/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rb-grib
-rubygems_version: 1.8.11
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby class library to hanlde GRIB file
-test_files: 
+test_files:
 - spec/grib_read_spec.rb
 - spec/spec_helper.rb