iroki 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb67d2dc5061c2179894ac9f073504df648d29d7
-  data.tar.gz: 71f43e1773fcb2e69e5088543f83856673727ac2
+  metadata.gz: c06f93db8e46a7d0f22be2d97d822e221077de6b
+  data.tar.gz: fdd189811979674c0a7ce3ff11fc3e16bec66609
 SHA512:
-  metadata.gz: eed9c447d1cf5cc883d94474abf826619a04bbe9688b6c7be99d5512bbdda14c17174b3becad1751122b845deaa31bc8641e17ca43cb6f034f0f2707c04a5a31
-  data.tar.gz: d6808c9ed89514ed2ce541869c297c64a53111d827cf7e7ed698570b6135b2c686988606ee753980d8f8e80d1fc6570b78d92b45577bd1518724f65ba81041f6
+  metadata.gz: b2fbca399dd1ce23d25fb0fbf43cd7b82ca6860eb3725cbde8f86df2ba6842bbbf21fa5db50f653a5bd6e21cf4f6c13143367e0883d82ea93f1ffc2315e6b08a
+  data.tar.gz: 817d8a4015728800cf8cdce8399b2bfabf12dc2860d9848669868bd8c9eda4f59c24e47f679eb90fa0cc99100f64d7acab2d67e173a1ee7cd30bb2f001ba193e

data/.gitignore

@@ -14,3 +14,5 @@ newicks
 /test_files
 sandbox
 .coveralls.yml
+spec/test_files/nexus_files/output.nex
+.idea

data/README.md

@@ -164,3 +164,8 @@ Add `reorder_nodes` script.
 ### 0.0.20 ###
 
 - Handle more examples of bad biom files and bad name maps
+
+### 0.0.21 ###
+
+- Fix empty branch tag bug (issue 6)
+

data/lib/iroki/core_ext/file/file.rb

@@ -49,6 +49,7 @@ module Iroki
         arg
       end
 
+      # TODO this is now pointless
       def parse_color_map fname,
                           exact_matching: true,
                           auto_color: false
@@ -180,6 +181,8 @@ module Iroki
                 label_tag = Iroki::Color.get_tag color, auto_color
               elsif (color = has_branch_tag? label_color)
                 branch_tag = Iroki::Color.get_tag color, auto_color
+              elsif line.match(/\t\Z/) # empty branch color, branch will be black
+                label_tag = Iroki::Color.get_tag label_color, auto_color
               else
                 label_tag = Iroki::Color.get_tag label_color, auto_color
                 branch_tag = Iroki::Color.get_tag label_color, auto_color

data/lib/iroki/main/main.rb

@@ -190,7 +190,6 @@ module Iroki
 
       color_f = nil
       if !biom_f && (color_taxa_names || color_branches)
-        p color_map_f
         color_f = check_file color_map_f, :color_map_f
       end
 

data/lib/iroki/version.rb

@@ -18,7 +18,7 @@
 
 # Library metadata
 module Iroki
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
   COPYRIGHT = "2015 - 2016 Ryan Moore"
   CONTACT   = "moorer@udel.edu"
   WEBSITE   = "https://github.com/mooreryan/iroki"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iroki
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Ryan Moore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler