Permalink
Browse files

synching with ruby trunk

  • Loading branch information...
1 parent 8dfd1b1 commit 1a5609f1c19238565ddf520b7439bfc0948cf539 @tenderlove tenderlove committed Mar 30, 2011
Showing with 7 additions and 6 deletions.
  1. +0 −1 Manifest.txt
  2. +5 −3 Rakefile
  3. +1 −1 ext/psych/extconf.rb
  4. +1 −1 test/psych/test_psych.rb
View
@@ -34,7 +34,6 @@ lib/psych/nodes/sequence.rb
lib/psych/nodes/stream.rb
lib/psych/omap.rb
lib/psych/parser.rb
-lib/psych/psych.bundle
lib/psych/scalar_scanner.rb
lib/psych/set.rb
lib/psych/stream.rb
View
@@ -15,7 +15,6 @@ Hoe.plugin :debugging, :doofus, :git
Hoe.spec 'psych' do
developer 'Aaron Patterson', 'aaronp@rubyforge.org'
- developer 'John Barnette', 'jbarnette@rubyforge.org'
self.extra_rdoc_files = Dir['*.rdoc']
self.history_file = 'CHANGELOG.rdoc'
@@ -24,10 +23,13 @@ Hoe.spec 'psych' do
extra_dev_deps << ['rake-compiler', '>= 0.4.1']
- self.spec_extras = { :extensions => ["ext/psych/extconf.rb"] }
+ self.spec_extras = {
+ :extensions => ["ext/psych/extconf.rb"],
+ :required_ruby_version => '>= 1.9.2'
+ }
Rake::ExtensionTask.new "psych", spec do |ext|
- ext.lib_dir = File.join(*['lib', 'psych', ENV['FAT_DIR']].compact)
+ ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
end
end
View
@@ -17,6 +17,6 @@ def asplode missing
asplode('yaml.h') unless find_header 'yaml.h'
asplode('libyaml') unless find_library 'yaml', 'yaml_get_version'
-create_makefile 'psych/psych'
+create_makefile 'psych'
# :startdoc:
View
@@ -99,7 +99,7 @@ def test_parse_stream
def test_add_builtin_type
got = nil
- Psych.add_builtin_type 'omap', do |type, val|
+ Psych.add_builtin_type 'omap' do |type, val|
got = val
end
Psych.load('--- !!omap hello')

0 comments on commit 1a5609f

Please sign in to comment.