iroki 0.0.32 → 0.0.33

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 (11) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +7 -3
  3. data/assets/images/iroki_logo3.png +0 -0
  4. data/assets/kelly_info/kelly.graffle +0 -0
  5. data/assets/kelly_info/kelly.pdf +0 -0
  6. data/assets/kelly_info/kelly.png +0 -0
  7. data/assets/kelly_info/kelly_color_key.html +31 -0
  8. data/lib/iroki/color/palette/palette.rb +21 -0
  9. data/lib/iroki/main/main.rb +7 -3
  10. data/lib/iroki/version.rb +1 -1
  11. metadata +7 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 571e5fc652dc40cb60edcb05f06a2a7665b63174
4
- data.tar.gz: 814c6974bead105ac50b176706af90360ed236b7
3
+ metadata.gz: df837c589f22bbd555fb6a8afe7571524777cf14
4
+ data.tar.gz: 6e9dc756c45e1b2916541c0a00168dcf0be57220
5
5
  SHA512:
6
- metadata.gz: d8ef3ec139f50d020f063d9f226661a4684c5310a4997e223c45d771b330ea3d1e8131ca452f9aa0ffff9861d49f6c1dfc7e6b419bd41eaf9b2c4672cdc2f3bf
7
- data.tar.gz: 57e478c4e164883104019233a5ec179f8e2c58df6890a03d95cb0e8120edef80ad3c4aa5a136da156bbe4f3579761243a9dcd12ffce5655fb47d62e1fba3fadc
6
+ metadata.gz: b0fe9ffa5da9eba6812aaac4281ac4eabac97f813b3d61138784379d2ace0e2baf8c29a200488336219cc814136014e68bc01634ddd80e0f38fc2033646f9588
7
+ data.tar.gz: 1270cc9ede4186ba4c191085ab776a6e5cc7a9f97cd3710c91db92ef39584ba436f0a6c4d8b0e01e2aaabd3f193a84e935c29b93d21b178a82d173afc588c174
data/README.md CHANGED
@@ -1,4 +1,4 @@
1
- [![Iroki](https://github.com/mooreryan/iroki/blob/master/assets/images/iroki_logo2.png)](https://github.com/mooreryan/iroki/blob/master/assets/images/iroki_logo2.png)
1
+ [![Iroki](https://github.com/mooreryan/iroki/blob/master/assets/images/iroki_logo3.png)](https://github.com/mooreryan/iroki/blob/master/assets/images/iroki_logo3.png)
2
2
 
3
3
  # Iroki #
4
4
 
@@ -13,10 +13,10 @@ customization program.
13
13
 
14
14
  ## Citation ##
15
15
 
16
- Iroki is research software. If you use Iroki, please cite the Iroki preprint:
16
+ Iroki is research software. If you use Iroki, please cite the Iroki [preprint](http://biorxiv.org/content/early/2017/04/25/106138.1):
17
17
 
18
18
  ```
19
- Moore RM, Harrison AO, McAllister SM, Marine R, Chan C, Wommack KE. 2017. Iroki: automatic customization for phylogenetic trees. doi: https://doi.org/10.1101/106138
19
+ Moore RM, Harrison AO, McAllister SM , Marine RL, Chan CS, and Wommack KE. 2017. Iroki: automatic customization for phylogenetic trees. bioRxiv doi:10.1101/106138
20
20
  ```
21
21
 
22
22
  ## Documentation ##
@@ -25,6 +25,10 @@ For in depth docs and examples, please see the [Iroki wiki](https://github.com/m
25
25
 
26
26
  ## Installation ##
27
27
 
28
+ ### Using the web app
29
+
30
+ Iroki has a web app ([iroki.net](http://www.iroki.net/)). The [code](https://github.com/mooreryan/iroki_web) for that is also on GitHub.
31
+
28
32
  ### Running with Docker ###
29
33
 
30
34
  See the [wiki](https://github.com/mooreryan/iroki/wiki).
data/assets/images/iroki_logo3.png ADDED
Binary file
data/assets/kelly_info/kelly.graffle ADDED
Binary file
data/assets/kelly_info/kelly.pdf ADDED
Binary file
data/assets/kelly_info/kelly.png ADDED
Binary file
data/assets/kelly_info/kelly_color_key.html ADDED
@@ -0,0 +1,31 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+
4
+ <head>
5
+ <title>Jess's Key</title>
6
+ </head>
7
+
8
+ <body>
9
+
10
+ <p><span style="background-color: #875692; font-size: 200%;">1: Purple (#875692)</span></p>
11
+ <p><span style="background-color: #F38400; font-size: 200%;">2: Orange (#F38400)</span></p>
12
+ <p><span style="background-color: #A1CAF1; font-size: 200%;">3: Light Blue (#A1CAF1)</span></p>
13
+ <p><span style="background-color: #BE0032; font-size: 200%;">4: Red (#BE0032)</span></p>
14
+ <p><span style="background-color: #C2B280; font-size: 200%;">5: Buff (#C2B280)</span></p>
15
+ <p><span style="background-color: #848482; font-size: 200%;">6: Grey (#848482)</span></p>
16
+ <p><span style="background-color: #008856; font-size: 200%;">7: Green (#008856)</span></p>
17
+ <p><span style="background-color: #E68FAC; font-size: 200%;">8: Purplish pink (#E68FAC)</span></p>
18
+ <p><span style="background-color: #0067A5; font-size: 200%;">9: Blue (#0067A5)</span></p>
19
+ <p><span style="background-color: #F99379; font-size: 200%;">10: Yellowish pink (#F99379)</span></p>
20
+ <p><span style="background-color: #604E97; font-size: 200%;">11: Violet (#604E97)</span></p>
21
+ <p><span style="background-color: #F6A600; font-size: 200%;">12: Orange yellow (#F6A600)</span></p>
22
+ <p><span style="background-color: #B3446C; font-size: 200%;">13: Purplish red (#B3446C)</span></p>
23
+ <p><span style="background-color: #882D17; font-size: 200%;">14: Reddish brown (#882D17)</span></p>
24
+ <p><span style="background-color: #8DB600; font-size: 200%;">15: Yellow green (#8DB600)</span></p>
25
+ <p><span style="background-color: #654522; font-size: 200%;">16: Yellowish brown (#654522)</span></p>
26
+ <p><span style="background-color: #E25822; font-size: 200%;">17: Reddish orange (#E25822)</span></p>
27
+ <p><span style="background-color: #2B3D26; font-size: 200%;">18: Olive green (#2B3D26)</span></p>
28
+ <p><span style="background-color: #F3C300; font-size: 200%;">19: Yellow (#F3C300)</span></p>
29
+ </body>
30
+
31
+ </html>
data/lib/iroki/color/palette/palette.rb CHANGED
@@ -34,6 +34,27 @@ module Iroki
34
34
  "18" => { name: "olive_green", hex: "#2B3D26" },
35
35
  "19" => { name: "yellow", hex: "#F3C300" },
36
36
  }
37
+
38
+ KELLY_TEXT = " 1: Purple (#875692)
39
+ 2: Orange (#F38400)
40
+ 3: Light Blue (#A1CAF1)
41
+ 4: Red (#BE0032)
42
+ 5: Buff (#C2B280)
43
+ 6: Grey (#848482)
44
+ 7: Green (#008856)
45
+ 8: Purplish pink (#E68FAC)
46
+ 9: Blue (#0067A5)
47
+ 10: Yellowish pink (#F99379)
48
+ 11: Violet (#604E97)
49
+ 12: Orange yellow (#F6A600)
50
+ 13: Purplish red (#B3446C)
51
+ 14: Reddish brown (#882D17)
52
+ 15: Yellow green (#8DB600)
53
+ 16: Yellowish brown (#654522)
54
+ 17: Reddish orange (#E25822)
55
+ 18: Olive green (#2B3D26)
56
+ 19: Yellow (#F3C300)"
57
+
37
58
  end
38
59
  end
39
60
  end
data/lib/iroki/main/main.rb CHANGED
@@ -147,7 +147,9 @@ module Iroki
147
147
  name_map_f: nil,
148
148
  auto_color: nil,
149
149
  display_auto_color_options: nil,
150
- newick_f: nil)
150
+ newick_f: nil,
151
+ min_lumin: 35,
152
+ max_lumin: 70)
151
153
 
152
154
  begin
153
155
  out_f = Tempfile.new "foo"
@@ -163,7 +165,9 @@ module Iroki
163
165
  auto_color: auto_color,
164
166
  display_auto_color_options: display_auto_color_options,
165
167
  newick_f: newick_f,
166
- out_f: out_f)
168
+ out_f: out_f,
169
+ min_lumin: min_lumin,
170
+ max_lumin: max_lumin)
167
171
  ensure
168
172
  if out_f
169
173
  out_f.close
@@ -193,7 +197,7 @@ module Iroki
193
197
 
194
198
  if display_auto_color_options
195
199
  STDERR.puts "\n Choices for --auto-color ..."
196
- STDERR.print " - kelly: up to 19 high contrast colors (purple, orange, light blue, red, ...)\n\n"
200
+ STDERR.print " - kelly: up to 19 high contrast colors\n\n#{Iroki::Color::Palette::KELLY_TEXT}\n\n"
197
201
  exit
198
202
  end
199
203
 
data/lib/iroki/version.rb CHANGED
@@ -18,7 +18,7 @@
18
18
 
19
19
  # Library metadata
20
20
  module Iroki
21
- VERSION = "0.0.32"
21
+ VERSION = "0.0.33"
22
22
  COPYRIGHT = "2015 - 2017 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.32
4
+ version: 0.0.33
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Moore
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-04-23 00:00:00.000000000 Z
11
+ date: 2017-04-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -188,6 +188,7 @@ files:
188
188
  - assets/images/iroki_logo2.idraw
189
189
  - assets/images/iroki_logo2.png
190
190
  - assets/images/iroki_logo2.svg
191
+ - assets/images/iroki_logo3.png
191
192
  - assets/images/iroki_text.graffle
192
193
  - assets/images/iroki_text.idraw
193
194
  - assets/images/iroki_text.pdf
@@ -195,6 +196,10 @@ files:
195
196
  - assets/images/iroki_text.svg
196
197
  - assets/images/iroki_text_omni.pdf
197
198
  - assets/images/iroki_text_omni.svg
199
+ - assets/kelly_info/kelly.graffle
200
+ - assets/kelly_info/kelly.pdf
201
+ - assets/kelly_info/kelly.png
202
+ - assets/kelly_info/kelly_color_key.html
198
203
  - bin/console
199
204
  - bin/iroki_docker
200
205
  - bin/setup