rserve-client 0.3.3 → 0.3.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +2 -0
- data/.travis.yml +3 -3
- data/Gemfile +1 -2
- data/History.txt +6 -0
- data/README.md +2 -2
- data/Rakefile +1 -3
- data/lib/rserve.rb +1 -2
- data/lib/rserve/connection.rb +1 -1
- data/lib/rserve/talk.rb +1 -1
- data/lib/rserve/version.rb +4 -0
- data/rserve-client.gemspec +6 -8
- data/spec/rserve_bug_1_spec.rb +4 -2
- data/spec/rserve_talk_spec.rb +8 -7
- data/spec/spec_helper.rb +1 -2
- metadata +16 -8
- data/Gemfile.lock +0 -33
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6388addfcc2e16a3123020c25301529371a1ef37
|
4
|
+
data.tar.gz: 2502c2748046af92d8bf57b99d79866dfcd15089
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 164f6c0b116b8239c5e50d87d71af884182a61ca42814fef2ca67d5b9776dd0f35451a1cd019790a8749cf28b8623034b3ff07d5e10a673f2b890b676cde8f92
|
7
|
+
data.tar.gz: 4de9c23b4c873c94f93b355d5621d572fd162b3b70493f3f6b0a3dbd1d7ee10d0060b900ae3d8914edc77ccbc80fe831d76255419cc5fe35a11b9ef9a11f6f70
|
data/.gitignore
CHANGED
data/.travis.yml
CHANGED
@@ -2,15 +2,15 @@ language:
|
|
2
2
|
ruby
|
3
3
|
|
4
4
|
rvm:
|
5
|
-
- '1.8.7'
|
6
5
|
- '1.9.3'
|
7
6
|
- '2.0.0'
|
8
7
|
- '2.1.1'
|
8
|
+
- '2.3.1'
|
9
9
|
|
10
10
|
script:
|
11
|
-
bundle exec
|
11
|
+
bundle exec rspec spec/*.rb
|
12
12
|
|
13
13
|
before_install:
|
14
14
|
- sudo apt-get update -qq
|
15
15
|
- sudo apt-get install -y r-base r-base-dev
|
16
|
-
- sudo Rscript -e "install.packages(c('Rserve','icc'),,'http://cran.us.r-project.org')"
|
16
|
+
- sudo Rscript -e "install.packages(c('Rserve','icc','irr'),,'http://cran.us.r-project.org')"
|
data/Gemfile
CHANGED
data/History.txt
CHANGED
@@ -1,3 +1,9 @@
|
|
1
|
+
=== 0.3.4 / 2017-08-27
|
2
|
+
|
3
|
+
* Updated rserve_talk_spec to latest rspec
|
4
|
+
* Deleted Gemfile.lock (545ch4 idea). Starting process to deprecate ruby 1.9
|
5
|
+
* Corrected deprecation of Fixnum : https://github.com/545ch4/Rserve-Ruby-client/commit/ab27f5ccd95ed58dd325a0e073649f6b9b1b0727
|
6
|
+
* Removes unsafe require from gemspec : https://github.com/apptopia/Rserve-Ruby-client/commit/506b06d6c27e3d2a5302a8c2ffd17436ce4d36ad
|
1
7
|
=== 0.3.3 / 2017-07-06
|
2
8
|
|
3
9
|
* Added support for crypt and plaintext authentication
|
data/README.md
CHANGED
@@ -16,7 +16,7 @@ Follows closely the new Java client API, but maintains all Ruby conventions when
|
|
16
16
|
* Uses TCP/IP sockets to interchange data and commands
|
17
17
|
* Requires Rserve installed on the server machine. On debian / ubuntu, you should use <tt>sudo apt-get install r-cran-rserve</tt>
|
18
18
|
Pros:
|
19
|
-
* Work with Ruby 1.
|
19
|
+
* Work with Ruby 1.9.3, 2.0.0, 2.1.1, 2.3.1 (tested on Travis) and and JRuby 1.5.
|
20
20
|
* Retrieve and assign various R's datatypes: integer, doubles, chars, logical vectors, lists and raw data.
|
21
21
|
* 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.
|
22
22
|
* 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
|
|
118
118
|
|
119
119
|
REngine - Java interface to R
|
120
120
|
Copyright (C) 2004,5,6,7 Simon Urbanek
|
121
|
-
Copyrigth (C) 2010 Claudio Bustos (Ruby version)
|
121
|
+
Copyrigth (C) 2010-2017 Claudio Bustos (Ruby version)
|
122
122
|
|
123
123
|
This library is free software; you can redistribute it and/or
|
124
124
|
modify it under the terms of the GNU Lesser General Public
|
data/Rakefile
CHANGED
@@ -1,14 +1,12 @@
|
|
1
1
|
# -*- ruby -*-
|
2
|
-
$:.unshift(File.dirname(__FILE__)+"/lib")
|
3
2
|
require 'rubygems'
|
4
|
-
|
3
|
+
require_relative 'lib/rserve'
|
5
4
|
require 'rspec'
|
6
5
|
require 'rspec/core/rake_task'
|
7
6
|
|
8
7
|
require 'bundler'
|
9
8
|
Bundler::GemHelper.install_tasks
|
10
9
|
|
11
|
-
|
12
10
|
# vim: syntax=ruby
|
13
11
|
|
14
12
|
|
data/lib/rserve.rb
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
require 'socket'
|
2
2
|
require 'rbconfig'
|
3
3
|
module Rserve
|
4
|
-
VERSION = '0.3.3'
|
5
4
|
ON_WINDOWS=RbConfig::CONFIG['arch']=~/mswin|mingw/
|
6
5
|
end
|
7
6
|
|
@@ -23,5 +22,5 @@ require_relative 'rserve/session'
|
|
23
22
|
require_relative 'rserve/connection'
|
24
23
|
require_relative 'rserve/rlist'
|
25
24
|
require_relative 'rserve/rfactor'
|
26
|
-
|
25
|
+
require_relative 'rserve/version'
|
27
26
|
|
data/lib/rserve/connection.rb
CHANGED
data/lib/rserve/talk.rb
CHANGED
@@ -41,7 +41,7 @@ module Rserve
|
|
41
41
|
|
42
42
|
|
43
43
|
if (!cont.nil?)
|
44
|
-
raise ":cont shouldn't contain anything but Fixnum" if cont.any? {|v|
|
44
|
+
raise ":cont shouldn't contain anything but Fixnum" if cont.any? {|v| v.class != 1.class}
|
45
45
|
if (offset>=cont.length)
|
46
46
|
cont=nil;len=0
|
47
47
|
elsif (len>cont.length-offset)
|
data/rserve-client.gemspec
CHANGED
@@ -1,21 +1,19 @@
|
|
1
1
|
# -*- encoding: utf-8 -*-
|
2
|
-
|
3
|
-
|
4
|
-
require File.expand_path("../lib/rserve", __FILE__)
|
2
|
+
require_relative "lib/rserve/version"
|
5
3
|
|
6
4
|
Gem::Specification.new do |s|
|
7
5
|
s.name = "rserve-client"
|
8
6
|
s.version = Rserve::VERSION
|
9
7
|
s.platform = Gem::Platform::RUBY
|
10
8
|
s.authors = ['Claudio Bustos']
|
11
|
-
s.email = []
|
9
|
+
s.email = ["clbustos_at_gmail_dot_com"]
|
12
10
|
s.homepage = "http://rubygems.org/gems/rserve-client"
|
13
11
|
s.summary = "Rserve client for ruby"
|
14
|
-
s.description = "
|
15
|
-
|
12
|
+
s.description = "Ruby client for Rserve, a Binary R server (http://www.rforge.net/Rserve/)."
|
13
|
+
s.license="LGPL-2.1+"
|
16
14
|
s.required_rubygems_version = ">= 1.3.6"
|
17
|
-
s.add_development_dependency "bundler", ">= 1.0.0"
|
18
|
-
s.add_development_dependency "rspec"
|
15
|
+
s.add_development_dependency "bundler", '~>1.0', ">= 1.0.0"
|
16
|
+
s.add_development_dependency "rspec", '~>0'
|
19
17
|
s.files = `git ls-files`.split("\n")
|
20
18
|
s.executables = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
|
21
19
|
s.require_path = 'lib'
|
data/spec/rserve_bug_1_spec.rb
CHANGED
@@ -9,8 +9,10 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
|
|
9
9
|
it "should return a correct irr object" do
|
10
10
|
|
11
11
|
@r.void_eval("
|
12
|
-
|
13
|
-
|
12
|
+
if(!require('irr')) {
|
13
|
+
install.packages('irr',repos='https://cloud.r-project.org',quiet=TRUE);
|
14
|
+
}
|
15
|
+
library(irr)
|
14
16
|
ds<-data.frame(a=rnorm(100),b=rnorm(100),c=rnorm(100),d=rnorm(100));
|
15
17
|
iccs=list(
|
16
18
|
icc_1=icc(ds,'o','c','s'),
|
data/spec/rserve_talk_spec.rb
CHANGED
@@ -30,9 +30,10 @@ describe Rserve::Talk do
|
|
30
30
|
server_response_1=[rep,cl,0,0].pack("IIII")
|
31
31
|
server_response_2=cont
|
32
32
|
|
33
|
-
@iomock.
|
34
|
-
|
35
|
-
@iomock.
|
33
|
+
expect(@iomock).to receive(:write).once.with(buf.pack("C*"))
|
34
|
+
|
35
|
+
expect(@iomock).to receive(:recv).once.with(16).and_return(server_response_1)
|
36
|
+
expect(@iomock).to receive(:recv).once.with(cl).and_return(server_response_2)
|
36
37
|
|
37
38
|
ret=@talk.request(:cmd=>ty)
|
38
39
|
ret.should be_instance_of(Rserve::Packet)
|
@@ -56,11 +57,11 @@ describe Rserve::Talk do
|
|
56
57
|
cl=cont.length
|
57
58
|
server_response_1=[rep,cl,0,0].pack("IIII")
|
58
59
|
server_response_2=cont
|
59
|
-
@iomock.
|
60
|
-
@iomock.
|
60
|
+
expect(@iomock).to receive(:write).once.with(buf.pack("C*"))
|
61
|
+
expect(@iomock).to receive(:write).once.with(es_proc)
|
61
62
|
|
62
|
-
@iomock.
|
63
|
-
@iomock.
|
63
|
+
expect(@iomock).to receive(:recv).once.with(16).and_return(server_response_1)
|
64
|
+
expect(@iomock).to receive(:recv).once.with(cl).and_return(server_response_2)
|
64
65
|
|
65
66
|
ret=@talk.request(:cmd=>ty,:cont=>es)
|
66
67
|
|
data/spec/spec_helper.rb
CHANGED
metadata
CHANGED
@@ -1,19 +1,22 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rserve-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Claudio Bustos
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-08-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
+
- - "~>"
|
18
|
+
- !ruby/object:Gem::Version
|
19
|
+
version: '1.0'
|
17
20
|
- - ">="
|
18
21
|
- !ruby/object:Gem::Version
|
19
22
|
version: 1.0.0
|
@@ -21,6 +24,9 @@ dependencies:
|
|
21
24
|
prerelease: false
|
22
25
|
version_requirements: !ruby/object:Gem::Requirement
|
23
26
|
requirements:
|
27
|
+
- - "~>"
|
28
|
+
- !ruby/object:Gem::Version
|
29
|
+
version: '1.0'
|
24
30
|
- - ">="
|
25
31
|
- !ruby/object:Gem::Version
|
26
32
|
version: 1.0.0
|
@@ -28,18 +34,19 @@ dependencies:
|
|
28
34
|
name: rspec
|
29
35
|
requirement: !ruby/object:Gem::Requirement
|
30
36
|
requirements:
|
31
|
-
- - "
|
37
|
+
- - "~>"
|
32
38
|
- !ruby/object:Gem::Version
|
33
39
|
version: '0'
|
34
40
|
type: :development
|
35
41
|
prerelease: false
|
36
42
|
version_requirements: !ruby/object:Gem::Requirement
|
37
43
|
requirements:
|
38
|
-
- - "
|
44
|
+
- - "~>"
|
39
45
|
- !ruby/object:Gem::Version
|
40
46
|
version: '0'
|
41
|
-
description:
|
42
|
-
email:
|
47
|
+
description: Ruby client for Rserve, a Binary R server (http://www.rforge.net/Rserve/).
|
48
|
+
email:
|
49
|
+
- clbustos_at_gmail_dot_com
|
43
50
|
executables: []
|
44
51
|
extensions: []
|
45
52
|
extra_rdoc_files: []
|
@@ -49,7 +56,6 @@ files:
|
|
49
56
|
- ".rspec"
|
50
57
|
- ".travis.yml"
|
51
58
|
- Gemfile
|
52
|
-
- Gemfile.lock
|
53
59
|
- History.txt
|
54
60
|
- Introduction.txt
|
55
61
|
- Manifest.txt
|
@@ -97,6 +103,7 @@ files:
|
|
97
103
|
- lib/rserve/rlist.rb
|
98
104
|
- lib/rserve/session.rb
|
99
105
|
- lib/rserve/talk.rb
|
106
|
+
- lib/rserve/version.rb
|
100
107
|
- lib/rserve/with2dnames.rb
|
101
108
|
- lib/rserve/with2dsizes.rb
|
102
109
|
- lib/rserve/withattributes.rb
|
@@ -127,7 +134,8 @@ files:
|
|
127
134
|
- spec/rserve_withnames_spec.rb
|
128
135
|
- spec/spec_helper.rb
|
129
136
|
homepage: http://rubygems.org/gems/rserve-client
|
130
|
-
licenses:
|
137
|
+
licenses:
|
138
|
+
- LGPL-2.1+
|
131
139
|
metadata: {}
|
132
140
|
post_install_message:
|
133
141
|
rdoc_options: []
|
data/Gemfile.lock
DELETED
@@ -1,33 +0,0 @@
|
|
1
|
-
GEM
|
2
|
-
remote: https://rubygems.org/
|
3
|
-
specs:
|
4
|
-
diff-lcs (1.3)
|
5
|
-
hoe (3.16.0)
|
6
|
-
rake (>= 0.8, < 13.0)
|
7
|
-
rake (12.0.0)
|
8
|
-
rbx-require-relative (0.0.9)
|
9
|
-
rspec (3.6.0)
|
10
|
-
rspec-core (~> 3.6.0)
|
11
|
-
rspec-expectations (~> 3.6.0)
|
12
|
-
rspec-mocks (~> 3.6.0)
|
13
|
-
rspec-core (3.6.0)
|
14
|
-
rspec-support (~> 3.6.0)
|
15
|
-
rspec-expectations (3.6.0)
|
16
|
-
diff-lcs (>= 1.2.0, < 2.0)
|
17
|
-
rspec-support (~> 3.6.0)
|
18
|
-
rspec-mocks (3.6.0)
|
19
|
-
diff-lcs (>= 1.2.0, < 2.0)
|
20
|
-
rspec-support (~> 3.6.0)
|
21
|
-
rspec-support (3.6.0)
|
22
|
-
|
23
|
-
PLATFORMS
|
24
|
-
ruby
|
25
|
-
|
26
|
-
DEPENDENCIES
|
27
|
-
hoe
|
28
|
-
rake
|
29
|
-
rbx-require-relative
|
30
|
-
rspec
|
31
|
-
|
32
|
-
BUNDLED WITH
|
33
|
-
1.15.1
|