summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Manifest.txt1
-rw-r--r--Rakefile8
-rw-r--r--ext/psych/extconf.rb2
-rw-r--r--test/psych/test_psych.rb2
4 files changed, 7 insertions, 6 deletions
diff --git a/Manifest.txt b/Manifest.txt
index 823b634..234c027 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -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
diff --git a/Rakefile b/Rakefile
index 946cabb..457327d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -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
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index 673b950..fe7795f 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -17,6 +17,6 @@ end
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:
diff --git a/test/psych/test_psych.rb b/test/psych/test_psych.rb
index f59af46..9986699 100644
--- a/test/psych/test_psych.rb
+++ b/test/psych/test_psych.rb
@@ -99,7 +99,7 @@ class TestPsych < Psych::TestCase
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')