genevalidatorapp 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4281aed95e4b44abf62ad3631347e45568708ac6522124e766e65a540ec32f57
-  data.tar.gz: e1a05add24deb954ff084539e878ec1a3884d49092a6e0c3d00c0da8bfef5fe2
+  metadata.gz: 8c55cdbae6d48fbf506a703f06e2a99d7c06453834dc7d084bc94ad732b0168e
+  data.tar.gz: d39e39a309b8f425ae949871f6cf6866003a73fd9e0ca15061d70a824c41622d
 SHA512:
-  metadata.gz: 2f7cae72b1489e8615f6293fef6895b2d131a6ed4a189a42d9b5b4f41390a69db982ee245fff6aea4b426e9a7b4f585aa565911af1345d9a96b4289fe95e1bf6
-  data.tar.gz: a3a27f1e54d2631b720032d6ca41b148f6ca7683aca3c2e5872d3b7f90de9af349376313cefc5b84b14aa5fdd301d54a7f34fdebec78d322da943da361e6fa73
+  metadata.gz: 9d6a43a16780ea12b2b58d667f2f6993f297a4d1b3d558d2991ae3b02bbce261374d614514c2a4f77fce4889999231e11796608273e46ea4d074e4969c19e5c8
+  data.tar.gz: e4fde6e584511ebd4dfce98b3f8b943da1bf3e8c44dd3d31ae5c881bb2a69742803bcf2e8c548609fda8edbd44598a33065dd3ec1ed52cbf0aecf4ff2829bb12

data/lib/genevalidatorapp.rb

@@ -12,7 +12,7 @@ require 'genevalidatorapp/version'
 
 module GeneValidatorApp
   # Use a fixed minimum version of BLAST+
-  MINIMUM_BLAST_VERSION = '2.2.30+'.freeze
+  MINIMUM_BLAST_VERSION = '2.11.0+'.freeze
 
   class << self
     def environment
@@ -208,7 +208,8 @@ module GeneValidatorApp
     def assert_blast_installed_and_compatible
       raise BLAST_NOT_INSTALLED unless command? 'blastdbcmd'
       version = `blastdbcmd -version`.split[1]
-      raise BLAST_NOT_COMPATIBLE, version unless version >= MINIMUM_BLAST_VERSION
+      return if is_compatible(version, MINIMUM_BLAST_VERSION)
+      raise BLAST_NOT_COMPATIBLE, version 
     end
 
     def assert_mafft_installed
@@ -249,5 +250,19 @@ module GeneValidatorApp
     def command?(command)
       system("which #{command} > /dev/null 2>&1")
     end
+
+    # Returns true if the given version is higher than the minimum expected
+    # version string.
+    def is_compatible(given, expected)
+      # The speceship operator (<=>) below returns -1, 0, 1 depending on
+      # on whether the left operand is lower, same, or higher than the
+      # right operand. We want the left operand to be the same or higher.
+      (parse_version(given) <=> parse_version(expected)) >= 0
+    end
+
+    # Turn version string into an arrary of its component numbers.
+    def parse_version(version_string)
+      version_string.split('.').map(&:to_i)
+    end
   end
 end

data/lib/genevalidatorapp/version.rb

@@ -1,3 +1,3 @@
 module GeneValidatorApp
-  VERSION = '2.1.7'.freeze
+  VERSION = '2.1.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genevalidatorapp
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Monica Dragan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Web App wrapper for GeneValidator.