knjrbfw 0.0.115 → 0.0.116

data/lib/knj/includes/appserver_cli.rb

@@ -5,15 +5,15 @@ class Appserver_cli
   def self.loadfile(filepath)
     require filepath
   end
-  
+
   def self._(str)
     return str
   end
-  
+
   def self.gettext
     return self
   end
-  
+
   def self.lang_opts
     return []
   end
@@ -32,7 +32,7 @@ def _ob
 end
 
 autoinc_cli_path = "../include/autoinclude_cli.rb"
-if File.exists?(autoinc_cli_path)
+if File.exist?(autoinc_cli_path)
   require autoinc_cli_path
 else
   require "../include/autoinclude.rb"

data/lib/knj/knj.rb

@@ -2,40 +2,40 @@ $knjpath = "knj/" if !$knjpath
 
 module Knj
   CONFIG = {}
-  
+
   def self.const_missing(name)
     if name == :Db
       filepath = "#{$knjpath}knjdb/libknjdb"
     else
       filepath = "#{$knjpath}#{name.to_s.downcase}"
     end
-    
+
     require filepath
     raise "Constant still not defined: '#{name}'." if !Knj.const_defined?(name)
     return Knj.const_get(name)
   end
-  
+
   def self.appserver_cli(filename)
     Knj::Os.chdir_file(filename)
     require "#{$knjpath}/includes/appserver_cli.rb"
   end
-  
+
   def self.dirname(filepath)
-    raise "Filepath does not exist: #{filepath}" if !File.exists?(filepath)
+    raise "Filepath does not exist: #{filepath}" if !File.exist?(filepath)
     return File.realpath(File.dirname(filepath))
   end
-  
+
   #Returns the path of the knjrbfw-framework.
   def self.knjrbfw_path
     return File.realpath(File.dirname(__FILE__))
   end
-  
+
   #Shortcut to Php4r.print_r.
   def self.p(*args, &block)
     require "php4r" if !Kernel.const_defined?(:Php4r)
     return Php4r.print_r(*args, &block)
   end
-  
+
   def self.handle_return(args)
     if args[:block]
       args[:enum].each(&args[:block])
@@ -44,7 +44,7 @@ module Knj
       return Array_enumerator.new(args[:enum])
     end
   end
-  
+
   #Loads a gem by a given name. First tries to load the gem from a custom parent directory to enable loading of development-gems.
   def self.gem_require(gem_const, gem_name = nil)
     #Support given an array for multiple gem-names in one call.
@@ -52,37 +52,37 @@ module Knj
       gem_const.each do |gem_i|
         self.gem_require(gem_i)
       end
-      
+
       return nil
     end
-    
+
     #Set correct names.
     gem_name = gem_const.to_s.downcase.strip if !gem_name
     gem_const = "#{gem_const.to_s[0].upcase}#{gem_const.to_s[1, gem_name.length]}"
-    
+
     #Return false if the constant is already loaded.
     return false if ::Kernel.const_defined?(gem_const)
-    
+
     #Try to load gem from custom development-path.
     found_custom = false
-    
+
     paths = [
       "#{File.realpath("#{File.dirname(__FILE__)}/../../..")}/#{gem_name}/lib/#{gem_name}.rb"
     ]
     paths.each do |path|
-      if File.exists?(path)
+      if File.exist?(path)
         require path
         found_custom = true
         break
       end
     end
-    
+
     #Custom-path could not be loaded - load gem normally.
     if !found_custom
       require "rubygems"
       require gem_name.to_s
     end
-    
+
     #Return true to enable detection of that something was loaded.
     return true
   end

data/lib/knj/mount.rb

@@ -2,32 +2,32 @@ class Knj::Mount
   def self.list(args = {})
     mount_output = Knj::Os.shellcmd("mount")
     ret = []
-    
+
     mount_output.scan(/^(.+?) on (.+?) type (.+) \((.+?)\)$/) do |match|
       type = match[2]
       folder_from = match[0]
       folder_to = match[1]
       opts = match[3].split(",")
-      
+
       folder_from = nil if folder_from == "none"
-      #raise "The folder doesnt exist?" if !File.exists?(folder_to)
-      
+      #raise "The folder doesnt exist?" if !File.exist?(folder_to)
+
       add = true
       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
       end
-      
+
       if args["to_search"]
         Knj::Strings.searchstring(args["to_search"]).each do |str|
           add = false if !folder_to or folder_to.index(str) == nil
         end
       end
-      
+
       if add
         ret << Knj::Mount.new(
           :type => type,
@@ -37,26 +37,26 @@ class Knj::Mount
         )
       end
     end
-    
+
     return ret
   end
-  
+
   def self.mount(args)
     cmd = "mount"
     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.key?("opts")
       raise "opts argument must be an array." if !args["opts"].is_a?(Array)
-      
+
       cmd << "-O "
-      
+
       first = true
       args["opts"].each do |opt|
         cmd << "," if !first
         first = false if first
-        
+
         if opt.is_a?(Array)
           raise "Array-opt must have a length of 2." if opt.length != 2
           cmd << "#{Knj::Strings.unixsafe(opt[0])}=#{Knj::Strings.unixsafe(opt[1])}"
@@ -67,38 +67,38 @@ class Knj::Mount
         end
       end
     end
-    
+
     Knj::Os.shellcmd(cmd)
   end
-  
+
   def self.ensure(args)
     list = Knj::Mount.list("to_search" => args["to"])
     return false if !list.empty?
     Knj::Mount.mount(args)
     return true
   end
-  
+
   attr_reader :data
-  
+
   def initialize(data)
     @data = data
   end
-  
+
   def [](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.key?("timeout")
     access = false
-    
+
     begin
       Timeout.timeout(args["timeout"]) do
         Dir.new(@data[:to]).each do |file|
@@ -109,7 +109,7 @@ class Knj::Mount
     rescue Timeout::Error => e
       return false
     end
-    
+
     return access
   end
 end

data/lib/knj/os.rb

@@ -1,36 +1,36 @@
 module Knj::Os
   #Returns the path of the home-dir as a string.
   #===Examples
-  # print "Looks like the current user uses Mozilla software?" if File.exists?("#{Knj::Os.homedir}/.mozilla")
+  # print "Looks like the current user uses Mozilla software?" if File.exist?("#{Knj::Os.homedir}/.mozilla")
   def self.homedir
     if ENV["USERPROFILE"]
       homedir = ENV["USERPROFILE"]
     else
       homedir = File.expand_path("~")
     end
-    
+
     if homedir.length <= 0
       raise "Could not figure out the homedir."
     end
-    
+
     return homedir
   end
-  
+
   #This method was created to make up for the fact that Dir.tmpdir sometimes returns empty strings??
   #===Examples
   # tmp_db_path = "#{Knj::Os.tmpdir}/temp_db.sqlite3"
   def self.tmpdir
     require "tmpdir"
     tmpdir = Dir.tmpdir.to_s.strip
-    
-    return tmpdir if tmpdir.length >= 3 and File.exists?(tmpdir)
-    return ENV["TEMP"] if ENV["TEMP"].to_s.strip.length > 0 and File.exists?(ENV["TMP"])
-    return ENV["TMP"] if ENV["TMP"].to_s.strip.length > 0 and File.exists?(ENV["TMP"])
-    return "/tmp" if File.exists?("/tmp")
-    
+
+    return tmpdir if tmpdir.length >= 3 and File.exist?(tmpdir)
+    return ENV["TEMP"] if ENV["TEMP"].to_s.strip.length > 0 and File.exist?(ENV["TMP"])
+    return ENV["TMP"] if ENV["TMP"].to_s.strip.length > 0 and File.exist?(ENV["TMP"])
+    return "/tmp" if File.exist?("/tmp")
+
     raise "Could not figure out temp-dir."
   end
-  
+
   #This method returns the username of the current user.
   #===Examples
   # print "I can do what I want, I am root!" if Knj::Os.whoami == "root"
@@ -40,14 +40,14 @@ module Knj::Os
     else
       whoami = %x[whoami].strip
     end
-    
+
     if whoami.length <= 0
       raise "Could not figure out the user who is logged in."
     end
-    
+
     return whoami
   end
-  
+
   #Returns the operating system a string.
   #===Examples
   # print "Can I please move to another machine?" if Knj::Os.os == "windows"
@@ -58,7 +58,7 @@ module Knj::Os
     elsif RUBY_PLATFORM
       teststring = RUBY_PLATFORM.to_s.downcase
     end
-    
+
     if teststring.include?("windows")
       return "windows"
     elsif teststring.include?("linux")
@@ -68,7 +68,7 @@ module Knj::Os
       raise "Could not figure out OS: '#{teststring}'."
     end
   end
-  
+
   #Returns the current graphical toolkit running.
   #===Examples
   # Knj::Os.toolkit #=> 'kde'
@@ -78,18 +78,18 @@ module Knj::Os
         return "kde"
       end
     end
-    
+
     raise "Could not figure out the toolkit."
   end
-  
+
   def self.class_exist(classstr)
     if Module.constants.index(classstr) != nil
       return true
     end
-    
+
     return false
   end
-  
+
   def self.chdir_file(filepath)
     if File.symlink?(filepath)
       Dir.chdir(File.dirname(File.readlink(filepath)))
@@ -97,19 +97,19 @@ module Knj::Os
       Dir.chdir(File.dirname(filepath))
     end
   end
-  
+
   def self.realpath(path)
     return self.realpath(File.readlink(path)) if File.symlink?(path)
     return path
   end
-  
+
   #Runs a command and returns output. Also throws an exception of something is outputted to stderr.
   def self.shellcmd(cmd)
     res = {
       :out => "",
       :err => ""
     }
-    
+
     if RUBY_ENGINE == "jruby"
       begin
         IO.popen4(cmd) do |pid, stdin, stdout, stderr|
@@ -131,70 +131,70 @@ module Knj::Os
         res[:err] << stderr.read
       end
     end
-    
+
     if res[:err].to_s.strip.length > 0
       raise res[:err]
     end
-    
+
     return res[:out]
   end
-  
+
   #Runs a command as a process of its own and wont block or be depended on this process.
   def self.subproc(cmd)
     %x[#{cmd} >> /dev/null 2>&1 &]
   end
-  
+
   #Returns the xauth file for GDM.
   def self.xauth_file
     authfile = ""
-    
-    if File.exists?("/var/run/gdm")
+
+    if File.exist?("/var/run/gdm")
       Dir.foreach("/var/run/gdm") do |file|
         next if file == "." or file == ".." or !file.match(/^auth-for-gdm-.+$/)
         authfile = "/var/run/gdm/#{file}/database"
       end
     end
-    
-    if File.exists?("/var/run/lightdm")
+
+    if File.exist?("/var/run/lightdm")
       Dir.foreach("/var/run/lightdm") do |file|
         next if file == "." or file == ".."
-        
+
         Dir.foreach("/var/run/lightdm/#{file}") do |f2|
           authfile = "/var/run/lightdm/#{file}/#{f2}" if f2.match(/^:(\d+)$/)
         end
       end
     end
-    
+
     if authfile.to_s.length <= 0
       raise "Could not figure out authfile for GDM."
     end
-    
+
     return authfile
   end
-  
+
   #Checks if the display variable and xauth is set - if not sets it to the GDM xauth and defaults the display to :0.0.
   def self.check_display_env
     ret = {}
-    
+
     if ENV["DISPLAY"].to_s.strip.length <= 0
       x_procs = Knj::Unix_proc.list("grep" => "/usr/bin/X")
       set_disp = nil
-      
+
       x_procs.each do |x_proc|
         if match = x_proc["cmd"].match(/(:\d+)/)
           set_disp = match[1]
           break
         end
       end
-      
+
       raise "Could not figure out display." if !set_disp
-      
+
       ENV["DISPLAY"] = set_disp
       ret["display"] = set_disp
     else
       ret["display"] = ENV["DISPLAY"]
     end
-    
+
     if !ENV["XAUTHORITY"]
       res = Knj::Os.xauth_file
       ENV["XAUTHORITY"] = res
@@ -202,31 +202,31 @@ module Knj::Os
     else
       ret["xauth"] = ENV["XAUTHORITY"]
     end
-    
+
     return ret
   end
-  
+
   #Returns the command used to execute the current process.
   def self.executed_cmd
     return ENV["SUDO_COMMAND"] if ENV["SUDO_COMMAND"]
-    
+
     proc_self = Knj::Unix_proc.find_self
     cmd = proc_self["cmd"]
-    
+
     cmd.gsub!(/^ruby([\d\.]+)/, ENV["_"]) if ENV["_"]
-    
+
     return cmd
   end
-  
+
   #Returns the Ruby executable that is running the current process if possible.
   def self.executed_executable
     return ENV["rvm_ruby_string"] if !ENV["rvm_ruby_string"].to_s.empty?
-    
+
     if ENV["MY_RUBY_HOME"]
       ruby_bin_path = "#{ENV["MY_RUBY_HOME"]}/bin/ruby"
-      return ruby_bin_path if File.exists?(ruby_bin_path)
+      return ruby_bin_path if File.exist?(ruby_bin_path)
     end
-    
+
     #Try to look the executeable up by command.
     if self.os == "linux"
       unix_proc = Knj::Unix_proc.find_self
@@ -240,13 +240,13 @@ module Knj::Os
         raise "Could not find the self-process."
       end
     end
-    
+
     # Code for returning RBEnv Ruby path if running through RBEnv.
     if ENV["RBENV_VERSION"] && ENV["RBENV_ROOT"]
       rbenv_path = "#{ENV["RBENV_ROOT"]}/versions/#{ENV["RBENV_VERSION"]}/bin/ruby"
-      return rbenv_path if File.exists?(rbenv_path)
+      return rbenv_path if File.exist?(rbenv_path)
     end
-    
+
     raise "Could not figure out the executed executable from the environment: '#{ENV.to_hash}'."
   end
 end

data/lib/knj/power_manager.rb

@@ -1,31 +1,31 @@
 class Knj::Power_manager
   def initialize(args = {})
     @args = args
-    
-    if !File.exists?("/proc/acpi/ac_adapter")
+
+    if !File.exist?("/proc/acpi/ac_adapter")
       raise "Could not find the proc-acpi folder."
     end
-    
+
     Dir.new("/proc/acpi/ac_adapter").each do |file|
       next if file == "." or file == ".."
       fn = "/proc/acpi/ac_adapter/#{file}"
-      
+
       if File.directory?(fn)
         @ac_folder = Php4r.realpath(fn)
         break
       end
     end
-    
+
     raise "Could not register ac-folder." if !@ac_folder
   end
-  
+
   def state
     cont = File.read("#{@ac_folder}/state")
-    
+
     if match = cont.match(/state:\s*(.+)\s*/)
       return match[1]
     end
-    
+
     raise "Could not figure out state."
   end
 end

data/lib/knj/scripts/svn_merge.rb

@@ -6,24 +6,24 @@ path_to = ARGV[0]
 
 Dir.glob(File.join("**", ".svn")).each do |dir|
   newdir = path_to + "/" + dir
-  
+
   #print dir + "\n"
   #print newdir + "\n"
-  
-  if File.exists?(newdir)
+
+  if File.exist?(newdir)
     print "Remove: " + newdir.to_s + "\n"
     FileUtils.rm_r(newdir)
   end
-  
+
   begin
     #print "Move: " + dir + "\n"
     #FileUtils.mv(dir, newdir)
-    
+
     print "Copy: " + dir + "\n"
     FileUtils.cp_r(dir, newdir)
   rescue => e
     print "Failed: " + e.message + "\n"
   end
-  
+
   #print "\n"
 end

data/lib/knj/scripts/upgrade_knjrbfw_checker.rb

@@ -20,16 +20,16 @@ checks = [
 checks.each do |dir|
   dev_name = dir + "_dev"
   original_name = dir + "_original"
-  
+
   if mode == "dev"
-    if File.exists?(dir) and File.symlink?(dir)
+    if File.exist?(dir) and File.symlink?(dir)
       #do nothing.
-    elsif File.exists?(dir) and !File.exists?(original_name)
+    elsif File.exist?(dir) and !File.exist?(original_name)
       File.rename(dir, original_name)
       File.rename(dev_name, dir)
     end
   elsif mode == "original"
-    if File.exists?(dir) and File.exists?(original_name) and File.symlink?(dir)
+    if File.exist?(dir) and File.exist?(original_name) and File.symlink?(dir)
       File.rename(dir, dev_name)
       File.rename(original_name, dir)
     else

data/lib/knj/web.rb

@@ -443,7 +443,7 @@ class Knj::Web
         raise "No value given in arguments for imageupload-input." if !args.key?(:value)
 
         path = args[:path].gsub("%value%", value.to_s).untaint
-        if File.exists?(path)
+        if File.exist?(path)
           html << "<img src=\"image.rhtml?path=#{self.urlenc(path).html}&smartsize=100&rounded_corners=10&border_color=black&force=true&ts=#{Time.new.to_f}\" alt=\"Image\" />"
 
           if args[:dellink]