Rakefile in tzinfo-1.0.1 vs Rakefile in tzinfo-1.1.0

@@ -1,18 +1,43 @@
-# Available options:
+#--
+# Copyright (c) 2005-2013 Philip Ross
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
 #
-# rake test - Runs all test cases.
-# rake package - Runs test cases and builds packages for distribution.
-# rake rdoc - Builds API documentation in doc dir.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#++
 
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
 require 'rubygems'
 require 'rubygems/package_task'
 require 'fileutils'
+require 'rake/testtask'
 
+# Ignore errors loading rdoc/task (the rdoc tasks will be excluded if
+# rdoc is unavailable).
+begin
+  require 'rdoc/task'
+rescue LoadError, RuntimeError
+end
+
+BASE_DIR = File.expand_path(File.dirname(__FILE__))
+
+task :default => [:test]
+
 spec = eval(File.read('tzinfo.gemspec'))
 
 class TZInfoPackageTask < Gem::PackageTask
   alias_method :orig_sh, :sh
   private :orig_sh
@@ -32,21 +57,21 @@
   pkg.need_zip = true
   pkg.need_tar_gz = true
   pkg.tar_command = '__tar_with_owner__'
 end
 
-RDoc::Task.new do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title = 'TZInfo'
-  rdoc.main = 'README'
-  rdoc.options.concat spec.rdoc_options
-  rdoc.rdoc_files.include(spec.extra_rdoc_files) 
-  rdoc.rdoc_files.include('lib')  
+# Skip the rdoc task if RDoc::Task is unavailable
+if defined?(RDoc) && defined?(RDoc::Task)
+  RDoc::Task.new do |rdoc|
+    rdoc.rdoc_dir = 'doc'
+    rdoc.options.concat spec.rdoc_options
+    rdoc.rdoc_files.include(spec.extra_rdoc_files) 
+    rdoc.rdoc_files.include('lib')  
+  end
 end
 
 Rake::Task[package_task.package_dir_path].enhance do
-  File.chmod(0755, package_task.package_dir_path)
   recurse_chmod(package_task.package_dir_path)
 end
 
 Rake::Task[:package].enhance do
   FileUtils.rm_rf(package_task.package_dir_path)
@@ -65,23 +90,21 @@
       end
     end
   end
 end
 
+desc 'Run tests using RubyDataSource, then ZoneinfoDataSource'
 task :test => [:test_ruby, :test_zoneinfo] do
 end
 
 def setup_tests(test_task, type)
-  # Force a particular timezone to be local (helps find issues when local
-  # timezone isn't GMT). This won't work on Windows.
-  ENV['TZ'] = 'America/Los_Angeles'
-  
-  test_task.pattern = File.join(File.expand_path(File.dirname(__FILE__)), 'test', "ts_all_#{type}.rb")
+  test_task.libs = [File.join(BASE_DIR, 'lib')]
+  test_task.pattern = File.join(BASE_DIR, 'test', "ts_all_#{type}.rb")
 end
 
-Rake::TestTask.new('test_ruby') do |t|
+Rake::TestTask.new(:test_ruby) do |t|
   setup_tests(t, :ruby)
 end
 
-Rake::TestTask.new('test_zoneinfo') do |t|
+Rake::TestTask.new(:test_zoneinfo) do |t|
   setup_tests(t, :zoneinfo)
 end