OTWO-1206 Ruby 1.9.2 compatibility

No longer compatible with Ruby 1.8.7

Author: Robin Luckey

Rakefile

@@ -3,7 +3,7 @@ require 'rake/clean'
 require 'rake/testtask'
 
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 spec = Gem::Specification.new do |s|
   s.name = 'ohloh_scm'
@@ -21,7 +21,7 @@ spec = Gem::Specification.new do |s|
   s.test_files = FileList["test/**/*"]
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
   pkg.need_zip = true
 end

lib/scm/adapters/abstract/sha1.rb

@@ -1,4 +1,4 @@
-require 'sha1'
+require 'digest/sha1'
 
 NULL_SHA1 = '0000000000000000000000000000000000000000' unless defined?(NULL_SHA1)
 
@@ -11,7 +11,7 @@ class AbstractAdapter
 		# that match those generated natively by Git.
 
 		def compute_sha1(blob)
-			blob.to_s == '' ? NULL_SHA1 : SHA1.sha1("blob #{blob.length}\0#{blob}").to_s
+			blob.to_s == '' ? NULL_SHA1 : Digest::SHA1.hexdigest("blob #{blob.length}\0#{blob}")
 		end
 
 		# Populates the SHA1 values for each diff in a commit.

lib/scm/adapters/svn/pull.rb

@@ -42,6 +42,7 @@ def svnadmin_create_local
 			FileUtils.rmdir path
 			run "svnadmin create #{path}"
 			FileUtils.cp pre_revprop_change_template, pre_revprop_change_path
+      FileUtils.chmod 0755, pre_revprop_change_path
 		end
 
 		def svnadmin_create_remote

lib/scm/parsers/bzr_xml_parser.rb

@@ -1,4 +1,3 @@
-require 'parsedate'
 require 'rexml/document'
 require 'rexml/streamlistener'
 

lib/scm/parsers/svn_xml_parser.rb

@@ -1,4 +1,3 @@
-require 'parsedate'
 require 'rexml/document'
 require 'rexml/streamlistener'
 
@@ -33,7 +32,7 @@ def tag_end(name)
 			when 'author'
 				@commit.committer_name = @text
 			when 'date'
-				@commit.committer_date = Time.utc(*ParseDate.parsedate(@text))
+				@commit.committer_date = Time.parse(@text).round.utc
 			when 'path'
 				@diff.path = @text
 				@commit.diffs << @diff

test/unit/svn_commits_test.rb

@@ -207,11 +207,11 @@ def test_each_commit
 			assert_equal [1, 2, 3, 4, 5], commits.collect { |c| c.token }
 			assert_equal ['robin','robin','robin','jason','jason'], commits.collect { |c| c.committer_name }
 
-			assert commits[0].committer_date - Time.utc(2006,6,11,18,28,0) < 1 # commits include milliseconds
-			assert commits[1].committer_date - Time.utc(2006,6,11,18,32,13) < 1
-			assert commits[2].committer_date - Time.utc(2006,6,11,18,34,17) < 1
-			assert commits[3].committer_date - Time.utc(2006,7,14,22,17,8) < 1
-			assert commits[4].committer_date - Time.utc(2006,7,14,23,7,15) < 1
+			assert_equal Time.utc(2006,6,11,18,28, 0), commits[0].committer_date
+			assert_equal Time.utc(2006,6,11,18,32,14), commits[1].committer_date
+			assert_equal Time.utc(2006,6,11,18,34,18), commits[2].committer_date
+			assert_equal Time.utc(2006,7,14,22,17, 9), commits[3].committer_date
+			assert_equal Time.utc(2006,7,14,23, 7,16), commits[4].committer_date
 
 			assert_equal "Initial Checkin\n", commits[0].message
 			assert_equal "added makefile", commits[1].message

test/unit/svn_convert_test.rb

@@ -16,7 +16,7 @@ def test_basic_convert
 						# Because Subversion does not track authors (only committers),
 						# the Subversion committer becomes the Git author.
 						assert_equal c.committer_name, dest_commits[i].author_name
-						assert_equal c.committer_date, dest_commits[i].author_date
+						assert_equal c.committer_date.round, dest_commits[i].author_date
 
 						# The svn-to-git conversion process loses the trailing \n for single-line messages
 						assert_equal c.message.strip, dest_commits[i].message.strip