iroki 0.0.12 → 0.0.13
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.
- checksums.yaml +4 -4
- data/README.md +4 -0
- data/lib/iroki/main/main.rb +22 -1
- data/lib/iroki/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c7dc31c2808eb188a480ce2027daa72a6024e913
|
|
4
|
+
data.tar.gz: d8a7ec7990c34342fb7505e0aaeae2167f7e67ce
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e3d183860b306f6a9b6036099f2a14375a20587e69dee9bf2b59926416e37e2b329ff0b82dcb64f716bb4ccebb3ff8cf9a8d1ab80c64d72b5fc64cd2ef8d02c1
|
|
7
|
+
data.tar.gz: 595cd8111b7ad59f16798ffbe53d7cee12eedfafb48752bd524fd7532065285042d5373e66a918ad6f49e59fa954fbf2043199406a47924e321b0649382d4ec6
|
data/README.md
CHANGED
data/lib/iroki/main/main.rb
CHANGED
|
@@ -53,11 +53,26 @@ module Iroki
|
|
|
53
53
|
auto_color_hash = Iroki::Color::Palette::KELLY
|
|
54
54
|
end
|
|
55
55
|
|
|
56
|
+
abort_if single_color && biom_f.nil?,
|
|
57
|
+
"--single-color was passed but no biom file was given"
|
|
58
|
+
|
|
56
59
|
abort_if biom_f && color_map_f,
|
|
57
60
|
"--color-map and --biom-file cannot both be specified. Try iroki --help for help."
|
|
58
61
|
|
|
62
|
+
abort_if (biom_f || color_map_f) && color_branches.nil? && color_taxa_names.nil?,
|
|
63
|
+
"No coloring options selected."
|
|
64
|
+
|
|
59
65
|
newick = check_file newick_f, :newick
|
|
60
66
|
|
|
67
|
+
abort_if out_f.nil?,
|
|
68
|
+
"--outfile is a required arg. Try iroki --help for help."
|
|
69
|
+
|
|
70
|
+
if color_branches || color_taxa_names
|
|
71
|
+
abort_if biom_f.nil? && color_map_f.nil?,
|
|
72
|
+
"Color options were provided, but no biom file " +
|
|
73
|
+
"or color map file was provided"
|
|
74
|
+
end
|
|
75
|
+
|
|
61
76
|
color_f = nil
|
|
62
77
|
if !biom_f && (color_taxa_names || color_branches)
|
|
63
78
|
color_f = check_file color_map_f, :color_map_f
|
|
@@ -68,9 +83,15 @@ module Iroki
|
|
|
68
83
|
!color_branches
|
|
69
84
|
|
|
70
85
|
abort_if check,
|
|
71
|
-
"A
|
|
86
|
+
"A color map file was provided without specifying " +
|
|
72
87
|
"any coloring options"
|
|
73
88
|
|
|
89
|
+
abort_if(newick_f &&
|
|
90
|
+
color_map_f.nil? &&
|
|
91
|
+
biom_f.nil? &&
|
|
92
|
+
name_map_f.nil?,
|
|
93
|
+
"Newick file was given but no other files were given")
|
|
94
|
+
|
|
74
95
|
# get the color patterns
|
|
75
96
|
if color_f
|
|
76
97
|
patterns = parse_color_map color_f,
|
data/lib/iroki/version.rb
CHANGED