rbbt-util 5.17.89 → 5.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56653aeb0297a9c75d251c516332e80d4c8dab3d
-  data.tar.gz: c15ac190a4700594eee5d50e72ee0a28446f339a
+  metadata.gz: ab39fdc1ea50f9747effe02d0c7008a288194a88
+  data.tar.gz: 4359eaf63e8c0592bb0d035099bd94e1e12fa3b9
 SHA512:
-  metadata.gz: 2e8f2f8eae1892499a33dba6d43c28cfa65065e6df074a3728e937bae108ba6e1929a12545022f02708a62b25bc6abd0f9fa576dd6cc8ad76770115a60e4ac4e
-  data.tar.gz: 3727fb8076c8e6ac692d947d19abae675198c2795d508c652fcd7a34c1febe96a624c5b6697ba1b3eedaeefec119c17371c907cc79b6b4f1df5436e7abd6f067
+  metadata.gz: cccceae6eee4bbc8d64dcfc8e9791c7e7b00ee32bfec839ff3bb914b2511c29b1382acf626f641e1b38c022caabe347492ea3eb1315f5a5b06b01dbc3d2a312c
+  data.tar.gz: dc1dc72ef5f0f69f36d81b9b7bbfcb8f84c5259618aa9e466967a750e13192eeaed3a5d69589fbbbead6347d3df8306cb22e43c098de7414b5fb91f049dc5adb

data/etc/app.d/finder.rb

@@ -11,6 +11,10 @@ if ENV['RBBT_FINDER']
   mi_hash = {"Mutated Isoform" => /ENSP\w+:.+/}
   finder.add_instance(mi_hash, :namespace => organism) 
 
+  prot_hash = {"Ensembl Protein ID" => /ENSP\w+$/}
+  finder.add_instance(prot_hash, :namespace => organism) 
+
+
   organism_hash = {"organism" => /[A-Z][a-z]{2}(?:\/[a-z]{3}20\d\d)?/}
   finder.add_instance(organism_hash, :namespace => organism) 
 end

data/lib/rbbt/workflow/accessor.rb

@@ -586,10 +586,9 @@ module Workflow
       if inputs.any? or dependencies.any?
         tagged_jobname = case TAG
                          when :hash
-                           input_str = ""
-                           input_str << inputs.collect{|i| Misc.fingerprint(i) } * "," 
-                           input_str << ";" << dependencies.collect{|dep| dep.name } * "\n"
-                           jobname + '_' << Misc.digest(input_str)
+                           input_hash = Hash[*(1..inputs.length).zip(inputs).flatten]
+                           hash_str = Misc.hash2md5(input_hash)
+                           jobname + '_' << hash_str
                          else
                            jobname
                          end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.89
+  version: 5.18.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake