aai 0.5.2 → 0.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/exe/aai +16 -9
  3. data/lib/aai.rb +1 -2
  4. data/lib/aai/version.rb +1 -1
  5. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7ad0d928493f79c8941621c5a60c434eab14d210
4
- data.tar.gz: 64f0ddaac0103bf9413302cc6fc42b85d694e645
3
+ metadata.gz: b586d37bb48f611b4e9340171db7924a065dc613
4
+ data.tar.gz: a3aa577a3688fbbca2b45487c8ec467b6238c2d1
5
5
  SHA512:
6
- metadata.gz: 3ea7855a5732a973b543bc17841c21ff256828ee750acc02ebe49b4e26462f9065c245d9907f3a00afaf8e2cfc6f70f8c936c1372bc46f7e9540356de1198d60
7
- data.tar.gz: 7cfba7f20566fc6f9c6177ce5bcc758a816e1c9e8ee65c9c2938e5dfd0b4a25ebfed0e34be1c209a164729d1b385d11f41dc3105646fb4bf2cbf0be7170b9285
6
+ metadata.gz: ee7bc5696839c7c727d4062b8fe3cc9f4c25c47727d80221694f34fe3ea23764e407f1c8e1f33098190d766dc1aa06201a99a3152b83ae4ec0c974d800e0dd09
7
+ data.tar.gz: 24a5566d3eeb9c5df9a4958e2d350d448c63a34d7e93f8ff9f1ab061fecbda2eff9ee41b40f69c19aa6313e63aac4d00694ab510d45dc6732eab12d6da26089b
data/exe/aai CHANGED
@@ -102,23 +102,30 @@ Time.time_it "Writing score file", AbortIf.logger do
102
102
  FileUtils.mkdir_p score_dir
103
103
  outf = File.join score_dir, "#{opts[:basename]}.aai.txt"
104
104
  File.open(outf, "w") do |f|
105
+ f.puts %w[genome_A genome_B A_to_B_aai B_to_A_aai two_way_aai].
106
+ join "\t"
107
+
105
108
  Aai.aai_strings(one_way, two_way).each do |str|
106
109
  f.puts str
107
110
  end
108
111
  end
109
112
  end
110
113
 
111
- AbortIf.logger.info { "Cleaning up" }
114
+ Time.time_it "Cleaning up", AbortIf.logger do
115
+ blast_db_dir = File.join opts[:outdir], "blastdbs"
116
+ btab_dir = File.join opts[:outdir], "btabs"
117
+ clean_fasta_dir = File.join opts[:outdir], "clean_fastas"
112
118
 
113
- blast_db_dir = File.join opts[:outdir], "blastdbs"
114
- btab_dir = File.join opts[:outdir], "btabs"
115
- clean_fasta_dir = File.join opts[:outdir], "clean_fastas"
119
+ FileUtils.mkdir_p [blast_db_dir, btab_dir, clean_fasta_dir]
116
120
 
117
- FileUtils.mkdir_p [blast_db_dir, btab_dir, clean_fasta_dir]
121
+ AbortIf.logger.debug { "Moving clean fastas" }
122
+ move_files clean_fnames, clean_fasta_dir
118
123
 
119
- move_files clean_fnames, clean_fasta_dir
120
- move_files btabs, btab_dir
124
+ AbortIf.logger.debug { "Moving btabs" }
125
+ move_files btabs, btab_dir
121
126
 
122
- blast_db_basenames.each do |basename|
123
- move_files Dir.glob("#{basename}*"), blast_db_dir
127
+ AbortIf.logger.debug { "Moving blast dbs" }
128
+ blast_db_basenames.each do |basename|
129
+ move_files Dir.glob("#{basename}*"), blast_db_dir
130
+ end
124
131
  end
data/lib/aai.rb CHANGED
@@ -287,8 +287,7 @@ module Aai
287
287
  end
288
288
 
289
289
  aai_strings.map do |genome_pair, aais|
290
- [genome_pair.join("----"),
291
- aais.join("\t")].join "\t"
290
+ [genome_pair, aais].flatten.join "\t"
292
291
  end
293
292
  end
294
293
 
@@ -1,5 +1,5 @@
1
1
  module Aai
2
- VERSION = "0.5.2"
2
+ VERSION = "0.5.3"
3
3
  COPYRIGHT = "2017 Ryan Moore"
4
4
  CONTACT = "moorer@udel.edu"
5
5
  WEBSITE = "https://github.com/mooreryan/aai"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aai
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.2
4
+ version: 0.5.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Moore