Merge pull request #22 from notalex/OTWO-3248

Rename Scm modules to OhlohScm

Author: Peter Degen-Portnoy

lib/ohloh_scm/adapters/svn/commits.rb

@@ -96,7 +96,7 @@ def deepen_diff(diff, rev)
 			if (diff.action == 'D' or diff.action == 'A') && is_directory?(diff.path, recurse_rev)
 				# Deleting or adding a directory. Expand it out to show every file.
 				recurse_files(diff.path, recurse_rev).collect do |f|
-					Scm::Diff.new(:action => diff.action, :path => File.join(diff.path, f))
+					OhlohScm::Diff.new(:action => diff.action, :path => File.join(diff.path, f))
 				end
 			else
 				# An ordinary file action. Just return the diff.

lib/ohloh_scm/commit.rb

@@ -1,4 +1,4 @@
-module Scm
+module OhlohScm
 	# A commit is a collection of diffs united by a single timestamp, author, and
 	# message.
 	#

lib/ohloh_scm/diff.rb

@@ -1,10 +1,10 @@
-module Scm
+module OhlohScm
 	# A +Diff+ represents a change to a single file. It can represent the addition or
 	# deletion of a file, or it can represent a modification of the file contents.
-	# 
+	#
 	# Ohloh does not track filename changes. If a file is renamed, Ohloh treats this
 	# as the deletion of one file and the creation of another.
-	# 
+	#
 	# Ohloh does not track directories, only the files within directories.
 	#
 	# Don't confuse our use of the word "Diff" with a patch file or the output of the
@@ -22,7 +22,7 @@ class Diff
 		#   'M' modified
 		#   'D' deleted
 		attr_accessor :action
-		
+
 		# The SHA1 hash of the file contents both before and after the change.
 		# These must be computed using the same method as Git.
 		attr_accessor :parent_sha1, :sha1

lib/ohloh_scm/parsers/bzr_parser.rb

@@ -30,7 +30,7 @@ def self.internal_parse(buffer, opts)
 						e.diffs = remove_dupes(e.diffs)
 						yield e
 					end
-					e = Scm::Commit.new
+					e = OhlohScm::Commit.new
 					e.diffs = []
 					next_state = :data
 				when /^#{indent}revno:\s+(\d+)$/
@@ -98,10 +98,10 @@ def self.parse_diffs(action, line)
 				# Note that is possible to be renamed to the empty string!
 				# This happens when a subdirectory is moved to become the root.
 				before, after = line.scan(/(.+) => ?(.*)/).first
-				[ Scm::Diff.new(:action => 'D', :path => before),
-					Scm::Diff.new(:action => 'A', :path => after || '' )]
+				[ OhlohScm::Diff.new(:action => 'D', :path => before),
+					OhlohScm::Diff.new(:action => 'A', :path => after || '' )]
 			else
-				[Scm::Diff.new(:action => action, :path => line)]
+				[OhlohScm::Diff.new(:action => action, :path => line)]
 			end.each do |d|
 				d.path = strip_trailing_asterisk(d.path)
 			end

lib/ohloh_scm/parsers/bzr_xml_parser.rb

@@ -18,7 +18,7 @@ def initialize(callback)
 		def tag_start(name, attrs)
       case name
       when 'log'
-				@commit = Scm::Commit.new
+				@commit = OhlohScm::Commit.new
 				@commit.diffs = []
       when 'affected-files'
         @diffs = []
@@ -87,18 +87,18 @@ def parse_diff(action, path, before_path)
       case action
         # A rename action requires two diffs: one to remove the old filename,
         # another to add the new filename.
-        #   
+        #
         # Note that is possible to be renamed to the empty string!
         # This happens when a subdirectory is moved to become the root.
       when 'renamed'
-        diffs = [ Scm::Diff.new(:action => 'D', :path => before_path),
-                  Scm::Diff.new(:action => 'A', :path => path || '')]
+        diffs = [ OhlohScm::Diff.new(:action => 'D', :path => before_path),
+                  OhlohScm::Diff.new(:action => 'A', :path => path || '')]
       when 'added'
-        diffs = [Scm::Diff.new(:action => 'A', :path => path)]
+        diffs = [OhlohScm::Diff.new(:action => 'A', :path => path)]
       when 'modified'
-        diffs = [Scm::Diff.new(:action => 'M', :path => path)]
+        diffs = [OhlohScm::Diff.new(:action => 'M', :path => path)]
       when 'removed'
-        diffs = [Scm::Diff.new(:action => 'D', :path => path)]
+        diffs = [OhlohScm::Diff.new(:action => 'D', :path => path)]
       end
       diffs.each do |d|
         d.path = strip_trailing_asterisk(d.path)
@@ -108,11 +108,11 @@ def parse_diff(action, path, before_path)
 
     def strip_trailing_asterisk(path)
       path[-1..-1] == '*' ? path[0..-2] : path
-    end 
+    end
 
     def remove_dupes(diffs)
       BzrXmlParser.remove_dupes(diffs)
-    end 
+    end
 
 	end
 
@@ -133,14 +133,14 @@ def self.scm
     def self.remove_dupes(diffs)
       # Bazaar may report that a file was added and modified in a single commit.
       # Reduce these cases to a single 'A' action.
-      diffs.delete_if do |d| 
+      diffs.delete_if do |d|
         d.action == 'M' && diffs.select { |x| x.path == d.path && x.action == 'A' }.any?
-      end 
+      end
 
       # Bazaar may report that a file was both deleted and added in a single commit.
       # Reduce these cases to a single 'M' action.
-      diffs.each do |d| 
-        d.action = 'M' if diffs.select { |x| x.path == d.path }.size > 1 
+      diffs.each do |d|
+        d.action = 'M' if diffs.select { |x| x.path == d.path }.size > 1
       end.uniq
     end
 

lib/ohloh_scm/parsers/cvs_parser.rb

@@ -139,7 +139,7 @@ def self.read_commit(io, filename, commit_number, should_yield)
 					should_yield = false if commit_number == '1.1' and state == 'dead'
 					message = read_message(io)
 					if should_yield
-						commit = Scm::Commit.new
+						commit = OhlohScm::Commit.new
 						commit.token = committer_date[0..18]
 						commit.committer_date = Time.parse(committer_date[0..18] + ' +0000').utc
 						commit.committer_name = committer_name

lib/ohloh_scm/parsers/git_parser.rb

@@ -27,7 +27,7 @@ def self.internal_parse(io, opts)
 					when /^commit ([a-z0-9]{40,40})$/
 						sha1 = $1
 						yield e if e
-						e = Scm::Commit.new
+						e = OhlohScm::Commit.new
 						e.diffs = []
 						e.token = sha1
 						e.author_name = ANONYMOUS
@@ -53,7 +53,7 @@ def self.internal_parse(io, opts)
 
 				elsif state == :diffs
 					if line =~ /^([ADM])\t(.+)$/
-						e.diffs << Scm::Diff.new( :action => $1, :path => $2)
+						e.diffs << OhlohScm::Diff.new( :action => $1, :path => $2)
 					end
 
 				else

lib/ohloh_scm/parsers/git_styled_parser.rb

@@ -35,7 +35,7 @@ def self.internal_parse(io, opts)
 					if line =~ /^Commit: ([a-z0-9]+)$/
 						sha1 = $1
 						yield e if e
-						e = Scm::Commit.new
+						e = OhlohScm::Commit.new
 						e.diffs = []
 						e.token = sha1
 						e.author_name = ANONYMOUS
@@ -70,7 +70,7 @@ def self.internal_parse(io, opts)
 					elsif line =~ /:([0-9]+) ([0-9]+) ([a-z0-9]+) ([a-z0-9]+) ([A-Z])\t"?(.+[^"])"?$/
 						# Submodules have a file mode of '160000', which indicates a "gitlink"
 						# We ignore submodules completely.
-						e.diffs << Scm::Diff.new( :action => $5, :path => $6, :sha1 => $4, :parent_sha1 => $3 ) unless $1=='160000' || $2=='160000'
+						e.diffs << OhlohScm::Diff.new( :action => $5, :path => $6, :sha1 => $4, :parent_sha1 => $3 ) unless $1=='160000' || $2=='160000'
 					end
 
 				else

lib/ohloh_scm/parsers/hg_parser.rb

@@ -17,7 +17,7 @@ def self.internal_parse(buffer, opts)
 					case l
 					when /^changeset:\s+\d+:([0-9a-f]+)/
 						yield e if e && block_given?
-						e = Scm::Commit.new
+						e = OhlohScm::Commit.new
 						e.diffs = []
 						e.token = $1
 					when /^user:\s+(.+?)(\s+<(.+)>)?$/
@@ -27,7 +27,7 @@ def self.internal_parse(buffer, opts)
 						e.committer_date = Time.parse($1).utc
 					when /^files:\s+(.+)/
 						($1 || '').split(' ').each do |file|
-							e.diffs << Scm::Diff.new(:action => '?', :path => file)
+							e.diffs << OhlohScm::Diff.new(:action => '?', :path => file)
 						end
 					when /^summary:\s+(.+)/
 						e.message = $1

lib/ohloh_scm/parsers/hg_styled_parser.rb

@@ -25,7 +25,7 @@ def self.internal_parse(buffer, opts)
 				if state == :data
 					case l
 					when /^changeset:\s+([0-9a-f]+)/
-						e = Scm::Commit.new
+						e = OhlohScm::Commit.new
 						e.diffs = []
 						e.token = $1
 					when /^user:\s+(.+?)(\s+<(.+)>)?$/
@@ -46,7 +46,7 @@ def self.internal_parse(buffer, opts)
 					if l == "__END_FILES__\n"
 						next_state = :data
 					elsif l =~ /^([MAD]) (.+)$/
-						e.diffs << Scm::Diff.new(:action => $1, :path => $2)
+						e.diffs << OhlohScm::Diff.new(:action => $1, :path => $2)
 					end
 
 				elsif state == :long_comment