rbbt-util 5.26.19 → 5.26.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a10144feb6639d2b817d80bcfed22df323ad425763a6507bed478a2c89b0897
-  data.tar.gz: f4e5fc4cb957f65980ef643f5cfaf291f28a983c6847cf47f29876ff18d976c7
+  metadata.gz: b92efe3e401eaeeec427031f665e88ece42c4a8a39cac35ff1c2ed5148f471fe
+  data.tar.gz: 77269b375e40fcce3b5ba4589c6422a6253a8a0cc136689c964d7323734e8755
 SHA512:
-  metadata.gz: 54cf91e27202d364a4191941bae22984ea64cfdd1ee81c6a2b46fb1ddcfd982a9c9f3fff5fcb1f76e0e20e9e708ef58e691a13e52d3087e91dee683836edd659
-  data.tar.gz: 24aac2c7852232398207d95e1e3dfc4973ae0708c5c19f8c44913e616c42765e508955644c83d1664784325ae11fa3c3fed08841e13bc9298c63e9735e0cbf87
+  metadata.gz: fcd84776db4a825762d260cc34575d74f8943543c2d410fb38a488c67e9f92210d59ada1f1b1c5dc94f40ec1a7e41bc796d1634fa27108811e132586ba1173e9
+  data.tar.gz: 532000c51cae567f919da52d4daed6941264d09bf05040b0bce6f3a3a7e490deeacbdefa4e48172308781f7b2489595480c13e08a9ae3a45e2ce9e99ec0803cf

data/lib/rbbt/resource/path.rb

@@ -376,11 +376,15 @@ module Path
     self.annotate(new_path)
   end
 
+  def self.get_extension(path)
+    path.match(/\.([^\.\/]{1,5})$/)[1]
+  end
+
   def replace_extension(new_extension = nil, multiple = false)
     if multiple
-      new_path = self.sub(/(\.[^\.\/]{2,5})+$/,'')
+      new_path = self.sub(/(\.[^\.\/]{1,5})+$/,'')
     else
-      new_path = self.sub(/\.[^\.\/]{2,5}$/,'')
+      new_path = self.sub(/\.[^\.\/]{1,5}$/,'')
     end
     new_path = new_path + "." + new_extension.to_s
     self.annotate(new_path)

data/lib/rbbt/workflow.rb

@@ -515,7 +515,7 @@ module Workflow
     step = Step.new path
     relocated = false
     step.dependencies = (step.info[:dependencies] || []).collect do |task,name,dep_path|
-      if Open.exists?(dep_path)
+      if Open.exists?(dep_path) || Open.exists?(dep_path + '.info')
         Workflow._load_step dep_path
       else
         new_path = relocate(path, dep_path)

data/lib/rbbt/workflow/step/dependencies.rb

@@ -212,7 +212,7 @@ class Step
       type, *rest = type
     end
 
-    canfail = rest && rest.include?(:canfail)
+    canfail = (rest && rest.include?(:canfail)) || type == :canfail
 
     case type
     when :canfail

data/share/install/software/lib/install_helpers

@@ -250,6 +250,7 @@ build_make(){
 
 
     [ -d src -a ! -e CMakeLists.txt -a ! -e Makefile -a ! -e configure ] && cd src
+    [ -d source -a ! -e CMakeLists.txt -a ! -e Makefile -a ! -e configure ] && cd source
 
     echo "Building with configure $name"
     if [ "x$extra" != "x" ]; then
@@ -287,6 +288,7 @@ buid_cmake(){
 
 
     [ -d src -a ! -e CMakeLists.txt -a ! -e Makefile -a ! -e configure ] && cd src
+    [ -d source -a ! -e CMakeLists.txt -a ! -e Makefile -a ! -e configure ] && cd source
 
     echo "Building with cmake $name"
     if [ "x$extra" != "x" ]; then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.19
+  version: 5.26.20
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake