bives 1.0 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78a248354dc4356b69fe053804f03193eb952c23
-  data.tar.gz: 218969612f8e304136fecbd39c9f853aaad5e688
+SHA256:
+  metadata.gz: 3bf969c5025b4d8c0b0dab2efdc6ee18bb0df71ce66812365ec1d08b11fa9f06
+  data.tar.gz: 9044163e790948abd5cab9adac12a4e8216f566d16cfb8bd2bc00f33833cb292
 SHA512:
-  metadata.gz: 7fa418934de669742b83847fe9beaa3519ae9fd62124e2e252f26eff6f93d8a57f2f154b73f48e416f8d47161eceece77b9031ca64a92e46cecbcb6b678ff030
-  data.tar.gz: a8f14085079e21f07fcfaa8d9e5ed092ac2258e20b344b748724ac5fcb4fc52bdb8843c92341d09907195a592fa4d4974a800f32f7d8d342c9b68e96f0c24d92
+  metadata.gz: 82fb7a680e3db090dd5f6fd0a236c1a8cc7f4031ee8a6e8ae2544d647c544237e4d99110a2293ae0f52c48f450d51ec3715c025b91a5312ac112168123d711ec
+  data.tar.gz: ec26a8ccfe8fcffdeaff27cab9035a27dfff8bf40958a47253ac96e4b53f381c022547e4ad3a995bc1e46017c817cc5d9e5bdc6f4f56d09a9db25eab87250803

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .idea/
+.rakeTasks

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.6
+ruby-2.4.9

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 
-rvm:
-  - 2.1.6
+jdk:
+  - openjdk8
+  - openjdk11
 
 env:
    - SUITE="rake test"

data/bives.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "test-unit", "~> 3.0"
+  spec.add_development_dependency "minitest"
 
-  spec.add_runtime_dependency "open4","~>1.3.0"
+  spec.add_runtime_dependency "terrapin"
 
 end
 

data/lib/bives.rb

@@ -1,5 +1,5 @@
+require 'terrapin'
 require_relative "bives/version"
-require 'open4'
 
 module Bives
   class ConversionException < Exception
@@ -10,7 +10,7 @@ module Bives
 
   end
 
-  JAR_FILENAME = "BiVeS-1.3.12-jar-with-dependencies.jar"
+  JAR_FILENAME = "BiVeS-1.12.1-jar-with-dependencies.jar"
   JAR_FILEPATH = File.join File.dirname(__FILE__),"jars","#{JAR_FILENAME}"
 
   def self.included(mod)
@@ -30,28 +30,11 @@ module Bives
     cmd_opts = opts.collect{|o| "--#{o}"}.join(" ")
     command = "java -jar #{JAR_FILEPATH} #{cmd_opts} #{file1} #{file2}"
 
-    err_message = ""
-    output = ""
-    status = Open4::popen4(command) do |pid, stdin, stdout, stderr|
+    output = Terrapin::CommandLine.new(command).run
 
+    output.strip
+  rescue Terrapin::ExitStatusError => exception
+    raise ConversionException.new(exception.message)
 
-      while ((line = stdout.gets) != nil) do
-        output << line
-      end
-      stdout.close
-
-      while ((line=stderr.gets)!= nil) do
-        err_message << line
-      end
-      stderr.close
-    end
-
-    output=output.strip
-
-    if status.to_i != 0
-      raise ConversionException.new(err_message)
-    end
-
-    output
   end
 end

data/lib/bives/version.rb

@@ -1,3 +1,3 @@
 module Bives
-  VERSION = "1.0"
+  VERSION = "2.0"
 end

data/test/bives_test.rb

@@ -1,8 +1,8 @@
-require 'minitest/unit'
+require 'minitest'
 require "minitest/autorun"
 require_relative '../lib/bives'
 
-class BivesTest < MiniTest::Unit::TestCase
+class BivesTest < MiniTest::Test
   include Bives
 
   def setup
@@ -23,7 +23,7 @@ class BivesTest < MiniTest::Unit::TestCase
     exception = assert_raises Bives::ConversionException do
       compare("","",[])
     end
-    assert_includes exception.message,"no file provided"
+    assert_includes exception.message,"Parsing of command line options failed. need at least one file"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bives
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '2.0'
 platform: ruby
 authors:
 - Stuart Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: open4
+  name: terrapin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 description: Ruby wrapper for the BiVeS model version comparison tool
 email:
 - stuart.owen@manchester.ac.uk
@@ -70,7 +70,7 @@ files:
 - bives.gemspec
 - lib/bives.rb
 - lib/bives/version.rb
-- lib/jars/BiVeS-1.3.12-jar-with-dependencies.jar
+- lib/jars/BiVeS-1.12.1-jar-with-dependencies.jar
 - test/bives_test.rb
 - test/models/potato1.xml
 - test/models/potato2.xml
@@ -93,8 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper to interface with the BiVeS model version comparison tool -