Skip to content
Browse files

small ruby1.9 fixes. there was a syntax error and the rakefile couldn…

…t find simple_markup.rb
  • Loading branch information...
1 parent 5cd500f commit bd016e6f4bd244e4606a6824cbcf74d8514e61aa @seanhess committed Feb 26, 2010
Showing with 45 additions and 44 deletions.
  1. +1 −0 .gitignore
  2. +43 −43 Rakefile
  3. +1 −1 lib/aws/s3/extensions.rb
View
1 .gitignore
@@ -1,3 +1,4 @@
.rake_tasks
site/public/index.html
pkg/
+.DS_Store
View
86 Rakefile
@@ -208,7 +208,7 @@ namespace :test do
desc 'Check test coverage'
task :coverage do
- system("rcov -x Library -x support --sort coverage #{File.join(library_root, 'test/*_test.rb')}")
+ system("rcov --sort coverage #{File.join(library_root, 'test/*_test.rb')}")
show_test_coverage_results
end
@@ -224,7 +224,7 @@ namespace :test do
desc 'Check test coverage of full stack remote tests'
task :full_coverage do
- system("rcov -x Library -x support --sort coverage #{File.join(library_root, 'test/remote/*_test.rb')} #{File.join(library_root, 'test/*_test.rb')}")
+ system("rcov --sort coverage #{File.join(library_root, 'test/remote/*_test.rb')} #{File.join(library_root, 'test/*_test.rb')}")
show_test_coverage_results
end
@@ -289,46 +289,46 @@ namespace :todo do
TODOS.uncompleted.display
end
end if File.exists?(File.join(library_root, 'TODO'))
-
-namespace :site do
- require 'erb'
- require 'rdoc/markup/simple_markup'
- require 'rdoc/markup/simple_markup/to_html'
-
- readme = lambda { IO.read('README')[/^== Getting started\n(.*)/m, 1] }
-
- readme_to_html = lambda do
- handler = SM::ToHtml.new
- handler.instance_eval do
- require 'syntax'
- require 'syntax/convertors/html'
- def accept_verbatim(am, fragment)
- syntax = Syntax::Convertors::HTML.for_syntax('ruby')
- @res << %(<div class="ruby">#{syntax.convert(fragment.txt, true)}</div>)
- end
- end
- SM::SimpleMarkup.new.convert(readme.call, handler)
- end
-
- desc 'Regenerate the public website page'
- task :build => 'doc:readme' do
- open('site/public/index.html', 'w') do |file|
- erb_data = {}
- erb_data[:readme] = readme_to_html.call
- file.write ERB.new(IO.read('site/index.erb')).result(binding)
- end
- end
-
- task :refresh => :build do
- system 'open site/public/index.html'
- end
-
- desc 'Update the live website'
- task :deploy => :build do
- site_files = FileList['site/public/*']
- site_files.delete_if {|file| File.directory?(file)}
- sh %(scp #{site_files.join ' '} marcel@rubyforge.org:/var/www/gforge-projects/amazon/)
- end
-end
+
+# namespace :site do
+# require 'erb'
+# require 'rdoc/markup/simple_markup'
+# require 'rdoc/markup/simple_markup/to_html'
+#
+# readme = lambda { IO.read('README')[/^== Getting started\n(.*)/m, 1] }
+#
+# readme_to_html = lambda do
+# handler = SM::ToHtml.new
+# handler.instance_eval do
+# require 'syntax'
+# require 'syntax/convertors/html'
+# def accept_verbatim(am, fragment)
+# syntax = Syntax::Convertors::HTML.for_syntax('ruby')
+# @res << %(<div class="ruby">#{syntax.convert(fragment.txt, true)}</div>)
+# end
+# end
+# SM::SimpleMarkup.new.convert(readme.call, handler)
+# end
+#
+# desc 'Regenerate the public website page'
+# task :build => 'doc:readme' do
+# open('site/public/index.html', 'w') do |file|
+# erb_data = {}
+# erb_data[:readme] = readme_to_html.call
+# file.write ERB.new(IO.read('site/index.erb')).result(binding)
+# end
+# end
+#
+# task :refresh => :build do
+# system 'open site/public/index.html'
+# end
+#
+# desc 'Update the live website'
+# task :deploy => :build do
+# site_files = FileList['site/public/*']
+# site_files.delete_if {|file| File.directory?(file)}
+# sh %(scp #{site_files.join ' '} marcel@rubyforge.org:/var/www/gforge-projects/amazon/)
+# end
+# end
task :clean => ['dist:clobber_package', 'doc:clobber_rdoc', 'test:clobber_coverage']
View
2 lib/aws/s3/extensions.rb
@@ -81,7 +81,7 @@ def remove_extended!
end
else
def remove_extended!
- gsub!(/[\x80-\xFF]/) { "%02X" % $&[0] }
+ # gsub!(/[\x80-\xFF]/) { "%02X" % $&[0] }
end
end

0 comments on commit bd016e6

Please sign in to comment.
Something went wrong with that request. Please try again.