aai 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ad0d928493f79c8941621c5a60c434eab14d210
-  data.tar.gz: 64f0ddaac0103bf9413302cc6fc42b85d694e645
+  metadata.gz: b586d37bb48f611b4e9340171db7924a065dc613
+  data.tar.gz: a3aa577a3688fbbca2b45487c8ec467b6238c2d1
 SHA512:
-  metadata.gz: 3ea7855a5732a973b543bc17841c21ff256828ee750acc02ebe49b4e26462f9065c245d9907f3a00afaf8e2cfc6f70f8c936c1372bc46f7e9540356de1198d60
-  data.tar.gz: 7cfba7f20566fc6f9c6177ce5bcc758a816e1c9e8ee65c9c2938e5dfd0b4a25ebfed0e34be1c209a164729d1b385d11f41dc3105646fb4bf2cbf0be7170b9285
+  metadata.gz: ee7bc5696839c7c727d4062b8fe3cc9f4c25c47727d80221694f34fe3ea23764e407f1c8e1f33098190d766dc1aa06201a99a3152b83ae4ec0c974d800e0dd09
+  data.tar.gz: 24a5566d3eeb9c5df9a4958e2d350d448c63a34d7e93f8ff9f1ab061fecbda2eff9ee41b40f69c19aa6313e63aac4d00694ab510d45dc6732eab12d6da26089b

data/exe/aai

@@ -102,23 +102,30 @@ Time.time_it "Writing score file", AbortIf.logger do
   FileUtils.mkdir_p score_dir
   outf = File.join score_dir, "#{opts[:basename]}.aai.txt"
   File.open(outf, "w") do |f|
+    f.puts %w[genome_A genome_B A_to_B_aai B_to_A_aai two_way_aai].
+            join "\t"
+
     Aai.aai_strings(one_way, two_way).each do |str|
       f.puts str
     end
   end
 end
 
-AbortIf.logger.info { "Cleaning up" }
+Time.time_it "Cleaning up", AbortIf.logger do
+  blast_db_dir = File.join opts[:outdir], "blastdbs"
+  btab_dir = File.join opts[:outdir], "btabs"
+  clean_fasta_dir = File.join opts[:outdir], "clean_fastas"
 
-blast_db_dir = File.join opts[:outdir], "blastdbs"
-btab_dir = File.join opts[:outdir], "btabs"
-clean_fasta_dir = File.join opts[:outdir], "clean_fastas"
+  FileUtils.mkdir_p [blast_db_dir, btab_dir, clean_fasta_dir]
 
-FileUtils.mkdir_p [blast_db_dir, btab_dir, clean_fasta_dir]
+  AbortIf.logger.debug { "Moving clean fastas" }
+  move_files clean_fnames, clean_fasta_dir
 
-move_files clean_fnames, clean_fasta_dir
-move_files btabs, btab_dir
+  AbortIf.logger.debug { "Moving btabs" }
+  move_files btabs, btab_dir
 
-blast_db_basenames.each do |basename|
-  move_files Dir.glob("#{basename}*"), blast_db_dir
+  AbortIf.logger.debug { "Moving blast dbs" }
+  blast_db_basenames.each do |basename|
+    move_files Dir.glob("#{basename}*"), blast_db_dir
+  end
 end

data/lib/aai.rb

@@ -287,8 +287,7 @@ module Aai
     end
 
     aai_strings.map do |genome_pair, aais|
-      [genome_pair.join("----"),
-       aais.join("\t")].join "\t"
+      [genome_pair, aais].flatten.join "\t"
     end
   end
 

data/lib/aai/version.rb

@@ -1,5 +1,5 @@
 module Aai
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
   COPYRIGHT = "2017 Ryan Moore"
   CONTACT   = "moorer@udel.edu"
   WEBSITE   = "https://github.com/mooreryan/aai"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aai
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Ryan Moore