bives 1.0 → 2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.gitignore +1 -0
- data/.ruby-version +1 -1
- data/.travis.yml +3 -2
- data/bives.gemspec +2 -2
- data/lib/bives.rb +6 -23
- data/lib/bives/version.rb +1 -1
- data/lib/jars/BiVeS-1.12.1-jar-with-dependencies.jar +0 -0
- data/test/bives_test.rb +3 -3
- metadata +14 -15
- data/lib/jars/BiVeS-1.3.12-jar-with-dependencies.jar +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 3bf969c5025b4d8c0b0dab2efdc6ee18bb0df71ce66812365ec1d08b11fa9f06
|
4
|
+
data.tar.gz: 9044163e790948abd5cab9adac12a4e8216f566d16cfb8bd2bc00f33833cb292
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 82fb7a680e3db090dd5f6fd0a236c1a8cc7f4031ee8a6e8ae2544d647c544237e4d99110a2293ae0f52c48f450d51ec3715c025b91a5312ac112168123d711ec
|
7
|
+
data.tar.gz: ec26a8ccfe8fcffdeaff27cab9035a27dfff8bf40958a47253ac96e4b53f381c022547e4ad3a995bc1e46017c817cc5d9e5bdc6f4f56d09a9db25eab87250803
|
data/.gitignore
CHANGED
data/.ruby-version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
ruby-2.
|
1
|
+
ruby-2.4.9
|
data/.travis.yml
CHANGED
data/bives.gemspec
CHANGED
@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
|
|
20
20
|
spec.require_paths = ["lib"]
|
21
21
|
|
22
22
|
spec.add_development_dependency "rake"
|
23
|
-
spec.add_development_dependency "
|
23
|
+
spec.add_development_dependency "minitest"
|
24
24
|
|
25
|
-
spec.add_runtime_dependency "
|
25
|
+
spec.add_runtime_dependency "terrapin"
|
26
26
|
|
27
27
|
end
|
28
28
|
|
data/lib/bives.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
+
require 'terrapin'
|
1
2
|
require_relative "bives/version"
|
2
|
-
require 'open4'
|
3
3
|
|
4
4
|
module Bives
|
5
5
|
class ConversionException < Exception
|
@@ -10,7 +10,7 @@ module Bives
|
|
10
10
|
|
11
11
|
end
|
12
12
|
|
13
|
-
JAR_FILENAME = "BiVeS-1.
|
13
|
+
JAR_FILENAME = "BiVeS-1.12.1-jar-with-dependencies.jar"
|
14
14
|
JAR_FILEPATH = File.join File.dirname(__FILE__),"jars","#{JAR_FILENAME}"
|
15
15
|
|
16
16
|
def self.included(mod)
|
@@ -30,28 +30,11 @@ module Bives
|
|
30
30
|
cmd_opts = opts.collect{|o| "--#{o}"}.join(" ")
|
31
31
|
command = "java -jar #{JAR_FILEPATH} #{cmd_opts} #{file1} #{file2}"
|
32
32
|
|
33
|
-
|
34
|
-
output = ""
|
35
|
-
status = Open4::popen4(command) do |pid, stdin, stdout, stderr|
|
33
|
+
output = Terrapin::CommandLine.new(command).run
|
36
34
|
|
35
|
+
output.strip
|
36
|
+
rescue Terrapin::ExitStatusError => exception
|
37
|
+
raise ConversionException.new(exception.message)
|
37
38
|
|
38
|
-
while ((line = stdout.gets) != nil) do
|
39
|
-
output << line
|
40
|
-
end
|
41
|
-
stdout.close
|
42
|
-
|
43
|
-
while ((line=stderr.gets)!= nil) do
|
44
|
-
err_message << line
|
45
|
-
end
|
46
|
-
stderr.close
|
47
|
-
end
|
48
|
-
|
49
|
-
output=output.strip
|
50
|
-
|
51
|
-
if status.to_i != 0
|
52
|
-
raise ConversionException.new(err_message)
|
53
|
-
end
|
54
|
-
|
55
|
-
output
|
56
39
|
end
|
57
40
|
end
|
data/lib/bives/version.rb
CHANGED
Binary file
|
data/test/bives_test.rb
CHANGED
@@ -1,8 +1,8 @@
|
|
1
|
-
require 'minitest
|
1
|
+
require 'minitest'
|
2
2
|
require "minitest/autorun"
|
3
3
|
require_relative '../lib/bives'
|
4
4
|
|
5
|
-
class BivesTest < MiniTest::
|
5
|
+
class BivesTest < MiniTest::Test
|
6
6
|
include Bives
|
7
7
|
|
8
8
|
def setup
|
@@ -23,7 +23,7 @@ class BivesTest < MiniTest::Unit::TestCase
|
|
23
23
|
exception = assert_raises Bives::ConversionException do
|
24
24
|
compare("","",[])
|
25
25
|
end
|
26
|
-
assert_includes exception.message,"
|
26
|
+
assert_includes exception.message,"Parsing of command line options failed. need at least one file"
|
27
27
|
end
|
28
28
|
|
29
29
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bives
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: '
|
4
|
+
version: '2.0'
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Stuart Owen
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2020-02-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|
@@ -25,33 +25,33 @@ dependencies:
|
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: '0'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
|
-
name:
|
28
|
+
name: minitest
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - "
|
31
|
+
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '
|
33
|
+
version: '0'
|
34
34
|
type: :development
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- - "
|
38
|
+
- - ">="
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: '
|
40
|
+
version: '0'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
|
-
name:
|
42
|
+
name: terrapin
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- - "
|
45
|
+
- - ">="
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version:
|
47
|
+
version: '0'
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- - "
|
52
|
+
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version:
|
54
|
+
version: '0'
|
55
55
|
description: Ruby wrapper for the BiVeS model version comparison tool
|
56
56
|
email:
|
57
57
|
- stuart.owen@manchester.ac.uk
|
@@ -70,7 +70,7 @@ files:
|
|
70
70
|
- bives.gemspec
|
71
71
|
- lib/bives.rb
|
72
72
|
- lib/bives/version.rb
|
73
|
-
- lib/jars/BiVeS-1.
|
73
|
+
- lib/jars/BiVeS-1.12.1-jar-with-dependencies.jar
|
74
74
|
- test/bives_test.rb
|
75
75
|
- test/models/potato1.xml
|
76
76
|
- test/models/potato2.xml
|
@@ -93,8 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
93
93
|
- !ruby/object:Gem::Version
|
94
94
|
version: '0'
|
95
95
|
requirements: []
|
96
|
-
|
97
|
-
rubygems_version: 2.2.3
|
96
|
+
rubygems_version: 3.0.6
|
98
97
|
signing_key:
|
99
98
|
specification_version: 4
|
100
99
|
summary: Ruby wrapper to interface with the BiVeS model version comparison tool -
|
Binary file
|