Merge branch 'master' of github.com:tenderlove/psych

* 'master' of github.com:tenderlove/psych:
  Clean up some more 1.9.2 warnings
  Add "." to Hoe include_dirs for Ruby 1.9.2
  Update Manifest
  Cleanup for using "rake gem"

4 files changed, 9 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 8555a7b..516f23f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 lib/psych/psych.bundle
 tmp
+pkg
diff --git a/Manifest.txt b/Manifest.txt
index 51c08fa..ea68c1f 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,9 +1,9 @@
 .autotest
+.gitignore
 CHANGELOG.rdoc
 Manifest.txt
 README.rdoc
 Rakefile
-bench.rb
 ext/psych/emitter.c
 ext/psych/emitter.h
 ext/psych/extconf.rb
@@ -34,23 +34,26 @@ lib/psych/set.rb
 lib/psych/tree_builder.rb
 lib/psych/visitors.rb
 lib/psych/visitors/emitter.rb
+lib/psych/visitors/json_tree.rb
 lib/psych/visitors/to_ruby.rb
 lib/psych/visitors/visitor.rb
 lib/psych/visitors/yaml_tree.rb
 lib/psych/yaml.rb
 test/helper.rb
+test/psych/test_alias_and_anchor.rb
 test/psych/test_coder.rb
 test/psych/test_document.rb
 test/psych/test_emitter.rb
 test/psych/test_encoding.rb
+test/psych/test_json_tree.rb
 test/psych/test_parser.rb
+test/psych/test_psych.rb
 test/psych/test_scalar.rb
+test/psych/test_scalar_scanner.rb
 test/psych/test_serialize_subclasses.rb
 test/psych/test_struct.rb
 test/psych/test_to_yaml_properties.rb
 test/psych/test_tree_builder.rb
-test/test_psych.rb
-test/test_scalar_scanner.rb
 test/visitors/test_emitter.rb
 test/visitors/test_to_ruby.rb
 test/visitors/test_yaml_tree.rb
diff --git a/Rakefile b/Rakefile
index dc3d4a8..edcffca 100644
--- a/Rakefile
+++ b/Rakefile
@@ -27,6 +27,8 @@ Hoe.spec 'psych' do
   end
 end
 
+Hoe.add_include_dirs('.')
+
 task :test => :compile
 
 # vim: syntax=ruby
diff --git a/test/psych/visitors/test_to_ruby.rb b/test/psych/visitors/test_to_ruby.rb
index 2105e9a..c793d1d 100644
--- a/test/psych/visitors/test_to_ruby.rb
+++ b/test/psych/visitors/test_to_ruby.rb
@@ -1,7 +1,6 @@
 require 'minitest/autorun'
 require 'psych'
 require 'date'
-require 'rational'
 
 module Psych
   module Visitors