iroki 0.0.20 → 0.0.21

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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +2 -0
  3. data/README.md +5 -0
  4. data/lib/iroki/core_ext/file/file.rb +3 -0
  5. data/lib/iroki/main/main.rb +0 -1
  6. data/lib/iroki/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cb67d2dc5061c2179894ac9f073504df648d29d7
4
- data.tar.gz: 71f43e1773fcb2e69e5088543f83856673727ac2
3
+ metadata.gz: c06f93db8e46a7d0f22be2d97d822e221077de6b
4
+ data.tar.gz: fdd189811979674c0a7ce3ff11fc3e16bec66609
5
5
  SHA512:
6
- metadata.gz: eed9c447d1cf5cc883d94474abf826619a04bbe9688b6c7be99d5512bbdda14c17174b3becad1751122b845deaa31bc8641e17ca43cb6f034f0f2707c04a5a31
7
- data.tar.gz: d6808c9ed89514ed2ce541869c297c64a53111d827cf7e7ed698570b6135b2c686988606ee753980d8f8e80d1fc6570b78d92b45577bd1518724f65ba81041f6
6
+ metadata.gz: b2fbca399dd1ce23d25fb0fbf43cd7b82ca6860eb3725cbde8f86df2ba6842bbbf21fa5db50f653a5bd6e21cf4f6c13143367e0883d82ea93f1ffc2315e6b08a
7
+ data.tar.gz: 817d8a4015728800cf8cdce8399b2bfabf12dc2860d9848669868bd8c9eda4f59c24e47f679eb90fa0cc99100f64d7acab2d67e173a1ee7cd30bb2f001ba193e
data/.gitignore CHANGED
@@ -14,3 +14,5 @@ newicks
14
14
  /test_files
15
15
  sandbox
16
16
  .coveralls.yml
17
+ spec/test_files/nexus_files/output.nex
18
+ .idea
data/README.md CHANGED
@@ -164,3 +164,8 @@ Add `reorder_nodes` script.
164
164
  ### 0.0.20 ###
165
165
 
166
166
  - Handle more examples of bad biom files and bad name maps
167
+
168
+ ### 0.0.21 ###
169
+
170
+ - Fix empty branch tag bug (issue 6)
171
+
data/lib/iroki/core_ext/file/file.rb CHANGED
@@ -49,6 +49,7 @@ module Iroki
49
49
  arg
50
50
  end
51
51
 
52
+ # TODO this is now pointless
52
53
  def parse_color_map fname,
53
54
  exact_matching: true,
54
55
  auto_color: false
@@ -180,6 +181,8 @@ module Iroki
180
181
  label_tag = Iroki::Color.get_tag color, auto_color
181
182
  elsif (color = has_branch_tag? label_color)
182
183
  branch_tag = Iroki::Color.get_tag color, auto_color
184
+ elsif line.match(/\t\Z/) # empty branch color, branch will be black
185
+ label_tag = Iroki::Color.get_tag label_color, auto_color
183
186
  else
184
187
  label_tag = Iroki::Color.get_tag label_color, auto_color
185
188
  branch_tag = Iroki::Color.get_tag label_color, auto_color
data/lib/iroki/main/main.rb CHANGED
@@ -190,7 +190,6 @@ module Iroki
190
190
 
191
191
  color_f = nil
192
192
  if !biom_f && (color_taxa_names || color_branches)
193
- p color_map_f
194
193
  color_f = check_file color_map_f, :color_map_f
195
194
  end
196
195
 
data/lib/iroki/version.rb CHANGED
@@ -18,7 +18,7 @@
18
18
 
19
19
  # Library metadata
20
20
  module Iroki
21
- VERSION = "0.0.20"
21
+ VERSION = "0.0.21"
22
22
  COPYRIGHT = "2015 - 2016 Ryan Moore"
23
23
  CONTACT = "moorer@udel.edu"
24
24
  WEBSITE = "https://github.com/mooreryan/iroki"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: iroki
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.20
4
+ version: 0.0.21
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Moore
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-08-19 00:00:00.000000000 Z
11
+ date: 2016-09-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler