rserve-client 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fff9789e59308f0fc962b2d3a4fece6fdcc00b74
-  data.tar.gz: 5adc4082d943001c3fcb2cc9af70caf9afa00ef8
+  metadata.gz: 6388addfcc2e16a3123020c25301529371a1ef37
+  data.tar.gz: 2502c2748046af92d8bf57b99d79866dfcd15089
 SHA512:
-  metadata.gz: 459d3aae846e86289edf748ea0a74694e06fc77fe097bbb5639a5f338922408607418ab4006e220231480af0a9b23f00b9811d5c989632eae5bbb3be72c70e77
-  data.tar.gz: 97a53fdc28bc498980d30ca0935c00a5dc9877ddeb8c824221015eed6a7025712c61d9bd824fbf2ffd6c0388b3d91b81607ff1fa2b9de6600feaa75e33062972
+  metadata.gz: 164f6c0b116b8239c5e50d87d71af884182a61ca42814fef2ca67d5b9776dd0f35451a1cd019790a8749cf28b8623034b3ff07d5e10a673f2b890b676cde8f92
+  data.tar.gz: 4de9c23b4c873c94f93b355d5621d572fd162b3b70493f3f6b0a3dbd1d7ee10d0060b900ae3d8914edc77ccbc80fe831d76255419cc5fe35a11b9ef9a11f6f70

data/.gitignore

@@ -4,3 +4,5 @@ coverage.info
 doc
 pkg
 coverage
+Gemfile.lock
+.idea

data/.travis.yml

@@ -2,15 +2,15 @@ language:
   ruby
 
 rvm:
-  - '1.8.7'
   - '1.9.3'
   - '2.0.0'
   - '2.1.1'
+  - '2.3.1'
 
 script:
-  bundle exec rake spec 
+  bundle exec rspec spec/*.rb 
   
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y r-base r-base-dev
-  - sudo Rscript -e "install.packages(c('Rserve','icc'),,'http://cran.us.r-project.org')"
+  - sudo Rscript -e "install.packages(c('Rserve','icc','irr'),,'http://cran.us.r-project.org')"

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-gem 'hoe'
 gem 'rspec'
 gem 'rake'
-gem 'rbx-require-relative', :platforms => :ruby_18
+gem 'rbx-require-relative', :platforms => :ruby_18

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.3.4 / 2017-08-27
+
+* Updated rserve_talk_spec to latest rspec
+* Deleted Gemfile.lock (545ch4 idea). Starting process to deprecate ruby 1.9
+* Corrected deprecation of Fixnum : https://github.com/545ch4/Rserve-Ruby-client/commit/ab27f5ccd95ed58dd325a0e073649f6b9b1b0727
+* Removes unsafe require from gemspec : https://github.com/apptopia/Rserve-Ruby-client/commit/506b06d6c27e3d2a5302a8c2ffd17436ce4d36ad 
 === 0.3.3 / 2017-07-06
 
 * Added support for crypt and plaintext authentication 

data/README.md

@@ -16,7 +16,7 @@ Follows closely the new Java client API, but maintains all Ruby conventions when
 * Uses TCP/IP sockets to interchange data and commands
 * Requires Rserve installed on the server machine. On debian /  ubuntu, you should use <tt>sudo apt-get install r-cran-rserve</tt>
 Pros:
-* Work with Ruby 1.8, 1.9 and JRuby 1.5.
+* Work with Ruby 1.9.3, 2.0.0, 2.1.1, 2.3.1 (tested on Travis) and  and JRuby 1.5.
 * Retrieve and assign various R's datatypes: integer, doubles, chars, logical vectors, lists and raw data.
 * Session allows to process data asynchronously. You start a command, detach the process and retrieve result later. You can marshall the session, store on file or database and use it when you need it.
 * Ruby API follows closely the Java API, so any change on the server API could be adopted without much problem
@@ -118,7 +118,7 @@ Spec
 
 REngine - Java interface to R
 Copyright (C) 2004,5,6,7  Simon Urbanek 
-Copyrigth (C) 2010 Claudio Bustos (Ruby version)
+Copyrigth (C) 2010-2017 Claudio Bustos (Ruby version)
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

data/Rakefile

@@ -1,14 +1,12 @@
 # -*- ruby -*-
-$:.unshift(File.dirname(__FILE__)+"/lib")
 require 'rubygems'
-require 'rserve'
+require_relative 'lib/rserve'
 require 'rspec'
 require 'rspec/core/rake_task'
 
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-
 # vim: syntax=ruby
 
 

data/lib/rserve.rb

@@ -1,7 +1,6 @@
 require 'socket'
 require 'rbconfig'
 module Rserve
-  VERSION = '0.3.3'
   ON_WINDOWS=RbConfig::CONFIG['arch']=~/mswin|mingw/
 end
 
@@ -23,5 +22,5 @@ require_relative 'rserve/session'
 require_relative 'rserve/connection'
 require_relative 'rserve/rlist'
 require_relative 'rserve/rfactor'
-
+require_relative 'rserve/version'
 

data/lib/rserve/connection.rb

@@ -123,7 +123,7 @@ module Rserve
             @auth_req=true
           elsif (attr=="ARuc") 
             @auth_req=true
-            @auth_type=AT_crypt #
+            @auth_type=AT_crypt
           elsif (attr[0..0]=='K') 
             @key=attr[1,2]
           end

data/lib/rserve/talk.rb

@@ -41,7 +41,7 @@ module Rserve
 
 
       if (!cont.nil?)
-        raise ":cont shouldn't contain anything but Fixnum" if cont.any? {|v| !v.is_a? Fixnum}
+        raise ":cont shouldn't contain anything but Fixnum" if cont.any? {|v| v.class != 1.class}
         if (offset>=cont.length)
           cont=nil;len=0
         elsif (len>cont.length-offset)

data/lib/rserve/version.rb

@@ -0,0 +1,4 @@
+module Rserve
+
+  VERSION="0.3.5"
+end

data/rserve-client.gemspec

@@ -1,21 +1,19 @@
 # -*- encoding: utf-8 -*-
-$:.unshift(File.expand_path(File.dirname(__FILE__)+"/lib"))
-
-require File.expand_path("../lib/rserve", __FILE__)
+require_relative "lib/rserve/version"
 
 Gem::Specification.new do |s|
   s.name = "rserve-client"
   s.version = Rserve::VERSION
   s.platform = Gem::Platform::RUBY
   s.authors = ['Claudio Bustos']
-  s.email = []
+  s.email = ["clbustos_at_gmail_dot_com"]
   s.homepage = "http://rubygems.org/gems/rserve-client"
   s.summary = "Rserve client for ruby"
-  s.description = "Rserve client for ruby"
-
+  s.description = "Ruby client for Rserve, a Binary R server (http://www.rforge.net/Rserve/)."
+  s.license="LGPL-2.1+"
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "bundler", '~>1.0', ">= 1.0.0"
+  s.add_development_dependency "rspec", '~>0'
   s.files = `git ls-files`.split("\n")
   s.executables = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'

data/spec/rserve_bug_1_spec.rb

@@ -9,8 +9,10 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
     it "should return a correct irr object" do
 
     @r.void_eval("
-    install.packages('irr');
-    library(irr);
+    if(!require('irr')) {
+       install.packages('irr',repos='https://cloud.r-project.org',quiet=TRUE);
+    }
+    library(irr)
     ds<-data.frame(a=rnorm(100),b=rnorm(100),c=rnorm(100),d=rnorm(100));
     iccs=list(
     icc_1=icc(ds,'o','c','s'),

data/spec/rserve_talk_spec.rb

@@ -30,9 +30,10 @@ describe Rserve::Talk do
     server_response_1=[rep,cl,0,0].pack("IIII")
     server_response_2=cont
 
-    @iomock.should_receive(:write).once.with(buf.pack("C*"))
-    @iomock.should_receive(:recv).once.with(16).and_return(server_response_1)
-    @iomock.should_receive(:recv).once.with(cl).and_return(server_response_2)
+    expect(@iomock).to receive(:write).once.with(buf.pack("C*"))
+
+    expect(@iomock).to receive(:recv).once.with(16).and_return(server_response_1)
+    expect(@iomock).to receive(:recv).once.with(cl).and_return(server_response_2)
 
     ret=@talk.request(:cmd=>ty)
     ret.should be_instance_of(Rserve::Packet)
@@ -56,11 +57,11 @@ describe Rserve::Talk do
     cl=cont.length
     server_response_1=[rep,cl,0,0].pack("IIII")
     server_response_2=cont
-    @iomock.should_receive(:write).once.with(buf.pack("C*"))
-    @iomock.should_receive(:write).once.with(es_proc)
+    expect(@iomock).to receive(:write).once.with(buf.pack("C*"))
+    expect(@iomock).to receive(:write).once.with(es_proc)
 
-    @iomock.should_receive(:recv).once.with(16).and_return(server_response_1)
-    @iomock.should_receive(:recv).once.with(cl).and_return(server_response_2)
+    expect(@iomock).to receive(:recv).once.with(16).and_return(server_response_1)
+    expect(@iomock).to receive(:recv).once.with(cl).and_return(server_response_2)
 
     ret=@talk.request(:cmd=>ty,:cont=>es)
 

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
-$:.unshift(File.dirname(__FILE__)+"/../lib")
 require 'rspec'
-require 'rserve'
+require_relative '../lib/rserve'
 require 'matrix'
 require 'pp'
 

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: rserve-client
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Claudio Bustos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -28,18 +34,19 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Rserve client for ruby
-email: []
+description: Ruby client for Rserve, a Binary R server (http://www.rforge.net/Rserve/).
+email:
+- clbustos_at_gmail_dot_com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -49,7 +56,6 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - History.txt
 - Introduction.txt
 - Manifest.txt
@@ -97,6 +103,7 @@ files:
 - lib/rserve/rlist.rb
 - lib/rserve/session.rb
 - lib/rserve/talk.rb
+- lib/rserve/version.rb
 - lib/rserve/with2dnames.rb
 - lib/rserve/with2dsizes.rb
 - lib/rserve/withattributes.rb
@@ -127,7 +134,8 @@ files:
 - spec/rserve_withnames_spec.rb
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/rserve-client
-licenses: []
+licenses:
+- LGPL-2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/Gemfile.lock

@@ -1,33 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.3)
-    hoe (3.16.0)
-      rake (>= 0.8, < 13.0)
-    rake (12.0.0)
-    rbx-require-relative (0.0.9)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  hoe
-  rake
-  rbx-require-relative
-  rspec
-
-BUNDLED WITH
-   1.15.1