mount.rb in knjrbfw-0.0.8

- old
+ new

@@ -11,12 +11,12 @@
 			
 			folder_from = nil if folder_from == "none"
 			#raise "The folder doesnt exist?" if !File.exists?(folder_to)
 			
 			add = true
-			add = false if args.has_key?("to") and args["to"] != folder_to
-			add = false if args.has_key?("from") and args["from"] != folder_from
+			add = false if args.key?("to") and args["to"] != folder_to
+			add = false if args.key?("from") and args["from"] != folder_from
 			
 			if args["from_search"]
 				Knj::Strings.searchstring(args["from_search"]).each do |str|
 					add = false if !folder_from or folder_from.index(str) == nil
 				end
@@ -41,15 +41,15 @@
 		return ret
 	end
 	
 	def self.mount(args)
 		cmd = "mount"
-		cmd += " -t #{Knj::Strings.unixsafe(args["type"])}" if args.has_key?("type")
+		cmd += " -t #{Knj::Strings.unixsafe(args["type"])}" if args.key?("type")
 		cmd += " --bind" if args["bind"]
 		cmd += " #{Knj::Strings.unixsafe(args["from"])} #{Knj::Strings.unixsafe(args["to"])}"
 		
-		if args.has_key?("opts")
+		if args.key?("opts")
 			raise "opts argument must be an array." if !args["opts"].is_a?(Array)
 			
 			cmd += "-O "
 			
 			first = true
@@ -83,21 +83,21 @@
 	def initialize(data)
 		@data = data
 	end
 	
 	def [](key)
-		raise "Invalid key: #{key}." if !@data.has_key?(key)
+		raise "Invalid key: #{key}." if !@data.key?(key)
 		return @data[key]
 	end
 	
 	def unmount
 		Knj::Os.shellcmd("umount #{Knj::Strings.unixsafe(@data[:to])}")
 	end
 	
 	alias :umount :unmount
 	
 	def access?(args = {})
-		args["timeout"] = 2 if !args.has_key?("timeout")
+		args["timeout"] = 2 if !args.key?("timeout")
 		access = false
 		
 		begin
 			Timeout.timeout(args["timeout"]) do
 				Dir.new(@data[:to]).each do |file|