iroki 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1353014b106465bf35d48a151d021f1a75d71be7
-  data.tar.gz: dc1e7cdb040b541bd19651feb2dd3c64e12d812a
+  metadata.gz: 9cf667ad18dfe8bbbbe321c56bcda4c7cb308fd9
+  data.tar.gz: 637d39d6337b01a3e91bb194fdd6ead4ec4293c4
 SHA512:
-  metadata.gz: cb798fe65976dda134d5e3663261cc69b42c36438ffd42beb21d20c9b9a76c565c820e30f534ce3d1333df18643b950b484e7be7d2b45e3431cf502963b88cdc
-  data.tar.gz: 1a9ddb377d4c6744f5b1a5c4dc7e58b040afa558d34bfd30165dc97ecf586fe865bc31d09006c8c2cb8ff7368169ed20b7eb193710c03ba1f9d0522c42a21912
+  metadata.gz: 91d870557644bf808a515af2c31d930a2e707dcfeff79f97ca377b0641725727bb7942fa6d9b9258afa5a77d187fbbeee90785b4e8814fb8ccb32b3311a71fd1
+  data.tar.gz: 27f6130d57b4d6222f4f5d0f3b3a797f963775796ab2d253c9c3bad72b54577e42604c41f236f1fb3f77746cf4b7ecb4874efbae2004fd8c9f22e6440b168290

data/.gitignore

@@ -15,4 +15,6 @@ newicks
 sandbox
 .coveralls.yml
 spec/test_files/nexus_files/output.nex
-.idea
+.idea
+.DS_Store
+spec/.DS_Store

data/README.md

@@ -184,3 +184,7 @@ Add `reorder_nodes` script.
 ### 0.0.25 ###
 
 - Bugfix
+
+### 0.0.26 ###
+
+- Basic validation of Newick files (issue 9)

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

@@ -37,6 +37,18 @@ end
 module Iroki
   module CoreExt
     module File
+      # @note Only checks that first and last chars off the file
+      #   (minus trailing newlines) are correct. I.e., first char is
+      #   '(' and last char is ';'
+      def valid_newick? fname
+        str = Object::File.read(fname).chomp
+        first_char = str[0]
+        last_char = str[-1]
+
+        p [:ryan, first_char, last_char]
+        first_char == "(" && last_char == ";"
+      end
+
       def check_file arg, which
         help = " Try iroki --help for help."
 

data/lib/iroki/main/main.rb

@@ -214,6 +214,9 @@ module Iroki
 
       newick = check_file newick_f, :newick
 
+      abort_unless valid_newick?(newick_f),
+                   "The Newick file doesn't look like a real Newick file"
+
       abort_if out_f.nil?,
                "--outfile is a required arg. Try iroki --help for help."
 

data/lib/iroki/version.rb

@@ -18,7 +18,7 @@
 
 # Library metadata
 module Iroki
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
   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.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Ryan Moore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler