Merge branch 'gem-update'

Author: v0dro

CONTRIBUTING.md

@@ -6,29 +6,25 @@ Either nmatrix or rb-gsl are NOT NECESSARY for using daru. They are just require
 
 To install dependencies, execute the following commands:
 
-*  `sudo apt-get update -qq`
-*  `sudo apt-get install -y libgsl0-dev r-base r-base-dev`
-*  `sudo Rscript -e "install.packages(c('Rserve','irr'),,'http://cran.us.r-project.org')"`
-*  `sudo apt-get install libmagickwand-dev imagemagick`
-
-
-Then install remaining dependencies:
-
-  `bundle install`
+``` bash
+sudo apt-get update -qq
+sudo apt-get install -y libgsl0-dev r-base r-base-dev
+sudo Rscript -e "install.packages(c('Rserve','irr'),,'http://cran.us.r-project.org')"
+sudo apt-get install libmagickwand-dev imagemagick
+export DARU_TEST_NMATRIX=1  # for running nmatrix tests.
+export DARU_TEST_GSL=1 # for running rb-GSL tests.
+bundle install
+```
+You don't need `DARU_TEST_NMATRIX` or `DARU_TEST_GSL` if you don't want to make changes
+to those parts of the code. However, they will be set in CI and will raise a test failure
+if something goes wrong.
 
 And run the test suite (should be all green with pending tests):
 
   `bundle exec rspec`
 
 If you have problems installing nmatrix, please consult the [nmatrix installation wiki](https://github.com/SciRuby/nmatrix/wiki/Installation) or the [mailing list](https://groups.google.com/forum/#!forum/sciruby-dev).
 
-**NOTE**: `Daru` is compatible with Ruby versions < 2.5; for later Ruby versions it breaks, returning the following error in versions >= 2.5.
-```
-/gems/packable-1.3.10/lib/packable/extensions/io.rb:86:in `pos': Illegal seek @ rb_io_tell - <STDOUT> (Errno::ESPIPE)
-```
-To reproduce this issue or explore this error further, head over to 
-[issue #500](https://github.com/SciRuby/daru/issues/500),
-[issue #503](https://github.com/SciRuby/daru/issues/503). Also, if you want to fix this issue, then please discuss it here : [#505](https://github.com/SciRuby/daru/issues/500)
 
 While preparing your pull requests, don't forget to check your code with Rubocop:
 

daru.gemspec

@@ -32,17 +32,17 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'spreadsheet', '~> 1.1.1'
   spec.add_development_dependency 'bundler', '>= 1.10'
-  spec.add_development_dependency 'rake', '~>10.5'
+  spec.add_development_dependency 'rake', '~>13.0'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rserve-client', '~> 0.3'
   spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'awesome_print'
   spec.add_development_dependency 'nyaplot', '~> 0.1.5'
-  spec.add_development_dependency 'nmatrix', '~> 0.2.1'
+  spec.add_development_dependency 'nmatrix', '~> 0.2.1' if ENV['DARU_TEST_NMATRIX']
   spec.add_development_dependency 'distribution', '~> 0.7'
-  spec.add_development_dependency 'gsl', '~>2.1.0.2'
+  spec.add_development_dependency 'gsl', '~>2.1.0.2' if ENV['DARU_TEST_GSL']
   spec.add_development_dependency 'dbd-sqlite3'
   spec.add_development_dependency 'dbi'
   spec.add_development_dependency 'activerecord', '~> 6.0'

spec/accessors/gsl_wrapper_spec.rb

@@ -1,50 +1,53 @@
-describe Daru::Accessors::GSLWrapper do
-  before :each do
-    @stub_context = Object.new
-    @gsl_wrapper = Daru::Accessors::GSLWrapper.new([1,2,3,4,5,6], @stub_context)
-  end
+if Daru.has_gsl?
+  describe Daru::Accessors::GSLWrapper do
+    before :each do
+      @stub_context = Object.new
+      @gsl_wrapper = Daru::Accessors::GSLWrapper.new([1,2,3,4,5,6], @stub_context)
+    end
 
-  context ".new" do
-    it "actually creates a GSL Vector" do
-      expect(@gsl_wrapper.data.class).to eq(GSL::Vector)
+    context ".new" do
+      it "actually creates a GSL Vector" do
+        expect(@gsl_wrapper.data.class).to eq(GSL::Vector)
+      end
     end
-  end
 
-  context "#mean" do
-    it "computes mean" do
-      expect(@gsl_wrapper.mean).to eq(3.5)
+    context "#mean" do
+      it "computes mean" do
+        expect(@gsl_wrapper.mean).to eq(3.5)
+      end
     end
-  end
 
-  context "#map!" do
-    it "destructively maps" do
-      expect(@gsl_wrapper.map! { |a| a += 1 }).to eq(
-        Daru::Accessors::GSLWrapper.new([2,3,4,5,6,7], @stub_context)
-      )
+    context "#map!" do
+      it "destructively maps" do
+        expect(@gsl_wrapper.map! { |a| a += 1 }).to eq(
+          Daru::Accessors::GSLWrapper.new([2,3,4,5,6,7], @stub_context)
+        )
+      end
     end
-  end
 
-  context "#delete_at" do
-    it "deletes at key" do
-      expect(@gsl_wrapper.delete_at(2)).to eq(3)
+    context "#delete_at" do
+      it "deletes at key" do
+        expect(@gsl_wrapper.delete_at(2)).to eq(3)
 
-      expect(@gsl_wrapper).to eq(
-        Daru::Accessors::GSLWrapper.new([1,2,4,5,6], @stub_context)
-      )
+        expect(@gsl_wrapper).to eq(
+          Daru::Accessors::GSLWrapper.new([1,2,4,5,6], @stub_context)
+        )
+      end
     end
-  end
 
-  context "#index" do
-    it "returns index of value" do
-      expect(@gsl_wrapper.index(3)).to eq(2)
+    context "#index" do
+      it "returns index of value" do
+        expect(@gsl_wrapper.index(3)).to eq(2)
+      end
     end
-  end
 
-  context "#push" do
-    it "appends element" do
-      expect(@gsl_wrapper.push(15)).to eq(
-        Daru::Accessors::GSLWrapper.new([1,2,3,4,5,6,15], @stub_context)
-      )
+    context "#push" do
+      it "appends element" do
+        expect(@gsl_wrapper.push(15)).to eq(
+          Daru::Accessors::GSLWrapper.new([1,2,3,4,5,6,15], @stub_context)
+        )
+      end
     end
   end
 end
+

spec/accessors/nmatrix_wrapper_spec.rb

@@ -1,32 +1,35 @@
 require 'spec_helper.rb'
 
-describe Daru::Accessors::NMatrixWrapper do
-  before :each do
-    stub_context = Object.new
-    @nm_wrapper = Daru::Accessors::NMatrixWrapper.new([1,2,3,4,5], stub_context, :float32)
-  end
+if Daru.has_nmatrix?
+  describe Daru::Accessors::NMatrixWrapper do
+    before :each do
+      stub_context = Object.new
+      @nm_wrapper = Daru::Accessors::NMatrixWrapper.new([1,2,3,4,5], stub_context, :float32)
+    end
 
-  it "checks for actual NMatrix creation" do
-    expect(@nm_wrapper.data.class).to eq(NMatrix)
-  end
+    it "checks for actual NMatrix creation" do
+      expect(@nm_wrapper.data.class).to eq(NMatrix)
+    end
 
-  it "checks the actual size of the NMatrix object" do
-    expect(@nm_wrapper.data.size).to eq(10)
-  end
+    it "checks the actual size of the NMatrix object" do
+      expect(@nm_wrapper.data.size).to eq(10)
+    end
 
-  it "checks that @size is the number of elements in the vector" do
-    expect(@nm_wrapper.size).to eq(5)
-  end
+    it "checks that @size is the number of elements in the vector" do
+      expect(@nm_wrapper.size).to eq(5)
+    end
 
-  it "checks for underlying NMatrix data type" do
-    expect(@nm_wrapper.data.dtype).to eq(:float32)
-  end
+    it "checks for underlying NMatrix data type" do
+      expect(@nm_wrapper.data.dtype).to eq(:float32)
+    end
 
-  it "resizes" do
-    @nm_wrapper.resize(100)
+    it "resizes" do
+      @nm_wrapper.resize(100)
 
-    expect(@nm_wrapper.size).to eq(5)
-    expect(@nm_wrapper.data.size).to eq(100)
-    expect(@nm_wrapper.data).to eq(NMatrix.new [100], [1,2,3,4,5])
+      expect(@nm_wrapper.size).to eq(5)
+      expect(@nm_wrapper.data.size).to eq(100)
+      expect(@nm_wrapper.data).to eq(NMatrix.new [100], [1,2,3,4,5])
+    end
   end
 end
+

spec/spec_helper.rb

@@ -18,12 +18,6 @@ def jruby?
   RUBY_ENGINE == 'jruby'
 end
 
-if jruby?
-  require 'mdarray'
-else
-  require 'nmatrix/nmatrix'
-end
-
 RSpec::Expectations.configuration.warn_about_potential_false_positives = false
 
 require 'simplecov'
@@ -37,6 +31,14 @@ def jruby?
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'daru'
 
+if jruby?
+  require 'mdarray'
+else
+  if Daru.has_nmatrix?
+    require 'nmatrix/nmatrix'
+  end
+end
+
 ALL_DTYPES = [:nmatrix, :gsl, :array]
 
 # FIXME: This must go! Need to be able to use be_within