mr_poole 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db31487041b5c6ed8e580f7d8a8b003bb65c775a
-  data.tar.gz: 9999f65961a392b2b3121ccb0edff2c87d69d06a
+  metadata.gz: 55b01d175e1b4409aa3952570665706d4cb48b12
+  data.tar.gz: e3e8070ed4000eae92275b01c2ba420ff7424432
 SHA512:
-  metadata.gz: f5f0071a2daf4825b72f3eecc81cf54afcc1d032fcaf6ba07f4a29bacbad69ea4d2c4ec1aebc62fd72ceb817b94a3d593ee9349463d789401a77e2cbbb850cdb
-  data.tar.gz: 83515d8083a1734d9a50c5c7a097acc12a7ab5e1f0b2e0a681eee3b809cfea58fd73467479139f7805578758f09a0a4fdee669f0d6c383aef968d0e6bffd7b1c
+  metadata.gz: 6e7f154e7cc3cab30bfecc709f5fc132d39fa69a0e62742bc9f6436bef2aa901f8633f87ae474a3524913997c795c3c5af2c1c86dde696866b0e623af808afb1
+  data.tar.gz: 357f0267e6992c9b944f1ff8b1ff01947ad28da1e6a36e2880f9ffde82b585cb03e304da7f1e883810d9650c6aef2027ff9763090af0d677eef1edf9cc6a4033

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### v0.5.1 (2014-01-31)
+
+- Bug fixes for older rubies (1.8.7, 1.9.2).
+
 ### v0.5.0 (2014-01-31)
 
 - Add word_separator configuration option (to use hyphens). Thanks to [Harry

data/lib/mr_poole/config.rb

@@ -1,6 +1,17 @@
 require 'yaml'
 require 'ostruct'
 
+# YAML parsing in old rubies didn't use Psych, and so throws a NameError later
+# when we check for one after we parse our YAML. Before we start, we'll check
+# for that and create a dummy Pysch::SyntaxError constant. Older ruby YAML
+# errors will be caught by check_word_separator and will throw a TypeError
+# instead.
+if RUBY_VERSION < '1.9'
+  class Psych
+    SyntaxError = nil
+  end
+end
+
 module MrPoole
   class Config
 
@@ -10,10 +21,11 @@ module MrPoole
           yaml = YAML.load(File.read('_config.yml'))
           @config = OpenStruct.new(yaml["poole"])
           @config.srcdir = yaml['source'] if yaml['source']
+          check_word_separator
         else
           @config = OpenStruct.new
         end
-      rescue Psych::SyntaxError
+      rescue TypeError, ::Psych::SyntaxError
         bad_yaml_message
         exit
       end
@@ -33,6 +45,17 @@ module MrPoole
 
     private
 
+    # on old rubies, the YAML parser doesn't throw an error if you pass
+    # something like 'word_separator: -', it just assumes you want an array
+    # with the elment nil.  We'll check for that case and die, since it's not
+    # what we want here.
+    def check_word_separator
+      return unless @config.word_separator
+      if @config.word_separator == [nil]
+        raise TypeError
+      end
+    end
+
     def bad_yaml_message
       puts 'Error reading YAML file _config.yml!'
       puts '  (Did you forget to escape a hyphen?)'

data/lib/mr_poole/helper.rb

@@ -93,7 +93,7 @@ module MrPoole
       puts ''
       puts "This is Mr. Poole, version #{MrPoole::VERSION}, running on ruby version #{RUBY_VERSION}"
       puts ''
-      puts 'Copyright 2013, Michael McClimon'
+      puts 'Copyright 2014, Michael McClimon'
       puts 'https://github.com/mmcclimon/mr_poole'
       puts ''
       exit

data/lib/mr_poole/version.rb

@@ -1,3 +1,3 @@
 module MrPoole
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr_poole
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Michael McClimon