moss_ruby 1.1.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6388f6ab27c44a591101464aa52b353023baf4e8
-  data.tar.gz: a6ea6678cab87b739629d4dfe96070b5b07d9669
+SHA256:
+  metadata.gz: 78627675df04c3b8c8a178e690f2c64f3f8588f451541dfd348b9fc0d4377ab5
+  data.tar.gz: 6f6c14edc678829dcf1a8b28ed1494ae64bfc0f5be0902ac9976b84ddc201e92
 SHA512:
-  metadata.gz: 230ff756021bca01adfb49e4f91103b421922b8ef10a05dde7754681d9426d0ccc2b32bbbddbefda2a4908f21b81b66d3be173961b97f72e8d75cce59debaeed
-  data.tar.gz: 1533a081ee20ba3f568338e1663af6bce61c6f8827360a4c8a07988f23eab25bab0b1bfafa6d15e6e3020bc490da586f5b6486e132aff417468a833acb7acee3
+  metadata.gz: 9e46b7f5ca7d20c833a6e3d8729a53611392f86379ac71c1de9c9695088f870ba7a651169ac9d5bb5a85a71500382404c0467babad16be7da32292c2a99d78d9
+  data.tar.gz: cb30039ddb1641f4b2c860021402497846e1e2dcd713417794a3987c9cf495a6079d45f442c33662770ca5de4d7638b95cf2015778ec56124bc19a6f21543e2b

data/lib/moss_ruby.rb

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'socket'
+require 'tcp_timeout'
 require 'open-uri'
 
 #
@@ -61,15 +61,13 @@ class MossRuby
 	end
 
 	def upload_file (moss_server, file, id = 0)
-		filename = file.strip.tap do |name|
-			name.gsub! /[^\w\-\/.]/, '_'
-		end
+		filename = file.strip.encode('UTF-8', invalid: :replace, undef: :replace, replace: '').gsub /[^\w\-\/.]/, '_'
 
-		content = IO.read(filename)
+		content = IO.read(file)
 		size = content.bytes.length
 
-		if size > 0 
-			moss_server.write "file #{id} #{@options[:language]} #{size} #{file}\n"
+		if size > 0
+			moss_server.write "file #{id} #{@options[:language]} #{size} #{filename}\n"
 			moss_server.write content
 		end
 	end
@@ -77,7 +75,7 @@ class MossRuby
 	def check(files_dict, callback=nil)
 		# Chech that the files_dict contains valid filenames
 		files_dict[:base_files].each do |file_search|
-			if Dir.glob(file_search, File::FNM_CASEFOLD).length == 0
+			if Dir.glob(file_search).length == 0
 				raise "Unable to locate base file(s) matching #{file_search}"
 			end
 		end
@@ -87,14 +85,14 @@ class MossRuby
 		end
 
 		files_dict[:files].each do |file_search|
-			if Dir.glob(file_search, File::FNM_CASEFOLD).length == 0
+			if Dir.glob(file_search).length == 0
 				raise "Unable to locate base file(s) matching #{file_search}"
 			end
 		end
 
 		# Connect to the server
 		callback.call('Connecting to MOSS') unless callback.nil?
-		moss_server = TCPSocket.new @server, @port
+		moss_server = TCPTimeout::TCPSocket.new @server, @port, connect_timeout: 10, write_timeout: 9, read_timeout: 300
 		begin
 			# Send header details
 			callback.call(' - Sending configuration details') unless callback.nil?
@@ -108,7 +106,7 @@ class MossRuby
 			moss_server.write "language #{@options[:language]}\n"
 
 			callback.call(' - Checking language') unless callback.nil?
-			line = moss_server.gets
+			line = gets(moss_server)
 			if line.strip() != "yes"
 				moss_server.write "end\n"
 				raise "Invalid language option."
@@ -118,7 +116,7 @@ class MossRuby
 			processing = files_dict[:base_files]
 			processing.each do |file_search|
 				callback.call(" - Sending base files #{count} of #{processing.count} - #{file_search}") unless callback.nil?
-				files = Dir.glob(file_search, File::FNM_CASEFOLD)
+				files = Dir.glob(file_search)
 				file_count = 1
 				files.each do |file|
 					callback.call("   - Base file #{file_count} of #{files.count} - #{file}") unless callback.nil?
@@ -133,7 +131,7 @@ class MossRuby
 			processing = files_dict[:files]
 			processing.each do |file_search|
 				callback.call(" - Sending files #{count} of #{processing.count} - #{file_search}") unless callback.nil?
-				files = Dir.glob(file_search, File::FNM_CASEFOLD)
+				files = Dir.glob(file_search)
 				file_count = 1
 				files.each do |file|
 					callback.call("   - File #{idx} = #{file_count} of #{files.count} - #{file}") unless callback.nil?
@@ -146,7 +144,7 @@ class MossRuby
 			callback.call(" - Waiting for server response") unless callback.nil?
 			moss_server.write "query 0 #{@options[:comment]}\n"
 
-			result = moss_server.gets
+			result = gets(moss_server)
 
 			moss_server.write "end\n"
 			return result.strip()
@@ -168,7 +166,7 @@ class MossRuby
 
 				# read the two match files
 				match_url = "#{uri}/match#{id}-top.html"
-				match_top = open(match_url).read
+				match_top = URI.open(match_url).read().encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '?')
 
 				callback.call(" - checking match #{match} percents") unless callback.nil?
 				top = read_pcts match_top
@@ -177,8 +175,8 @@ class MossRuby
 
 				callback.call(" - fetching #{match} html") unless callback.nil?
 
-				match_file[0] = open("#{uri}/match#{id}-0.html").read
-				match_file[1] = open("#{uri}/match#{id}-1.html").read
+				match_file[0] = URI.open("#{uri}/match#{id}-0.html").read().encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '?')
+				match_file[1] = URI.open("#{uri}/match#{id}-1.html").read().encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '?')
 
 				# puts match_top
 				# puts "---FILE0\n\n"
@@ -190,22 +188,22 @@ class MossRuby
 
 				data[0] = read_data match_file[0]
 				data[1] = read_data match_file[1]
-				
+
 				callback.call(" - adding #{match} result") unless callback.nil?
-				result << [ 
+				result << [
 					{
-						filename: 	data[0][:filename], 
+						filename: 	data[0][:filename],
 						html:  		strip_a("<PRE>#{data[0][:html]}</PRE>"),
 						pct:  		Integer(top[:pct0]),
 						url: 		match_url,
 						part_url: 	"#{uri}/match#{id}-0.html"
 					},
 					{
-						filename: 	data[1][:filename], 
+						filename: 	data[1][:filename],
 						html:  		strip_a("<PRE>#{data[1][:html]}</PRE>"),
 						pct:  		Integer(top[:pct1]),
 						url: 		match_url,
-						part_url: 	"#{uri}/match#{id}-1.html"			
+						part_url: 	"#{uri}/match#{id}-1.html"
 					}
 				]
 			end
@@ -222,10 +220,10 @@ class MossRuby
 		result = Array.new
 		begin
 			callback.call(" - Reading match data") unless callback.nil?
-			page = open("#{uri}").read
+			page = URI.open("#{uri}").read().encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '?')
 			regex = /<TR><TD><A HREF=".*?match(?<match_id>\d+).html">.*\((?<pct0>\d+)%\)<\/A>\n.*?<TD><A.*?((?<pct0>\d+)%\))/i
 			# puts "scanning page"
-			page.scan(regex).each do | match | 
+			page.scan(regex).each do | match |
 				id, pct0, pct1 = match
 				# puts "#{id}, #{pct0}, #{pct1}"
 				if Integer(pct0) >= min_pct || Integer(pct1) >= min_pct
@@ -251,4 +249,23 @@ class MossRuby
 		regex = /<TH>(?<filename0>\S+)\s\((?<pct0>\d+)%\).*<TH>(?<filename1>\S+)\s\((?<pct1>\d+)%\)/xm
 		top_file.match(regex)
 	end
-end
+
+	##
+	# Reads a line from the server.
+	def gets moss_server
+		buffer = ""
+		
+		loop do
+			tmp = moss_server.read(1)
+			
+			if !tmp.nil?
+				buffer += tmp
+			end
+
+			break if tmp.nil? || tmp.include?("\n")
+			tmp = ''
+		end
+		
+		return buffer.gsub(/\n/, '')
+	end
+end

metadata

@@ -1,45 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: moss_ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.4
 platform: ruby
 authors:
 - Andrew Cain
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
-dependencies: []
+date: 2022-05-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tcp_timeout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
 description: Moss-ruby is an unofficial ruby gem for the Moss system for Detecting
   Software Plagiarism (http://theory.stanford.edu/~aiken/moss/)
-email: acain@swin.edu.au
+email:
+- macite@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/moss_ruby.rb
-homepage: https://bitbucket.org/macite/moss-ruby
+homepage: https://github.com/doubtfire-lms/moss-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Moss gem to access system for Detecting Software Plagiarism
 test_files: []